diff --git a/.eslintrc.json b/.eslintrc.json
index af1b97849b..6920cc4712 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -231,10 +231,13 @@
         "*.json5"
       ],
       "extends": [
-        "plugin:jsonc/recommended-with-jsonc"
+        "plugin:jsonc/recommended-with-json5"
       ],
       "rules": {
-        "no-irregular-whitespace": "error",
+        // The ESLint core no-irregular-whitespace rule doesn't work well in JSON
+        // See: https://ota-meshi.github.io/eslint-plugin-jsonc/rules/no-irregular-whitespace.html
+        "no-irregular-whitespace": "off",
+        "jsonc/no-irregular-whitespace": "error",
         "no-trailing-spaces": "error",
         "jsonc/comma-dangle": [
           "error",
diff --git a/.github/disabled-workflows/pull_request_opened.yml b/.github/disabled-workflows/pull_request_opened.yml
deleted file mode 100644
index 0dc718c0b9..0000000000
--- a/.github/disabled-workflows/pull_request_opened.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-# This workflow runs whenever a new pull request is created
-# TEMPORARILY DISABLED. Unfortunately this doesn't work for PRs created from forked repositories (which is how we tend to create PRs).
-# There is no known workaround yet. See https://github.community/t/how-to-use-github-token-for-prs-from-forks/16818
-name: Pull Request opened
-
-# Only run for newly opened PRs against the "main" branch
-on: 
-  pull_request:
-    types: [opened]
-    branches: 
-      - main
-
-jobs:
-  automation:
-    runs-on: ubuntu-latest
-    steps:
-    # Assign the PR to whomever created it. This is useful for visualizing assignments on project boards
-    # See https://github.com/marketplace/actions/pull-request-assigner
-    - name: Assign PR to creator
-      uses: thomaseizinger/assign-pr-creator-action@v1.0.0
-      # Note, this authentication token is created automatically
-      # See: https://docs.github.com/en/actions/configuring-and-managing-workflows/authenticating-with-the-github_token
-      with:
-        repo-token: ${{ secrets.GITHUB_TOKEN }}
-      # Ignore errors. It is possible the PR was created by someone who cannot be assigned
-      continue-on-error: true
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 219074780e..a72d0d6c18 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -7,7 +7,8 @@ name: Build
 on: [push, pull_request]
 
 permissions:
-  contents: read  #  to fetch code (actions/checkout)
+  contents: read  # to fetch code (actions/checkout)
+  packages: read  # to fetch private images from GitHub Container Registry (GHCR)
 
 jobs:
   tests:
@@ -33,21 +34,26 @@ jobs:
       #CHROME_VERSION: "90.0.4430.212-1"
       # Bump Node heap size (OOM in CI after upgrading to Angular 15)
       NODE_OPTIONS: '--max-old-space-size=4096'
+      # Project name to use when running "docker compose" prior to e2e tests
+      COMPOSE_PROJECT_NAME: 'ci'
+      # Docker Registry to use for Docker compose scripts below.
+      # We use GitHub's Container Registry to avoid aggressive rate limits at DockerHub.
+      DOCKER_REGISTRY: ghcr.io
     strategy:
       # Create a matrix of Node versions to test against (in parallel)
       matrix:
-        node-version: [16.x, 18.x]
+        node-version: [18.x, 20.x]
       # Do NOT exit immediately if one matrix job fails
       fail-fast: false
     # These are the actual CI steps to perform per job
     steps:
       # https://github.com/actions/checkout
       - name: Checkout codebase
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       # https://github.com/actions/setup-node
       - name: Install Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node-version }}
 
@@ -72,7 +78,7 @@ jobs:
         id: yarn-cache-dir-path
         run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT
       - name: Cache Yarn dependencies
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           # Cache entire Yarn cache directory (see previous step)
           path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
@@ -99,26 +105,34 @@ jobs:
       # so that it can be shared with the 'codecov' job (see below)
       # NOTE: Angular CLI only supports code coverage for specs. See https://github.com/angular/angular-cli/issues/6286
       - name: Upload code coverage report to Artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: matrix.node-version == '18.x'
         with:
-          name: dspace-angular coverage report
+          name: coverage-report-${{ matrix.node-version }}
           path: 'coverage/dspace-angular/lcov.info'
           retention-days: 14
 
-      # Using docker-compose start backend using CI configuration
+      # Login to our Docker registry, so that we can access private Docker images using "docker compose" below.
+      - name: Login to ${{ env.DOCKER_REGISTRY }}
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ env.DOCKER_REGISTRY }}
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      # Using "docker compose" start backend using CI configuration
       # and load assetstore from a cached copy
       - name: Start DSpace REST Backend via Docker (for e2e tests)
         run: |
-          docker-compose -f ./docker/docker-compose-ci.yml up -d
-          docker-compose -f ./docker/cli.yml -f ./docker/cli.assetstore.yml run --rm dspace-cli
+          docker compose -f ./docker/docker-compose-ci.yml up -d
+          docker compose -f ./docker/cli.yml -f ./docker/cli.assetstore.yml run --rm dspace-cli
           docker container ls
 
       # Run integration tests via Cypress.io
       # https://github.com/cypress-io/github-action
       # (NOTE: to run these e2e tests locally, just use 'ng e2e')
       - name: Run e2e tests (integration tests)
-        uses: cypress-io/github-action@v5
+        uses: cypress-io/github-action@v6
         with:
           # Run tests in Chrome, headless mode (default)
           browser: chrome
@@ -133,19 +147,19 @@ jobs:
       # Cypress always creates a video of all e2e tests (whether they succeeded or failed)
       # Save those in an Artifact
       - name: Upload e2e test videos to Artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: always()
         with:
-          name: e2e-test-videos
+          name: e2e-test-videos-${{ matrix.node-version }}
           path: cypress/videos
 
       # If e2e tests fail, Cypress creates a screenshot of what happened
       # Save those in an Artifact
       - name: Upload e2e test failure screenshots to Artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: failure()
         with:
-          name: e2e-test-screenshots
+          name: e2e-test-screenshots-${{ matrix.node-version }}
           path: cypress/screenshots
 
       - name: Stop app (in case it stays up after e2e tests)
@@ -170,17 +184,120 @@ jobs:
       # Get homepage and verify that the <meta name="title"> tag includes "DSpace".
       # If it does, then SSR is working, as this tag is created by our MetadataService.
       # This step also prints entire HTML of homepage for easier debugging if grep fails.
-      - name: Verify SSR (server-side rendering)
+      - name: Verify SSR (server-side rendering) on Homepage
         run: |
           result=$(wget -O- -q http://127.0.0.1:4000/home)
           echo "$result"
           echo "$result" | grep -oE "<meta name=\"title\" [^>]*>" | grep DSpace
 
+      # Get a specific community in our test data and verify that the "<h1>" tag includes "Publications" (the community name).
+      # If it does, then SSR is working.
+      - name: Verify SSR on a Community page
+        run: |
+          result=$(wget -O- -q http://127.0.0.1:4000/communities/0958c910-2037-42a9-81c7-dca80e3892b4)
+          echo "$result"
+          echo "$result" | grep -oE "<h1 [^>]*>[^><]*</h1>" | grep Publications
+
+      # Get a specific collection in our test data and verify that the "<h1>" tag includes "Articles" (the collection name).
+      # If it does, then SSR is working.
+      - name: Verify SSR on a Collection page
+        run: |
+          result=$(wget -O- -q http://127.0.0.1:4000/collections/282164f5-d325-4740-8dd1-fa4d6d3e7200)
+          echo "$result"
+          echo "$result" | grep -oE "<h1 [^>]*>[^><]*</h1>" | grep Articles
+
+      # Get a specific publication in our test data and verify that the <meta name="title"> tag includes
+      # the title of this publication. If it does, then SSR is working.
+      - name: Verify SSR on a Publication page
+        run: |
+          result=$(wget -O- -q http://127.0.0.1:4000/entities/publication/6160810f-1e53-40db-81ef-f6621a727398)
+          echo "$result"
+          echo "$result" | grep -oE "<meta name=\"title\" [^>]*>" | grep "An Economic Model of Mortality Salience"
+
+      # Get a specific person in our test data and verify that the <meta name="title"> tag includes
+      # the name of the person. If it does, then SSR is working.
+      - name: Verify SSR on a Person page
+        run: |
+          result=$(wget -O- -q http://127.0.0.1:4000/entities/person/b1b2c768-bda1-448a-a073-fc541e8b24d9)
+          echo "$result"
+          echo "$result" | grep -oE "<meta name=\"title\" [^>]*>" | grep "Simmons, Cameron"
+
+      # Get a specific project in our test data and verify that the <meta name="title"> tag includes
+      # the name of the project. If it does, then SSR is working.
+      - name: Verify SSR on a Project page
+        run: |
+          result=$(wget -O- -q http://127.0.0.1:4000/entities/project/46ccb608-a74c-4bf6-bc7a-e29cc7defea9)
+          echo "$result"
+          echo "$result" | grep -oE "<meta name=\"title\" [^>]*>" | grep "University Research Fellowship"
+
+      # Get a specific orgunit in our test data and verify that the <meta name="title"> tag includes
+      # the name of the orgunit. If it does, then SSR is working.
+      - name: Verify SSR on an OrgUnit page
+        run: |
+          result=$(wget -O- -q http://127.0.0.1:4000/entities/orgunit/9851674d-bd9a-467b-8d84-068deb568ccf)
+          echo "$result"
+          echo "$result" | grep -oE "<meta name=\"title\" [^>]*>" | grep "Law and Development"
+
+      # Get a specific journal in our test data and verify that the <meta name="title"> tag includes
+      # the name of the journal. If it does, then SSR is working.
+      - name: Verify SSR on a Journal page
+        run: |
+          result=$(wget -O- -q http://127.0.0.1:4000/entities/journal/d4af6c3e-53d0-4757-81eb-566f3b45d63a)
+          echo "$result"
+          echo "$result" | grep -oE "<meta name=\"title\" [^>]*>" | grep "Environmental &amp; Architectural Phenomenology"
+
+      # Get a specific journal volume in our test data and verify that the <meta name="title"> tag includes
+      # the name of the volume. If it does, then SSR is working.
+      - name: Verify SSR on a Journal Volume page
+        run: |
+          result=$(wget -O- -q http://127.0.0.1:4000/entities/journalvolume/07c6249f-4bf7-494d-9ce3-6ffdb2aed538)
+          echo "$result"
+          echo "$result" | grep -oE "<meta name=\"title\" [^>]*>" | grep "Environmental &amp; Architectural Phenomenology Volume 28 (2017)"
+
+      # Get a specific journal issue in our test data and verify that the <meta name="title"> tag includes
+      # the name of the issue. If it does, then SSR is working.
+      - name: Verify SSR on a Journal Issue page
+        run: |
+          result=$(wget -O- -q http://127.0.0.1:4000/entities/journalissue/44c29473-5de2-48fa-b005-e5029aa1a50b)
+          echo "$result"
+          echo "$result" | grep -oE "<meta name=\"title\" [^>]*>" | grep "Environmental &amp; Architectural Phenomenology Vol. 28, No. 1"
+
+      # Verify 301 Handle redirect behavior
+      # Note: /handle/123456789/260 is the same test Publication used by our e2e tests
+      - name: Verify 301 redirect from '/handle' URLs
+        run: |
+          result=$(wget --server-response --quiet http://127.0.0.1:4000/handle/123456789/260 2>&1 | head -1 | awk '{print $2}')
+          echo "$result"
+          [[ "$result" -eq "301" ]]
+
+      # Verify 403 error code behavior
+      - name: Verify 403 error code from '/403'
+        run: |
+          result=$(wget --server-response --quiet http://127.0.0.1:4000/403 2>&1 | head -1 | awk '{print $2}')
+          echo "$result"
+          [[ "$result" -eq "403" ]]
+
+      # Verify 404 error code behavior
+      - name: Verify 404 error code from '/404' and on invalid pages
+        run: |
+          result=$(wget --server-response --quiet http://127.0.0.1:4000/404 2>&1 | head -1 | awk '{print $2}')
+          echo "$result"
+          result2=$(wget --server-response --quiet http://127.0.0.1:4000/invalidurl 2>&1 | head -1 | awk '{print $2}')
+          echo "$result2"
+          [[ "$result" -eq "404" && "$result2" -eq "404" ]]
+
+      # Verify 500 error code behavior
+      - name: Verify 500 error code from '/500'
+        run: |
+          result=$(wget --server-response --quiet http://127.0.0.1:4000/500 2>&1 | head -1 | awk '{print $2}')
+          echo "$result"
+          [[ "$result" -eq "500" ]]
+
       - name: Stop running app
         run: kill -9 $(lsof -t -i:4000)
 
       - name: Shutdown Docker containers
-        run: docker-compose -f ./docker/docker-compose-ci.yml down
+        run: docker compose -f ./docker/docker-compose-ci.yml down
 
   # Codecov upload is a separate job in order to allow us to restart this separate from the entire build/test
   # job above. This is necessary because Codecov uploads seem to randomly fail at times.
@@ -191,11 +308,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       # Download artifacts from previous 'tests' job
       - name: Download coverage artifacts
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
 
       # Now attempt upload to Codecov using its action.
       # NOTE: We use a retry action to retry the Codecov upload if it fails the first time.
@@ -203,10 +320,15 @@ jobs:
       # Retry action: https://github.com/marketplace/actions/retry-action
       # Codecov action: https://github.com/codecov/codecov-action
       - name: Upload coverage to Codecov.io
-        uses: Wandalen/wretry.action@v1.0.36
+        uses: Wandalen/wretry.action@v1.3.0
         with:
-          action: codecov/codecov-action@v3
-          # Try upload 5 times max
+          action: codecov/codecov-action@v4
+          # Ensure codecov-action throws an error when it fails to upload
+          # This allows us to auto-restart the action if an error is thrown
+          with: |
+            fail_ci_if_error: true
+            token: ${{ secrets.CODECOV_TOKEN }}
+          # Try re-running action 5 times max
           attempt_limit: 5
           # Run again in 30 seconds
           attempt_delay: 30000
diff --git a/.github/workflows/codescan.yml b/.github/workflows/codescan.yml
index 35a2e2d24a..d96e786cc3 100644
--- a/.github/workflows/codescan.yml
+++ b/.github/workflows/codescan.yml
@@ -5,12 +5,16 @@
 # because CodeQL requires a fresh build with all tests *disabled*.
 name: "Code Scanning"
 
-# Run this code scan for all pushes / PRs to main branch. Also run once a week.
+# Run this code scan for all pushes / PRs to main or maintenance branches. Also run once a week.
 on:
   push:
-    branches: [ main ]
+    branches:
+      - main
+      - 'dspace-**'
   pull_request:
-    branches: [ main ]
+    branches:
+      - main
+      - 'dspace-**'
     # Don't run if PR is only updating static documentation
     paths-ignore:
       - '**/*.md'
@@ -31,7 +35,7 @@ jobs:
     steps:
       # https://github.com/actions/checkout
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       # Initializes the CodeQL tools for scanning.
       # https://github.com/github/codeql-action
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 9a2c838d83..c9671bcac0 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -3,6 +3,9 @@ name: Docker images
 
 # Run this Build for all pushes to 'main' or maintenance branches, or tagged releases.
 # Also run for PRs to ensure PR doesn't break Docker build process
+# NOTE: uses "reusable-docker-build.yml" in DSpace/DSpace to actually build each of the Docker images
+# https://github.com/DSpace/DSpace/blob/dspace-7_x/.github/workflows/reusable-docker-build.yml
+# 
 on:
   push:
     branches:
@@ -13,108 +16,45 @@ on:
   pull_request:
 
 permissions:
-  contents: read  #  to fetch code (actions/checkout)
+  contents: read  # to fetch code (actions/checkout)
+  packages: write # to write images to GitHub Container Registry (GHCR)
 
 jobs:
-  docker:
+  #############################################################
+  # Build/Push the 'dspace/dspace-angular' image
+  #############################################################
+  dspace-angular:
     # Ensure this job never runs on forked repos. It's only executed for 'dspace/dspace-angular'
     if: github.repository == 'dspace/dspace-angular'
-    runs-on: ubuntu-latest
-    env:
-      # Define tags to use for Docker images based on Git tags/branches (for docker/metadata-action)
-      # For a new commit on default branch (main), use the literal tag 'dspace-7_x' on Docker image.
-      # For a new commit on other branches, use the branch name as the tag for Docker image.
-      # For a new tag, copy that tag name as the tag for Docker image.
-      IMAGE_TAGS: |
-        type=raw,value=dspace-7_x,enable=${{ endsWith(github.ref, github.event.repository.default_branch) }}
-        type=ref,event=branch,enable=${{ !endsWith(github.ref, github.event.repository.default_branch) }}
-        type=ref,event=tag
-      # Define default tag "flavor" for docker/metadata-action per
-      # https://github.com/docker/metadata-action#flavor-input
-      # We turn off 'latest' tag by default.
-      TAGS_FLAVOR: |
-        latest=false
-      # Architectures / Platforms for which we will build Docker images
-      # If this is a PR, we ONLY build for AMD64. For PRs we only do a sanity check test to ensure Docker builds work.
-      # If this is NOT a PR (e.g. a tag or merge commit), also build for ARM64.
-      PLATFORMS: linux/amd64${{ github.event_name != 'pull_request' && ', linux/arm64' || '' }}
+    # Use the reusable-docker-build.yml script from DSpace/DSpace repo to build our Docker image
+    uses: DSpace/DSpace/.github/workflows/reusable-docker-build.yml@dspace-7_x
+    with:
+      build_id: dspace-angular-dev
+      image_name: dspace/dspace-angular
+      dockerfile_path: ./Dockerfile
+    secrets:
+      DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
+      DOCKER_ACCESS_TOKEN: ${{ secrets.DOCKER_ACCESS_TOKEN }}
 
-    steps:
-      # https://github.com/actions/checkout
-      - name: Checkout codebase
-        uses: actions/checkout@v3
-
-      # https://github.com/docker/setup-buildx-action
-      - name: Setup Docker Buildx
-        uses: docker/setup-buildx-action@v2
-
-      # https://github.com/docker/setup-qemu-action
-      - name: Set up QEMU emulation to build for multiple architectures
-        uses: docker/setup-qemu-action@v2
-
-      # https://github.com/docker/login-action
-      - name: Login to DockerHub
-        # Only login if not a PR, as PRs only trigger a Docker build and not a push
-        if: github.event_name != 'pull_request'
-        uses: docker/login-action@v2
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_ACCESS_TOKEN }}
-
-      ###############################################
-      # Build/Push the 'dspace/dspace-angular' image
-      ###############################################
-      # https://github.com/docker/metadata-action
-      # Get Metadata for docker_build step below
-      - name: Sync metadata (tags, labels) from GitHub to Docker for 'dspace-angular' image
-        id: meta_build
-        uses: docker/metadata-action@v4
-        with:
-          images: dspace/dspace-angular
-          tags: ${{ env.IMAGE_TAGS }}
-          flavor: ${{ env.TAGS_FLAVOR }}
-
-      # https://github.com/docker/build-push-action
-      - name: Build and push 'dspace-angular' image
-        id: docker_build
-        uses: docker/build-push-action@v3
-        with:
-          context: .
-          file: ./Dockerfile
-          platforms: ${{ env.PLATFORMS }}
-          # For pull requests, we run the Docker build (to ensure no PR changes break the build),
-          # but we ONLY do an image push to DockerHub if it's NOT a PR
-          push: ${{ github.event_name != 'pull_request' }}
-          # Use tags / labels provided by 'docker/metadata-action' above
-          tags: ${{ steps.meta_build.outputs.tags }}
-          labels: ${{ steps.meta_build.outputs.labels }}
-
-      #####################################################
-      # Build/Push the 'dspace/dspace-angular' image ('-dist' tag)
-      #####################################################
-      # https://github.com/docker/metadata-action
-      # Get Metadata for docker_build_dist step below
-      - name: Sync metadata (tags, labels) from GitHub to Docker for 'dspace-angular-dist' image
-        id: meta_build_dist
-        uses: docker/metadata-action@v4
-        with:
-          images: dspace/dspace-angular
-          tags: ${{ env.IMAGE_TAGS }}
-          # As this is a "dist" image, its tags are all suffixed with "-dist". Otherwise, it uses the same
-          # tagging logic as the primary 'dspace/dspace-angular' image above.
-          flavor: ${{ env.TAGS_FLAVOR }}
-            suffix=-dist
-
-      - name: Build and push 'dspace-angular-dist' image
-        id: docker_build_dist
-        uses: docker/build-push-action@v3
-        with:
-          context: .
-          file: ./Dockerfile.dist
-          platforms: ${{ env.PLATFORMS }}
-          # For pull requests, we run the Docker build (to ensure no PR changes break the build),
-          # but we ONLY do an image push to DockerHub if it's NOT a PR
-          push: ${{ github.event_name != 'pull_request' }}
-          # Use tags / labels provided by 'docker/metadata-action' above
-          tags: ${{ steps.meta_build_dist.outputs.tags }}
-          labels: ${{ steps.meta_build_dist.outputs.labels }}
+  #############################################################
+  # Build/Push the 'dspace/dspace-angular' image ('-dist' tag)
+  #############################################################
+  dspace-angular-dist:
+    # Ensure this job never runs on forked repos. It's only executed for 'dspace/dspace-angular'
+    if: github.repository == 'dspace/dspace-angular'
+    # Use the reusable-docker-build.yml script from DSpace/DSpace repo to build our Docker image
+    uses: DSpace/DSpace/.github/workflows/reusable-docker-build.yml@dspace-7_x
+    with:
+      build_id: dspace-angular-dist
+      image_name: dspace/dspace-angular
+      dockerfile_path: ./Dockerfile.dist
+      # As this is a "dist" image, its tags are all suffixed with "-dist". Otherwise, it uses the same
+      # tagging logic as the primary 'dspace/dspace-angular' image above.
+      tags_flavor: suffix=-dist
+    secrets:
+      DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
+      DOCKER_ACCESS_TOKEN: ${{ secrets.DOCKER_ACCESS_TOKEN }}
+      # Enable redeploy of sandbox & demo if the branch for this image matches the deployment branch of
+      # these sites as specified in reusable-docker-build.xml
+      REDEPLOY_SANDBOX_URL:  ${{ secrets.REDEPLOY_SANDBOX_URL }}
+      REDEPLOY_DEMO_URL:  ${{ secrets.REDEPLOY_DEMO_URL }}
\ No newline at end of file
diff --git a/.github/workflows/issue_opened.yml b/.github/workflows/issue_opened.yml
index b4436dca3a..0a35a6a950 100644
--- a/.github/workflows/issue_opened.yml
+++ b/.github/workflows/issue_opened.yml
@@ -16,7 +16,7 @@ jobs:
       # Only add to project board if issue is flagged as "needs triage" or has no labels
       # NOTE: By default we flag new issues as "needs triage" in our issue template
       if: (contains(github.event.issue.labels.*.name, 'needs triage') || join(github.event.issue.labels.*.name) == '')
-      uses: actions/add-to-project@v0.5.0
+      uses: actions/add-to-project@v1.0.0
       # Note, the authentication token below is an ORG level Secret. 
       # It must be created/recreated manually via a personal access token with admin:org, project, public_repo permissions
       # See: https://docs.github.com/en/actions/configuring-and-managing-workflows/authenticating-with-the-github_token#permissions-for-the-github_token
diff --git a/.github/workflows/label_merge_conflicts.yml b/.github/workflows/label_merge_conflicts.yml
index c1396b6f45..ccc6c401c0 100644
--- a/.github/workflows/label_merge_conflicts.yml
+++ b/.github/workflows/label_merge_conflicts.yml
@@ -1,11 +1,12 @@
 # This workflow checks open PRs for merge conflicts and labels them when conflicts are found
 name: Check for merge conflicts
 
-# Run whenever the "main" branch is updated
-# NOTE: This means merge conflicts are only checked for when a PR is merged to main.
+# Run this for all pushes (i.e. merges) to 'main' or maintenance branches
 on:
   push:
-    branches: [ main ]
+    branches:
+      - main
+      - 'dspace-**'
   # So that the `conflict_label_name` is removed if conflicts are resolved,
   # we allow this to run for `pull_request_target` so that github secrets are available.
   pull_request_target:
@@ -24,6 +25,8 @@ jobs:
       # See: https://github.com/prince-chrismc/label-merge-conflicts-action
       - name: Auto-label PRs with merge conflicts
         uses: prince-chrismc/label-merge-conflicts-action@v3
+        # Ignore any failures -- may occur (randomly?) for older, outdated PRs.
+        continue-on-error: true
         # Add "merge conflict" label if a merge conflict is detected. Remove it when resolved.
         # Note, the authentication token is created automatically
         # See: https://docs.github.com/en/actions/configuring-and-managing-workflows/authenticating-with-the-github_token
diff --git a/.github/workflows/port_merged_pull_request.yml b/.github/workflows/port_merged_pull_request.yml
new file mode 100644
index 0000000000..857f22755e
--- /dev/null
+++ b/.github/workflows/port_merged_pull_request.yml
@@ -0,0 +1,46 @@
+# This workflow will attempt to port a merged pull request to
+# the branch specified in a "port to" label (if exists)
+name: Port merged Pull Request
+
+# Only run for merged PRs against the "main" or maintenance branches
+# We allow this to run for `pull_request_target` so that github secrets are available
+# (This is required when the PR comes from a forked repo)
+on:
+  pull_request_target:
+    types: [ closed ]
+    branches:
+      - main
+      - 'dspace-**'
+
+permissions:
+  contents: write      # so action can add comments
+  pull-requests: write # so action can create pull requests
+
+jobs:
+  port_pr:
+    runs-on: ubuntu-latest
+    # Don't run on closed *unmerged* pull requests
+    if: github.event.pull_request.merged
+    steps:
+      # Checkout code
+      - uses: actions/checkout@v4
+      # Port PR to other branch (ONLY if labeled with "port to")
+      # See https://github.com/korthout/backport-action
+      - name: Create backport pull requests
+        uses: korthout/backport-action@v2
+        with:
+          # Trigger based on a "port to [branch]" label on PR
+          # (This label must specify the branch name to port to)
+          label_pattern: '^port to ([^ ]+)$'
+          # Title to add to the (newly created) port PR
+          pull_title: '[Port ${target_branch}] ${pull_title}'
+          # Description to add to the (newly created) port PR
+          pull_description: 'Port of #${pull_number} by @${pull_author} to `${target_branch}`.'
+          # Copy all labels from original PR to (newly created) port PR
+          # NOTE: The labels matching 'label_pattern' are automatically excluded
+          copy_labels_pattern: '.*'
+          # Skip any merge commits in the ported PR. This means only non-merge commits are cherry-picked to the new PR
+          merge_commits: 'skip'
+          # Use a personal access token (PAT) to create PR as 'dspace-bot' user.
+          # A PAT is required in order for the new PR to trigger its own actions (for CI checks)
+          github_token: ${{ secrets.PR_PORT_TOKEN }}
\ No newline at end of file
diff --git a/.github/workflows/pull_request_opened.yml b/.github/workflows/pull_request_opened.yml
new file mode 100644
index 0000000000..bbac52af24
--- /dev/null
+++ b/.github/workflows/pull_request_opened.yml
@@ -0,0 +1,24 @@
+# This workflow runs whenever a new pull request is created
+name: Pull Request opened
+
+# Only run for newly opened PRs against the "main" or maintenance branches
+# We allow this to run for `pull_request_target` so that github secrets are available
+# (This is required to assign a PR back to the creator when the PR comes from a forked repo)
+on:
+  pull_request_target:
+    types: [ opened ]
+    branches:
+      - main
+      - 'dspace-**'
+
+permissions:
+  pull-requests: write
+
+jobs:
+  automation:
+    runs-on: ubuntu-latest
+    steps:
+    # Assign the PR to whomever created it. This is useful for visualizing assignments on project boards
+    # See https://github.com/toshimaru/auto-author-assign
+    - name: Assign PR to creator
+      uses: toshimaru/auto-author-assign@v2.1.0
diff --git a/Dockerfile b/Dockerfile
index 8fac7495e1..e395e4b90e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
 # This image will be published as dspace/dspace-angular
 # See https://github.com/DSpace/dspace-angular/tree/main/docker for usage details
 
-FROM node:18-alpine
+FROM docker.io/node:18-alpine
 
 # Ensure Python and other build tools are available
 # These are needed to install some node modules, especially on linux/arm64
@@ -24,5 +24,5 @@ ENV NODE_OPTIONS="--max_old_space_size=4096"
 # Listen / accept connections from all IP addresses.
 # NOTE: At this time it is only possible to run Docker container in Production mode
 # if you have a public URL. See https://github.com/DSpace/dspace-angular/issues/1485
-ENV NODE_ENV development
+ENV NODE_ENV=development
 CMD yarn serve --host 0.0.0.0
diff --git a/Dockerfile.dist b/Dockerfile.dist
index 2a6a66fc06..c3ea539e04 100644
--- a/Dockerfile.dist
+++ b/Dockerfile.dist
@@ -4,7 +4,7 @@
 # Test build:
 # docker build -f Dockerfile.dist -t dspace/dspace-angular:dspace-7_x-dist .
 
-FROM node:18-alpine as build
+FROM docker.io/node:18-alpine AS build
 
 # Ensure Python and other build tools are available
 # These are needed to install some node modules, especially on linux/arm64
@@ -26,6 +26,6 @@ COPY --chown=node:node docker/dspace-ui.json /app/dspace-ui.json
 
 WORKDIR /app
 USER node
-ENV NODE_ENV production
+ENV NODE_ENV=production
 EXPOSE 4000
 CMD pm2-runtime start dspace-ui.json --json
diff --git a/README.md b/README.md
index 689c64a292..ebc24f8b91 100644
--- a/README.md
+++ b/README.md
@@ -157,8 +157,8 @@ DSPACE_UI_SSL => DSPACE_SSL
 
 The same settings can also be overwritten by setting system environment variables instead, E.g.:
 ```bash
-export DSPACE_HOST=api7.dspace.org
-export DSPACE_UI_PORT=4200
+export DSPACE_HOST=demo.dspace.org
+export DSPACE_UI_PORT=4000
 ```
 
 The priority works as follows: **environment variable** overrides **variable in `.env` file** overrides external config set by `DSPACE_APP_CONFIG_PATH` overrides **`config.(prod or dev).yml`**
@@ -288,7 +288,7 @@ E2E tests (aka integration tests) use [Cypress.io](https://www.cypress.io/). Con
 The test files can be found in the `./cypress/integration/` folder.
 
 Before you can run e2e tests, two things are REQUIRED:
-1. You MUST be running the DSpace backend (i.e. REST API) locally. The e2e tests will *NOT* succeed if run against our demo REST API (https://api7.dspace.org/server/), as that server is uncontrolled and may have content added/removed at any time.
+1. You MUST be running the DSpace backend (i.e. REST API) locally. The e2e tests will *NOT* succeed if run against our demo/sandbox REST API (https://demo.dspace.org/server/ or https://sandbox.dspace.org/server/), as those sites may have content added/removed at any time.
     * After starting up your backend on localhost, make sure either your `config.prod.yml` or `config.dev.yml` has its `rest` settings defined to use that localhost backend.
 	* If you'd prefer, you may instead use environment variables as described at [Configuring](#configuring). For example:
        ```
diff --git a/angular.json b/angular.json
index 5e597d4d30..afda50a320 100644
--- a/angular.json
+++ b/angular.json
@@ -30,7 +30,6 @@
               "lodash",
               "jwt-decode",
               "uuid",
-              "webfontloader",
               "zone.js"
             ],
             "outputPath": "dist/browser",
diff --git a/config/config.example.yml b/config/config.example.yml
index ea38303fa3..ac2a645e25 100644
--- a/config/config.example.yml
+++ b/config/config.example.yml
@@ -1,7 +1,7 @@
 # NOTE: will log all redux actions and transfers in console
 debug: false
 
-# Angular Universal server settings
+# Angular User Inteface settings
 # NOTE: these settings define where Node.js will start your UI application. Therefore, these
 # "ui" settings usually specify a localhost port/URL which is later proxied to a public URL (using Apache or similar)
 ui:
@@ -17,15 +17,61 @@ ui:
   # Trust X-FORWARDED-* headers from proxies (default = true)
   useProxies: true
 
+# Angular Universal / Server Side Rendering (SSR) settings
+universal:
+  # Whether to tell Angular to inline "critical" styles into the server-side rendered HTML.
+  # Determining which styles are critical is a relatively expensive operation; this option is
+  # disabled (false) by default to boost server performance at the expense of loading smoothness.
+  inlineCriticalCss: false
+  # Patterns to be run as regexes against the path of the page to check if SSR is allowed.
+  # If the path match any of the regexes it will be served directly in CSR.
+  # By default, excludes community and collection browse, global browse, global search, community list, statistics and various administrative tools.
+  excludePathPatterns:
+    - pattern: "^/communities/[a-f0-9-]{36}/browse(/.*)?$"
+      flag: "i"
+    - pattern: "^/collections/[a-f0-9-]{36}/browse(/.*)?$"
+      flag: "i"
+    - pattern: "^/browse/"
+    - pattern: "^/search$"
+    - pattern: "^/community-list$"
+    - pattern: "^/admin/"
+    - pattern: "^/processes/?"
+    - pattern: "^/notifications/"
+    - pattern: "^/statistics/?"
+    - pattern: "^/access-control/"
+    - pattern: "^/health$"
+
+  # Whether to enable rendering of Search component on SSR.
+  # If set to true the component will be included in the HTML returned from the server side rendering.
+  # If set to false the component will not be included in the HTML returned from the server side rendering.
+  enableSearchComponent: false
+  # Whether to enable rendering of Browse component on SSR.
+  # If set to true the component will be included in the HTML returned from the server side rendering.
+  # If set to false the component will not be included in the HTML returned from the server side rendering.
+  enableBrowseComponent: false
+  # Enable state transfer from the server-side application to the client-side application.
+  # Defaults to true.
+  # Note: When using an external application cache layer, it's recommended not to transfer the state to avoid caching it.
+  # Disabling it ensures that dynamic state information is not inadvertently cached, which can improve security and
+  # ensure that users always use the most up-to-date state.
+  transferState: true
+  # When a different REST base URL is used for the server-side application, the generated state contains references to
+  # REST resources with the internal URL configured. By default, these internal URLs are replaced with public URLs.
+  # Disable this setting to avoid URL replacement during SSR. In this the state is not transferred to avoid security issues.
+  replaceRestUrl: true
+
 # The REST API server settings
 # NOTE: these settings define which (publicly available) REST API to use. They are usually
 # 'synced' with the 'dspace.server.url' setting in your backend's local.cfg.
 rest:
   ssl: true
-  host: api7.dspace.org
+  host: demo.dspace.org
   port: 443
   # NOTE: Space is capitalized because 'namespace' is a reserved string in TypeScript
   nameSpace: /server
+  # Provide a different REST url to be used during SSR execution. It must contain the whole url including protocol, server port and
+  # server namespace (uncomment to use it).
+  #ssrBaseUrl: http://localhost:8080/server
 
 # Caching settings
 cache:
@@ -75,7 +121,7 @@ cache:
     anonymousCache:
       # Maximum number of pages to cache. Default is zero (0) which means anonymous user cache is disabled.
       # As all pages are cached in server memory, increasing this value will increase memory needs.
-      # Individual cached pages are usually small (<100KB), so a value of max=1000 would only require ~100MB of memory. 
+      # Individual cached pages are usually small (<100KB), so a value of max=1000 would only require ~100MB of memory.
       max: 0
       # Amount of time after which cached pages are considered stale (in ms). After becoming stale, the cached
       # copy is automatically refreshed on the next request.
@@ -169,6 +215,12 @@ languages:
   - code: en
     label: English
     active: true
+  - code: ar
+    label: العربية
+    active: true
+  - code: bn
+    label: বাংলা
+    active: true
   - code: ca
     label: Català
     active: true
@@ -178,24 +230,36 @@ languages:
   - code: de
     label: Deutsch
     active: true
+  - code: el
+    label: Ελληνικά
+    active: true
   - code: es
     label: Español
     active: true
+  - code: fi
+    label: Suomi
+    active: true
   - code: fr
     label: Français
     active: true
   - code: gd
     label: Gàidhlig
     active: true
-  - code: it
-    label: Italiano
-    active: true
-  - code: lv
-    label: Latviešu
+  - code: hi
+    label: हिंदी
     active: true
   - code: hu
     label: Magyar
     active: true
+  - code: it
+    label: Italiano
+    active: true
+  - code: kk
+    label: Қазақ
+    active: true
+  - code: lv
+    label: Latviešu
+    active: true
   - code: nl
     label: Nederlands
     active: true
@@ -208,8 +272,11 @@ languages:
   - code: pt-BR
     label: Português do Brasil
     active: true
-  - code: fi
-    label: Suomi
+  - code: sr-lat
+    label: Srpski (lat)
+    active: true
+  - code: sr-cyr
+    label: Српски
     active: true
   - code: sv
     label: Svenska
@@ -217,24 +284,12 @@ languages:
   - code: tr
     label: Türkçe
     active: true
-  - code: vi
-    label: Tiếng Việt
-    active: true
-  - code: kk
-    label: Қазақ
-    active: true
-  - code: bn
-    label: বাংলা
-    active: true
-  - code: hi
-    label: हिंदी
-    active: true
-  - code: el
-    label: Ελληνικά
-    active: true
   - code: uk
     label: Yкраї́нська
     active: true
+  - code: vi
+    label: Tiếng Việt
+    active: true
 
 
 # Browse-By Pages
@@ -292,33 +347,33 @@ themes:
   #
   # # A theme with a handle property will match the community, collection or item with the given
   # # handle, and all collections and/or items within it
-  # - name: 'custom',
-  #   handle: '10673/1233'
+  # - name: custom
+  #   handle: 10673/1233
   #
   # # A theme with a regex property will match the route using a regular expression. If it
   # # matches the route for a community or collection it will also apply to all collections
   # # and/or items within it
-  # - name: 'custom',
-  #   regex: 'collections\/e8043bc2.*'
+  # - name: custom
+  #   regex: collections\/e8043bc2.*
   #
   # # A theme with a uuid property will match the community, collection or item with the given
   # # ID, and all collections and/or items within it
-  # - name: 'custom',
-  #   uuid: '0958c910-2037-42a9-81c7-dca80e3892b4'
+  # - name: custom
+  #   uuid: 0958c910-2037-42a9-81c7-dca80e3892b4
   #
   # # The extends property specifies an ancestor theme (by name). Whenever a themed component is not found
   # # in the current theme, its ancestor theme(s) will be checked recursively before falling back to default.
-  # - name: 'custom-A',
-  #   extends: 'custom-B',
+  # - name: custom-A
+  #   extends: custom-B
   #   # Any of the matching properties above can be used
-  #   handle: '10673/34'
+  #   handle: 10673/34
   #
-  # - name: 'custom-B',
-  #   extends: 'custom',
-  #   handle: '10673/12'
+  # - name: custom-B
+  #   extends: custom
+  #   handle: 10673/12
   #
   # # A theme with only a name will match every route
-  # name: 'custom'
+  # name: custom
   #
   # # This theme will use the default bootstrap styling for DSpace components
   # - name: BASE_THEME_NAME
@@ -376,7 +431,30 @@ vocabularies:
     vocabulary: 'srsc'
     enabled: true
 
-# Default collection/community sorting order at Advanced search, Create/update community and collection when there are not a query. 
+# Default collection/community sorting order at Advanced search, Create/update community and collection when there are not a query.
 comcolSelectionSort:
   sortField: 'dc.title'
-  sortDirection: 'ASC'
\ No newline at end of file
+  sortDirection: 'ASC'
+
+# Live Region configuration
+# Live Region as defined by w3c, https://www.w3.org/TR/wai-aria-1.1/#terms:
+# Live regions are perceivable regions of a web page that are typically updated as a
+# result of an external event when user focus may be elsewhere.
+#
+# The DSpace live region is a component present at the bottom of all pages that is invisible by default, but is useful
+# for screen readers. Any message pushed to the live region will be announced by the screen reader. These messages
+# usually contain information about changes on the page that might not be in focus.
+liveRegion:
+  # The duration after which messages disappear from the live region in milliseconds
+  messageTimeOutDurationMs: 30000
+  # The visibility of the live region. Setting this to true is only useful for debugging purposes.
+  isVisible: false
+
+
+# Search settings
+search:
+  # Number used to render n UI elements called loading skeletons that act as placeholders.
+  # These elements indicate that some content will be loaded in their stead.
+  # Since we don't know how many filters will be loaded before we receive a response from the server we use this parameter for the skeletons count.
+  # e.g. If we set 5 then 5 loading skeletons will be visualized before the actual filters are retrieved.
+  defaultFiltersCount: 5
diff --git a/config/config.yml b/config/config.yml
index b5eecd112f..dcf5389378 100644
--- a/config/config.yml
+++ b/config/config.yml
@@ -1,5 +1,5 @@
 rest:
   ssl: true
-  host: api7.dspace.org
+  host: demo.dspace.org
   port: 443
   nameSpace: /server
diff --git a/cypress.config.ts b/cypress.config.ts
index 91eeb9838b..36d8120342 100644
--- a/cypress.config.ts
+++ b/cypress.config.ts
@@ -1,6 +1,7 @@
 import { defineConfig } from 'cypress';
 
 export default defineConfig({
+  video: true,
   videosFolder: 'cypress/videos',
   screenshotsFolder: 'cypress/screenshots',
   fixturesFolder: 'cypress/fixtures',
@@ -9,27 +10,33 @@ export default defineConfig({
     openMode: 0,
   },
   env: {
-    // Global constants used in DSpace e2e tests (see also ./cypress/support/e2e.ts)
-    // May be overridden in our cypress.json config file using specified environment variables.
+    // Global DSpace environment variables used in all our Cypress e2e tests
+    // May be modified in this config, or overridden in a variety of ways.
+    // See Cypress environment variable docs: https://docs.cypress.io/guides/guides/environment-variables
     // Default values listed here are all valid for the Demo Entities Data set available at
     // https://github.com/DSpace-Labs/AIP-Files/releases/tag/demo-entities-data
     // (This is the data set used in our CI environment)
 
     // Admin account used for administrative tests
     DSPACE_TEST_ADMIN_USER: 'dspacedemo+admin@gmail.com',
+    DSPACE_TEST_ADMIN_USER_UUID: '335647b6-8a52-4ecb-a8c1-7ebabb199bda',
     DSPACE_TEST_ADMIN_PASSWORD: 'dspace',
     // Community/collection/publication used for view/edit tests
     DSPACE_TEST_COMMUNITY: '0958c910-2037-42a9-81c7-dca80e3892b4',
     DSPACE_TEST_COLLECTION: '282164f5-d325-4740-8dd1-fa4d6d3e7200',
-    DSPACE_TEST_ENTITY_PUBLICATION: 'e98b0f27-5c19-49a0-960d-eb6ad5287067',
+    DSPACE_TEST_ENTITY_PUBLICATION: '6160810f-1e53-40db-81ef-f6621a727398',
     // Search term (should return results) used in search tests
     DSPACE_TEST_SEARCH_TERM: 'test',
-    // Collection used for submission tests
+    // Main Collection used for submission tests. Should be able to accept normal Item objects
     DSPACE_TEST_SUBMIT_COLLECTION_NAME: 'Sample Collection',
     DSPACE_TEST_SUBMIT_COLLECTION_UUID: '9d8334e9-25d3-4a67-9cea-3dffdef80144',
+    // Collection used for Person entity submission tests. MUST be configured with EntityType=Person.
+    DSPACE_TEST_SUBMIT_PERSON_COLLECTION_NAME: 'People',
     // Account used to test basic submission process
     DSPACE_TEST_SUBMIT_USER: 'dspacedemo+submit@gmail.com',
     DSPACE_TEST_SUBMIT_USER_PASSWORD: 'dspace',
+    // Administrator users group
+    DSPACE_ADMINISTRATOR_GROUP: 'e59f5659-bff9-451e-b28f-439e7bd467e4'
   },
   e2e: {
     // Setup our plugins for e2e tests
diff --git a/cypress/e2e/admin-add-new-modals.cy.ts b/cypress/e2e/admin-add-new-modals.cy.ts
new file mode 100644
index 0000000000..332d44da13
--- /dev/null
+++ b/cypress/e2e/admin-add-new-modals.cy.ts
@@ -0,0 +1,54 @@
+import { testA11y } from 'cypress/support/utils';
+
+describe('Admin Add New Modals', () => {
+  beforeEach(() => {
+    // Must login as an Admin for sidebar to appear
+    cy.visit('/login');
+    cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
+  });
+
+  it('Add new Community modal should pass accessibility tests', () => {
+    // Pin the sidebar open
+    cy.get('#sidebar-collapse-toggle').trigger('mouseover');
+    cy.get('#sidebar-collapse-toggle').click();
+
+    // Click on entry of menu
+    cy.get('#admin-menu-section-new-title').should('be.visible');
+    cy.get('#admin-menu-section-new-title').click();
+
+    cy.get('a[data-test="menu.section.new_community"]').click();
+
+    // Analyze <ds-create-community-parent-selector> for accessibility
+    testA11y('ds-create-community-parent-selector');
+  });
+
+  it('Add new Collection modal should pass accessibility tests', () => {
+    // Pin the sidebar open
+    cy.get('#sidebar-collapse-toggle').trigger('mouseover');
+    cy.get('#sidebar-collapse-toggle').click();
+
+    // Click on entry of menu
+    cy.get('#admin-menu-section-new-title').should('be.visible');
+    cy.get('#admin-menu-section-new-title').click();
+
+    cy.get('a[data-test="menu.section.new_collection"]').click();
+
+    // Analyze <ds-create-collection-parent-selector> for accessibility
+    testA11y('ds-create-collection-parent-selector');
+  });
+
+  it('Add new Item modal should pass accessibility tests', () => {
+    // Pin the sidebar open
+    cy.get('#sidebar-collapse-toggle').trigger('mouseover');
+    cy.get('#sidebar-collapse-toggle').click();
+
+    // Click on entry of menu
+    cy.get('#admin-menu-section-new-title').should('be.visible');
+    cy.get('#admin-menu-section-new-title').click();
+
+    cy.get('a[data-test="menu.section.new_item"]').click();
+
+    // Analyze <ds-create-item-parent-selector> for accessibility
+    testA11y('ds-create-item-parent-selector');
+  });
+});
diff --git a/cypress/e2e/admin-curation-tasks.cy.ts b/cypress/e2e/admin-curation-tasks.cy.ts
new file mode 100644
index 0000000000..e66f0ccaad
--- /dev/null
+++ b/cypress/e2e/admin-curation-tasks.cy.ts
@@ -0,0 +1,16 @@
+import { testA11y } from 'cypress/support/utils';
+
+describe('Admin Curation Tasks', () => {
+  beforeEach(() => {
+    // Must login as an Admin to see the page
+    cy.visit('/admin/curation-tasks');
+    cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
+  });
+
+  it('should pass accessibility tests', () => {
+    // Page must first be visible
+    cy.get('ds-admin-curation-task').should('be.visible');
+    // Analyze <ds-admin-curation-task> for accessibility issues
+    testA11y('ds-admin-curation-task');
+  });
+});
diff --git a/cypress/e2e/admin-edit-modals.cy.ts b/cypress/e2e/admin-edit-modals.cy.ts
new file mode 100644
index 0000000000..8ba524d5be
--- /dev/null
+++ b/cypress/e2e/admin-edit-modals.cy.ts
@@ -0,0 +1,54 @@
+import { testA11y } from 'cypress/support/utils';
+
+describe('Admin Edit Modals', () => {
+  beforeEach(() => {
+    // Must login as an Admin for sidebar to appear
+    cy.visit('/login');
+    cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
+  });
+
+  it('Edit Community modal should pass accessibility tests', () => {
+    // Pin the sidebar open
+    cy.get('#sidebar-collapse-toggle').trigger('mouseover');
+    cy.get('#sidebar-collapse-toggle').click();
+
+    // Click on entry of menu
+    cy.get('#admin-menu-section-edit-title').should('be.visible');
+    cy.get('#admin-menu-section-edit-title').click();
+
+    cy.get('a[data-test="menu.section.edit_community"]').click();
+
+    // Analyze <ds-edit-community-selector> for accessibility
+    testA11y('ds-edit-community-selector');
+  });
+
+  it('Edit Collection modal should pass accessibility tests', () => {
+    // Pin the sidebar open
+    cy.get('#sidebar-collapse-toggle').trigger('mouseover');
+    cy.get('#sidebar-collapse-toggle').click();
+
+    // Click on entry of menu
+    cy.get('#admin-menu-section-edit-title').should('be.visible');
+    cy.get('#admin-menu-section-edit-title').click();
+
+    cy.get('a[data-test="menu.section.edit_collection"]').click();
+
+    // Analyze <ds-edit-collection-selector> for accessibility
+    testA11y('ds-edit-collection-selector');
+  });
+
+  it('Edit Item modal should pass accessibility tests', () => {
+    // Pin the sidebar open
+    cy.get('#sidebar-collapse-toggle').trigger('mouseover');
+    cy.get('#sidebar-collapse-toggle').click();
+
+    // Click on entry of menu
+    cy.get('#admin-menu-section-edit-title').should('be.visible');
+    cy.get('#admin-menu-section-edit-title').click();
+
+    cy.get('a[data-test="menu.section.edit_item"]').click();
+
+    // Analyze <ds-edit-item-selector> for accessibility
+    testA11y('ds-edit-item-selector');
+  });
+});
diff --git a/cypress/e2e/admin-export-modals.cy.ts b/cypress/e2e/admin-export-modals.cy.ts
new file mode 100644
index 0000000000..24a184fd35
--- /dev/null
+++ b/cypress/e2e/admin-export-modals.cy.ts
@@ -0,0 +1,39 @@
+import { testA11y } from 'cypress/support/utils';
+
+describe('Admin Export Modals', () => {
+  beforeEach(() => {
+    // Must login as an Admin for sidebar to appear
+    cy.visit('/login');
+    cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
+  });
+
+  it('Export metadata modal should pass accessibility tests', () => {
+    // Pin the sidebar open
+    cy.get('#sidebar-collapse-toggle').trigger('mouseover');
+    cy.get('#sidebar-collapse-toggle').click();
+
+    // Click on entry of menu
+    cy.get('#admin-menu-section-export-title').should('be.visible');
+    cy.get('#admin-menu-section-export-title').click();
+
+    cy.get('a[data-test="menu.section.export_metadata"]').click();
+
+    // Analyze <ds-export-metadata-selector> for accessibility
+    testA11y('ds-export-metadata-selector');
+  });
+
+  it('Export batch modal should pass accessibility tests', () => {
+    // Pin the sidebar open
+    cy.get('#sidebar-collapse-toggle').trigger('mouseover');
+    cy.get('#sidebar-collapse-toggle').click();
+
+    // Click on entry of menu
+    cy.get('#admin-menu-section-export-title').should('be.visible');
+    cy.get('#admin-menu-section-export-title').click();
+
+    cy.get('a[data-test="menu.section.export_batch"]').click();
+
+    // Analyze <ds-export-batch-selector> for accessibility
+    testA11y('ds-export-metadata-selector');
+  });
+});
diff --git a/cypress/e2e/admin-search-page.cy.ts b/cypress/e2e/admin-search-page.cy.ts
new file mode 100644
index 0000000000..4fbf8939fe
--- /dev/null
+++ b/cypress/e2e/admin-search-page.cy.ts
@@ -0,0 +1,21 @@
+import { testA11y } from 'cypress/support/utils';
+
+describe('Admin Search Page', () => {
+  beforeEach(() => {
+    // Must login as an Admin to see the page
+    cy.visit('/admin/search');
+    cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
+  });
+
+  it('should pass accessibility tests', () => {
+    //Page must first be visible
+    cy.get('ds-admin-search-page').should('be.visible');
+    // At least one search result should be displayed
+    cy.get('[data-test="list-object"]').should('be.visible');
+    // Click each filter toggle to open *every* filter
+    // (As we want to scan filter section for accessibility issues as well)
+    cy.get('[data-test="filter-toggle"]').click({ multiple: true });
+    // Analyze <ds-admin-search-page> for accessibility issues
+    testA11y('ds-admin-search-page');
+  });
+});
diff --git a/cypress/e2e/admin-sidebar.cy.ts b/cypress/e2e/admin-sidebar.cy.ts
new file mode 100644
index 0000000000..7612eb5313
--- /dev/null
+++ b/cypress/e2e/admin-sidebar.cy.ts
@@ -0,0 +1,28 @@
+import { Options } from 'cypress-axe';
+import { testA11y } from 'cypress/support/utils';
+
+describe('Admin Sidebar', () => {
+    beforeEach(() => {
+        // Must login as an Admin for sidebar to appear
+        cy.visit('/login');
+        cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
+    });
+
+    it('should be pinnable and pass accessibility tests', () => {
+        // Pin the sidebar open
+        cy.get('#sidebar-collapse-toggle').click();
+
+        // Click on every expandable section to open all menus
+        cy.get('ds-expandable-admin-sidebar-section').click({multiple: true});
+
+        // Analyze <ds-admin-sidebar> for accessibility
+        testA11y('ds-admin-sidebar',
+        {
+            rules: {
+                // Currently all expandable sections have nested interactive elements
+                // See https://github.com/DSpace/dspace-angular/issues/2178
+                'nested-interactive': { enabled: false },
+            }
+        } as Options);
+    });
+});
diff --git a/cypress/e2e/admin-workflow-page.cy.ts b/cypress/e2e/admin-workflow-page.cy.ts
new file mode 100644
index 0000000000..c3c235e346
--- /dev/null
+++ b/cypress/e2e/admin-workflow-page.cy.ts
@@ -0,0 +1,21 @@
+import { testA11y } from 'cypress/support/utils';
+
+describe('Admin Workflow Page', () => {
+  beforeEach(() => {
+    // Must login as an Admin to see the page
+    cy.visit('/admin/workflow');
+    cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
+  });
+
+  it('should pass accessibility tests', () => {
+    // Page must first be visible
+    cy.get('ds-admin-workflow-page').should('be.visible');
+    // At least one search result should be displayed
+    cy.get('[data-test="list-object"]').should('be.visible');
+    // Click each filter toggle to open *every* filter
+    // (As we want to scan filter section for accessibility issues as well)
+    cy.get('[data-test="filter-toggle"]').click({ multiple: true });
+    // Analyze <ds-admin-workflow-page> for accessibility issues
+    testA11y('ds-admin-workflow-page');
+  });
+});
diff --git a/cypress/e2e/batch-import-page.cy.ts b/cypress/e2e/batch-import-page.cy.ts
new file mode 100644
index 0000000000..871b8644ce
--- /dev/null
+++ b/cypress/e2e/batch-import-page.cy.ts
@@ -0,0 +1,16 @@
+import { testA11y } from 'cypress/support/utils';
+
+describe('Batch Import Page', () => {
+  beforeEach(() => {
+    // Must login as an Admin to see processes
+    cy.visit('/admin/batch-import');
+    cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
+  });
+
+  it('should pass accessibility tests', () => {
+    // Batch import form must first be visible
+    cy.get('ds-batch-import-page').should('be.visible');
+    // Analyze <ds-batch-import-page> for accessibility issues
+    testA11y('ds-batch-import-page');
+  });
+});
diff --git a/cypress/e2e/bitstreams-format.cy.ts b/cypress/e2e/bitstreams-format.cy.ts
new file mode 100644
index 0000000000..f113d45ebc
--- /dev/null
+++ b/cypress/e2e/bitstreams-format.cy.ts
@@ -0,0 +1,16 @@
+import { testA11y } from 'cypress/support/utils';
+
+describe('Bitstreams Formats', () => {
+  beforeEach(() => {
+    // Must login as an Admin to see the page
+    cy.visit('/admin/registries/bitstream-formats');
+    cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
+  });
+
+  it('should pass accessibility tests', () => {
+    // Page must first be visible
+    cy.get('ds-bitstream-formats').should('be.visible');
+    // Analyze <ds-bitstream-formats> for accessibility issues
+    testA11y('ds-bitstream-formats');
+  });
+});
diff --git a/cypress/e2e/breadcrumbs.cy.ts b/cypress/e2e/breadcrumbs.cy.ts
index ea6acdafcd..0cddbc723c 100644
--- a/cypress/e2e/breadcrumbs.cy.ts
+++ b/cypress/e2e/breadcrumbs.cy.ts
@@ -1,10 +1,9 @@
-import { TEST_ENTITY_PUBLICATION } from 'cypress/support/e2e';
 import { testA11y } from 'cypress/support/utils';
 
 describe('Breadcrumbs', () => {
     it('should pass accessibility tests', () => {
         // Visit an Item, as those have more breadcrumbs
-        cy.visit('/entities/publication/'.concat(TEST_ENTITY_PUBLICATION));
+        cy.visit('/entities/publication/'.concat(Cypress.env('DSPACE_TEST_ENTITY_PUBLICATION')));
 
         // Wait for breadcrumbs to be visible
         cy.get('ds-breadcrumbs').should('be.visible');
diff --git a/cypress/e2e/bulk-access.cy.ts b/cypress/e2e/bulk-access.cy.ts
new file mode 100644
index 0000000000..87033e13e4
--- /dev/null
+++ b/cypress/e2e/bulk-access.cy.ts
@@ -0,0 +1,31 @@
+import { testA11y } from 'cypress/support/utils';
+import { Options } from 'cypress-axe';
+
+describe('Bulk Access', () => {
+  beforeEach(() => {
+    // Must login as an Admin to see the page
+    cy.visit('/access-control/bulk-access');
+    cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
+  });
+
+  it('should pass accessibility tests', () => {
+    // Page must first be visible
+    cy.get('ds-bulk-access').should('be.visible');
+    // At least one search result should be displayed
+    cy.get('[data-test="list-object"]').should('be.visible');
+    // Click each filter toggle to open *every* filter
+    // (As we want to scan filter section for accessibility issues as well)
+    cy.get('[data-test="filter-toggle"]').click({ multiple: true });
+    // Analyze <ds-bulk-access> for accessibility issues
+    testA11y('ds-bulk-access', {
+      rules: {
+        // All panels are accordians & fail "aria-required-children" and "nested-interactive".
+        // Seem to require updating ng-bootstrap and https://github.com/DSpace/dspace-angular/issues/2216
+        'aria-required-children': { enabled: false },
+        'nested-interactive': { enabled: false },
+        // Card titles fail this test currently
+        'heading-order': { enabled: false },
+      },
+    } as Options);
+  });
+});
diff --git a/cypress/e2e/collection-edit.cy.ts b/cypress/e2e/collection-edit.cy.ts
new file mode 100644
index 0000000000..63d873db3e
--- /dev/null
+++ b/cypress/e2e/collection-edit.cy.ts
@@ -0,0 +1,128 @@
+import { testA11y } from 'cypress/support/utils';
+
+const COLLECTION_EDIT_PAGE = '/collections/'.concat(Cypress.env('DSPACE_TEST_COLLECTION')).concat('/edit');
+
+beforeEach(() => {
+    // All tests start with visiting the Edit Collection Page
+    cy.visit(COLLECTION_EDIT_PAGE);
+
+    // This page is restricted, so we will be shown the login form. Fill it out & submit.
+    cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
+});
+
+describe('Edit Collection > Edit Metadata tab', () => {
+    it('should pass accessibility tests', () => {
+        // <ds-edit-collection> tag must be loaded
+        cy.get('ds-edit-collection').should('be.visible');
+
+        // Analyze <ds-edit-collection> for accessibility issues
+        testA11y('ds-edit-collection');
+    });
+});
+
+describe('Edit Collection > Assign Roles tab', () => {
+
+    it('should pass accessibility tests', () => {
+        cy.get('a[data-test="roles"]').click();
+
+        // <ds-collection-roles> tag must be loaded
+        cy.get('ds-collection-roles').should('be.visible');
+
+        // Analyze for accessibility issues
+        testA11y('ds-collection-roles');
+    });
+});
+
+describe('Edit Collection > Content Source tab', () => {
+
+    it('should pass accessibility tests', () => {
+        cy.get('a[data-test="source"]').click();
+
+        // <ds-collection-source> tag must be loaded
+        cy.get('ds-collection-source').should('be.visible');
+
+        // Check the external source checkbox (to display all fields on the page)
+        cy.get('#externalSourceCheck').check();
+
+        // Wait for the source controls to appear
+        // cy.get('ds-collection-source-controls').should('be.visible');
+
+        // Analyze entire page for accessibility issues
+        testA11y('ds-collection-source');
+    });
+});
+
+describe('Edit Collection > Curate tab', () => {
+
+    it('should pass accessibility tests', () => {
+        cy.get('a[data-test="curate"]').click();
+
+        // <ds-collection-curate> tag must be loaded
+        cy.get('ds-collection-curate').should('be.visible');
+
+        // Analyze for accessibility issues
+        testA11y('ds-collection-curate');
+    });
+});
+
+describe('Edit Collection > Access Control tab', () => {
+
+    it('should pass accessibility tests', () => {
+        cy.get('a[data-test="access-control"]').click();
+
+        // <ds-collection-access-control> tag must be loaded
+        cy.get('ds-collection-access-control').should('be.visible');
+
+        // Analyze for accessibility issues
+        testA11y('ds-collection-access-control');
+    });
+});
+
+describe('Edit Collection > Authorizations tab', () => {
+
+    it('should pass accessibility tests', () => {
+        cy.get('a[data-test="authorizations"]').click();
+
+        // <ds-collection-authorizations> tag must be loaded
+        cy.get('ds-collection-authorizations').should('be.visible');
+
+        // Analyze for accessibility issues
+        testA11y('ds-collection-authorizations');
+    });
+});
+
+describe('Edit Collection > Item Mapper tab', () => {
+
+    it('should pass accessibility tests', () => {
+        cy.get('a[data-test="mapper"]').click();
+
+        // <ds-collection-item-mapper> tag must be loaded
+        cy.get('ds-collection-item-mapper').should('be.visible');
+
+        // Analyze entire page for accessibility issues
+        testA11y('ds-collection-item-mapper');
+
+        // Click on the "Map new Items" tab
+        cy.get('li[data-test="mapTab"] a').click();
+
+        // Make sure search form is now visible
+        cy.get('ds-search-form').should('be.visible');
+
+        // Analyze entire page (again) for accessibility issues
+        testA11y('ds-collection-item-mapper');
+    });
+});
+
+
+describe('Edit Collection > Delete page', () => {
+
+    it('should pass accessibility tests', () => {
+        cy.get('a[data-test="delete-button"]').click();
+
+        // <ds-delete-collection> tag must be loaded
+        cy.get('ds-delete-collection').should('be.visible');
+
+        // Analyze for accessibility issues
+        testA11y('ds-delete-collection');
+    });
+});
diff --git a/cypress/e2e/collection-page.cy.ts b/cypress/e2e/collection-page.cy.ts
index a034b4361d..373da07888 100644
--- a/cypress/e2e/collection-page.cy.ts
+++ b/cypress/e2e/collection-page.cy.ts
@@ -1,15 +1,21 @@
-import { TEST_COLLECTION } from 'cypress/support/e2e';
 import { testA11y } from 'cypress/support/utils';
 
 describe('Collection Page', () => {
 
-    it('should pass accessibility tests', () => {
-        cy.visit('/collections/'.concat(TEST_COLLECTION));
+  it('should pass accessibility tests', () => {
+    cy.intercept('POST', '/server/api/statistics/viewevents').as('viewevent');
 
-        // <ds-collection-page> tag must be loaded
-        cy.get('ds-collection-page').should('be.visible');
+    // Visit Collections page
+    cy.visit('/collections/'.concat(Cypress.env('DSPACE_TEST_COLLECTION')));
 
-        // Analyze <ds-collection-page> for accessibility issues
-        testA11y('ds-collection-page');
-    });
+    // Wait for the "viewevent" to trigger on the Collection page.
+    // This ensures our <ds-collection-page> tag  is fully loaded, as the <ds-view-event> tag is contained within it.
+    cy.wait('@viewevent');
+
+    // <ds-collection-page> tag must be loaded
+    cy.get('ds-collection-page').should('be.visible');
+
+    // Analyze <ds-collection-page> for accessibility issues
+    testA11y('ds-collection-page');
+  });
 });
diff --git a/cypress/e2e/collection-statistics.cy.ts b/cypress/e2e/collection-statistics.cy.ts
index 6df4e9a454..a08f8cb198 100644
--- a/cypress/e2e/collection-statistics.cy.ts
+++ b/cypress/e2e/collection-statistics.cy.ts
@@ -1,12 +1,12 @@
-import { REGEX_MATCH_NON_EMPTY_TEXT, TEST_COLLECTION } from 'cypress/support/e2e';
+import { REGEX_MATCH_NON_EMPTY_TEXT } from 'cypress/support/e2e';
 import { testA11y } from 'cypress/support/utils';
 
 describe('Collection Statistics Page', () => {
-    const COLLECTIONSTATISTICSPAGE = '/statistics/collections/'.concat(TEST_COLLECTION);
+    const COLLECTIONSTATISTICSPAGE = '/statistics/collections/'.concat(Cypress.env('DSPACE_TEST_COLLECTION'));
 
     it('should load if you click on "Statistics" from a Collection page', () => {
-        cy.visit('/collections/'.concat(TEST_COLLECTION));
-        cy.get('ds-navbar ds-link-menu-item a[title="Statistics"]').click();
+        cy.visit('/collections/'.concat(Cypress.env('DSPACE_TEST_COLLECTION')));
+        cy.get('ds-navbar ds-link-menu-item a[data-test="link-menu-item.menu.section.statistics"]').click();
         cy.location('pathname').should('eq', COLLECTIONSTATISTICSPAGE);
     });
 
@@ -18,7 +18,7 @@ describe('Collection Statistics Page', () => {
     it('should contain a "Total visits per month" section', () => {
         cy.visit(COLLECTIONSTATISTICSPAGE);
         // Check just for existence because this table is empty in CI environment as it's historical data
-        cy.get('.'.concat(TEST_COLLECTION).concat('_TotalVisitsPerMonth')).should('exist');
+        cy.get('.'.concat(Cypress.env('DSPACE_TEST_COLLECTION')).concat('_TotalVisitsPerMonth')).should('exist');
     });
 
     it('should pass accessibility tests', () => {
diff --git a/cypress/e2e/community-edit.cy.ts b/cypress/e2e/community-edit.cy.ts
new file mode 100644
index 0000000000..8fc1a7733e
--- /dev/null
+++ b/cypress/e2e/community-edit.cy.ts
@@ -0,0 +1,86 @@
+import { testA11y } from 'cypress/support/utils';
+
+const COMMUNITY_EDIT_PAGE = '/communities/'.concat(Cypress.env('DSPACE_TEST_COMMUNITY')).concat('/edit');
+
+beforeEach(() => {
+    // All tests start with visiting the Edit Community Page
+    cy.visit(COMMUNITY_EDIT_PAGE);
+
+    // This page is restricted, so we will be shown the login form. Fill it out & submit.
+    cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
+});
+
+describe('Edit Community > Edit Metadata tab', () => {
+    it('should pass accessibility tests', () => {
+        // <ds-edit-community> tag must be loaded
+        cy.get('ds-edit-community').should('be.visible');
+
+        // Analyze <ds-edit-community> for accessibility issues
+        testA11y('ds-edit-community');
+    });
+});
+
+describe('Edit Community > Assign Roles tab', () => {
+
+    it('should pass accessibility tests', () => {
+        cy.get('a[data-test="roles"]').click();
+
+        // <ds-community-roles> tag must be loaded
+        cy.get('ds-community-roles').should('be.visible');
+
+        // Analyze for accessibility issues
+        testA11y('ds-community-roles');
+    });
+});
+
+describe('Edit Community > Curate tab', () => {
+
+    it('should pass accessibility tests', () => {
+        cy.get('a[data-test="curate"]').click();
+
+        // <ds-community-curate> tag must be loaded
+        cy.get('ds-community-curate').should('be.visible');
+
+        // Analyze for accessibility issues
+        testA11y('ds-community-curate');
+    });
+});
+
+describe('Edit Community > Access Control tab', () => {
+
+    it('should pass accessibility tests', () => {
+        cy.get('a[data-test="access-control"]').click();
+
+        // <ds-community-access-control> tag must be loaded
+        cy.get('ds-community-access-control').should('be.visible');
+
+        // Analyze for accessibility issues
+        testA11y('ds-community-access-control');
+    });
+});
+
+describe('Edit Community > Authorizations tab', () => {
+
+    it('should pass accessibility tests', () => {
+        cy.get('a[data-test="authorizations"]').click();
+
+        // <ds-community-authorizations> tag must be loaded
+        cy.get('ds-community-authorizations').should('be.visible');
+
+        // Analyze for accessibility issues
+        testA11y('ds-community-authorizations');
+    });
+});
+
+describe('Edit Community > Delete page', () => {
+
+    it('should pass accessibility tests', () => {
+        cy.get('a[data-test="delete-button"]').click();
+
+        // <ds-delete-community> tag must be loaded
+        cy.get('ds-delete-community').should('be.visible');
+
+        // Analyze for accessibility issues
+        testA11y('ds-delete-community');
+    });
+});
diff --git a/cypress/e2e/community-list.cy.ts b/cypress/e2e/community-list.cy.ts
index 7b60b59dbc..c371f6ceae 100644
--- a/cypress/e2e/community-list.cy.ts
+++ b/cypress/e2e/community-list.cy.ts
@@ -1,4 +1,3 @@
-import { Options } from 'cypress-axe';
 import { testA11y } from 'cypress/support/utils';
 
 describe('Community List Page', () => {
@@ -13,13 +12,6 @@ describe('Community List Page', () => {
         cy.get('[data-test="expand-button"]').click({ multiple: true });
 
         // Analyze <ds-community-list-page> for accessibility issues
-        // Disable heading-order checks until it is fixed
-        testA11y('ds-community-list-page',
-            {
-                rules: {
-                    'heading-order': { enabled: false }
-                }
-            } as Options
-        );
+        testA11y('ds-community-list-page');
     });
 });
diff --git a/cypress/e2e/community-page.cy.ts b/cypress/e2e/community-page.cy.ts
index 6c628e21ce..386bb592a0 100644
--- a/cypress/e2e/community-page.cy.ts
+++ b/cypress/e2e/community-page.cy.ts
@@ -1,15 +1,14 @@
-import { TEST_COMMUNITY } from 'cypress/support/e2e';
 import { testA11y } from 'cypress/support/utils';
 
 describe('Community Page', () => {
 
     it('should pass accessibility tests', () => {
-        cy.visit('/communities/'.concat(TEST_COMMUNITY));
+        cy.visit('/communities/'.concat(Cypress.env('DSPACE_TEST_COMMUNITY')));
 
         // <ds-community-page> tag must be loaded
         cy.get('ds-community-page').should('be.visible');
 
         // Analyze <ds-community-page> for accessibility issues
-        testA11y('ds-community-page',);
+        testA11y('ds-community-page');
     });
 });
diff --git a/cypress/e2e/community-statistics.cy.ts b/cypress/e2e/community-statistics.cy.ts
index 710450e797..8122e68fbb 100644
--- a/cypress/e2e/community-statistics.cy.ts
+++ b/cypress/e2e/community-statistics.cy.ts
@@ -1,12 +1,12 @@
-import { REGEX_MATCH_NON_EMPTY_TEXT, TEST_COMMUNITY } from 'cypress/support/e2e';
+import { REGEX_MATCH_NON_EMPTY_TEXT } from 'cypress/support/e2e';
 import { testA11y } from 'cypress/support/utils';
 
 describe('Community Statistics Page', () => {
-    const COMMUNITYSTATISTICSPAGE = '/statistics/communities/'.concat(TEST_COMMUNITY);
+    const COMMUNITYSTATISTICSPAGE = '/statistics/communities/'.concat(Cypress.env('DSPACE_TEST_COMMUNITY'));
 
     it('should load if you click on "Statistics" from a Community page', () => {
-        cy.visit('/communities/'.concat(TEST_COMMUNITY));
-        cy.get('ds-navbar ds-link-menu-item a[title="Statistics"]').click();
+        cy.visit('/communities/'.concat(Cypress.env('DSPACE_TEST_COMMUNITY')));
+        cy.get('a[data-test="link-menu-item.menu.section.statistics"]').click();
         cy.location('pathname').should('eq', COMMUNITYSTATISTICSPAGE);
     });
 
@@ -18,7 +18,7 @@ describe('Community Statistics Page', () => {
     it('should contain a "Total visits per month" section', () => {
         cy.visit(COMMUNITYSTATISTICSPAGE);
         // Check just for existence because this table is empty in CI environment as it's historical data
-        cy.get('.'.concat(TEST_COMMUNITY).concat('_TotalVisitsPerMonth')).should('exist');
+        cy.get('.'.concat(Cypress.env('DSPACE_TEST_COMMUNITY')).concat('_TotalVisitsPerMonth')).should('exist');
     });
 
     it('should pass accessibility tests', () => {
diff --git a/cypress/e2e/create-eperson.cy.ts b/cypress/e2e/create-eperson.cy.ts
new file mode 100644
index 0000000000..d23986ba29
--- /dev/null
+++ b/cypress/e2e/create-eperson.cy.ts
@@ -0,0 +1,16 @@
+import { testA11y } from 'cypress/support/utils';
+
+describe('Create Eperson', () => {
+  beforeEach(() => {
+    // Must login as an Admin to see the page
+    cy.visit('/access-control/epeople/create');
+    cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
+  });
+
+  it('should pass accessibility tests', () => {
+    // Form must first be visible
+    cy.get('ds-eperson-form').should('be.visible');
+    // Analyze <ds-eperson-form> for accessibility issues
+    testA11y('ds-eperson-form');
+  });
+});
diff --git a/cypress/e2e/create-group.cy.ts b/cypress/e2e/create-group.cy.ts
new file mode 100644
index 0000000000..135c041a8d
--- /dev/null
+++ b/cypress/e2e/create-group.cy.ts
@@ -0,0 +1,16 @@
+import { testA11y } from 'cypress/support/utils';
+
+describe('Create Group', () => {
+  beforeEach(() => {
+    // Must login as an Admin to see the page
+    cy.visit('/access-control/groups/create');
+    cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
+  });
+
+  it('should pass accessibility tests', () => {
+    // Form must first be visible
+    cy.get('ds-group-form').should('be.visible');
+    // Analyze <ds-group-form> for accessibility issues
+    testA11y('ds-group-form');
+  });
+});
diff --git a/cypress/e2e/edit-eperson.cy.ts b/cypress/e2e/edit-eperson.cy.ts
new file mode 100644
index 0000000000..166c913b8c
--- /dev/null
+++ b/cypress/e2e/edit-eperson.cy.ts
@@ -0,0 +1,16 @@
+import { testA11y } from 'cypress/support/utils';
+
+describe('Edit Eperson', () => {
+  beforeEach(() => {
+    // Must login as an Admin to see the page
+    cy.visit('/access-control/epeople/'.concat(Cypress.env('DSPACE_TEST_ADMIN_USER_UUID')).concat('/edit'));
+    cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
+  });
+
+  it('should pass accessibility tests', () => {
+    // Form must first be visible
+    cy.get('ds-eperson-form').should('be.visible');
+    // Analyze <ds-eperson-form> for accessibility issues
+    testA11y('ds-eperson-form');
+  });
+});
diff --git a/cypress/e2e/edit-group.cy.ts b/cypress/e2e/edit-group.cy.ts
new file mode 100644
index 0000000000..e43ede978a
--- /dev/null
+++ b/cypress/e2e/edit-group.cy.ts
@@ -0,0 +1,16 @@
+import { testA11y } from 'cypress/support/utils';
+
+describe('Edit Group', () => {
+  beforeEach(() => {
+    // Must login as an Admin to see the page
+    cy.visit('/access-control/groups/'.concat(Cypress.env('DSPACE_ADMINISTRATOR_GROUP')).concat('/edit'));
+    cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
+  });
+
+  it('should pass accessibility tests', () => {
+    // Form must first be visible
+    cy.get('ds-group-form').should('be.visible');
+    // Analyze <ds-group-form> for accessibility issues
+    testA11y('ds-group-form');
+  });
+});
diff --git a/cypress/e2e/end-user-agreement.cy.ts b/cypress/e2e/end-user-agreement.cy.ts
new file mode 100644
index 0000000000..989d21ce60
--- /dev/null
+++ b/cypress/e2e/end-user-agreement.cy.ts
@@ -0,0 +1,13 @@
+import { testA11y } from 'cypress/support/utils';
+
+describe('End User Agreement', () => {
+  it('should pass accessibility tests', () => {
+    cy.visit('/info/end-user-agreement');
+
+    // Page must first be visible
+    cy.get('ds-end-user-agreement').should('be.visible');
+
+    // Analyze <ds-end-user-agreement> for accessibility
+    testA11y('ds-end-user-agreement');
+  });
+});
diff --git a/cypress/e2e/epeople-registry.cy.ts b/cypress/e2e/epeople-registry.cy.ts
new file mode 100644
index 0000000000..a6192f13d9
--- /dev/null
+++ b/cypress/e2e/epeople-registry.cy.ts
@@ -0,0 +1,16 @@
+import { testA11y } from 'cypress/support/utils';
+
+describe('Epeople registry', () => {
+  beforeEach(() => {
+    // Must login as an Admin to see the page
+    cy.visit('/access-control/epeople');
+    cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
+  });
+
+  it('should pass accessibility tests', () => {
+    // Epeople registry page must first be visible
+    cy.get('ds-epeople-registry').should('be.visible');
+    // Analyze <ds-epeople-registry> for accessibility issues
+    testA11y('ds-epeople-registry');
+  });
+});
diff --git a/cypress/e2e/feedback.cy.ts b/cypress/e2e/feedback.cy.ts
new file mode 100644
index 0000000000..75fe1097c6
--- /dev/null
+++ b/cypress/e2e/feedback.cy.ts
@@ -0,0 +1,13 @@
+import { testA11y } from 'cypress/support/utils';
+
+describe('Feedback', () => {
+  it('should pass accessibility tests', () => {
+    cy.visit('/info/feedback');
+
+    // Page must first be visible
+    cy.get('ds-feedback').should('be.visible');
+
+    // Analyze <ds-feedback> for accessibility
+    testA11y('ds-feedback');
+  });
+});
diff --git a/cypress/e2e/groups-registry.cy.ts b/cypress/e2e/groups-registry.cy.ts
new file mode 100644
index 0000000000..5c0099c2f1
--- /dev/null
+++ b/cypress/e2e/groups-registry.cy.ts
@@ -0,0 +1,16 @@
+import { testA11y } from 'cypress/support/utils';
+
+describe('Groups registry', () => {
+  beforeEach(() => {
+    // Must login as an Admin to see the page
+    cy.visit('/access-control/groups');
+    cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
+  });
+
+  it('should pass accessibility tests', () => {
+    // Epeople registry page must first be visible
+    cy.get('ds-groups-registry').should('be.visible');
+    // Analyze <ds-groups-registry> for accessibility issues
+    testA11y('ds-groups-registry');
+  });
+});
diff --git a/cypress/e2e/header.cy.ts b/cypress/e2e/header.cy.ts
index 236208db68..c86fd39f1f 100644
--- a/cypress/e2e/header.cy.ts
+++ b/cypress/e2e/header.cy.ts
@@ -8,12 +8,31 @@ describe('Header', () => {
         cy.get('ds-header').should('be.visible');
 
         // Analyze <ds-header> for accessibility
-        testA11y({
-            include: ['ds-header'],
-            exclude: [
-                ['#search-navbar-container'], // search in navbar has duplicative ID. Will be fixed in #1174
-                ['.dropdownLogin']            // "Log in" link has color contrast issues. Will be fixed in #1149
-            ],
-        });
+        testA11y('ds-header');
+    });
+
+    it('should allow for changing language to German (for example)', () => {
+        cy.visit('/');
+
+        // Click the language switcher (globe) in header
+        cy.get('a[data-test="lang-switch"]').click();
+        // Click on the "Deusch" language in dropdown
+        cy.get('#language-menu-list li').contains('Deutsch').click();
+
+        // HTML "lang" attribute should switch to "de"
+        cy.get('html').invoke('attr', 'lang').should('eq', 'de');
+
+        // Login menu should now be in German
+        cy.get('a[data-test="login-menu"]').contains('Anmelden');
+
+        // Change back to English from language switcher
+        cy.get('a[data-test="lang-switch"]').click();
+        cy.get('#language-menu-list li').contains('English').click();
+
+        // HTML "lang" attribute should switch to "en"
+        cy.get('html').invoke('attr', 'lang').should('eq', 'en');
+
+        // Login menu should now be in English
+        cy.get('a[data-test="login-menu"]').contains('Log In');
     });
 });
diff --git a/cypress/e2e/health-page.cy.ts b/cypress/e2e/health-page.cy.ts
new file mode 100644
index 0000000000..c702fa72d7
--- /dev/null
+++ b/cypress/e2e/health-page.cy.ts
@@ -0,0 +1,62 @@
+import { testA11y } from 'cypress/support/utils';
+import { Options } from 'cypress-axe';
+
+
+beforeEach(() => {
+  // Must login as an Admin to see the page
+  cy.visit('/health');
+  cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
+});
+
+describe('Health Page > Status Tab', () => {
+  it('should pass accessibility tests', () => {
+    cy.intercept('GET', '/server/actuator/health').as('status');
+    cy.wait('@status');
+
+    cy.get('a[data-test="health-page.status-tab"]').click();
+    // Page must first be visible
+    cy.get('ds-health-page').should('be.visible');
+    cy.get('ds-health-panel').should('be.visible');
+
+    // wait for all the ds-health-info-component components to be rendered
+    cy.get('div[role="tabpanel"]').each(($panel: HTMLDivElement) => {
+      cy.wrap($panel).find('ds-health-component').should('be.visible');
+    });
+    // Analyze <ds-health-page> for accessibility issues
+    testA11y('ds-health-page', {
+      rules: {
+        // All panels are accordians & fail "aria-required-children" and "nested-interactive".
+        // Seem to require updating ng-bootstrap and https://github.com/DSpace/dspace-angular/issues/2216
+        'aria-required-children': { enabled: false },
+        'nested-interactive': { enabled: false },
+      },
+    } as Options);
+  });
+});
+
+describe('Health Page > Info Tab', () => {
+  it('should pass accessibility tests', () => {
+    cy.intercept('GET', '/server/actuator/info').as('info');
+    cy.wait('@info');
+
+    cy.get('a[data-test="health-page.info-tab"]').click();
+    // Page must first be visible
+    cy.get('ds-health-page').should('be.visible');
+    cy.get('ds-health-info').should('be.visible');
+
+    // wait for all the ds-health-info-component components to be rendered
+    cy.get('div[role="tabpanel"]').each(($panel: HTMLDivElement) => {
+      cy.wrap($panel).find('ds-health-info-component').should('be.visible');
+    });
+
+    // Analyze <ds-health-info> for accessibility issues
+    testA11y('ds-health-info', {
+      rules: {
+        // All panels are accordions & fail "aria-required-children" and "nested-interactive".
+        // Seem to require updating ng-bootstrap and https://github.com/DSpace/dspace-angular/issues/2216
+        'aria-required-children': { enabled: false },
+        'nested-interactive': { enabled: false },
+      },
+    } as Options);
+  });
+});
diff --git a/cypress/e2e/homepage-statistics.cy.ts b/cypress/e2e/homepage-statistics.cy.ts
index 2a1ab9785a..88daeeb2b9 100644
--- a/cypress/e2e/homepage-statistics.cy.ts
+++ b/cypress/e2e/homepage-statistics.cy.ts
@@ -1,18 +1,18 @@
-import { REGEX_MATCH_NON_EMPTY_TEXT, TEST_ENTITY_PUBLICATION } from 'cypress/support/e2e';
+import { REGEX_MATCH_NON_EMPTY_TEXT } from 'cypress/support/e2e';
 import { testA11y } from 'cypress/support/utils';
 import '../support/commands';
 
 describe('Site Statistics Page', () => {
     it('should load if you click on "Statistics" from homepage', () => {
         cy.visit('/');
-        cy.get('ds-navbar ds-link-menu-item a[title="Statistics"]').click();
+        cy.get('a[data-test="link-menu-item.menu.section.statistics"]').click();
         cy.location('pathname').should('eq', '/statistics');
     });
 
     it('should pass accessibility tests', () => {
         // generate 2 view events on an Item's page
-        cy.generateViewEvent(TEST_ENTITY_PUBLICATION, 'item');
-        cy.generateViewEvent(TEST_ENTITY_PUBLICATION, 'item');
+        cy.generateViewEvent(Cypress.env('DSPACE_TEST_ENTITY_PUBLICATION'), 'item');
+        cy.generateViewEvent(Cypress.env('DSPACE_TEST_ENTITY_PUBLICATION'), 'item');
 
         cy.visit('/statistics');
 
diff --git a/cypress/e2e/item-edit.cy.ts b/cypress/e2e/item-edit.cy.ts
new file mode 100644
index 0000000000..ad5d8ea093
--- /dev/null
+++ b/cypress/e2e/item-edit.cy.ts
@@ -0,0 +1,180 @@
+import { testA11y } from 'cypress/support/utils';
+import { Options } from 'cypress-axe';
+
+const ITEM_EDIT_PAGE = '/items/'.concat(Cypress.env('DSPACE_TEST_ENTITY_PUBLICATION')).concat('/edit');
+
+beforeEach(() => {
+  // All tests start with visiting the Edit Item Page
+  cy.visit(ITEM_EDIT_PAGE);
+
+  // This page is restricted, so we will be shown the login form. Fill it out & submit.
+  cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
+});
+
+describe('Edit Item > Edit Metadata tab', () => {
+  it('should pass accessibility tests', () => {
+    cy.get('a[data-test="metadata"]').should('be.visible');
+    cy.get('a[data-test="metadata"]').click();
+
+    // Our selected tab should be both visible & active
+    cy.get('a[data-test="metadata"]').should('be.visible');
+    cy.get('a[data-test="metadata"]').should('have.class', 'active');
+
+    // <ds-edit-item-page> tag must be loaded
+    cy.get('ds-edit-item-page').should('be.visible');
+
+    // wait for all the ds-dso-edit-metadata-value components to be rendered
+    cy.get('ds-dso-edit-metadata-value div[role="row"]').each(($row: HTMLDivElement) => {
+      cy.wrap($row).find('div[role="cell"]').should('be.visible');
+    });
+
+    // Analyze <ds-edit-item-page> for accessibility issues
+    testA11y('ds-edit-item-page');
+  });
+});
+
+describe('Edit Item > Status tab', () => {
+
+  it('should pass accessibility tests', () => {
+    cy.get('a[data-test="status"]').should('be.visible');
+    cy.get('a[data-test="status"]').click();
+
+    // Our selected tab should be both visible & active
+    cy.get('a[data-test="status"]').should('be.visible');
+    cy.get('a[data-test="status"]').should('have.class', 'active');
+
+    // <ds-item-status> tag must be loaded
+    cy.get('ds-item-status').should('be.visible');
+
+    // Analyze for accessibility issues
+    testA11y('ds-item-status');
+  });
+});
+
+describe('Edit Item > Bitstreams tab', () => {
+
+  it('should pass accessibility tests', () => {
+    cy.get('a[data-test="bitstreams"]').should('be.visible');
+    cy.get('a[data-test="bitstreams"]').click();
+
+    // Our selected tab should be both visible & active
+    cy.get('a[data-test="bitstreams"]').should('be.visible');
+    cy.get('a[data-test="bitstreams"]').should('have.class', 'active');
+
+    // <ds-item-bitstreams> tag must be loaded
+    cy.get('ds-item-bitstreams').should('be.visible');
+
+    // Table of item bitstreams must also be loaded
+    cy.get('div.item-bitstreams').should('be.visible');
+
+    // Analyze for accessibility issues
+    testA11y('ds-item-bitstreams',
+            {
+              rules: {
+                // Currently Bitstreams page loads a pagination component per Bundle
+                // and they all use the same 'id="p-dad"'.
+                'duplicate-id': { enabled: false },
+              },
+            } as Options,
+    );
+  });
+});
+
+describe('Edit Item > Curate tab', () => {
+
+  it('should pass accessibility tests', () => {
+    cy.get('a[data-test="curate"]').should('be.visible');
+    cy.get('a[data-test="curate"]').click();
+
+    // Our selected tab should be both visible & active
+    cy.get('a[data-test="curate"]').should('be.visible');
+    cy.get('a[data-test="curate"]').should('have.class', 'active');
+
+    // <ds-item-curate> tag must be loaded
+    cy.get('ds-item-curate').should('be.visible');
+
+    // Analyze for accessibility issues
+    testA11y('ds-item-curate');
+  });
+});
+
+describe('Edit Item > Relationships tab', () => {
+
+  it('should pass accessibility tests', () => {
+    cy.get('a[data-test="relationships"]').should('be.visible');
+    cy.get('a[data-test="relationships"]').click();
+
+    // Our selected tab should be both visible & active
+    cy.get('a[data-test="relationships"]').should('be.visible');
+    cy.get('a[data-test="relationships"]').should('have.class', 'active');
+
+    // <ds-item-relationships> tag must be loaded
+    cy.get('ds-item-relationships').should('be.visible');
+
+    // Analyze for accessibility issues
+    testA11y('ds-item-relationships');
+  });
+});
+
+describe('Edit Item > Version History tab', () => {
+
+  it('should pass accessibility tests', () => {
+    cy.get('a[data-test="versionhistory"]').should('be.visible');
+    cy.get('a[data-test="versionhistory"]').click();
+
+    // Our selected tab should be both visible & active
+    cy.get('a[data-test="versionhistory"]').should('be.visible');
+    cy.get('a[data-test="versionhistory"]').should('have.class', 'active');
+
+    // <ds-item-version-history> tag must be loaded
+    cy.get('ds-item-version-history').should('be.visible');
+
+    // Analyze for accessibility issues
+    testA11y('ds-item-version-history');
+  });
+});
+
+describe('Edit Item > Access Control tab', () => {
+
+  it('should pass accessibility tests', () => {
+    cy.get('a[data-test="access-control"]').should('be.visible');
+    cy.get('a[data-test="access-control"]').click();
+
+    // Our selected tab should be both visible & active
+    cy.get('a[data-test="access-control"]').should('be.visible');
+    cy.get('a[data-test="access-control"]').should('have.class', 'active');
+
+    // <ds-item-access-control> tag must be loaded
+    cy.get('ds-item-access-control').should('be.visible');
+
+    // Analyze for accessibility issues
+    testA11y('ds-item-access-control');
+  });
+});
+
+describe('Edit Item > Collection Mapper tab', () => {
+
+  it('should pass accessibility tests', () => {
+    cy.get('a[data-test="mapper"]').should('be.visible');
+    cy.get('a[data-test="mapper"]').click();
+
+    // Our selected tab should be both visible & active
+    cy.get('a[data-test="mapper"]').should('be.visible');
+    cy.get('a[data-test="mapper"]').should('have.class', 'active');
+
+    // <ds-item-collection-mapper> tag must be loaded
+    cy.get('ds-item-collection-mapper').should('be.visible');
+
+    // Analyze entire page for accessibility issues
+    testA11y('ds-item-collection-mapper');
+
+    // Click on the "Map new collections" tab
+    cy.get('li[data-test="mapTab"] a').click();
+
+    // Make sure search form is now visible
+    cy.get('ds-search-form').should('be.visible');
+
+    // Analyze entire page (again) for accessibility issues
+    testA11y('ds-item-collection-mapper');
+  });
+});
diff --git a/cypress/e2e/item-page.cy.ts b/cypress/e2e/item-page.cy.ts
index 9eed711776..7d42126b82 100644
--- a/cypress/e2e/item-page.cy.ts
+++ b/cypress/e2e/item-page.cy.ts
@@ -1,31 +1,45 @@
-import { Options } from 'cypress-axe';
-import { TEST_ENTITY_PUBLICATION } from 'cypress/support/e2e';
 import { testA11y } from 'cypress/support/utils';
 
 describe('Item  Page', () => {
-    const ITEMPAGE = '/items/'.concat(TEST_ENTITY_PUBLICATION);
-    const ENTITYPAGE = '/entities/publication/'.concat(TEST_ENTITY_PUBLICATION);
+    const ITEMPAGE = '/items/'.concat(Cypress.env('DSPACE_TEST_ENTITY_PUBLICATION'));
+    const ENTITYPAGE = '/entities/publication/'.concat(Cypress.env('DSPACE_TEST_ENTITY_PUBLICATION'));
 
     // Test that entities will redirect to /entities/[type]/[uuid] when accessed via /items/[uuid]
     it('should redirect to the entity page when navigating to an item page', () => {
         cy.visit(ITEMPAGE);
+        cy.wait(1000);
         cy.location('pathname').should('eq', ENTITYPAGE);
     });
 
     it('should pass accessibility tests', () => {
+        cy.intercept('POST', '/server/api/statistics/viewevents').as('viewevent');
+
         cy.visit(ENTITYPAGE);
 
+        // Wait for the "viewevent" to trigger on the Item page.
+        // This ensures our <ds-item-page> tag  is fully loaded, as the <ds-view-event> tag is contained within it.
+        cy.wait('@viewevent');
+
         // <ds-item-page> tag must be loaded
         cy.get('ds-item-page').should('be.visible');
 
         // Analyze <ds-item-page> for accessibility issues
-        // Disable heading-order checks until it is fixed
-        testA11y('ds-item-page',
-            {
-                rules: {
-                    'heading-order': { enabled: false }
-                }
-            } as Options
-        );
+        testA11y('ds-item-page');
+    });
+
+    it('should pass accessibility tests on full item page', () => {
+        cy.intercept('POST', '/server/api/statistics/viewevents').as('viewevent');
+
+        cy.visit(ENTITYPAGE + '/full');
+
+        // Wait for the "viewevent" to trigger on the Item page.
+        // This ensures our <ds-item-page> tag  is fully loaded, as the <ds-view-event> tag is contained within it.
+        cy.wait('@viewevent');
+
+        // <ds-full-item-page> tag must be loaded
+        cy.get('ds-full-item-page').should('be.visible');
+
+        // Analyze <ds-full-item-page> for accessibility issues
+        testA11y('ds-full-item-page');
     });
 });
diff --git a/cypress/e2e/item-statistics.cy.ts b/cypress/e2e/item-statistics.cy.ts
index 9b90cb24af..3fdc2e7f9d 100644
--- a/cypress/e2e/item-statistics.cy.ts
+++ b/cypress/e2e/item-statistics.cy.ts
@@ -1,12 +1,12 @@
-import { REGEX_MATCH_NON_EMPTY_TEXT, TEST_ENTITY_PUBLICATION } from 'cypress/support/e2e';
+import { REGEX_MATCH_NON_EMPTY_TEXT } from 'cypress/support/e2e';
 import { testA11y } from 'cypress/support/utils';
 
 describe('Item Statistics Page', () => {
-    const ITEMSTATISTICSPAGE = '/statistics/items/'.concat(TEST_ENTITY_PUBLICATION);
+    const ITEMSTATISTICSPAGE = '/statistics/items/'.concat(Cypress.env('DSPACE_TEST_ENTITY_PUBLICATION'));
 
     it('should load if you click on "Statistics" from an Item/Entity page', () => {
-        cy.visit('/entities/publication/'.concat(TEST_ENTITY_PUBLICATION));
-        cy.get('ds-navbar ds-link-menu-item a[title="Statistics"]').click();
+        cy.visit('/entities/publication/'.concat(Cypress.env('DSPACE_TEST_ENTITY_PUBLICATION')));
+        cy.get('a[data-test="link-menu-item.menu.section.statistics"]').click();
         cy.location('pathname').should('eq', ITEMSTATISTICSPAGE);
     });
 
@@ -23,8 +23,7 @@ describe('Item Statistics Page', () => {
 
     it('should contain a "Total visits per month" section', () => {
         cy.visit(ITEMSTATISTICSPAGE);
-        // Check just for existence because this table is empty in CI environment as it's historical data
-        cy.get('.'.concat(TEST_ENTITY_PUBLICATION).concat('_TotalVisitsPerMonth')).should('exist');
+        cy.get('table[data-test="TotalVisitsPerMonth"]').should('be.visible');
     });
 
     it('should pass accessibility tests', () => {
diff --git a/cypress/e2e/login-modal.cy.ts b/cypress/e2e/login-modal.cy.ts
index b169634cfa..88c69d6dec 100644
--- a/cypress/e2e/login-modal.cy.ts
+++ b/cypress/e2e/login-modal.cy.ts
@@ -1,42 +1,42 @@
-import { TEST_ADMIN_PASSWORD, TEST_ADMIN_USER, TEST_ENTITY_PUBLICATION } from 'cypress/support/e2e';
+import { testA11y } from 'cypress/support/utils';
 
 const page = {
-    openLoginMenu() {
-        // Click the "Log In" dropdown menu in header
-        cy.get('ds-themed-navbar [data-test="login-menu"]').click();
-    },
-    openUserMenu() {
-        // Once logged in, click the User menu in header
-        cy.get('ds-themed-navbar [data-test="user-menu"]').click();
-    },
-    submitLoginAndPasswordByPressingButton(email, password) {
-        // Enter email
-        cy.get('ds-themed-navbar [data-test="email"]').type(email);
-        // Enter password
-        cy.get('ds-themed-navbar [data-test="password"]').type(password);
-        // Click login button
-        cy.get('ds-themed-navbar [data-test="login-button"]').click();
-    },
-    submitLoginAndPasswordByPressingEnter(email, password) {
-        // In opened Login modal, fill out email & password, then click Enter
-        cy.get('ds-themed-navbar [data-test="email"]').type(email);
-        cy.get('ds-themed-navbar [data-test="password"]').type(password);
-        cy.get('ds-themed-navbar [data-test="password"]').type('{enter}');
-    },
-    submitLogoutByPressingButton() {
-        // This is the POST command that will actually log us out
-        cy.intercept('POST', '/server/api/authn/logout').as('logout');
-        // Click logout button
-        cy.get('ds-themed-navbar [data-test="logout-button"]').click();
-        // Wait until above POST command responds before continuing
-        // (This ensures next action waits until logout completes)
-        cy.wait('@logout');
-    }
+  openLoginMenu() {
+    // Click the "Log In" dropdown menu in header
+    cy.get('[data-test="login-menu"]').click();
+  },
+  openUserMenu() {
+    // Once logged in, click the User menu in header
+    cy.get('[data-test="user-menu"]').click();
+  },
+  submitLoginAndPasswordByPressingButton(email, password) {
+    // Enter email
+    cy.get('[data-test="email"]').type(email);
+    // Enter password
+    cy.get('[data-test="password"]').type(password);
+    // Click login button
+    cy.get('[data-test="login-button"]').click();
+  },
+  submitLoginAndPasswordByPressingEnter(email, password) {
+    // In opened Login modal, fill out email & password, then click Enter
+    cy.get('[data-test="email"]').type(email);
+    cy.get('[data-test="password"]').type(password);
+    cy.get('[data-test="password"]').type('{enter}');
+  },
+  submitLogoutByPressingButton() {
+    // This is the POST command that will actually log us out
+    cy.intercept('POST', '/server/api/authn/logout').as('logout');
+    // Click logout button
+    cy.get('[data-test="logout-button"]').click();
+    // Wait until above POST command responds before continuing
+    // (This ensures next action waits until logout completes)
+    cy.wait('@logout');
+  },
 };
 
 describe('Login Modal', () => {
     it('should login when clicking button & stay on same page', () => {
-        const ENTITYPAGE = '/entities/publication/'.concat(TEST_ENTITY_PUBLICATION);
+        const ENTITYPAGE = '/entities/publication/'.concat(Cypress.env('DSPACE_TEST_ENTITY_PUBLICATION'));
         cy.visit(ENTITYPAGE);
 
         // Login menu should exist
@@ -46,7 +46,7 @@ describe('Login Modal', () => {
         page.openLoginMenu();
         cy.get('.form-login').should('be.visible');
 
-        page.submitLoginAndPasswordByPressingButton(TEST_ADMIN_USER, TEST_ADMIN_PASSWORD);
+        page.submitLoginAndPasswordByPressingButton(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
         cy.get('ds-log-in').should('not.exist');
 
         // Verify we are still on the same page
@@ -66,8 +66,8 @@ describe('Login Modal', () => {
         cy.get('.form-login').should('be.visible');
 
         // Login, and the <ds-log-in> tag should no longer exist
-        page.submitLoginAndPasswordByPressingEnter(TEST_ADMIN_USER, TEST_ADMIN_PASSWORD);
-        cy.get('.form-login').should('not.exist');
+        page.submitLoginAndPasswordByPressingEnter(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
+        cy.get('ds-log-in').should('not.exist');
 
         // Verify we are still on homepage
         cy.url().should('include', '/home');
@@ -80,7 +80,7 @@ describe('Login Modal', () => {
 
     it('should support logout', () => {
         // First authenticate & access homepage
-        cy.login(TEST_ADMIN_USER, TEST_ADMIN_PASSWORD);
+        cy.login(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
         cy.visit('/');
 
         // Verify ds-log-in tag doesn't exist, but ds-log-out tag does exist
@@ -102,12 +102,15 @@ describe('Login Modal', () => {
         page.openLoginMenu();
 
         // Registration link should be visible
-        cy.get('ds-themed-navbar [data-test="register"]').should('be.visible');
+        cy.get('ds-themed-header [data-test="register"]').should('be.visible');
 
         // Click registration link & you should go to registration page
-        cy.get('ds-themed-navbar [data-test="register"]').click();
+        cy.get('ds-themed-header [data-test="register"]').click();
         cy.location('pathname').should('eq', '/register');
         cy.get('ds-register-email').should('exist');
+
+        // Test accessibility of this page
+        testA11y('ds-register-email');
     });
 
     it('should allow forgot password', () => {
@@ -116,11 +119,32 @@ describe('Login Modal', () => {
         page.openLoginMenu();
 
         // Forgot password link should be visible
-        cy.get('ds-themed-navbar [data-test="forgot"]').should('be.visible');
+        cy.get('ds-themed-header [data-test="forgot"]').should('be.visible');
 
         // Click link & you should go to Forgot Password page
-        cy.get('ds-themed-navbar [data-test="forgot"]').click();
+        cy.get('ds-themed-header [data-test="forgot"]').click();
         cy.location('pathname').should('eq', '/forgot');
         cy.get('ds-forgot-email').should('exist');
+
+        // Test accessibility of this page
+        testA11y('ds-forgot-email');
+    });
+
+    it('should pass accessibility tests in menus', () => {
+        cy.visit('/');
+
+        // Open login menu & verify accessibility
+        page.openLoginMenu();
+        cy.get('ds-log-in').should('exist');
+        testA11y('ds-log-in');
+
+        // Now login
+        page.submitLoginAndPasswordByPressingButton(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
+        cy.get('ds-log-in').should('not.exist');
+
+        // Open user menu, verify user menu accesibility
+        page.openUserMenu();
+        cy.get('ds-user-menu').should('be.visible');
+        testA11y('ds-user-menu');
     });
 });
diff --git a/cypress/e2e/metadata-import-page.cy.ts b/cypress/e2e/metadata-import-page.cy.ts
new file mode 100644
index 0000000000..a31c18e4eb
--- /dev/null
+++ b/cypress/e2e/metadata-import-page.cy.ts
@@ -0,0 +1,16 @@
+import { testA11y } from 'cypress/support/utils';
+
+describe('Metadata Import Page', () => {
+  beforeEach(() => {
+    // Must login as an Admin to see the page
+    cy.visit('/admin/metadata-import');
+    cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
+  });
+
+  it('should pass accessibility tests', () => {
+    // Metadata import form must first be visible
+    cy.get('ds-metadata-import-page').should('be.visible');
+    // Analyze <ds-metadata-import-page> for accessibility issues
+    testA11y('ds-metadata-import-page');
+  });
+});
diff --git a/cypress/e2e/metadata-registry.cy.ts b/cypress/e2e/metadata-registry.cy.ts
new file mode 100644
index 0000000000..0402d33153
--- /dev/null
+++ b/cypress/e2e/metadata-registry.cy.ts
@@ -0,0 +1,16 @@
+import { testA11y } from 'cypress/support/utils';
+
+describe('Metadata Registry', () => {
+  beforeEach(() => {
+    // Must login as an Admin to see the page
+    cy.visit('/admin/registries/metadata');
+    cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
+  });
+
+  it('should pass accessibility tests', () => {
+    // Page must first be visible
+    cy.get('ds-metadata-registry').should('be.visible');
+    // Analyze <ds-metadata-registry> for accessibility issues
+    testA11y('ds-metadata-registry');
+  });
+});
diff --git a/cypress/e2e/metadata-schema.cy.ts b/cypress/e2e/metadata-schema.cy.ts
new file mode 100644
index 0000000000..9ff0db0714
--- /dev/null
+++ b/cypress/e2e/metadata-schema.cy.ts
@@ -0,0 +1,16 @@
+import { testA11y } from 'cypress/support/utils';
+
+describe('Metadata Schema', () => {
+  beforeEach(() => {
+    // Must login as an Admin to see the page
+    cy.visit('/admin/registries/metadata/dc');
+    cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
+  });
+
+  it('should pass accessibility tests', () => {
+    // Page must first be visible
+    cy.get('ds-metadata-schema').should('be.visible');
+    // Analyze <ds-metadata-schema> for accessibility issues
+    testA11y('ds-metadata-schema');
+  });
+});
diff --git a/cypress/e2e/my-dspace.cy.ts b/cypress/e2e/my-dspace.cy.ts
index 79786c298a..c48656ffcc 100644
--- a/cypress/e2e/my-dspace.cy.ts
+++ b/cypress/e2e/my-dspace.cy.ts
@@ -1,5 +1,3 @@
-import { Options } from 'cypress-axe';
-import { TEST_SUBMIT_USER, TEST_SUBMIT_USER_PASSWORD, TEST_SUBMIT_COLLECTION_NAME } from 'cypress/support/e2e';
 import { testA11y } from 'cypress/support/utils';
 
 describe('My DSpace page', () => {
@@ -7,7 +5,7 @@ describe('My DSpace page', () => {
         cy.visit('/mydspace');
 
         // This page is restricted, so we will be shown the login form. Fill it out & submit.
-        cy.loginViaForm(TEST_SUBMIT_USER, TEST_SUBMIT_USER_PASSWORD);
+        cy.loginViaForm(Cypress.env('DSPACE_TEST_SUBMIT_USER'), Cypress.env('DSPACE_TEST_SUBMIT_USER_PASSWORD'));
 
         cy.get('ds-my-dspace-page').should('be.visible');
 
@@ -19,28 +17,14 @@ describe('My DSpace page', () => {
         cy.get('.filter-toggle').click({ multiple: true });
 
         // Analyze <ds-my-dspace-page> for accessibility issues
-        testA11y(
-            {
-                include: ['ds-my-dspace-page'],
-                exclude: [
-                    ['nouislider'] // Date filter slider is missing ARIA labels. Will be fixed by #1175
-                ],
-            },
-            {
-                rules: {
-                    // Search filters fail these two "moderate" impact rules
-                    'heading-order': { enabled: false },
-                    'landmark-unique': { enabled: false }
-                }
-            } as Options
-        );
+        testA11y('ds-my-dspace-page');
     });
 
     it('should have a working detailed view that passes accessibility tests', () => {
         cy.visit('/mydspace');
 
         // This page is restricted, so we will be shown the login form. Fill it out & submit.
-        cy.loginViaForm(TEST_SUBMIT_USER, TEST_SUBMIT_USER_PASSWORD);
+        cy.loginViaForm(Cypress.env('DSPACE_TEST_SUBMIT_USER'), Cypress.env('DSPACE_TEST_SUBMIT_USER_PASSWORD'));
 
         cy.get('ds-my-dspace-page').should('be.visible');
 
@@ -49,16 +33,8 @@ describe('My DSpace page', () => {
 
         cy.get('ds-object-detail').should('be.visible');
 
-        // Analyze <ds-search-page> for accessibility issues
-        testA11y('ds-my-dspace-page',
-            {
-                rules: {
-                    // Search filters fail these two "moderate" impact rules
-                    'heading-order': { enabled: false },
-                    'landmark-unique': { enabled: false }
-                }
-            } as Options
-        );
+        // Analyze <ds-my-dspace-page> for accessibility issues
+        testA11y('ds-my-dspace-page');
     });
 
     // NOTE: Deleting existing submissions is exercised by submission.spec.ts
@@ -66,7 +42,7 @@ describe('My DSpace page', () => {
         cy.visit('/mydspace');
 
         // This page is restricted, so we will be shown the login form. Fill it out & submit.
-        cy.loginViaForm(TEST_SUBMIT_USER, TEST_SUBMIT_USER_PASSWORD);
+        cy.loginViaForm(Cypress.env('DSPACE_TEST_SUBMIT_USER'), Cypress.env('DSPACE_TEST_SUBMIT_USER_PASSWORD'));
 
         // Open the New Submission dropdown
         cy.get('button[data-test="submission-dropdown"]').click();
@@ -77,10 +53,10 @@ describe('My DSpace page', () => {
         cy.get('ds-create-item-parent-selector').should('be.visible');
 
         // Type in a known Collection name in the search box
-        cy.get('ds-authorized-collection-selector input[type="search"]').type(TEST_SUBMIT_COLLECTION_NAME);
+        cy.get('ds-authorized-collection-selector input[type="search"]').type(Cypress.env('DSPACE_TEST_SUBMIT_COLLECTION_NAME'));
 
         // Click on the button matching that known Collection name
-        cy.get('ds-authorized-collection-selector button[title="'.concat(TEST_SUBMIT_COLLECTION_NAME).concat('"]')).click();
+        cy.get('ds-authorized-collection-selector button[title="'.concat(Cypress.env('DSPACE_TEST_SUBMIT_COLLECTION_NAME')).concat('"]')).click();
 
         // New URL should include /workspaceitems, as we've started a new submission
         cy.url().should('include', '/workspaceitems');
@@ -89,7 +65,7 @@ describe('My DSpace page', () => {
         cy.get('ds-submission-edit').should('be.visible');
 
         // A Collection menu button should exist & its value should be the selected collection
-        cy.get('#collectionControlsMenuButton span').should('have.text', TEST_SUBMIT_COLLECTION_NAME);
+        cy.get('#collectionControlsMenuButton span').should('have.text', Cypress.env('DSPACE_TEST_SUBMIT_COLLECTION_NAME'));
 
         // Now that we've created a submission, we'll test that we can go back and Edit it.
         // Get our Submission URL, to parse out the ID of this new submission
@@ -138,7 +114,7 @@ describe('My DSpace page', () => {
         cy.visit('/mydspace');
 
         // This page is restricted, so we will be shown the login form. Fill it out & submit.
-        cy.loginViaForm(TEST_SUBMIT_USER, TEST_SUBMIT_USER_PASSWORD);
+        cy.loginViaForm(Cypress.env('DSPACE_TEST_SUBMIT_USER'), Cypress.env('DSPACE_TEST_SUBMIT_USER_PASSWORD'));
 
         // Open the New Import dropdown
         cy.get('button[data-test="import-dropdown"]').click();
@@ -150,6 +126,9 @@ describe('My DSpace page', () => {
 
         // The external import searchbox should be visible
         cy.get('ds-submission-import-external-searchbar').should('be.visible');
+
+        // Test for accessibility issues
+        testA11y('ds-submission-import-external');
     });
 
 });
diff --git a/cypress/e2e/new-process.cy.ts b/cypress/e2e/new-process.cy.ts
new file mode 100644
index 0000000000..d26da7cc4d
--- /dev/null
+++ b/cypress/e2e/new-process.cy.ts
@@ -0,0 +1,16 @@
+import { testA11y } from 'cypress/support/utils';
+
+describe('New Process', () => {
+  beforeEach(() => {
+    // Must login as an Admin to see the page
+    cy.visit('/processes/new');
+    cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
+  });
+
+  it('should pass accessibility tests', () => {
+    // Process form must first be visible
+    cy.get('ds-new-process').should('be.visible');
+    // Analyze <ds-new-process> for accessibility issues
+    testA11y('ds-new-process');
+  });
+});
diff --git a/cypress/e2e/pagenotfound.cy.ts b/cypress/e2e/pagenotfound.cy.ts
index 43e3c3af24..d02aa8541c 100644
--- a/cypress/e2e/pagenotfound.cy.ts
+++ b/cypress/e2e/pagenotfound.cy.ts
@@ -1,8 +1,13 @@
+import { testA11y } from 'cypress/support/utils';
+
 describe('PageNotFound', () => {
     it('should contain element ds-pagenotfound when navigating to page that doesnt exist', () => {
         // request an invalid page (UUIDs at root path aren't valid)
         cy.visit('/e9019a69-d4f1-4773-b6a3-bd362caa46f2', { failOnStatusCode: false });
         cy.get('ds-pagenotfound').should('be.visible');
+
+        // Analyze <ds-pagenotfound> for accessibility issues
+        testA11y('ds-pagenotfound');
     });
 
     it('should not contain element ds-pagenotfound when navigating to existing page', () => {
diff --git a/cypress/e2e/privacy.cy.ts b/cypress/e2e/privacy.cy.ts
new file mode 100644
index 0000000000..16e049f701
--- /dev/null
+++ b/cypress/e2e/privacy.cy.ts
@@ -0,0 +1,13 @@
+import { testA11y } from 'cypress/support/utils';
+
+describe('Privacy', () => {
+  it('should pass accessibility tests', () => {
+    cy.visit('/info/privacy');
+
+    // Page must first be visible
+    cy.get('ds-privacy').should('be.visible');
+
+    // Analyze <ds-privacy> for accessibility
+    testA11y('ds-privacy');
+  });
+});
diff --git a/cypress/e2e/processes-overview.cy.ts b/cypress/e2e/processes-overview.cy.ts
new file mode 100644
index 0000000000..2be3bd4c18
--- /dev/null
+++ b/cypress/e2e/processes-overview.cy.ts
@@ -0,0 +1,17 @@
+import { testA11y } from 'cypress/support/utils';
+
+describe('Processes Overview', () => {
+  beforeEach(() => {
+    // Must login as an Admin to see the page
+    cy.visit('/processes');
+    cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
+  });
+
+  it('should pass accessibility tests', () => {
+
+    // Process overview must first be visible
+    cy.get('ds-process-overview').should('be.visible');
+    // Analyze <ds-process-overview> for accessibility issues
+    testA11y('ds-process-overview');
+  });
+});
diff --git a/cypress/e2e/profile-page.cy.ts b/cypress/e2e/profile-page.cy.ts
new file mode 100644
index 0000000000..911ef33ba5
--- /dev/null
+++ b/cypress/e2e/profile-page.cy.ts
@@ -0,0 +1,16 @@
+import { testA11y } from 'cypress/support/utils';
+
+describe('Profile page', () => {
+  beforeEach(() => {
+    // Must login as an Admin to see the page
+    cy.visit('/profile');
+    cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
+  });
+
+  it('should pass accessibility tests', () => {
+    // Process form must first be visible
+    cy.get('ds-profile-page').should('be.visible');
+    // Analyze <ds-profile-page> for accessibility issues
+    testA11y('ds-profile-page');
+  });
+});
diff --git a/cypress/e2e/search-navbar.cy.ts b/cypress/e2e/search-navbar.cy.ts
index 648db17fe6..28a72bcc78 100644
--- a/cypress/e2e/search-navbar.cy.ts
+++ b/cypress/e2e/search-navbar.cy.ts
@@ -1,23 +1,21 @@
-import { TEST_SEARCH_TERM } from 'cypress/support/e2e';
-
 const page = {
     fillOutQueryInNavBar(query) {
         // Click the magnifying glass
-        cy.get('ds-themed-navbar [data-test="header-search-icon"]').click();
+        cy.get('ds-themed-header [data-test="header-search-icon"]').click();
         // Fill out a query in input that appears
-        cy.get('ds-themed-navbar [data-test="header-search-box"]').type(query);
+        cy.get('ds-themed-header [data-test="header-search-box"]').type(query);
     },
     submitQueryByPressingEnter() {
-        cy.get('ds-themed-navbar [data-test="header-search-box"]').type('{enter}');
+        cy.get('ds-themed-header [data-test="header-search-box"]').type('{enter}');
     },
     submitQueryByPressingIcon() {
-        cy.get('ds-themed-navbar [data-test="header-search-icon"]').click();
+        cy.get('ds-themed-header [data-test="header-search-icon"]').click();
     }
 };
 
 describe('Search from Navigation Bar', () => {
     // NOTE: these tests currently assume this query will return results!
-    const query = TEST_SEARCH_TERM;
+    const query = Cypress.env('DSPACE_TEST_SEARCH_TERM');
 
     it('should go to search page with correct query if submitted (from home)', () => {
         cy.visit('/');
diff --git a/cypress/e2e/search-page.cy.ts b/cypress/e2e/search-page.cy.ts
index 24519cc236..429f4e6da4 100644
--- a/cypress/e2e/search-page.cy.ts
+++ b/cypress/e2e/search-page.cy.ts
@@ -1,8 +1,10 @@
 import { Options } from 'cypress-axe';
-import { TEST_SEARCH_TERM } from 'cypress/support/e2e';
 import { testA11y } from 'cypress/support/utils';
 
 describe('Search Page', () => {
+    // NOTE: these tests currently assume this query will return results!
+    const query = Cypress.env('DSPACE_TEST_SEARCH_TERM');
+
     it('should redirect to the correct url when query was set and submit button was triggered', () => {
         const queryString = 'Another interesting query string';
         cy.visit('/search');
@@ -13,8 +15,8 @@ describe('Search Page', () => {
     });
 
     it('should load results and pass accessibility tests', () => {
-        cy.visit('/search?query='.concat(TEST_SEARCH_TERM));
-        cy.get('[data-test="search-box"]').should('have.value', TEST_SEARCH_TERM);
+        cy.visit('/search?query='.concat(query));
+        cy.get('[data-test="search-box"]').should('have.value', query);
 
         // <ds-search-page> tag must be loaded
         cy.get('ds-search-page').should('be.visible');
@@ -27,25 +29,11 @@ describe('Search Page', () => {
         cy.get('[data-test="filter-toggle"]').click({ multiple: true });
 
         // Analyze <ds-search-page> for accessibility issues
-        testA11y(
-            {
-                include: ['ds-search-page'],
-                exclude: [
-                    ['nouislider'] // Date filter slider is missing ARIA labels. Will be fixed by #1175
-                ],
-            },
-            {
-                rules: {
-                    // Search filters fail these two "moderate" impact rules
-                    'heading-order': { enabled: false },
-                    'landmark-unique': { enabled: false }
-                }
-            } as Options
-        );
+        testA11y('ds-search-page');
     });
 
     it('should have a working grid view that passes accessibility tests', () => {
-        cy.visit('/search?query='.concat(TEST_SEARCH_TERM));
+        cy.visit('/search?query='.concat(query));
 
         // Click button in sidebar to display grid view
         cy.get('ds-search-sidebar [data-test="grid-view"]').click();
@@ -60,9 +48,8 @@ describe('Search Page', () => {
         testA11y('ds-search-page',
             {
                 rules: {
-                    // Search filters fail these two "moderate" impact rules
-                    'heading-order': { enabled: false },
-                    'landmark-unique': { enabled: false }
+                    // Card titles fail this test currently
+                    'heading-order': { enabled: false }
                 }
             } as Options
         );
diff --git a/cypress/e2e/submission.cy.ts b/cypress/e2e/submission.cy.ts
index ed10b2d13a..8215b4749d 100644
--- a/cypress/e2e/submission.cy.ts
+++ b/cypress/e2e/submission.cy.ts
@@ -1,14 +1,16 @@
-import { TEST_SUBMIT_USER, TEST_SUBMIT_USER_PASSWORD, TEST_SUBMIT_COLLECTION_NAME, TEST_SUBMIT_COLLECTION_UUID } from 'cypress/support/e2e';
+import { testA11y } from 'cypress/support/utils';
+//import { TEST_SUBMIT_USER, TEST_SUBMIT_USER_PASSWORD, TEST_SUBMIT_COLLECTION_NAME, TEST_SUBMIT_COLLECTION_UUID, TEST_ADMIN_USER, TEST_ADMIN_PASSWORD } from 'cypress/support/e2e';
+import { Options } from 'cypress-axe';
 
 describe('New Submission page', () => {
-    // NOTE: We already test that new submissions can be started from MyDSpace in my-dspace.spec.ts
 
+    // NOTE: We already test that new Item submissions can be started from MyDSpace in my-dspace.spec.ts
     it('should create a new submission when using /submit path & pass accessibility', () => {
         // Test that calling /submit with collection & entityType will create a new submission
-        cy.visit('/submit?collection='.concat(TEST_SUBMIT_COLLECTION_UUID).concat('&entityType=none'));
+        cy.visit('/submit?collection='.concat(Cypress.env('DSPACE_TEST_SUBMIT_COLLECTION_UUID')).concat('&entityType=none'));
 
         // This page is restricted, so we will be shown the login form. Fill it out & submit.
-        cy.loginViaForm(TEST_SUBMIT_USER, TEST_SUBMIT_USER_PASSWORD);
+        cy.loginViaForm(Cypress.env('DSPACE_TEST_SUBMIT_USER'), Cypress.env('DSPACE_TEST_SUBMIT_USER_PASSWORD'));
 
         // Should redirect to /workspaceitems, as we've started a new submission
         cy.url().should('include', '/workspaceitems');
@@ -17,7 +19,7 @@ describe('New Submission page', () => {
         cy.get('ds-submission-edit').should('be.visible');
 
         // A Collection menu button should exist & it's value should be the selected collection
-        cy.get('#collectionControlsMenuButton span').should('have.text', TEST_SUBMIT_COLLECTION_NAME);
+        cy.get('#collectionControlsMenuButton span').should('have.text', Cypress.env('DSPACE_TEST_SUBMIT_COLLECTION_NAME'));
 
         // 4 sections should be visible by default
         cy.get('div#section_traditionalpageone').should('be.visible');
@@ -25,6 +27,25 @@ describe('New Submission page', () => {
         cy.get('div#section_upload').should('be.visible');
         cy.get('div#section_license').should('be.visible');
 
+        // Test entire page for accessibility
+        testA11y('ds-submission-edit',
+            {
+                rules: {
+                    // Author & Subject fields have invalid "aria-multiline" attrs.
+                    // See https://github.com/DSpace/dspace-angular/issues/1272
+                    'aria-allowed-attr': { enabled: false },
+                    // All panels are accordians & fail "aria-required-children" and "nested-interactive".
+                    // Seem to require updating ng-bootstrap and https://github.com/DSpace/dspace-angular/issues/2216
+                    'aria-required-children': { enabled: false },
+                    'nested-interactive': { enabled: false },
+                    // All select boxes fail to have a name / aria-label.
+                    // This is a bug in ng-dynamic-forms and may require https://github.com/DSpace/dspace-angular/issues/2216
+                    'select-name': { enabled: false },
+                }
+
+            } as Options
+        );
+
         // Discard button should work
         // Clicking it will display a confirmation, which we will confirm with another click
         cy.get('button#discard').click();
@@ -33,10 +54,10 @@ describe('New Submission page', () => {
 
     it('should block submission & show errors if required fields are missing', () => {
         // Create a new submission
-        cy.visit('/submit?collection='.concat(TEST_SUBMIT_COLLECTION_UUID).concat('&entityType=none'));
+        cy.visit('/submit?collection='.concat(Cypress.env('DSPACE_TEST_SUBMIT_COLLECTION_UUID')).concat('&entityType=none'));
 
         // This page is restricted, so we will be shown the login form. Fill it out & submit.
-        cy.loginViaForm(TEST_SUBMIT_USER, TEST_SUBMIT_USER_PASSWORD);
+        cy.loginViaForm(Cypress.env('DSPACE_TEST_SUBMIT_USER'), Cypress.env('DSPACE_TEST_SUBMIT_USER_PASSWORD'));
 
         // Attempt an immediate deposit without filling out any fields
         cy.get('button#deposit').click();
@@ -93,10 +114,10 @@ describe('New Submission page', () => {
 
     it('should allow for deposit if all required fields completed & file uploaded', () => {
         // Create a new submission
-        cy.visit('/submit?collection='.concat(TEST_SUBMIT_COLLECTION_UUID).concat('&entityType=none'));
+        cy.visit('/submit?collection='.concat(Cypress.env('DSPACE_TEST_SUBMIT_COLLECTION_UUID')).concat('&entityType=none'));
 
         // This page is restricted, so we will be shown the login form. Fill it out & submit.
-        cy.loginViaForm(TEST_SUBMIT_USER, TEST_SUBMIT_USER_PASSWORD);
+        cy.loginViaForm(Cypress.env('DSPACE_TEST_SUBMIT_USER'), Cypress.env('DSPACE_TEST_SUBMIT_USER_PASSWORD'));
 
         // Fill out all required fields (Title, Date)
         cy.get('input#dc_title').type('DSpace logo uploaded via e2e tests');
@@ -116,7 +137,7 @@ describe('New Submission page', () => {
 
         // Upload our DSpace logo via drag & drop onto submission form
         // cy.get('div#section_upload')
-        cy.get('div.ds-document-drop-zone').selectFile('src/assets/images/dspace-logo.png', {
+        cy.get('div.ds-document-drop-zone').selectFile('src/assets/images/dspace-logo.svg', {
             action: 'drag-drop'
         });
 
@@ -131,4 +152,76 @@ describe('New Submission page', () => {
         cy.get('ds-notification div.alert-success').should('be.visible');
     });
 
+    it('is possible to submit a new "Person" and that form passes accessibility', () => {
+        // To submit a different entity type, we'll start from MyDSpace
+        cy.visit('/mydspace');
+
+        // This page is restricted, so we will be shown the login form. Fill it out & submit.
+        // NOTE: At this time, we MUST login as admin to submit Person objects
+        cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
+
+        // Open the New Submission dropdown
+        cy.get('button[data-test="submission-dropdown"]').click();
+        // Click on the "Person" type in that dropdown
+        cy.get('#entityControlsDropdownMenu button[title="Person"]').click();
+
+        // This should display the <ds-create-item-parent-selector> (popup window)
+        cy.get('ds-create-item-parent-selector').should('be.visible');
+
+        // Type in a known Collection name in the search box
+        cy.get('ds-authorized-collection-selector input[type="search"]').type(Cypress.env('DSPACE_TEST_SUBMIT_PERSON_COLLECTION_NAME'));
+
+        // Click on the button matching that known Collection name
+        cy.get('ds-authorized-collection-selector button[title="'.concat(Cypress.env('DSPACE_TEST_SUBMIT_PERSON_COLLECTION_NAME')).concat('"]')).click();
+
+        // New URL should include /workspaceitems, as we've started a new submission
+        cy.url().should('include', '/workspaceitems');
+
+        // The Submission edit form tag should be visible
+        cy.get('ds-submission-edit').should('be.visible');
+
+        // A Collection menu button should exist & its value should be the selected collection
+        cy.get('#collectionControlsMenuButton span').should('have.text', Cypress.env('DSPACE_TEST_SUBMIT_PERSON_COLLECTION_NAME'));
+
+        // 3 sections should be visible by default
+        cy.get('div#section_personStep').should('be.visible');
+        cy.get('div#section_upload').should('be.visible');
+        cy.get('div#section_license').should('be.visible');
+
+        // Test entire page for accessibility
+        testA11y('ds-submission-edit',
+            {
+                rules: {
+                    // All panels are accordians & fail "aria-required-children" and "nested-interactive".
+                    // Seem to require updating ng-bootstrap and https://github.com/DSpace/dspace-angular/issues/2216
+                    'aria-required-children': { enabled: false },
+                    'nested-interactive': { enabled: false },
+                }
+
+            } as Options
+        );
+
+        // Click the lookup button next to "Publication" field
+        cy.get('button[data-test="lookup-button"]').click();
+
+        // A popup modal window should be visible
+        cy.get('ds-dynamic-lookup-relation-modal').should('be.visible');
+
+        // Popup modal should also pass accessibility tests
+        //testA11y('ds-dynamic-lookup-relation-modal');
+        testA11y({
+            include: ['ds-dynamic-lookup-relation-modal'],
+            exclude: [
+                ['ul.nav-tabs'] // Tabs at top of model have several issues which seem to be caused by ng-bootstrap
+            ],
+        });
+
+        // Close popup window
+        cy.get('ds-dynamic-lookup-relation-modal button.close').click();
+
+        // Back on the form, click the discard button to remove new submission
+        // Clicking it will display a confirmation, which we will confirm with another click
+        cy.get('button#discard').click();
+        cy.get('button#discard_submit').click();
+    });
 });
diff --git a/cypress/e2e/system-wide-alert.cy.ts b/cypress/e2e/system-wide-alert.cy.ts
new file mode 100644
index 0000000000..046bfe619f
--- /dev/null
+++ b/cypress/e2e/system-wide-alert.cy.ts
@@ -0,0 +1,16 @@
+import { testA11y } from 'cypress/support/utils';
+
+describe('System Wide Alert', () => {
+  beforeEach(() => {
+    // Must login as an Admin to see the page
+    cy.visit('/admin/system-wide-alert');
+    cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
+  });
+
+  it('should pass accessibility tests', () => {
+    // Page must first be visible
+    cy.get('ds-system-wide-alert-form').should('be.visible');
+    // Analyze <ds-system-wide-alert-form> for accessibility issues
+    testA11y('ds-system-wide-alert-form');
+  });
+});
diff --git a/cypress/plugins/index.ts b/cypress/plugins/index.ts
index ead38afb92..cc3dccba38 100644
--- a/cypress/plugins/index.ts
+++ b/cypress/plugins/index.ts
@@ -1,5 +1,11 @@
 const fs = require('fs');
 
+// These two global variables are used to store information about the REST API used
+// by these e2e tests. They are filled out prior to running any tests in the before()
+// method of e2e.ts. They can then be accessed by any tests via the getters below.
+let REST_BASE_URL: string;
+let REST_DOMAIN: string;
+
 // Plugins enable you to tap into, modify, or extend the internal behavior of Cypress
 // For more info, visit https://on.cypress.io/plugins-api
 module.exports = (on, config) => {
@@ -30,6 +36,24 @@ module.exports = (on, config) => {
             }
 
             return null;
+        },
+        // Save value of REST Base URL, looked up before all tests.
+        // This allows other tests to use it easily via getRestBaseURL() below.
+        saveRestBaseURL(url: string) {
+            return (REST_BASE_URL = url);
+        },
+        // Retrieve currently saved value of REST Base URL
+        getRestBaseURL() {
+            return REST_BASE_URL ;
+        },
+        // Save value of REST Domain, looked up before all tests.
+        // This allows other tests to use it easily via getRestBaseDomain() below.
+        saveRestBaseDomain(domain: string) {
+            return (REST_DOMAIN = domain);
+        },
+        // Retrieve currently saved value of REST Domain
+        getRestBaseDomain() {
+            return REST_DOMAIN ;
         }
     });
 };
diff --git a/cypress/support/commands.ts b/cypress/support/commands.ts
index c70c4e37e1..d433424d6f 100644
--- a/cypress/support/commands.ts
+++ b/cypress/support/commands.ts
@@ -5,11 +5,7 @@
 
 import { AuthTokenInfo, TOKENITEM } from 'src/app/core/auth/models/auth-token-info.model';
 import { DSPACE_XSRF_COOKIE, XSRF_REQUEST_HEADER } from 'src/app/core/xsrf/xsrf.constants';
-
-// NOTE: FALLBACK_TEST_REST_BASE_URL is only used if Cypress cannot read the REST API BaseURL
-// from the Angular UI's config.json. See 'login()'.
-export const FALLBACK_TEST_REST_BASE_URL = 'http://localhost:8080/server';
-export const FALLBACK_TEST_REST_DOMAIN = 'localhost';
+import { v4 as uuidv4 } from 'uuid';
 
 // Declare Cypress namespace to help with Intellisense & code completion in IDEs
 // ALL custom commands MUST be listed here for code completion to work
@@ -41,6 +37,13 @@ declare global {
              * @param dsoType type of DSpace Object (e.g. "item", "collection", "community")
              */
             generateViewEvent(uuid: string, dsoType: string): typeof generateViewEvent;
+
+            /**
+             * Create a new CSRF token and add to required Cookie. CSRF Token is returned
+             * in chainable in order to allow it to be sent also in required CSRF header.
+             * @returns Chainable reference to allow CSRF token to also be sent in header.
+             */
+            createCSRFCookie(): Chainable<any>;
         }
     }
 }
@@ -54,59 +57,32 @@ declare global {
  * @param password password to login as
  */
 function login(email: string, password: string): void {
-    // Cypress doesn't have access to the running application in Node.js.
-    // So, it's not possible to inject or load the AppConfig or environment of the Angular UI.
-    // Instead, we'll read our running application's config.json, which contains the configs &
-    // is regenerated at runtime each time the Angular UI application starts up.
-    cy.task('readUIConfig').then((str: string) => {
-        // Parse config into a JSON object
-        const config = JSON.parse(str);
+    // Create a fake CSRF cookie/token to use in POST
+    cy.createCSRFCookie().then((csrfToken: string) => {
+        // get our REST API's base URL, also needed for POST
+        cy.task('getRestBaseURL').then((baseRestUrl: string) => {
+            // Now, send login POST request including that CSRF token
+            cy.request({
+                method: 'POST',
+                url: baseRestUrl + '/api/authn/login',
+                headers: { [XSRF_REQUEST_HEADER]: csrfToken},
+                form: true, // indicates the body should be form urlencoded
+                body: { user: email, password: password }
+            }).then((resp) => {
+                // We expect a successful login
+                expect(resp.status).to.eq(200);
+                // We expect to have a valid authorization header returned (with our auth token)
+                expect(resp.headers).to.have.property('authorization');
 
-        // Find the URL of our REST API. Have a fallback ready, just in case 'rest.baseUrl' cannot be found.
-        let baseRestUrl = FALLBACK_TEST_REST_BASE_URL;
-        if (!config.rest.baseUrl) {
-            console.warn("Could not load 'rest.baseUrl' from config.json. Falling back to " + FALLBACK_TEST_REST_BASE_URL);
-        } else {
-            //console.log("Found 'rest.baseUrl' in config.json. Using this REST API for login: ".concat(config.rest.baseUrl));
-            baseRestUrl = config.rest.baseUrl;
-        }
+                // Initialize our AuthTokenInfo object from the authorization header.
+                const authheader = resp.headers.authorization as string;
+                const authinfo: AuthTokenInfo = new AuthTokenInfo(authheader);
 
-        // Now find domain of our REST API, again with a fallback.
-        let baseDomain = FALLBACK_TEST_REST_DOMAIN;
-        if (!config.rest.host) {
-            console.warn("Could not load 'rest.host' from config.json. Falling back to " + FALLBACK_TEST_REST_DOMAIN);
-        } else {
-            baseDomain = config.rest.host;
-        }
-
-        // Create a fake CSRF Token.  Set it in the required server-side cookie
-        const csrfToken = 'fakeLoginCSRFToken';
-        cy.setCookie(DSPACE_XSRF_COOKIE, csrfToken, { 'domain': baseDomain });
-
-        // Now, send login POST request including that CSRF token
-        cy.request({
-            method: 'POST',
-            url: baseRestUrl + '/api/authn/login',
-            headers: { [XSRF_REQUEST_HEADER]: csrfToken},
-            form: true, // indicates the body should be form urlencoded
-            body: { user: email, password: password }
-        }).then((resp) => {
-            // We expect a successful login
-            expect(resp.status).to.eq(200);
-            // We expect to have a valid authorization header returned (with our auth token)
-            expect(resp.headers).to.have.property('authorization');
-
-            // Initialize our AuthTokenInfo object from the authorization header.
-            const authheader = resp.headers.authorization as string;
-            const authinfo: AuthTokenInfo = new AuthTokenInfo(authheader);
-
-            // Save our AuthTokenInfo object to our dsAuthInfo UI cookie
-            // This ensures the UI will recognize we are logged in on next "visit()"
-            cy.setCookie(TOKENITEM, JSON.stringify(authinfo));
+                // Save our AuthTokenInfo object to our dsAuthInfo UI cookie
+                // This ensures the UI will recognize we are logged in on next "visit()"
+                cy.setCookie(TOKENITEM, JSON.stringify(authinfo));
+            });
         });
-
-        // Remove cookie with fake CSRF token, as it's no longer needed
-        cy.clearCookie(DSPACE_XSRF_COOKIE);
     });
 }
 // Add as a Cypress command (i.e. assign to 'cy.login')
@@ -118,12 +94,12 @@ Cypress.Commands.add('login', login);
  * @param password password to login as
  */
 function loginViaForm(email: string, password: string): void {
-    // Enter email
-    cy.get('ds-log-in [data-test="email"]').type(email);
-    // Enter password
-    cy.get('ds-log-in [data-test="password"]').type(password);
-    // Click login button
-    cy.get('ds-log-in [data-test="login-button"]').click();
+  // Enter email
+  cy.get('[data-test="email"]').type(email);
+  // Enter password
+  cy.get('[data-test="password"]').type(password);
+  // Click login button
+  cy.get('[data-test="login-button"]').click();
 }
 // Add as a Cypress command (i.e. assign to 'cy.loginViaForm')
 Cypress.Commands.add('loginViaForm', loginViaForm);
@@ -141,54 +117,53 @@ Cypress.Commands.add('loginViaForm', loginViaForm);
  * @param dsoType type of DSpace Object (e.g. "item", "collection", "community")
  */
 function generateViewEvent(uuid: string, dsoType: string): void {
-    // Cypress doesn't have access to the running application in Node.js.
-    // So, it's not possible to inject or load the AppConfig or environment of the Angular UI.
-    // Instead, we'll read our running application's config.json, which contains the configs &
-    // is regenerated at runtime each time the Angular UI application starts up.
-    cy.task('readUIConfig').then((str: string) => {
-        // Parse config into a JSON object
-        const config = JSON.parse(str);
-
-        // Find the URL of our REST API. Have a fallback ready, just in case 'rest.baseUrl' cannot be found.
-        let baseRestUrl = FALLBACK_TEST_REST_BASE_URL;
-        if (!config.rest.baseUrl) {
-            console.warn("Could not load 'rest.baseUrl' from config.json. Falling back to " + FALLBACK_TEST_REST_BASE_URL);
-        } else {
-            baseRestUrl = config.rest.baseUrl;
-        }
-
-        // Now find domain of our REST API, again with a fallback.
-        let baseDomain = FALLBACK_TEST_REST_DOMAIN;
-        if (!config.rest.host) {
-            console.warn("Could not load 'rest.host' from config.json. Falling back to " + FALLBACK_TEST_REST_DOMAIN);
-        } else {
-            baseDomain = config.rest.host;
-        }
-
-        // Create a fake CSRF Token.  Set it in the required server-side cookie
-        const csrfToken = 'fakeGenerateViewEventCSRFToken';
-        cy.setCookie(DSPACE_XSRF_COOKIE, csrfToken, { 'domain': baseDomain });
-
-        // Now, send 'statistics/viewevents' POST request including that fake CSRF token in required header
-        cy.request({
-            method: 'POST',
-            url: baseRestUrl + '/api/statistics/viewevents',
-            headers: {
-                [XSRF_REQUEST_HEADER] : csrfToken,
-                // use a known public IP address to avoid being seen as a "bot"
-                'X-Forwarded-For': '1.1.1.1',
-            },
-            //form: true, // indicates the body should be form urlencoded
-            body: { targetId: uuid, targetType: dsoType },
-        }).then((resp) => {
-            // We expect a 201 (which means statistics event was created)
-            expect(resp.status).to.eq(201);
+    // Create a fake CSRF cookie/token to use in POST
+    cy.createCSRFCookie().then((csrfToken: string) => {
+        // get our REST API's base URL, also needed for POST
+        cy.task('getRestBaseURL').then((baseRestUrl: string) => {
+            // Now, send 'statistics/viewevents' POST request including that fake CSRF token in required header
+            cy.request({
+                method: 'POST',
+                url: baseRestUrl + '/api/statistics/viewevents',
+                headers: {
+                    [XSRF_REQUEST_HEADER] : csrfToken,
+                    // use a known public IP address to avoid being seen as a "bot"
+                    'X-Forwarded-For': '1.1.1.1',
+                    // Use a user-agent of a Firefox browser on Windows. This again avoids being seen as a "bot"
+                    'user-agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:109.0) Gecko/20100101 Firefox/119.0',
+                },
+                //form: true, // indicates the body should be form urlencoded
+                body: { targetId: uuid, targetType: dsoType },
+            }).then((resp) => {
+                // We expect a 201 (which means statistics event was created)
+                expect(resp.status).to.eq(201);
+            });
         });
-
-        // Remove cookie with fake CSRF token, as it's no longer needed
-        cy.clearCookie(DSPACE_XSRF_COOKIE);
     });
 }
 // Add as a Cypress command (i.e. assign to 'cy.generateViewEvent')
 Cypress.Commands.add('generateViewEvent', generateViewEvent);
 
+
+/**
+ * Can be used by tests to generate a random XSRF/CSRF token and save it to
+ * the required XSRF/CSRF cookie for usage when sending POST requests or similar.
+ * The generated CSRF token is returned in a Chainable to allow it to be also sent
+ * in the CSRF HTTP Header.
+ * @returns a Cypress Chainable which can be used to get the generated CSRF Token
+ */
+function createCSRFCookie(): Cypress.Chainable {
+    // Generate a new token which is a random UUID
+    const csrfToken: string = uuidv4();
+
+    // Save it to our required cookie
+    cy.task('getRestBaseDomain').then((baseDomain: string) => {
+        // Create a fake CSRF Token.  Set it in the required server-side cookie
+        cy.setCookie(DSPACE_XSRF_COOKIE, csrfToken, { 'domain': baseDomain });
+    });
+
+    // return the generated token wrapped in a chainable
+    return cy.wrap(csrfToken);
+}
+// Add as a Cypress command (i.e. assign to 'cy.createCSRFCookie')
+Cypress.Commands.add('createCSRFCookie', createCSRFCookie);
diff --git a/cypress/support/e2e.ts b/cypress/support/e2e.ts
index dd7ee1824c..f6c6865052 100644
--- a/cypress/support/e2e.ts
+++ b/cypress/support/e2e.ts
@@ -19,45 +19,54 @@ import './commands';
 // Import Cypress Axe tools for all tests
 // https://github.com/component-driven/cypress-axe
 import 'cypress-axe';
+import { DSPACE_XSRF_COOKIE } from 'src/app/core/xsrf/xsrf.constants';
+
+
+// Runs once before all tests
+before(() => {
+  // Cypress doesn't have access to the running application in Node.js.
+  // So, it's not possible to inject or load the AppConfig or environment of the Angular UI.
+  // Instead, we'll read our running application's config.json, which contains the configs &
+  // is regenerated at runtime each time the Angular UI application starts up.
+  cy.task('readUIConfig').then((str: string) => {
+    // Parse config into a JSON object
+    const config = JSON.parse(str);
+
+    // Find URL of our REST API & save to global variable via task
+    let baseRestUrl = FALLBACK_TEST_REST_BASE_URL;
+    if (!config.rest.baseUrl) {
+        console.warn("Could not load 'rest.baseUrl' from config.json. Falling back to " + FALLBACK_TEST_REST_BASE_URL);
+    } else {
+        baseRestUrl = config.rest.baseUrl;
+    }
+    cy.task('saveRestBaseURL', baseRestUrl);
+
+    // Find domain of our REST API & save to global variable via task.
+    let baseDomain = FALLBACK_TEST_REST_DOMAIN;
+    if (!config.rest.host) {
+        console.warn("Could not load 'rest.host' from config.json. Falling back to " + FALLBACK_TEST_REST_DOMAIN);
+    } else {
+        baseDomain = config.rest.host;
+    }
+    cy.task('saveRestBaseDomain', baseDomain);
+
+  });
+});
 
 // Runs once before the first test in each "block"
 beforeEach(() => {
     // Pre-agree to all Klaro cookies by setting the klaro-anonymous cookie
     // This just ensures it doesn't get in the way of matching other objects in the page.
     cy.setCookie('klaro-anonymous', '{%22authentication%22:true%2C%22preferences%22:true%2C%22acknowledgement%22:true%2C%22google-analytics%22:true%2C%22google-recaptcha%22:true}');
+
+    // Remove any CSRF cookies saved from prior tests
+    cy.clearCookie(DSPACE_XSRF_COOKIE);
 });
 
-// For better stability between tests, we visit "about:blank" (i.e. blank page) after each test.
-// This ensures any remaining/outstanding XHR requests are killed, so they don't affect the next test.
-// Borrowed from: https://glebbahmutov.com/blog/visit-blank-page-between-tests/
-/*afterEach(() => {
-    cy.window().then((win) => {
-      win.location.href = 'about:blank';
-    });
-});*/
-
-
-// Global constants used in tests
-// May be overridden in our cypress.json config file using specified environment variables.
-// Default values listed here are all valid for the Demo Entities Data set available at
-// https://github.com/DSpace-Labs/AIP-Files/releases/tag/demo-entities-data
-// (This is the data set used in our CI environment)
-
-// Admin account used for administrative tests
-export const TEST_ADMIN_USER = Cypress.env('DSPACE_TEST_ADMIN_USER') || 'dspacedemo+admin@gmail.com';
-export const TEST_ADMIN_PASSWORD = Cypress.env('DSPACE_TEST_ADMIN_PASSWORD') || 'dspace';
-// Community/collection/publication used for view/edit tests
-export const TEST_COLLECTION = Cypress.env('DSPACE_TEST_COLLECTION') || '282164f5-d325-4740-8dd1-fa4d6d3e7200';
-export const TEST_COMMUNITY = Cypress.env('DSPACE_TEST_COMMUNITY') || '0958c910-2037-42a9-81c7-dca80e3892b4';
-export const TEST_ENTITY_PUBLICATION = Cypress.env('DSPACE_TEST_ENTITY_PUBLICATION') || 'e98b0f27-5c19-49a0-960d-eb6ad5287067';
-// Search term (should return results) used in search tests
-export const TEST_SEARCH_TERM = Cypress.env('DSPACE_TEST_SEARCH_TERM') || 'test';
-// Collection used for submission tests
-export const TEST_SUBMIT_COLLECTION_NAME = Cypress.env('DSPACE_TEST_SUBMIT_COLLECTION_NAME') || 'Sample Collection';
-export const TEST_SUBMIT_COLLECTION_UUID = Cypress.env('DSPACE_TEST_SUBMIT_COLLECTION_UUID') || '9d8334e9-25d3-4a67-9cea-3dffdef80144';
-export const TEST_SUBMIT_USER = Cypress.env('DSPACE_TEST_SUBMIT_USER') || 'dspacedemo+submit@gmail.com';
-export const TEST_SUBMIT_USER_PASSWORD = Cypress.env('DSPACE_TEST_SUBMIT_USER_PASSWORD') || 'dspace';
-
+// NOTE: FALLBACK_TEST_REST_BASE_URL is only used if Cypress cannot read the REST API BaseURL
+// from the Angular UI's config.json. See 'before()' above.
+const FALLBACK_TEST_REST_BASE_URL = 'http://localhost:8080/server';
+const FALLBACK_TEST_REST_DOMAIN = 'localhost';
 
 // USEFUL REGEX for testing
 
diff --git a/docker/README.md b/docker/README.md
index 42deb793f9..37d071a86f 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -101,8 +101,8 @@ and the backend at http://localhost:8080/server/
 
 ## Run DSpace Angular dist build with DSpace Demo site backend
 
-This allows you to run the Angular UI in *production* mode, pointing it at the demo backend
-(https://api7.dspace.org/server/).
+This allows you to run the Angular UI in *production* mode, pointing it at the demo or sandbox backend
+(https://demo.dspace.org/server/ or https://sandbox.dspace.org/server/).
 
 ```
 docker-compose -f docker/docker-compose-dist.yml pull
diff --git a/docker/cli.assetstore.yml b/docker/cli.assetstore.yml
index 40e4974c7c..98f7414861 100644
--- a/docker/cli.assetstore.yml
+++ b/docker/cli.assetstore.yml
@@ -12,15 +12,8 @@
 # https://github.com/DSpace/DSpace/blob/main/dspace/src/main/docker-compose/cli.assetstore.yml
 #
 # Therefore, it should be kept in sync with that file
-version: "3.7"
-
-networks:
-  dspacenet:
-
 services:
   dspace-cli:
-    networks:
-      dspacenet: {}
     environment:
       # This assetstore zip is available from https://github.com/DSpace-Labs/AIP-Files/releases/tag/demo-entities-data
       - LOADASSETS=https://github.com/DSpace-Labs/AIP-Files/releases/download/demo-entities-data/assetstore.tar.gz
diff --git a/docker/cli.ingest.yml b/docker/cli.ingest.yml
index 1db241af3b..cc3623298e 100644
--- a/docker/cli.ingest.yml
+++ b/docker/cli.ingest.yml
@@ -12,8 +12,6 @@
 # https://github.com/DSpace/DSpace/blob/main/dspace/src/main/docker-compose/cli.ingest.yml
 #
 # Therefore, it should be kept in sync with that file
-version: "3.7"
-
 services:
   dspace-cli:
     environment:
diff --git a/docker/cli.yml b/docker/cli.yml
index 54b83d4503..11fe2ee662 100644
--- a/docker/cli.yml
+++ b/docker/cli.yml
@@ -12,11 +12,16 @@
 # https://github.com/DSpace/DSpace/blob/main/docker-compose-cli.yml
 #
 # Therefore, it should be kept in sync with that file
-version: "3.7"
-
+networks:
+  # Default to using network named 'dspacenet' from docker-compose-rest.yml.
+  # Its full name will be prepended with the project name (e.g. "-p d7" means it will be named "d7_dspacenet")
+  # If COMPOSITE_PROJECT_NAME is missing, default value will be "docker" (name of folder this file is in)
+  default:
+    name: ${COMPOSE_PROJECT_NAME:-docker}_dspacenet
+    external: true
 services:
   dspace-cli:
-    image: "${DOCKER_OWNER:-dspace}/dspace-cli:${DSPACE_VER:-dspace-7_x}"
+    image: "${DOCKER_REGISTRY:-docker.io}/${DOCKER_OWNER:-dspace}/dspace-cli:${DSPACE_VER:-dspace-7_x}"
     container_name: dspace-cli
     environment:
       # Below syntax may look odd, but it is how to override dspace.cfg settings via env variables.
@@ -30,16 +35,12 @@ services:
       # solr.server: Ensure we are using the 'dspacesolr' image for Solr
       solr__P__server: http://dspacesolr:8983/solr
     volumes:
-    - "assetstore:/dspace/assetstore"
+    # Keep DSpace assetstore directory between reboots
+    - assetstore:/dspace/assetstore
     entrypoint: /dspace/bin/dspace
     command: help
-    networks:
-      - dspacenet
     tty: true
     stdin_open: true
 
 volumes:
   assetstore:
-
-networks:
-  dspacenet:
diff --git a/docker/db.entities.yml b/docker/db.entities.yml
index 6473bf2e38..26d848e022 100644
--- a/docker/db.entities.yml
+++ b/docker/db.entities.yml
@@ -12,11 +12,9 @@
 # https://github.com/DSpace/DSpace/blob/main/dspace/src/main/docker-compose/db.entities.yml
 #
 # # Therefore, it should be kept in sync with that file
-version: "3.7"
-
 services:
   dspacedb:
-    image: dspace/dspace-postgres-pgcrypto:loadsql
+    image: ${DOCKER_REGISTRY:-docker.io}/${DOCKER_OWNER:-dspace}/dspace-postgres-pgcrypto:${DSPACE_VER:-dspace-7_x}-loadsql
     environment:
       # This LOADSQL should be kept in sync with the URL in DSpace/DSpace
       # This SQL is available from https://github.com/DSpace-Labs/AIP-Files/releases/tag/demo-entities-data
diff --git a/docker/docker-compose-ci.yml b/docker/docker-compose-ci.yml
index 9ec8fe664a..e09d88b472 100644
--- a/docker/docker-compose-ci.yml
+++ b/docker/docker-compose-ci.yml
@@ -10,7 +10,6 @@
 # This is used by our GitHub CI at .github/workflows/build.yml
 # It is based heavily on the Backend's Docker Compose:
 # https://github.com/DSpace/DSpace/blob/main/docker-compose.yml
-version: '3.7'
 networks:
   dspacenet:
 services:
@@ -33,11 +32,12 @@ services:
       # Tell Statistics to commit all views immediately instead of waiting on Solr's autocommit.
       # This allows us to generate statistics in e2e tests so that statistics pages can be tested thoroughly.
       solr__D__statistics__P__autoCommit: 'false'
+      LOGGING_CONFIG: /dspace/config/log4j2-container.xml
+    image: "${DOCKER_REGISTRY:-docker.io}/${DOCKER_OWNER:-dspace}/dspace:${DSPACE_VER:-dspace-7_x-test}"
     depends_on:
     - dspacedb
-    image: dspace/dspace:dspace-7_x-test
     networks:
-      dspacenet:
+      - dspacenet
     ports:
     - published: 8080
       target: 8080
@@ -45,8 +45,6 @@ services:
     tty: true
     volumes:
     - assetstore:/dspace/assetstore
-    # Mount DSpace's solr configs to a volume, so that we can share to 'dspacesolr' container (see below)
-    - solr_configs:/dspace/solr
     # Ensure that the database is ready BEFORE starting tomcat
     # 1. While a TCP connection to dspacedb port 5432 is not available, continue to sleep
     # 2. Then, run database migration to init database tables (including any out-of-order ignored migrations, if any)
@@ -62,29 +60,30 @@ services:
   # NOTE: This is customized to use our loadsql image, so that we are using a database with existing test data
   dspacedb:
     container_name: dspacedb
+    image: "${DOCKER_REGISTRY:-docker.io}/${DOCKER_OWNER:-dspace}/dspace-postgres-pgcrypto:${DSPACE_VER:-dspace-7_x}-loadsql"
     environment:
       # This LOADSQL should be kept in sync with the LOADSQL in
       # https://github.com/DSpace/DSpace/blob/main/dspace/src/main/docker-compose/db.entities.yml
       # This SQL is available from https://github.com/DSpace-Labs/AIP-Files/releases/tag/demo-entities-data
       LOADSQL: https://github.com/DSpace-Labs/AIP-Files/releases/download/demo-entities-data/dspace7-entities-data.sql
       PGDATA: /pgdata
-    image: dspace/dspace-postgres-pgcrypto:loadsql
+      POSTGRES_PASSWORD: dspace
     networks:
-      dspacenet:
+      - dspacenet
+    ports:
+    - published: 5432
+      target: 5432
     stdin_open: true
     tty: true
     volumes:
+     # Keep Postgres data directory between reboots
     - pgdata:/pgdata
   # DSpace Solr container
   dspacesolr:
     container_name: dspacesolr
-    # Uses official Solr image at https://hub.docker.com/_/solr/
-    image: solr:8.11-slim
-    # Needs main 'dspace' container to start first to guarantee access to solr_configs
-    depends_on:
-    - dspace
+    image: "${DOCKER_REGISTRY:-docker.io}/${DOCKER_OWNER:-dspace}/dspace-solr:${DSPACE_VER:-dspace-7_x}"
     networks:
-      dspacenet:
+      - dspacenet
     ports:
     - published: 8983
       target: 8983
@@ -92,9 +91,6 @@ services:
     tty: true
     working_dir: /var/solr/data
     volumes:
-    # Mount our "solr_configs" volume available under the Solr's configsets folder (in a 'dspace' subfolder)
-    # This copies the Solr configs from main 'dspace' container into 'dspacesolr' via that volume
-    - solr_configs:/opt/solr/server/solr/configsets/dspace
     # Keep Solr data directory between reboots
     - solr_data:/var/solr/data
     # Initialize all DSpace Solr cores using the mounted configsets (see above), then start Solr
@@ -103,14 +99,16 @@ services:
     - '-c'
     - |
       init-var-solr
-      precreate-core authority /opt/solr/server/solr/configsets/dspace/authority
-      precreate-core oai /opt/solr/server/solr/configsets/dspace/oai
-      precreate-core search /opt/solr/server/solr/configsets/dspace/search
-      precreate-core statistics /opt/solr/server/solr/configsets/dspace/statistics
+      precreate-core authority /opt/solr/server/solr/configsets/authority
+      cp -r /opt/solr/server/solr/configsets/authority/* authority
+      precreate-core oai /opt/solr/server/solr/configsets/oai
+      cp -r /opt/solr/server/solr/configsets/oai/* oai
+      precreate-core search /opt/solr/server/solr/configsets/search
+      cp -r /opt/solr/server/solr/configsets/search/* search
+      precreate-core statistics /opt/solr/server/solr/configsets/statistics
+      cp -r /opt/solr/server/solr/configsets/statistics/* statistics
       exec solr -f
 volumes:
   assetstore:
   pgdata:
   solr_data:
-  # Special volume used to share Solr configs from 'dspace' to 'dspacesolr' container (see above)
-  solr_configs:
\ No newline at end of file
diff --git a/docker/docker-compose-dist.yml b/docker/docker-compose-dist.yml
index 1c75539da9..88e5be16a5 100644
--- a/docker/docker-compose-dist.yml
+++ b/docker/docker-compose-dist.yml
@@ -8,7 +8,6 @@
 
 # Docker Compose for running the DSpace Angular UI dist build
 # for previewing with the DSpace Demo site backend
-version: '3.7'
 networks:
   dspacenet:
 services:
@@ -24,10 +23,10 @@ services:
       # This is because Server Side Rendering (SSR) currently requires a public URL,
       # see this bug: https://github.com/DSpace/dspace-angular/issues/1485
       DSPACE_REST_SSL: 'true'
-      DSPACE_REST_HOST: api7.dspace.org
+      DSPACE_REST_HOST: demo.dspace.org
       DSPACE_REST_PORT: 443
       DSPACE_REST_NAMESPACE: /server
-    image: dspace/dspace-angular:dspace-7_x-dist
+    image: "${DOCKER_REGISTRY:-docker.io}/${DOCKER_OWNER:-dspace}/dspace-angular:${DSPACE_VER:-dspace-7_x}-dist"
     build:
       context: ..
       dockerfile: Dockerfile.dist
diff --git a/docker/docker-compose-rest.yml b/docker/docker-compose-rest.yml
index e5f62600e7..19d4d3c604 100644
--- a/docker/docker-compose-rest.yml
+++ b/docker/docker-compose-rest.yml
@@ -10,7 +10,6 @@
 # This is based heavily on the docker-compose.yml that is available in the DSpace/DSpace
 # (Backend) at:
 # https://github.com/DSpace/DSpace/blob/main/docker-compose.yml
-version: '3.7'
 networks:
   dspacenet:
     ipam:
@@ -29,8 +28,9 @@ services:
       # __D__ => "-" (e.g. google__D__metadata => google-metadata)
       # dspace.dir, dspace.server.url, dspace.ui.url and dspace.name
       dspace__P__dir: /dspace
-      dspace__P__server__P__url: http://localhost:8080/server
-      dspace__P__ui__P__url: http://localhost:4000
+      # Uncomment to set a non-default value for dspace.server.url or dspace.ui.url
+      # dspace__P__server__P__url: http://localhost:8080/server
+      # dspace__P__ui__P__url: http://localhost:4000
       dspace__P__name: 'DSpace Started with Docker Compose'
       # db.url: Ensure we are using the 'dspacedb' image for our database
       db__P__url: 'jdbc:postgresql://dspacedb:5432/dspace'
@@ -39,11 +39,12 @@ services:
       # proxies.trusted.ipranges: This setting is required for a REST API running in Docker to trust requests 
       # from the host machine. This IP range MUST correspond to the 'dspacenet' subnet defined above.
       proxies__P__trusted__P__ipranges: '172.23.0'
-    image: "${DOCKER_OWNER:-dspace}/dspace:${DSPACE_VER:-dspace-7_x-test}"
+      LOGGING_CONFIG: /dspace/config/log4j2-container.xml
+    image: "${DOCKER_REGISTRY:-docker.io}/${DOCKER_OWNER:-dspace}/dspace:${DSPACE_VER:-dspace-7_x-test}"
     depends_on:
     - dspacedb
     networks:
-      dspacenet:
+      - dspacenet
     ports:
     - published: 8080
       target: 8080
@@ -51,8 +52,6 @@ services:
     tty: true
     volumes:
     - assetstore:/dspace/assetstore
-    # Mount DSpace's solr configs to a volume, so that we can share to 'dspacesolr' container (see below)
-    - solr_configs:/dspace/solr
     # Ensure that the database is ready BEFORE starting tomcat
     # 1. While a TCP connection to dspacedb port 5432 is not available, continue to sleep
     # 2. Then, run database migration to init database tables
@@ -67,27 +66,27 @@ services:
   # DSpace database container    
   dspacedb:
     container_name: dspacedb
+    # Uses a custom Postgres image with pgcrypto installed
+    image: "${DOCKER_REGISTRY:-docker.io}/${DOCKER_OWNER:-dspace}/dspace-postgres-pgcrypto:${DSPACE_VER:-dspace-7_x}"
     environment:
       PGDATA: /pgdata
-    image: dspace/dspace-postgres-pgcrypto
+      POSTGRES_PASSWORD: dspace
     networks:
-      dspacenet:
+      - dspacenet
     ports:
     - published: 5432
       target: 5432
     stdin_open: true
     tty: true
     volumes:
+    # Keep Postgres data directory between reboots
     - pgdata:/pgdata
   # DSpace Solr container  
   dspacesolr:
     container_name: dspacesolr
-    image: "${DOCKER_OWNER:-dspace}/dspace-solr:${DSPACE_VER:-dspace-7_x}"
-    # Needs main 'dspace' container to start first to guarantee access to solr_configs
-    depends_on:
-    - dspace
+    image: "${DOCKER_REGISTRY:-docker.io}/${DOCKER_OWNER:-dspace}/dspace-solr:${DSPACE_VER:-dspace-7_x}"
     networks:
-      dspacenet:
+      - dspacenet
     ports:
     - published: 8983
       target: 8983
@@ -120,5 +119,3 @@ volumes:
   assetstore:
   pgdata:
   solr_data:
-  # Special volume used to share Solr configs from 'dspace' to 'dspacesolr' container (see above)
-  solr_configs:
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 1387b1de39..90a1d0c21c 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -9,7 +9,6 @@
 # Docker Compose for running the DSpace Angular UI for testing/development
 # Requires also running a REST API backend (either locally or remotely),
 # for example via 'docker-compose-rest.yml'
-version: '3.7'
 networks:
   dspacenet:
 services:
@@ -24,7 +23,7 @@ services:
       DSPACE_REST_HOST: localhost
       DSPACE_REST_PORT: 8080
       DSPACE_REST_NAMESPACE: /server
-    image: dspace/dspace-angular:dspace-7_x
+    image: "${DOCKER_REGISTRY:-docker.io}/${DOCKER_OWNER:-dspace}/dspace-angular:${DSPACE_VER:-dspace-7_x}"
     build:
       context: ..
       dockerfile: Dockerfile
diff --git a/docs/Configuration.md b/docs/Configuration.md
index 62fa444cc0..01fd83c94d 100644
--- a/docs/Configuration.md
+++ b/docs/Configuration.md
@@ -48,7 +48,7 @@ dspace-angular connects to your DSpace installation by using its REST endpoint.
 ```yaml
 rest:
   ssl: true
-  host: api7.dspace.org
+  host: demo.dspace.org
   port: 443
   nameSpace: /server
 }
@@ -57,7 +57,7 @@ rest:
 Alternately you can set the following environment variables. If any of these are set, it will override all configuration files:
 ```
   DSPACE_REST_SSL=true
-  DSPACE_REST_HOST=api7.dspace.org
+  DSPACE_REST_HOST=demo.dspace.org
   DSPACE_REST_PORT=443
   DSPACE_REST_NAMESPACE=/server
 ```
diff --git a/package.json b/package.json
index 719b13b23b..a9fc04b7ab 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "dspace-angular",
-  "version": "7.6.0",
+  "version": "7.6.4-next",
   "scripts": {
     "ng": "ng",
     "config:watch": "nodemon",
@@ -12,17 +12,16 @@
     "preserve": "yarn base-href",
     "serve": "ts-node --project ./tsconfig.ts-node.json scripts/serve.ts",
     "serve:ssr": "node dist/server/main",
-    "analyze": "webpack-bundle-analyzer dist/browser/stats.json",
     "build": "ng build --configuration development",
     "build:stats": "ng build --stats-json",
-    "build:prod": "yarn run build:ssr",
+    "build:prod": "cross-env NODE_ENV=production yarn run build:ssr",
     "build:ssr": "ng build --configuration production && ng run dspace-angular:server:production",
     "test": "ng test --source-map=true --watch=false --configuration test",
     "test:watch": "nodemon --exec \"ng test --source-map=true --watch=true --configuration test\"",
     "test:headless": "ng test --source-map=true --watch=false --configuration test --browsers=ChromeHeadless --code-coverage",
     "lint": "ng lint",
     "lint-fix": "ng lint --fix=true",
-    "e2e": "ng e2e",
+    "e2e": "cross-env NODE_ENV=production ng e2e",
     "clean:dev:config": "rimraf src/assets/config.json",
     "clean:coverage": "rimraf coverage",
     "clean:dist": "rimraf dist",
@@ -49,27 +48,20 @@
     "https": false
   },
   "private": true,
-  "resolutions": {
-    "minimist": "^1.2.5",
-    "webdriver-manager": "^12.1.8",
-    "ts-node": "10.2.1"
-  },
   "dependencies": {
-    "@angular/animations": "^15.2.8",
-    "@angular/cdk": "^15.2.8",
-    "@angular/common": "^15.2.8",
-    "@angular/compiler": "^15.2.8",
-    "@angular/core": "^15.2.8",
-    "@angular/forms": "^15.2.8",
-    "@angular/localize": "15.2.8",
-    "@angular/platform-browser": "^15.2.8",
-    "@angular/platform-browser-dynamic": "^15.2.8",
-    "@angular/platform-server": "^15.2.8",
-    "@angular/router": "^15.2.8",
-    "@babel/runtime": "7.21.0",
+    "@angular/animations": "^15.2.10",
+    "@angular/cdk": "^15.2.9",
+    "@angular/common": "^15.2.10",
+    "@angular/compiler": "^15.2.10",
+    "@angular/core": "^15.2.10",
+    "@angular/forms": "^15.2.10",
+    "@angular/localize": "15.2.10",
+    "@angular/platform-browser": "^15.2.10",
+    "@angular/platform-browser-dynamic": "^15.2.10",
+    "@angular/platform-server": "^15.2.10",
+    "@angular/router": "^15.2.10",
+    "@babel/runtime": "7.27.1",
     "@kolkov/ngx-gallery": "^2.0.1",
-    "@material-ui/core": "^4.11.0",
-    "@material-ui/icons": "^4.11.3",
     "@ng-bootstrap/ng-bootstrap": "^11.0.0",
     "@ng-dynamic-forms/core": "^15.0.0",
     "@ng-dynamic-forms/ui-ng-bootstrap": "^15.0.0",
@@ -79,129 +71,129 @@
     "@nguniversal/express-engine": "^15.2.1",
     "@ngx-translate/core": "^14.0.0",
     "@nicky-lenaers/ngx-scroll-to": "^14.0.0",
-    "@types/grecaptcha": "^3.0.4",
     "angular-idle-preload": "3.0.0",
-    "angulartics2": "^12.2.0",
-    "axios": "^0.27.2",
+    "angulartics2": "^12.2.1",
+    "axios": "^1.9.0",
     "bootstrap": "^4.6.1",
     "cerialize": "0.1.18",
     "cli-progress": "^3.12.0",
     "colors": "^1.4.0",
-    "compression": "^1.7.4",
-    "cookie-parser": "1.4.6",
-    "core-js": "^3.30.1",
-    "date-fns": "^2.29.3",
+    "compression": "^1.8.0",
+    "cookie-parser": "1.4.7",
+    "core-js": "^3.42.0",
+    "date-fns": "^2.30.0",
     "date-fns-tz": "^1.3.7",
     "deepmerge": "^4.3.1",
-    "ejs": "^3.1.9",
-    "express": "^4.18.2",
+    "ejs": "^3.1.10",
+    "express": "^4.21.2",
     "express-rate-limit": "^5.1.3",
     "fast-json-patch": "^3.1.1",
     "filesize": "^6.1.0",
-    "http-proxy-middleware": "^1.0.5",
-    "isbot": "^3.6.10",
+    "http-proxy-middleware": "^2.0.9",
+    "http-terminator": "^3.2.0",
+    "isbot": "^5.1.28",
     "js-cookie": "2.2.1",
     "js-yaml": "^4.1.0",
     "json5": "^2.2.3",
-    "jsonschema": "1.4.1",
+    "jsonschema": "1.5.0",
     "jwt-decode": "^3.1.2",
-    "klaro": "^0.7.18",
+    "klaro": "^0.7.21",
     "lodash": "^4.17.21",
     "lru-cache": "^7.14.1",
-    "markdown-it": "^13.0.1",
+    "markdown-it": "^13.0.2",
     "markdown-it-mathjax3": "^4.3.2",
-    "mirador": "^3.3.0",
+    "mirador": "^3.4.3",
     "mirador-dl-plugin": "^0.13.0",
-    "mirador-share-plugin": "^0.11.0",
+    "mirador-share-plugin": "^0.16.0",
     "morgan": "^1.10.0",
-    "ng-mocks": "^14.10.0",
     "ng2-file-upload": "1.4.0",
-    "ng2-nouislider": "^1.8.3",
+    "ng2-nouislider": "^2.0.0",
     "ngx-infinite-scroll": "^15.0.0",
     "ngx-pagination": "6.0.3",
+    "ngx-skeleton-loader": "^7.0.0",
     "ngx-sortablejs": "^11.1.0",
-    "ngx-ui-switch": "^14.0.3",
-    "nouislider": "^14.6.3",
-    "pem": "1.14.7",
-    "prop-types": "^15.8.1",
-    "react-copy-to-clipboard": "^5.1.0",
-    "reflect-metadata": "^0.1.13",
-    "rxjs": "^7.8.0",
-    "sanitize-html": "^2.10.0",
-    "sortablejs": "1.15.0",
+    "ngx-ui-switch": "^14.1.0",
+    "nouislider": "^15.8.1",
+    "pem": "1.14.8",
+    "reflect-metadata": "^0.2.2",
+    "rxjs": "^7.8.2",
+    "sanitize-html": "^2.16.0",
+    "sortablejs": "1.15.6",
     "uuid": "^8.3.2",
-    "webfontloader": "1.6.28",
-    "zone.js": "~0.11.5"
+    "zone.js": "~0.13.3"
   },
   "devDependencies": {
     "@angular-builders/custom-webpack": "~15.0.0",
-    "@angular-devkit/build-angular": "^15.2.6",
+    "@angular-devkit/build-angular": "^15.2.11",
     "@angular-eslint/builder": "15.2.1",
     "@angular-eslint/eslint-plugin": "15.2.1",
     "@angular-eslint/eslint-plugin-template": "15.2.1",
     "@angular-eslint/schematics": "15.2.1",
     "@angular-eslint/template-parser": "15.2.1",
-    "@angular/cli": "^15.2.6",
-    "@angular/compiler-cli": "^15.2.8",
-    "@angular/language-service": "^15.2.8",
+    "@angular/cli": "^16.2.16",
+    "@angular/compiler-cli": "^15.2.10",
+    "@angular/language-service": "^15.2.10",
     "@cypress/schematic": "^1.5.0",
-    "@fortawesome/fontawesome-free": "^6.4.0",
+    "@fortawesome/fontawesome-free": "^6.7.2",
+    "@material-ui/core": "^4.12.4",
+    "@material-ui/icons": "^4.11.3",
     "@ngrx/store-devtools": "^15.4.0",
     "@ngtools/webpack": "^15.2.6",
     "@nguniversal/builders": "^15.2.1",
-    "@types/deep-freeze": "0.1.2",
-    "@types/ejs": "^3.1.2",
-    "@types/express": "^4.17.17",
+    "@types/deep-freeze": "0.1.5",
+    "@types/ejs": "^3.1.5",
+    "@types/express": "^4.17.21",
+    "@types/grecaptcha": "^3.0.9",
     "@types/jasmine": "~3.6.0",
     "@types/js-cookie": "2.2.6",
-    "@types/lodash": "^4.14.194",
-    "@types/node": "^14.14.9",
-    "@types/sanitize-html": "^2.9.0",
-    "@typescript-eslint/eslint-plugin": "^5.59.1",
-    "@typescript-eslint/parser": "^5.59.1",
-    "axe-core": "^4.7.0",
+    "@types/lodash": "^4.17.16",
+    "@types/node": "^14.18.63",
+    "@types/sanitize-html": "^2.16.0",
+    "@typescript-eslint/eslint-plugin": "^5.62.0",
+    "@typescript-eslint/parser": "^5.62.0",
+    "axe-core": "^4.10.3",
     "compression-webpack-plugin": "^9.2.0",
     "copy-webpack-plugin": "^6.4.1",
     "cross-env": "^7.0.3",
-    "cypress": "12.10.0",
-    "cypress-axe": "^1.4.0",
+    "csstype": "^3.1.3",
+    "cypress": "^13.17.0",
+    "cypress-axe": "^1.6.0",
     "deep-freeze": "0.0.1",
     "eslint": "^8.39.0",
-    "eslint-plugin-deprecation": "^1.4.1",
-    "eslint-plugin-import": "^2.27.5",
-    "eslint-plugin-jsdoc": "^39.6.4",
-    "eslint-plugin-jsonc": "^2.6.0",
+    "eslint-plugin-deprecation": "^1.5.0",
+    "eslint-plugin-import": "^2.31.0",
+    "eslint-plugin-jsdoc": "^45.0.0",
+    "eslint-plugin-jsonc": "^2.20.1",
     "eslint-plugin-lodash": "^7.4.0",
     "eslint-plugin-unused-imports": "^2.0.0",
-    "express-static-gzip": "^2.1.7",
+    "express-static-gzip": "^2.2.0",
     "jasmine-core": "^3.8.0",
     "jasmine-marbles": "0.9.2",
-    "karma": "^6.4.2",
+    "karma": "^6.4.4",
     "karma-chrome-launcher": "~3.2.0",
     "karma-coverage-istanbul-reporter": "~3.0.3",
     "karma-jasmine": "~4.0.0",
     "karma-jasmine-html-reporter": "^1.5.0",
     "karma-mocha-reporter": "2.2.5",
+    "ng-mocks": "^14.13.4",
     "ngx-mask": "^13.1.7",
     "nodemon": "^2.0.22",
-    "postcss": "^8.4",
-    "postcss-apply": "0.12.0",
+    "postcss": "^8.5",
     "postcss-import": "^14.0.0",
     "postcss-loader": "^4.0.3",
     "postcss-preset-env": "^7.4.2",
-    "postcss-responsive-type": "1.0.0",
+    "prop-types": "^15.8.1",
     "react": "^16.14.0",
+    "react-copy-to-clipboard": "^5.1.0",
     "react-dom": "^16.14.0",
     "rimraf": "^3.0.2",
-    "rxjs-spy": "^8.0.2",
-    "sass": "~1.62.0",
+    "sass": "~1.89.0",
     "sass-loader": "^12.6.0",
     "sass-resources-loader": "^2.2.5",
     "ts-node": "^8.10.2",
     "typescript": "~4.8.4",
     "webpack": "5.76.1",
-    "webpack-bundle-analyzer": "^4.8.0",
     "webpack-cli": "^4.2.0",
-    "webpack-dev-server": "^4.13.3"
+    "webpack-dev-server": "^4.15.2"
   }
 }
diff --git a/postcss.config.js b/postcss.config.js
index df092d1d39..f8b9666b31 100644
--- a/postcss.config.js
+++ b/postcss.config.js
@@ -1,8 +1,6 @@
 module.exports = {
   plugins: [
     require('postcss-import')(),
-    require('postcss-preset-env')(),
-    require('postcss-apply')(),
-    require('postcss-responsive-type')()
+    require('postcss-preset-env')()
   ]
 };
diff --git a/server.ts b/server.ts
index 23327c2058..1aee5dc657 100644
--- a/server.ts
+++ b/server.ts
@@ -28,10 +28,11 @@ import * as expressStaticGzip from 'express-static-gzip';
 /* eslint-enable import/no-namespace */
 import axios from 'axios';
 import LRU from 'lru-cache';
-import isbot from 'isbot';
+import { isbot } from 'isbot';
 import { createCertificate } from 'pem';
 import { createServer } from 'https';
 import { json } from 'body-parser';
+import { createHttpTerminator } from 'http-terminator';
 
 import { readFileSync } from 'fs';
 import { join } from 'path';
@@ -54,6 +55,7 @@ import { APP_CONFIG, AppConfig } from './src/config/app-config.interface';
 import { extendEnvironmentWithAppConfig } from './src/config/config.util';
 import { logStartupMessage } from './startup-message';
 import { TOKENITEM } from './src/app/core/auth/models/auth-token-info.model';
+import { SsrExcludePatterns } from './src/config/universal-config.interface';
 
 
 /*
@@ -78,6 +80,9 @@ let anonymousCache: LRU<string, any>;
 // extend environment with app config for server
 extendEnvironmentWithAppConfig(environment, appConfig);
 
+// The REST server base URL
+const REST_BASE_URL = environment.rest.ssrBaseUrl || environment.rest.baseUrl;
+
 // The Express app is exported so that it can be used by serverless Functions.
 export function app() {
 
@@ -130,6 +135,7 @@ export function app() {
   server.engine('html', (_, options, callback) =>
     ngExpressEngine({
       bootstrap: ServerAppModule,
+      inlineCriticalCss: environment.universal.inlineCriticalCss,
       providers: [
         {
           provide: REQUEST,
@@ -174,7 +180,7 @@ export function app() {
    * Proxy the sitemaps
    */
   router.use('/sitemap**', createProxyMiddleware({
-    target: `${environment.rest.baseUrl}/sitemaps`,
+    target: `${REST_BASE_URL}/sitemaps`,
     pathRewrite: path => path.replace(environment.ui.nameSpace, '/'),
     changeOrigin: true
   }));
@@ -183,7 +189,7 @@ export function app() {
    * Proxy the linksets
    */
   router.use('/signposting**', createProxyMiddleware({
-    target: `${environment.rest.baseUrl}`,
+    target: `${REST_BASE_URL}`,
     pathRewrite: path => path.replace(environment.ui.nameSpace, '/'),
     changeOrigin: true
   }));
@@ -236,7 +242,7 @@ export function app() {
  * The callback function to serve server side angular
  */
 function ngApp(req, res) {
-  if (environment.universal.preboot) {
+  if (environment.universal.preboot && req.method === 'GET' && (req.path === '/' || !isExcludedFromSsr(req.path, environment.universal.excludePathPatterns))) {
     // Render the page to user via SSR (server side rendering)
     serverSideRender(req, res);
   } else {
@@ -267,6 +273,11 @@ function serverSideRender(req, res, sendToUser: boolean = true) {
     requestUrl: req.originalUrl,
   }, (err, data) => {
     if (hasNoValue(err) && hasValue(data)) {
+      // Replace REST URL with UI URL
+        if (environment.universal.replaceRestUrl && REST_BASE_URL !== environment.rest.baseUrl) {
+          data = data.replace(new RegExp(REST_BASE_URL, 'g'), environment.rest.baseUrl);
+      }
+
       // save server side rendered page to cache (if any are enabled)
       saveToCache(req, data);
       if (sendToUser) {
@@ -320,22 +331,23 @@ function initCache() {
   if (botCacheEnabled()) {
     // Initialize a new "least-recently-used" item cache (where least recently used pages are removed first)
     // See https://www.npmjs.com/package/lru-cache
-    // When enabled, each page defaults to expiring after 1 day
+    // When enabled, each page defaults to expiring after 1 day (defined in default-app-config.ts)
     botCache = new LRU( {
       max: environment.cache.serverSide.botCache.max,
-      ttl: environment.cache.serverSide.botCache.timeToLive || 24 * 60 * 60 * 1000, // 1 day
-      allowStale: environment.cache.serverSide.botCache.allowStale ?? true // if object is stale, return stale value before deleting
+      ttl: environment.cache.serverSide.botCache.timeToLive,
+      allowStale: environment.cache.serverSide.botCache.allowStale
     });
   }
 
   if (anonymousCacheEnabled()) {
     // NOTE: While caches may share SSR pages, this cache must be kept separately because the timeToLive
     // may expire pages more frequently.
-    // When enabled, each page defaults to expiring after 10 seconds (to minimize anonymous users seeing out-of-date content)
+    // When enabled, each page defaults to expiring after 10 seconds (defined in default-app-config.ts)
+    // to minimize anonymous users seeing out-of-date content
     anonymousCache = new LRU( {
       max: environment.cache.serverSide.anonymousCache.max,
-      ttl: environment.cache.serverSide.anonymousCache.timeToLive || 10 * 1000, // 10 seconds
-      allowStale: environment.cache.serverSide.anonymousCache.allowStale ?? true // if object is stale, return stale value before deleting
+      ttl: environment.cache.serverSide.anonymousCache.timeToLive,
+      allowStale: environment.cache.serverSide.anonymousCache.allowStale
     });
   }
 }
@@ -487,7 +499,7 @@ function saveToCache(req, page: any) {
  */
 function hasNotSucceeded(statusCode) {
   const rgx = new RegExp(/^20+/);
-  return !rgx.test(statusCode)
+  return !rgx.test(statusCode);
 }
 
 function retrieveHeaders(response) {
@@ -525,23 +537,46 @@ function serverStarted() {
  * @param keys SSL credentials
  */
 function createHttpsServer(keys) {
-  createServer({
+  const listener = createServer({
     key: keys.serviceKey,
     cert: keys.certificate
   }, app).listen(environment.ui.port, environment.ui.host, () => {
     serverStarted();
   });
+
+  // Graceful shutdown when signalled
+  const terminator = createHttpTerminator({server: listener});
+  process.on('SIGINT', () => {
+      void (async ()=> {
+        console.debug('Closing HTTPS server on signal');
+        await terminator.terminate().catch(e => { console.error(e); });
+        console.debug('HTTPS server closed');
+      })();
+      });
 }
 
+/**
+ * Create an HTTP server with the configured port and host.
+ */
 function run() {
   const port = environment.ui.port || 4000;
   const host = environment.ui.host || '/';
 
   // Start up the Node server
   const server = app();
-  server.listen(port, host, () => {
+  const listener = server.listen(port, host, () => {
     serverStarted();
   });
+
+  // Graceful shutdown when signalled
+  const terminator = createHttpTerminator({server: listener});
+  process.on('SIGINT', () => {
+      void (async () => {
+        console.debug('Closing HTTP server on signal');
+        await terminator.terminate().catch(e => { console.error(e); });
+        console.debug('HTTP server closed.');return undefined;
+        })();
+      });
 }
 
 function start() {
@@ -591,11 +626,26 @@ function start() {
   }
 }
 
+/**
+ * Check if SSR should be skipped for path
+ *
+ * @param path
+ * @param excludePathPattern
+ */
+function isExcludedFromSsr(path: string, excludePathPattern: SsrExcludePatterns[]): boolean {
+  const patterns = excludePathPattern.map(p =>
+    new RegExp(p.pattern, p.flag || '')
+  );
+  return patterns.some((regex) => {
+    return regex.test(path)
+  });
+}
+
 /*
  * The callback function to serve health check requests
  */
 function healthCheck(req, res) {
-  const baseUrl = `${environment.rest.baseUrl}${environment.actuators.endpointPath}`;
+  const baseUrl = `${REST_BASE_URL}${environment.actuators.endpointPath}`;
   axios.get(baseUrl)
     .then((response) => {
       res.status(response.status).send(response.data);
diff --git a/src/app/access-control/access-control-routing-paths.ts b/src/app/access-control/access-control-routing-paths.ts
index 259aa311e7..31f39f1c47 100644
--- a/src/app/access-control/access-control-routing-paths.ts
+++ b/src/app/access-control/access-control-routing-paths.ts
@@ -1,12 +1,22 @@
 import { URLCombiner } from '../core/url-combiner/url-combiner';
 import { getAccessControlModuleRoute } from '../app-routing-paths';
 
-export const GROUP_EDIT_PATH = 'groups';
+export const EPERSON_PATH = 'epeople';
+
+export function getEPersonsRoute(): string {
+  return new URLCombiner(getAccessControlModuleRoute(), EPERSON_PATH).toString();
+}
+
+export function getEPersonEditRoute(id: string): string {
+  return new URLCombiner(getEPersonsRoute(), id, 'edit').toString();
+}
+
+export const GROUP_PATH = 'groups';
 
 export function getGroupsRoute() {
-  return new URLCombiner(getAccessControlModuleRoute(), GROUP_EDIT_PATH).toString();
+  return new URLCombiner(getAccessControlModuleRoute(), GROUP_PATH).toString();
 }
 
 export function getGroupEditRoute(id: string) {
-  return new URLCombiner(getAccessControlModuleRoute(), GROUP_EDIT_PATH, id).toString();
+  return new URLCombiner(getGroupsRoute(), id, 'edit').toString();
 }
diff --git a/src/app/access-control/access-control-routing.module.ts b/src/app/access-control/access-control-routing.module.ts
index 6f6de6cb26..97d049ad83 100644
--- a/src/app/access-control/access-control-routing.module.ts
+++ b/src/app/access-control/access-control-routing.module.ts
@@ -3,7 +3,7 @@ import { RouterModule } from '@angular/router';
 import { EPeopleRegistryComponent } from './epeople-registry/epeople-registry.component';
 import { GroupFormComponent } from './group-registry/group-form/group-form.component';
 import { GroupsRegistryComponent } from './group-registry/groups-registry.component';
-import { GROUP_EDIT_PATH } from './access-control-routing-paths';
+import { EPERSON_PATH, GROUP_PATH } from './access-control-routing-paths';
 import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver';
 import { GroupPageGuard } from './group-registry/group-page.guard';
 import {
@@ -13,12 +13,14 @@ import {
   SiteAdministratorGuard
 } from '../core/data/feature-authorization/feature-authorization-guard/site-administrator.guard';
 import { BulkAccessComponent } from './bulk-access/bulk-access.component';
+import { EPersonFormComponent } from './epeople-registry/eperson-form/eperson-form.component';
+import { EPersonResolver } from './epeople-registry/eperson-resolver.service';
 
 @NgModule({
   imports: [
     RouterModule.forChild([
       {
-        path: 'epeople',
+        path: EPERSON_PATH,
         component: EPeopleRegistryComponent,
         resolve: {
           breadcrumb: I18nBreadcrumbResolver
@@ -27,7 +29,26 @@ import { BulkAccessComponent } from './bulk-access/bulk-access.component';
         canActivate: [SiteAdministratorGuard]
       },
       {
-        path: GROUP_EDIT_PATH,
+        path: `${EPERSON_PATH}/create`,
+        component: EPersonFormComponent,
+        resolve: {
+          breadcrumb: I18nBreadcrumbResolver,
+        },
+        data: { title: 'admin.access-control.epeople.add.title', breadcrumbKey: 'admin.access-control.epeople.add' },
+        canActivate: [SiteAdministratorGuard],
+      },
+      {
+        path: `${EPERSON_PATH}/:id/edit`,
+        component: EPersonFormComponent,
+        resolve: {
+          breadcrumb: I18nBreadcrumbResolver,
+          ePerson: EPersonResolver,
+        },
+        data: { title: 'admin.access-control.epeople.edit.title', breadcrumbKey: 'admin.access-control.epeople.edit' },
+        canActivate: [SiteAdministratorGuard],
+      },
+      {
+        path: GROUP_PATH,
         component: GroupsRegistryComponent,
         resolve: {
           breadcrumb: I18nBreadcrumbResolver
@@ -36,7 +57,7 @@ import { BulkAccessComponent } from './bulk-access/bulk-access.component';
         canActivate: [GroupAdministratorGuard]
       },
       {
-        path: `${GROUP_EDIT_PATH}/newGroup`,
+        path: `${GROUP_PATH}/create`,
         component: GroupFormComponent,
         resolve: {
           breadcrumb: I18nBreadcrumbResolver
@@ -45,7 +66,7 @@ import { BulkAccessComponent } from './bulk-access/bulk-access.component';
         canActivate: [GroupAdministratorGuard]
       },
       {
-        path: `${GROUP_EDIT_PATH}/:groupId`,
+        path: `${GROUP_PATH}/:groupId/edit`,
         component: GroupFormComponent,
         resolve: {
           breadcrumb: I18nBreadcrumbResolver
diff --git a/src/app/access-control/bulk-access/browse/bulk-access-browse.component.html b/src/app/access-control/bulk-access/browse/bulk-access-browse.component.html
index c716aedb8b..131cb49d6b 100644
--- a/src/app/access-control/bulk-access/browse/bulk-access-browse.component.html
+++ b/src/app/access-control/bulk-access/browse/bulk-access-browse.component.html
@@ -1,15 +1,15 @@
 <ngb-accordion #acc="ngbAccordion" [activeIds]="'browse'">
   <ngb-panel [id]="'browse'">
     <ng-template ngbPanelHeader>
-      <div class="w-100 d-flex justify-content-between collapse-toggle" ngbPanelToggle (click)="acc.toggle('browse')"
+      <div class="w-100 d-flex gap-3 justify-content-between collapse-toggle" ngbPanelToggle (click)="acc.toggle('browse')"
            data-test="browse">
         <button type="button" class="btn btn-link p-0" (click)="$event.preventDefault()"
-                [attr.aria-expanded]="!acc.isExpanded('browse')"
-                aria-controls="collapsePanels">
+                [attr.aria-expanded]="acc.isExpanded('browse')"
+                aria-controls="bulk-access-browse-panel-content">
           {{ 'admin.access-control.bulk-access-browse.header' | translate }}
         </button>
-        <div class="text-right d-flex">
-          <div class="ml-3 d-inline-block">
+        <div class="text-right d-flex gap-2">
+          <div class="d-flex my-auto">
             <span *ngIf="acc.isExpanded('browse')" class="fas fa-chevron-up fa-fw"></span>
             <span *ngIf="!acc.isExpanded('browse')" class="fas fa-chevron-down fa-fw"></span>
           </div>
@@ -17,51 +17,52 @@
       </div>
     </ng-template>
     <ng-template ngbPanelContent>
-      <ul ngbNav #nav="ngbNav" [(activeId)]="activateId" class="nav-pills">
-        <li [ngbNavItem]="'search'">
-          <a ngbNavLink>{{'admin.access-control.bulk-access-browse.search.header' | translate}}</a>
-          <ng-template ngbNavContent>
-            <div class="mx-n3">
-              <ds-themed-search [configuration]="'administrativeBulkAccess'"
-                                [selectable]="true"
-                                [selectionConfig]="{ repeatable: true, listId: listId }"
-                                [showThumbnails]="false"></ds-themed-search>
-            </div>
-          </ng-template>
-        </li>
-        <li [ngbNavItem]="'selected'">
-          <a ngbNavLink>
-            {{'admin.access-control.bulk-access-browse.selected.header' | translate: {number: ((objectsSelected$ | async)?.payload?.totalElements) ? (objectsSelected$ | async)?.payload?.totalElements : '0'} }}
-          </a>
-          <ng-template ngbNavContent>
-            <ds-pagination
-              [paginationOptions]="(paginationOptions$ | async)"
-              [pageInfoState]="(objectsSelected$|async)?.payload.pageInfo"
-              [collectionSize]="(objectsSelected$|async)?.payload?.totalElements"
-              [objects]="(objectsSelected$|async)"
-              [showPaginator]="false"
-              (prev)="pagePrev()"
-              (next)="pageNext()">
-              <ul *ngIf="(objectsSelected$|async)?.hasSucceeded" class="list-unstyled ml-4">
-                <li *ngFor='let object of (objectsSelected$|async)?.payload?.page | paginate: { itemsPerPage: (paginationOptions$ | async).pageSize,
-                            currentPage: (paginationOptions$ | async).currentPage, totalItems: (objectsSelected$|async)?.payload?.page.length }; let i = index; let last = last '
-                    class="mt-4 mb-4 d-flex"
-                    [attr.data-test]="'list-object' | dsBrowserOnly">
-                  <ds-selectable-list-item-control [index]="i"
-                                                   [object]="object"
-                                                   [selectionConfig]="{ repeatable: true, listId: listId }"></ds-selectable-list-item-control>
-                  <ds-listable-object-component-loader [listID]="listId"
-                                                       [index]="i"
-                                                       [object]="object"
-                                                       [showThumbnails]="false"
-                                                       [viewMode]="'list'"></ds-listable-object-component-loader>
-                </li>
-              </ul>
-            </ds-pagination>
-          </ng-template>
-        </li>
-      </ul>
-      <div [ngbNavOutlet]="nav" class="mt-5"></div>
+      <div id="bulk-access-browse-panel-content">
+        <ul ngbNav #nav="ngbNav" [(activeId)]="activateId" class="nav-pills">
+          <li [ngbNavItem]="'search'" role="presentation">
+            <a ngbNavLink>{{'admin.access-control.bulk-access-browse.search.header' | translate}}</a>
+            <ng-template ngbNavContent>
+              <div class="mx-n3">
+                <ds-themed-search [configuration]="'administrativeBulkAccess'"
+                                  [selectable]="true"
+                                  [selectionConfig]="{ repeatable: true, listId: listId }"
+                                  [showThumbnails]="false"></ds-themed-search>
+              </div>
+            </ng-template>
+          </li>
+          <li [ngbNavItem]="'selected'" role="presentation">
+            <a ngbNavLink>
+              {{'admin.access-control.bulk-access-browse.selected.header' | translate: {number: ((objectsSelected$ | async)?.payload?.totalElements) ? (objectsSelected$ | async)?.payload?.totalElements : '0'} }}
+            </a>
+            <ng-template ngbNavContent>
+              <ds-pagination
+                [paginationOptions]="(paginationOptions$ | async)"
+                [collectionSize]="(objectsSelected$|async)?.payload?.totalElements"
+                [objects]="(objectsSelected$|async)"
+                [showPaginator]="false"
+                (prev)="pagePrev()"
+                (next)="pageNext()">
+                <ul *ngIf="(objectsSelected$|async)?.hasSucceeded" class="list-unstyled ml-4">
+                  <li *ngFor='let object of (objectsSelected$|async)?.payload?.page | paginate: { itemsPerPage: (paginationOptions$ | async).pageSize,
+                              currentPage: (paginationOptions$ | async).currentPage, totalItems: (objectsSelected$|async)?.payload?.page.length }; let i = index; let last = last '
+                      class="mt-4 mb-4 d-flex"
+                      [attr.data-test]="'list-object' | dsBrowserOnly">
+                    <ds-selectable-list-item-control [index]="i"
+                                                     [object]="object"
+                                                     [selectionConfig]="{ repeatable: true, listId: listId }"></ds-selectable-list-item-control>
+                    <ds-listable-object-component-loader [listID]="listId"
+                                                         [index]="i"
+                                                         [object]="object"
+                                                         [showThumbnails]="false"
+                                                         [viewMode]="'list'"></ds-listable-object-component-loader>
+                  </li>
+                </ul>
+              </ds-pagination>
+            </ng-template>
+          </li>
+        </ul>
+        <div [ngbNavOutlet]="nav" class="mt-5"></div>
+      </div>
     </ng-template>
   </ngb-panel>
 </ngb-accordion>
diff --git a/src/app/access-control/bulk-access/bulk-access.component.html b/src/app/access-control/bulk-access/bulk-access.component.html
index 382caf85f4..cda6b805bc 100644
--- a/src/app/access-control/bulk-access/bulk-access.component.html
+++ b/src/app/access-control/bulk-access/bulk-access.component.html
@@ -1,4 +1,5 @@
 <div class="container">
+  <h1>{{ 'admin.access-control.bulk-access.title' | translate }}</h1>
   <ds-bulk-access-browse [listId]="listId"></ds-bulk-access-browse>
   <div class="clearfix mb-3"></div>
   <ds-bulk-access-settings #dsBulkSettings ></ds-bulk-access-settings>
@@ -9,7 +10,7 @@
     <button class="btn btn-outline-primary mr-3" (click)="reset()">
       {{ 'access-control-cancel' | translate }}
     </button>
-    <button class="btn btn-primary" [disabled]="!canExport()" (click)="submit()">
+    <button class="btn btn-primary" [dsBtnDisabled]="!canExport()" (click)="submit()">
       {{ 'access-control-execute' | translate }}
     </button>
   </div>
diff --git a/src/app/access-control/bulk-access/bulk-access.component.spec.ts b/src/app/access-control/bulk-access/bulk-access.component.spec.ts
index e9b253147d..4a545dc3dd 100644
--- a/src/app/access-control/bulk-access/bulk-access.component.spec.ts
+++ b/src/app/access-control/bulk-access/bulk-access.component.spec.ts
@@ -1,5 +1,5 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { NO_ERRORS_SCHEMA } from '@angular/core';
+import { NO_ERRORS_SCHEMA, Component } from '@angular/core';
 
 import { TranslateModule } from '@ngx-translate/core';
 import { of } from 'rxjs';
@@ -57,10 +57,15 @@ describe('BulkAccessComponent', () => {
     'file': {  }
   };
 
-  const mockSettings: any = jasmine.createSpyObj('AccessControlFormContainerComponent',  {
-    getValue: jasmine.createSpy('getValue'),
-    reset: jasmine.createSpy('reset')
-  });
+  @Component({
+    selector: 'ds-bulk-access-settings',
+    template: ''
+  })
+  class MockBulkAccessSettingsComponent {
+    isFormValid = jasmine.createSpy('isFormValid').and.returnValue(false);
+    getValue = jasmine.createSpy('getValue');
+    reset = jasmine.createSpy('reset');
+  }
   const selection: any[] = [{ indexableObject: { uuid: '1234' } }, { indexableObject: { uuid: '5678' } }];
   const selectableListState: SelectableListState = { id: 'test', selection };
   const expectedIdList = ['1234', '5678'];
@@ -73,7 +78,10 @@ describe('BulkAccessComponent', () => {
         RouterTestingModule,
         TranslateModule.forRoot()
       ],
-      declarations: [ BulkAccessComponent ],
+      declarations: [
+        BulkAccessComponent,
+        MockBulkAccessSettingsComponent,
+      ],
       providers: [
         { provide: BulkAccessControlService, useValue: bulkAccessControlServiceMock },
         { provide: NotificationsService, useValue: NotificationsServiceStub },
@@ -102,7 +110,6 @@ describe('BulkAccessComponent', () => {
 
       (component as any).selectableListService.getSelectableList.and.returnValue(of(selectableListStateEmpty));
       fixture.detectChanges();
-      component.settings = mockSettings;
     });
 
     it('should create', () => {
@@ -119,13 +126,12 @@ describe('BulkAccessComponent', () => {
 
   });
 
-  describe('when there are elements selected', () => {
+  describe('when there are elements selected and step two form is invalid', () => {
 
     beforeEach(() => {
 
       (component as any).selectableListService.getSelectableList.and.returnValue(of(selectableListState));
       fixture.detectChanges();
-      component.settings = mockSettings;
     });
 
     it('should create', () => {
@@ -136,9 +142,9 @@ describe('BulkAccessComponent', () => {
       expect(component.objectsSelected$.value).toEqual(expectedIdList);
     });
 
-    it('should enable the execute button when there are objects selected', () => {
+    it('should not enable the execute button when there are objects selected and step two form is invalid', () => {
       component.objectsSelected$.next(['1234']);
-      expect(component.canExport()).toBe(true);
+      expect(component.canExport()).toBe(false);
     });
 
     it('should call the settings reset method when reset is called', () => {
@@ -146,6 +152,23 @@ describe('BulkAccessComponent', () => {
       expect(component.settings.reset).toHaveBeenCalled();
     });
 
+
+  });
+
+  describe('when there are elements selectedted and the step two form is valid', () => {
+
+    beforeEach(() => {
+
+      (component as any).selectableListService.getSelectableList.and.returnValue(of(selectableListState));
+      fixture.detectChanges();
+      (component as any).settings.isFormValid.and.returnValue(true);
+    });
+
+    it('should enable the execute button when there are objects selected and step two form is valid', () => {
+      component.objectsSelected$.next(['1234']);
+      expect(component.canExport()).toBe(true);
+    });
+
     it('should call the bulkAccessControlService executeScript method when submit is called', () => {
       (component.settings as any).getValue.and.returnValue(mockFormState);
       bulkAccessControlService.createPayloadFile.and.returnValue(mockFile);
diff --git a/src/app/access-control/bulk-access/bulk-access.component.ts b/src/app/access-control/bulk-access/bulk-access.component.ts
index 04724614cb..bdea3d5cbe 100644
--- a/src/app/access-control/bulk-access/bulk-access.component.ts
+++ b/src/app/access-control/bulk-access/bulk-access.component.ts
@@ -37,7 +37,7 @@ export class BulkAccessComponent implements OnInit {
 
   constructor(
     private bulkAccessControlService: BulkAccessControlService,
-    private selectableListService: SelectableListService
+    private selectableListService: SelectableListService,
   ) {
   }
 
@@ -51,7 +51,7 @@ export class BulkAccessComponent implements OnInit {
   }
 
   canExport(): boolean {
-    return this.objectsSelected$.value?.length > 0;
+    return this.objectsSelected$.value?.length > 0 && this.settings?.isFormValid();
   }
 
   /**
diff --git a/src/app/access-control/bulk-access/settings/bulk-access-settings.component.html b/src/app/access-control/bulk-access/settings/bulk-access-settings.component.html
index 01f36ef03f..c41053874e 100644
--- a/src/app/access-control/bulk-access/settings/bulk-access-settings.component.html
+++ b/src/app/access-control/bulk-access/settings/bulk-access-settings.component.html
@@ -1,13 +1,13 @@
 <ngb-accordion #acc="ngbAccordion" [activeIds]="'settings'">
   <ngb-panel [id]="'settings'">
     <ng-template ngbPanelHeader>
-      <div class="w-100 d-flex justify-content-between collapse-toggle" ngbPanelToggle (click)="acc.toggle('settings')" data-test="settings">
-        <button type="button" class="btn btn-link p-0" (click)="$event.preventDefault()" [attr.aria-expanded]="!acc.isExpanded('browse')"
-                aria-controls="collapsePanels">
+      <div class="w-100 d-flex gap-3 justify-content-between collapse-toggle" ngbPanelToggle (click)="acc.toggle('settings')" data-test="settings">
+        <button type="button" class="btn btn-link p-0" (click)="$event.preventDefault()" [attr.aria-expanded]="acc.isExpanded('settings')"
+                aria-controls="bulk-access-settings-panel-content">
           {{ 'admin.access-control.bulk-access-settings.header' | translate }}
         </button>
-        <div class="text-right d-flex">
-          <div class="ml-3 d-inline-block">
+        <div class="text-right d-flex gap-2">
+          <div class="d-flex my-auto">
             <span *ngIf="acc.isExpanded('settings')" class="fas fa-chevron-up fa-fw"></span>
             <span *ngIf="!acc.isExpanded('settings')" class="fas fa-chevron-down fa-fw"></span>
           </div>
@@ -15,7 +15,7 @@
       </div>
     </ng-template>
     <ng-template ngbPanelContent>
-      <ds-access-control-form-container #dsAccessControlForm [showSubmit]="false"></ds-access-control-form-container>
+      <ds-access-control-form-container id="bulk-access-settings-panel-content" #dsAccessControlForm [showSubmit]="false"></ds-access-control-form-container>
     </ng-template>
   </ngb-panel>
 </ngb-accordion>
diff --git a/src/app/access-control/bulk-access/settings/bulk-access-settings.component.ts b/src/app/access-control/bulk-access/settings/bulk-access-settings.component.ts
index eecc016245..5d1070893c 100644
--- a/src/app/access-control/bulk-access/settings/bulk-access-settings.component.ts
+++ b/src/app/access-control/bulk-access/settings/bulk-access-settings.component.ts
@@ -31,4 +31,8 @@ export class BulkAccessSettingsComponent {
     this.controlForm.reset();
   }
 
+  isFormValid() {
+    return this.controlForm.isValid();
+  }
+
 }
diff --git a/src/app/access-control/epeople-registry/epeople-registry.component.html b/src/app/access-control/epeople-registry/epeople-registry.component.html
index e3a8e2c590..540f57032b 100644
--- a/src/app/access-control/epeople-registry/epeople-registry.component.html
+++ b/src/app/access-control/epeople-registry/epeople-registry.component.html
@@ -2,98 +2,92 @@
   <div class="epeople-registry row">
     <div class="col-12">
       <div class="d-flex justify-content-between border-bottom mb-3">
-        <h2 id="header" class="pb-2">{{labelPrefix + 'head' | translate}}</h2>
+        <h1 id="header" class="pb-2">{{labelPrefix + 'head' | translate}}</h1>
 
-        <div *ngIf="!isEPersonFormShown">
+        <div>
           <button class="mr-auto btn btn-success addEPerson-button"
-                  (click)="isEPersonFormShown = true">
+                  [routerLink]="'create'">
             <i class="fas fa-plus"></i>
             <span class="d-none d-sm-inline ml-1">{{labelPrefix + 'button.add' | translate}}</span>
           </button>
         </div>
       </div>
 
-      <ds-eperson-form *ngIf="isEPersonFormShown" (submitForm)="reset()"
-                       (cancelForm)="isEPersonFormShown = false"></ds-eperson-form>
-
-      <div *ngIf="!isEPersonFormShown">
-        <h3 id="search" class="border-bottom pb-2">{{labelPrefix + 'search.head' | translate}}
-
-        </h3>
-        <form [formGroup]="searchForm" (ngSubmit)="search(searchForm.value)" class="d-flex justify-content-between">
-          <div>
-            <select name="scope" id="scope" formControlName="scope" class="form-control" aria-label="Search scope">
-              <option value="metadata">{{labelPrefix + 'search.scope.metadata' | translate}}</option>
-              <option value="email">{{labelPrefix + 'search.scope.email' | translate}}</option>
-            </select>
-          </div>
-          <div class="flex-grow-1 mr-3 ml-3">
-            <div class="form-group input-group">
-              <input type="text" name="query" id="query" formControlName="query"
-                    class="form-control" [attr.aria-label]="labelPrefix + 'search.placeholder' | translate"
-                     [placeholder]="(labelPrefix + 'search.placeholder' | translate)">
-              <span class="input-group-append">
+      <h2 id="search" class="border-bottom pb-2">
+        {{labelPrefix + 'search.head' | translate}}
+      </h2>
+      <form [formGroup]="searchForm" (ngSubmit)="search(searchForm.value)" class="d-flex justify-content-between">
+        <div>
+          <select name="scope" id="scope" formControlName="scope" class="form-control" aria-label="Search scope">
+            <option value="metadata">{{labelPrefix + 'search.scope.metadata' | translate}}</option>
+            <option value="email">{{labelPrefix + 'search.scope.email' | translate}}</option>
+          </select>
+        </div>
+        <div class="flex-grow-1 mr-3 ml-3">
+          <div class="form-group input-group">
+            <input type="text" name="query" id="query" formControlName="query"
+                   class="form-control" [attr.aria-label]="labelPrefix + 'search.placeholder' | translate"
+                   [placeholder]="(labelPrefix + 'search.placeholder' | translate)">
+            <span class="input-group-append">
                 <button type="submit" class="search-button btn btn-primary">
                   <i class="fas fa-search"></i> {{ labelPrefix + 'search.button' | translate }}
                 </button>
               </span>
-            </div>
           </div>
-          <div>
-            <button (click)="clearFormAndResetResult();"
-                    class="search-button btn btn-secondary">{{labelPrefix + 'button.see-all' | translate}}</button>
-          </div>
-        </form>
-
-        <ds-themed-loading *ngIf="searching$ | async"></ds-themed-loading>
-        <ds-pagination
-          *ngIf="(pageInfoState$ | async)?.totalElements > 0 && !(searching$ | async)"
-          [paginationOptions]="config"
-          [pageInfoState]="pageInfoState$"
-          [collectionSize]="(pageInfoState$ | async)?.totalElements"
-          [hideGear]="true"
-          [hidePagerWhenSinglePage]="true">
-
-          <div class="table-responsive">
-            <table id="epeople" class="table table-striped table-hover table-bordered">
-              <thead>
-              <tr>
-                <th scope="col">{{labelPrefix + 'table.id' | translate}}</th>
-                <th scope="col">{{labelPrefix + 'table.name' | translate}}</th>
-                <th scope="col">{{labelPrefix + 'table.email' | translate}}</th>
-                <th>{{labelPrefix + 'table.edit' | translate}}</th>
-              </tr>
-              </thead>
-              <tbody>
-              <tr *ngFor="let epersonDto of (ePeopleDto$ | async)?.page"
-                  [ngClass]="{'table-primary' : isActive(epersonDto.eperson) | async}">
-                <td>{{epersonDto.eperson.id}}</td>
-                <td>{{ dsoNameService.getName(epersonDto.eperson) }}</td>
-                <td>{{epersonDto.eperson.email}}</td>
-                <td>
-                  <div class="btn-group edit-field">
-                    <button (click)="toggleEditEPerson(epersonDto.eperson)"
-                            class="btn btn-outline-primary btn-sm access-control-editEPersonButton"
-                            title="{{labelPrefix + 'table.edit.buttons.edit' | translate: { name: dsoNameService.getName(epersonDto.eperson) } }}">
-                      <i class="fas fa-edit fa-fw"></i>
-                    </button>
-                    <button [disabled]="!epersonDto.ableToDelete" (click)="deleteEPerson(epersonDto.eperson)"
-                            class="delete-button btn btn-outline-danger btn-sm access-control-deleteEPersonButton"
-                            title="{{labelPrefix + 'table.edit.buttons.remove' | translate: { name: dsoNameService.getName(epersonDto.eperson) } }}">
-                      <i class="fas fa-trash-alt fa-fw"></i>
-                    </button>
-                  </div>
-                </td>
-              </tr>
-              </tbody>
-            </table>
-          </div>
-
-        </ds-pagination>
-
-        <div *ngIf="(pageInfoState$ | async)?.totalElements == 0" class="alert alert-info w-100 mb-2" role="alert">
-          {{labelPrefix + 'no-items' | translate}}
         </div>
+        <div>
+          <button (click)="clearFormAndResetResult();"
+                  class="search-button btn btn-secondary">{{labelPrefix + 'button.see-all' | translate}}</button>
+        </div>
+      </form>
+
+      <ds-themed-loading *ngIf="searching$ | async"></ds-themed-loading>
+      <ds-pagination
+        *ngIf="(pageInfoState$ | async)?.totalElements > 0 && !(searching$ | async)"
+        [paginationOptions]="config"
+        [collectionSize]="(pageInfoState$ | async)?.totalElements"
+        [hideGear]="true"
+        [hidePagerWhenSinglePage]="true">
+
+        <div class="table-responsive">
+          <table id="epeople" class="table table-striped table-hover table-bordered">
+            <thead>
+            <tr>
+              <th scope="col">{{labelPrefix + 'table.id' | translate}}</th>
+              <th scope="col">{{labelPrefix + 'table.name' | translate}}</th>
+              <th scope="col">{{labelPrefix + 'table.email' | translate}}</th>
+              <th>{{labelPrefix + 'table.edit' | translate}}</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr *ngFor="let epersonDto of (ePeopleDto$ | async)?.page"
+                [ngClass]="{'table-primary' : (activeEPerson$ | async) === epersonDto.eperson}">
+              <td>{{epersonDto.eperson.id}}</td>
+              <td>{{ dsoNameService.getName(epersonDto.eperson) }}</td>
+              <td>{{epersonDto.eperson.email}}</td>
+              <td>
+                <div class="btn-group edit-field">
+                  <button [routerLink]="getEditEPeoplePage(epersonDto.eperson.id)"
+                          class="btn btn-outline-primary btn-sm access-control-editEPersonButton"
+                          title="{{labelPrefix + 'table.edit.buttons.edit' | translate: { name: dsoNameService.getName(epersonDto.eperson) } }}">
+                    <i class="fas fa-edit fa-fw"></i>
+                  </button>
+                  <button *ngIf="epersonDto.ableToDelete" (click)="deleteEPerson(epersonDto.eperson)"
+                          class="delete-button btn btn-outline-danger btn-sm access-control-deleteEPersonButton"
+                          title="{{labelPrefix + 'table.edit.buttons.remove' | translate: { name: dsoNameService.getName(epersonDto.eperson) } }}">
+                    <i class="fas fa-trash-alt fa-fw"></i>
+                  </button>
+                </div>
+              </td>
+            </tr>
+            </tbody>
+          </table>
+        </div>
+
+      </ds-pagination>
+
+      <div *ngIf="(pageInfoState$ | async)?.totalElements == 0" class="alert alert-info w-100 mb-2" role="alert">
+        {{labelPrefix + 'no-items' | translate}}
       </div>
     </div>
   </div>
diff --git a/src/app/access-control/epeople-registry/epeople-registry.component.spec.ts b/src/app/access-control/epeople-registry/epeople-registry.component.spec.ts
index 4a09913862..d948732321 100644
--- a/src/app/access-control/epeople-registry/epeople-registry.component.spec.ts
+++ b/src/app/access-control/epeople-registry/epeople-registry.component.spec.ts
@@ -27,6 +27,7 @@ import { RequestService } from '../../core/data/request.service';
 import { PaginationService } from '../../core/pagination/pagination.service';
 import { PaginationServiceStub } from '../../shared/testing/pagination-service.stub';
 import { FindListOptions } from '../../core/data/find-list-options.model';
+import {BtnDisabledDirective} from '../../shared/btn-disabled.directive';
 
 describe('EPeopleRegistryComponent', () => {
   let component: EPeopleRegistryComponent;
@@ -131,7 +132,7 @@ describe('EPeopleRegistryComponent', () => {
           }
         }),
       ],
-      declarations: [EPeopleRegistryComponent],
+      declarations: [EPeopleRegistryComponent, BtnDisabledDirective],
       providers: [
         { provide: EPersonDataService, useValue: ePersonDataServiceStub },
         { provide: NotificationsService, useValue: new NotificationsServiceStub() },
@@ -203,36 +204,6 @@ describe('EPeopleRegistryComponent', () => {
     });
   });
 
-  describe('toggleEditEPerson', () => {
-    describe('when you click on first edit eperson button', () => {
-      beforeEach(fakeAsync(() => {
-        const editButtons = fixture.debugElement.queryAll(By.css('.access-control-editEPersonButton'));
-        editButtons[0].triggerEventHandler('click', {
-          preventDefault: () => {/**/
-          }
-        });
-        tick();
-        fixture.detectChanges();
-      }));
-
-      it('editEPerson form is toggled', () => {
-        const ePeopleIds = fixture.debugElement.queryAll(By.css('#epeople tr td:first-child'));
-        ePersonDataServiceStub.getActiveEPerson().subscribe((activeEPerson: EPerson) => {
-          if (ePeopleIds[0] && activeEPerson === ePeopleIds[0].nativeElement.textContent) {
-            expect(component.isEPersonFormShown).toEqual(false);
-          } else {
-            expect(component.isEPersonFormShown).toEqual(true);
-          }
-
-        });
-      });
-
-      it('EPerson search section is hidden', () => {
-        expect(fixture.debugElement.query(By.css('#search'))).toBeNull();
-      });
-    });
-  });
-
   describe('deleteEPerson', () => {
     describe('when you click on first delete eperson button', () => {
       let ePeopleIdsFoundBeforeDelete;
@@ -269,7 +240,8 @@ describe('EPeopleRegistryComponent', () => {
     it('should be disabled', () => {
       ePeopleDeleteButton = fixture.debugElement.queryAll(By.css('#epeople tr td div button.delete-button'));
       ePeopleDeleteButton.forEach((deleteButton: DebugElement) => {
-        expect(deleteButton.nativeElement.disabled).toBe(true);
+        expect(deleteButton.nativeElement.getAttribute('aria-disabled')).toBe('true');
+        expect(deleteButton.nativeElement.classList.contains('disabled')).toBeTrue();
       });
     });
   });
diff --git a/src/app/access-control/epeople-registry/epeople-registry.component.ts b/src/app/access-control/epeople-registry/epeople-registry.component.ts
index fb045ebb88..12312cd4ac 100644
--- a/src/app/access-control/epeople-registry/epeople-registry.component.ts
+++ b/src/app/access-control/epeople-registry/epeople-registry.component.ts
@@ -22,6 +22,7 @@ import { PageInfo } from '../../core/shared/page-info.model';
 import { NoContent } from '../../core/shared/NoContent.model';
 import { PaginationService } from '../../core/pagination/pagination.service';
 import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
+import { getEPersonEditRoute, getEPersonsRoute } from '../access-control-routing-paths';
 
 @Component({
   selector: 'ds-epeople-registry',
@@ -45,6 +46,8 @@ export class EPeopleRegistryComponent implements OnInit, OnDestroy {
    */
   ePeopleDto$: BehaviorSubject<PaginatedList<EpersonDtoModel>> = new BehaviorSubject<PaginatedList<EpersonDtoModel>>({} as any);
 
+  activeEPerson$: Observable<EPerson>;
+
   /**
    * An observable for the pageInfo, needed to pass to the pagination component
    */
@@ -64,11 +67,6 @@ export class EPeopleRegistryComponent implements OnInit, OnDestroy {
     currentPage: 1
   });
 
-  /**
-   * Whether or not to show the EPerson form
-   */
-  isEPersonFormShown: boolean;
-
   // The search form
   searchForm;
 
@@ -114,17 +112,12 @@ export class EPeopleRegistryComponent implements OnInit, OnDestroy {
    */
   initialisePage() {
     this.searching$.next(true);
-    this.isEPersonFormShown = false;
     this.search({scope: this.currentSearchScope, query: this.currentSearchQuery});
-    this.subs.push(this.epersonService.getActiveEPerson().subscribe((eperson: EPerson) => {
-      if (eperson != null && eperson.id) {
-        this.isEPersonFormShown = true;
-      }
-    }));
+    this.activeEPerson$ = this.epersonService.getActiveEPerson();
     this.subs.push(this.ePeople$.pipe(
       switchMap((epeople: PaginatedList<EPerson>) => {
         if (epeople.pageInfo.totalElements > 0) {
-          return combineLatest([...epeople.page.map((eperson: EPerson) => {
+          return combineLatest(epeople.page.map((eperson: EPerson) => {
             return this.authorizationService.isAuthorized(FeatureID.CanDelete, hasValue(eperson) ? eperson.self : undefined).pipe(
               map((authorized) => {
                 const epersonDtoModel: EpersonDtoModel = new EpersonDtoModel();
@@ -133,7 +126,7 @@ export class EPeopleRegistryComponent implements OnInit, OnDestroy {
                 return epersonDtoModel;
               })
             );
-          })]).pipe(map((dtos: EpersonDtoModel[]) => {
+          })).pipe(map((dtos: EpersonDtoModel[]) => {
             return buildPaginatedList(epeople.pageInfo, dtos);
           }));
         } else {
@@ -160,14 +153,14 @@ export class EPeopleRegistryComponent implements OnInit, OnDestroy {
           const query: string = data.query;
           const scope: string = data.scope;
           if (query != null && this.currentSearchQuery !== query) {
-            this.router.navigate([this.epersonService.getEPeoplePageRouterLink()], {
+            void this.router.navigate([getEPersonsRoute()], {
               queryParamsHandling: 'merge'
             });
             this.currentSearchQuery = query;
             this.paginationService.resetPage(this.config.id);
           }
           if (scope != null && this.currentSearchScope !== scope) {
-            this.router.navigate([this.epersonService.getEPeoplePageRouterLink()], {
+            void this.router.navigate([getEPersonsRoute()], {
               queryParamsHandling: 'merge'
             });
             this.currentSearchScope = scope;
@@ -188,40 +181,6 @@ export class EPeopleRegistryComponent implements OnInit, OnDestroy {
     );
   }
 
-  /**
-   * Checks whether the given EPerson is active (being edited)
-   * @param eperson
-   */
-  isActive(eperson: EPerson): Observable<boolean> {
-    return this.getActiveEPerson().pipe(
-      map((activeEPerson) => eperson === activeEPerson)
-    );
-  }
-
-  /**
-   * Gets the active eperson (being edited)
-   */
-  getActiveEPerson(): Observable<EPerson> {
-    return this.epersonService.getActiveEPerson();
-  }
-
-  /**
-   * Start editing the selected EPerson
-   * @param ePerson
-   */
-  toggleEditEPerson(ePerson: EPerson) {
-    this.getActiveEPerson().pipe(take(1)).subscribe((activeEPerson: EPerson) => {
-      if (ePerson === activeEPerson) {
-        this.epersonService.cancelEditEPerson();
-        this.isEPersonFormShown = false;
-      } else {
-        this.epersonService.editEPerson(ePerson);
-        this.isEPersonFormShown = true;
-      }
-    });
-    this.scrollToTop();
-  }
-
   /**
    * Deletes EPerson, show notification on success/failure & updates EPeople list
    */
@@ -242,7 +201,7 @@ export class EPeopleRegistryComponent implements OnInit, OnDestroy {
               if (restResponse.hasSucceeded) {
                 this.notificationsService.success(this.translateService.get(this.labelPrefix + 'notification.deleted.success', {name: this.dsoNameService.getName(ePerson)}));
               } else {
-                this.notificationsService.error('Error occured when trying to delete EPerson with id: ' + ePerson.id + ' with code: ' + restResponse.statusCode + ' and message: ' + restResponse.errorMessage);
+                this.notificationsService.error(this.translateService.get(this.labelPrefix + 'notification.deleted.success', { id: ePerson.id, statusCode: restResponse.statusCode, errorMessage: restResponse.errorMessage }));
               }
             });
           }
@@ -264,16 +223,6 @@ export class EPeopleRegistryComponent implements OnInit, OnDestroy {
     this.subs.filter((sub) => hasValue(sub)).forEach((sub) => sub.unsubscribe());
   }
 
-  scrollToTop() {
-    (function smoothscroll() {
-      const currentScroll = document.documentElement.scrollTop || document.body.scrollTop;
-      if (currentScroll > 0) {
-        window.requestAnimationFrame(smoothscroll);
-        window.scrollTo(0, currentScroll - (currentScroll / 8));
-      }
-    })();
-  }
-
   /**
    * Reset all input-fields to be empty and search all search
    */
@@ -284,20 +233,7 @@ export class EPeopleRegistryComponent implements OnInit, OnDestroy {
     this.search({query: ''});
   }
 
-  /**
-   * This method will set everything to stale, which will cause the lists on this page to update.
-   */
-  reset(): void {
-    this.epersonService.getBrowseEndpoint().pipe(
-      take(1),
-      switchMap((href: string) => {
-        return this.requestService.setStaleByHrefSubstring(href).pipe(
-          take(1),
-        );
-      })
-    ).subscribe(()=>{
-      this.epersonService.cancelEditEPerson();
-      this.isEPersonFormShown = false;
-    });
+  getEditEPeoplePage(id: string): string {
+    return getEPersonEditRoute(id);
   }
 }
diff --git a/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.html b/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.html
index 228449a8a5..769ff84c33 100644
--- a/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.html
+++ b/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.html
@@ -1,89 +1,98 @@
-<div *ngIf="epersonService.getActiveEPerson() | async; then editheader; else createHeader"></div>
+<div class="container">
+  <div class="group-form row">
+    <div class="col-12">
 
-<ng-template #createHeader>
-  <h4>{{messagePrefix + '.create' | translate}}</h4>
-</ng-template>
+      <div *ngIf="activeEPerson$ | async; then editHeader; else createHeader"></div>
 
-<ng-template #editheader>
-  <h4>{{messagePrefix + '.edit' | translate}}</h4>
-</ng-template>
+      <ng-template #createHeader>
+        <h1 class="border-bottom pb-2">{{messagePrefix + '.create' | translate}}</h1>
+      </ng-template>
 
-<ds-form [formId]="formId"
-         [formModel]="formModel"
-         [formGroup]="formGroup"
-         [formLayout]="formLayout"
-         [displayCancel]="false"
-         [submitLabel]="submitLabel"
-         (submitForm)="onSubmit()">
-  <div before class="btn-group">
-    <button (click)="onCancel()"
-            class="btn btn-outline-secondary"><i class="fas fa-arrow-left"></i> {{messagePrefix + '.return' | translate}}</button>
-  </div>
-  <div *ngIf="displayResetPassword" between class="btn-group">
-    <button class="btn btn-primary" [disabled]="!(canReset$ | async)" (click)="resetPassword()">
-      <i class="fa fa-key"></i> {{'admin.access-control.epeople.actions.reset' | translate}}
-    </button>
-  </div>
-  <div between class="btn-group ml-1">
-    <button *ngIf="!isImpersonated" class="btn btn-primary" [ngClass]="{'d-none' : !(canImpersonate$ | async)}" (click)="impersonate()">
-      <i class="fa fa-user-secret"></i> {{'admin.access-control.epeople.actions.impersonate' | translate}}
-    </button>
-    <button *ngIf="isImpersonated" class="btn btn-primary" (click)="stopImpersonating()">
-      <i class="fa fa-user-secret"></i> {{'admin.access-control.epeople.actions.stop-impersonating' | translate}}
-    </button>
-  </div>
-  <button after class="btn btn-danger delete-button" [disabled]="!(canDelete$ | async)" (click)="delete()">
-    <i class="fas fa-trash"></i> {{'admin.access-control.epeople.actions.delete' | translate}}
-  </button>
-</ds-form>
+      <ng-template #editHeader>
+        <h1 class="border-bottom pb-2">{{messagePrefix + '.edit' | translate}}</h1>
+      </ng-template>
 
-<ds-themed-loading [showMessage]="false" *ngIf="!formGroup"></ds-themed-loading>
+      <ds-form [formId]="formId"
+               [formModel]="formModel"
+               [formGroup]="formGroup"
+               [formLayout]="formLayout"
+               [displayCancel]="false"
+               [submitLabel]="submitLabel"
+               (submitForm)="onSubmit()">
+        <div before class="btn-group">
+          <button (click)="onCancel()" type="button" class="btn btn-outline-secondary">
+            <i class="fas fa-arrow-left"></i> {{messagePrefix + '.return' | translate}}
+          </button>
+        </div>
+        <div *ngIf="displayResetPassword" between class="btn-group">
+          <button class="btn btn-primary" [dsBtnDisabled]="!(canReset$ | async)" type="button" (click)="resetPassword()">
+            <i class="fa fa-key"></i> {{'admin.access-control.epeople.actions.reset' | translate}}
+          </button>
+        </div>
+        <div *ngIf="canImpersonate$ | async" between class="btn-group">
+          <button *ngIf="!isImpersonated" class="btn btn-primary" type="button" (click)="impersonate()">
+            <i class="fa fa-user-secret"></i> {{'admin.access-control.epeople.actions.impersonate' | translate}}
+          </button>
+          <button *ngIf="isImpersonated" class="btn btn-primary" type="button" (click)="stopImpersonating()">
+            <i class="fa fa-user-secret"></i> {{'admin.access-control.epeople.actions.stop-impersonating' | translate}}
+          </button>
+        </div>
+        <button *ngIf="canDelete$ | async" after class="btn btn-danger delete-button" type="button" (click)="delete()">
+          <i class="fas fa-trash"></i> {{'admin.access-control.epeople.actions.delete' | translate}}
+        </button>
+      </ds-form>
 
-<div *ngIf="epersonService.getActiveEPerson() | async">
-  <h5>{{messagePrefix + '.groupsEPersonIsMemberOf' | translate}}</h5>
+      <ds-themed-loading [showMessage]="false" *ngIf="!formGroup"></ds-themed-loading>
 
-  <ds-themed-loading [showMessage]="false" *ngIf="!(groups | async)"></ds-themed-loading>
+      <div *ngIf="activeEPerson$ | async">
+        <h2>{{messagePrefix + '.groupsEPersonIsMemberOf' | translate}}</h2>
 
-  <ds-pagination
-    *ngIf="(groups | async)?.payload?.totalElements > 0"
-    [paginationOptions]="config"
-    [pageInfoState]="(groups | async)?.payload"
-    [collectionSize]="(groups | async)?.payload?.totalElements"
-    [hideGear]="true"
-    [hidePagerWhenSinglePage]="true"
-    (pageChange)="onPageChange($event)">
+        <ds-themed-loading [showMessage]="false" *ngIf="!(groups | async)"></ds-themed-loading>
 
-    <div class="table-responsive">
-      <table id="groups" class="table table-striped table-hover table-bordered">
-        <thead>
-        <tr>
-          <th scope="col" class="align-middle">{{messagePrefix + '.table.id' | translate}}</th>
-          <th scope="col" class="align-middle">{{messagePrefix + '.table.name' | translate}}</th>
-          <th scope="col" class="align-middle">{{messagePrefix + '.table.collectionOrCommunity' | translate}}</th>
-        </tr>
-        </thead>
-        <tbody>
-        <tr *ngFor="let group of (groups | async)?.payload?.page">
-          <td class="align-middle">{{group.id}}</td>
-          <td class="align-middle">
-            <a (click)="groupsDataService.startEditingNewGroup(group)"
-               [routerLink]="[groupsDataService.getGroupEditPageRouterLink(group)]">
-            {{ dsoNameService.getName(group) }}
-          </a>
-          </td>
-          <td class="align-middle">{{ dsoNameService.getName(undefined) }}</td>
-        </tr>
-        </tbody>
-      </table>
-    </div>
+        <ds-pagination
+          *ngIf="(groups | async)?.payload?.totalElements > 0"
+          [paginationOptions]="config"
+          [collectionSize]="(groups | async)?.payload?.totalElements"
+          [hideGear]="true"
+          [hidePagerWhenSinglePage]="true"
+          (pageChange)="onPageChange($event)">
 
-  </ds-pagination>
+          <div class="table-responsive">
+            <table id="groups" class="table table-striped table-hover table-bordered">
+              <thead>
+              <tr>
+                <th scope="col" class="align-middle">{{messagePrefix + '.table.id' | translate}}</th>
+                <th scope="col" class="align-middle">{{messagePrefix + '.table.name' | translate}}</th>
+                <th scope="col" class="align-middle">{{messagePrefix + '.table.collectionOrCommunity' | translate}}</th>
+              </tr>
+              </thead>
+              <tbody>
+              <tr *ngFor="let group of (groups | async)?.payload?.page">
+                <td class="align-middle">{{group.id}}</td>
+                <td class="align-middle">
+                  <a (click)="groupsDataService.startEditingNewGroup(group)"
+                     [routerLink]="[groupsDataService.getGroupEditPageRouterLink(group)]">
+                    {{ dsoNameService.getName(group) }}
+                  </a>
+                </td>
+                <td class="align-middle">
+                  {{ dsoNameService.getName((group.object | async)?.payload) }}
+                </td>
+              </tr>
+              </tbody>
+            </table>
+          </div>
 
-  <div *ngIf="(groups | async)?.payload?.totalElements == 0" class="alert alert-info w-100 mb-2" role="alert">
-    <div>{{messagePrefix + '.memberOfNoGroups' | translate}}</div>
-    <div>
-      <button [routerLink]="[groupsDataService.getGroupRegistryRouterLink()]"
-              class="btn btn-primary">{{messagePrefix + '.goToGroups' | translate}}</button>
+        </ds-pagination>
+
+        <div *ngIf="(groups | async)?.payload?.totalElements == 0" class="alert alert-info w-100 mb-2" role="alert">
+          <div>{{messagePrefix + '.memberOfNoGroups' | translate}}</div>
+          <div>
+            <button [routerLink]="[groupsDataService.getGroupRegistryRouterLink()]"
+                    class="btn btn-primary">{{messagePrefix + '.goToGroups' | translate}}</button>
+          </div>
+        </div>
+      </div>
     </div>
   </div>
 </div>
diff --git a/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.spec.ts b/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.spec.ts
index fb911e709c..0dd30b2f24 100644
--- a/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.spec.ts
+++ b/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.spec.ts
@@ -1,11 +1,11 @@
 import { Observable, of as observableOf } from 'rxjs';
 import { CommonModule } from '@angular/common';
-import { NO_ERRORS_SCHEMA } from '@angular/core';
+import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
 import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
 import { UntypedFormControl, UntypedFormGroup, FormsModule, ReactiveFormsModule, Validators } from '@angular/forms';
 import { BrowserModule, By } from '@angular/platform-browser';
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
+import { TranslateModule } from '@ngx-translate/core';
 import { buildPaginatedList, PaginatedList } from '../../../core/data/paginated-list.model';
 import { RemoteData } from '../../../core/data/remote-data';
 import { EPersonDataService } from '../../../core/eperson/eperson-data.service';
@@ -19,7 +19,6 @@ import { EPersonMock, EPersonMock2 } from '../../../shared/testing/eperson.mock'
 import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
 import { getMockFormBuilderService } from '../../../shared/mocks/form-builder-service.mock';
 import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
-import { TranslateLoaderMock } from '../../../shared/mocks/translate-loader.mock';
 import { AuthService } from '../../../core/auth/auth.service';
 import { AuthServiceStub } from '../../../shared/testing/auth-service.stub';
 import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
@@ -31,6 +30,12 @@ import { PaginationServiceStub } from '../../../shared/testing/pagination-servic
 import { FindListOptions } from '../../../core/data/find-list-options.model';
 import { ValidateEmailNotTaken } from './validators/email-taken.validator';
 import { EpersonRegistrationService } from '../../../core/data/eperson-registration.service';
+import { FollowLinkConfig } from '../../../shared/utils/follow-link-config.model';
+import { ActivatedRoute, Router } from '@angular/router';
+import { RouterStub } from '../../../shared/testing/router.stub';
+import { ActivatedRouteStub } from '../../../shared/testing/active-router.stub';
+import { RouterTestingModule } from '@angular/router/testing';
+import {BtnDisabledDirective} from '../../../shared/btn-disabled.directive';
 
 describe('EPersonFormComponent', () => {
   let component: EPersonFormComponent;
@@ -43,6 +48,8 @@ describe('EPersonFormComponent', () => {
   let authorizationService: AuthorizationDataService;
   let groupsDataService: GroupDataService;
   let epersonRegistrationService: EpersonRegistrationService;
+  let route: ActivatedRouteStub;
+  let router: RouterStub;
 
   let paginationService;
 
@@ -53,9 +60,6 @@ describe('EPersonFormComponent', () => {
     ePersonDataServiceStub = {
       activeEPerson: null,
       allEpeople: mockEPeople,
-      getEPeople(): Observable<RemoteData<PaginatedList<EPerson>>> {
-        return createSuccessfulRemoteDataObject$(buildPaginatedList(null, this.allEpeople));
-      },
       getActiveEPerson(): Observable<EPerson> {
         return observableOf(this.activeEPerson);
       },
@@ -106,6 +110,9 @@ describe('EPersonFormComponent', () => {
       },
       getEPersonByEmail(email): Observable<RemoteData<EPerson>> {
         return createSuccessfulRemoteDataObject$(null);
+      },
+      findById(_id: string, _useCachedVersionIfAvailable = true, _reRequestOnStale = true, ..._linksToFollow: FollowLinkConfig<EPerson>[]): Observable<RemoteData<EPerson>> {
+        return createSuccessfulRemoteDataObject$(null);
       }
     };
     builderService = Object.assign(getMockFormBuilderService(),{
@@ -182,16 +189,14 @@ describe('EPersonFormComponent', () => {
     });
 
     paginationService = new PaginationServiceStub();
+    route = new ActivatedRouteStub();
+    router = new RouterStub();
     TestBed.configureTestingModule({
       imports: [CommonModule, NgbModule, FormsModule, ReactiveFormsModule, BrowserModule,
-        TranslateModule.forRoot({
-          loader: {
-            provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
-        }),
+        RouterTestingModule,
+        TranslateModule.forRoot(),
       ],
-      declarations: [EPersonFormComponent],
+      declarations: [EPersonFormComponent, BtnDisabledDirective],
       providers: [
         { provide: EPersonDataService, useValue: ePersonDataServiceStub },
         { provide: GroupDataService, useValue: groupsDataService },
@@ -202,9 +207,11 @@ describe('EPersonFormComponent', () => {
         { provide: PaginationService, useValue: paginationService },
         { provide: RequestService, useValue: jasmine.createSpyObj('requestService', ['removeByHrefSubstring'])},
         { provide: EpersonRegistrationService, useValue: epersonRegistrationService },
+        { provide: ActivatedRoute, useValue: route },
+        { provide: Router, useValue: router },
         EPeopleRegistryComponent
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [CUSTOM_ELEMENTS_SCHEMA],
     }).compileComponents();
   }));
 
@@ -223,37 +230,13 @@ describe('EPersonFormComponent', () => {
   });
 
   describe('check form validation', () => {
-    let firstName;
-    let lastName;
-    let email;
-    let canLogIn;
-    let requireCertificate;
+    let canLogIn: boolean;
+    let requireCertificate: boolean;
 
-    let expected;
     beforeEach(() => {
-      firstName = 'testName';
-      lastName = 'testLastName';
-      email = 'testEmail@test.com';
       canLogIn = false;
       requireCertificate = false;
 
-      expected = Object.assign(new EPerson(), {
-        metadata: {
-          'eperson.firstname': [
-            {
-              value: firstName
-            }
-          ],
-          'eperson.lastname': [
-            {
-              value: lastName
-            },
-          ],
-        },
-        email: email,
-        canLogIn: canLogIn,
-        requireCertificate: requireCertificate,
-      });
       spyOn(component.submitForm, 'emit');
       component.canLogIn.value = canLogIn;
       component.requireCertificate.value = requireCertificate;
@@ -263,24 +246,18 @@ describe('EPersonFormComponent', () => {
       fixture.detectChanges();
     });
     describe('firstName, lastName and email should be required', () => {
-      it('form should be invalid because the firstName is required', waitForAsync(() => {
-        fixture.whenStable().then(() => {
-          expect(component.formGroup.controls.firstName.valid).toBeFalse();
-          expect(component.formGroup.controls.firstName.errors.required).toBeTrue();
-        });
-      }));
-      it('form should be invalid because the lastName is required', waitForAsync(() => {
-        fixture.whenStable().then(() => {
-          expect(component.formGroup.controls.lastName.valid).toBeFalse();
-          expect(component.formGroup.controls.lastName.errors.required).toBeTrue();
-        });
-      }));
-      it('form should be invalid because the email is required', waitForAsync(() => {
-        fixture.whenStable().then(() => {
-          expect(component.formGroup.controls.email.valid).toBeFalse();
-          expect(component.formGroup.controls.email.errors.required).toBeTrue();
-        });
-      }));
+      it('form should be invalid because the firstName is required', () => {
+        expect(component.formGroup.controls.firstName.valid).toBeFalse();
+        expect(component.formGroup.controls.firstName.errors.required).toBeTrue();
+      });
+      it('form should be invalid because the lastName is required', () => {
+        expect(component.formGroup.controls.lastName.valid).toBeFalse();
+        expect(component.formGroup.controls.lastName.errors.required).toBeTrue();
+      });
+      it('form should be invalid because the email is required', () => {
+        expect(component.formGroup.controls.email.valid).toBeFalse();
+        expect(component.formGroup.controls.email.errors.required).toBeTrue();
+      });
     });
 
     describe('after inserting information firstName,lastName and email not required', () => {
@@ -290,24 +267,18 @@ describe('EPersonFormComponent', () => {
         component.formGroup.controls.email.setValue('test@test.com');
         fixture.detectChanges();
       });
-      it('firstName should be valid because the firstName is set', waitForAsync(() => {
-        fixture.whenStable().then(() => {
+      it('firstName should be valid because the firstName is set', () => {
           expect(component.formGroup.controls.firstName.valid).toBeTrue();
           expect(component.formGroup.controls.firstName.errors).toBeNull();
-        });
-      }));
-      it('lastName should be valid because the lastName is set', waitForAsync(() => {
-        fixture.whenStable().then(() => {
+      });
+      it('lastName should be valid because the lastName is set', () => {
           expect(component.formGroup.controls.lastName.valid).toBeTrue();
           expect(component.formGroup.controls.lastName.errors).toBeNull();
-        });
-      }));
-      it('email should be valid because the email is set', waitForAsync(() => {
-        fixture.whenStable().then(() => {
+      });
+      it('email should be valid because the email is set', () => {
           expect(component.formGroup.controls.email.valid).toBeTrue();
           expect(component.formGroup.controls.email.errors).toBeNull();
-        });
-      }));
+      });
     });
 
 
@@ -316,12 +287,10 @@ describe('EPersonFormComponent', () => {
         component.formGroup.controls.email.setValue('test@test');
         fixture.detectChanges();
       });
-      it('email should not be valid because the email pattern', waitForAsync(() => {
-        fixture.whenStable().then(() => {
+      it('email should not be valid because the email pattern', () => {
           expect(component.formGroup.controls.email.valid).toBeFalse();
           expect(component.formGroup.controls.email.errors.pattern).toBeTruthy();
-        });
-      }));
+      });
     });
 
     describe('after already utilized email', () => {
@@ -336,22 +305,18 @@ describe('EPersonFormComponent', () => {
         fixture.detectChanges();
       });
 
-      it('email should not be valid because email is already taken', waitForAsync(() => {
-        fixture.whenStable().then(() => {
+      it('email should not be valid because email is already taken', () => {
           expect(component.formGroup.controls.email.valid).toBeFalse();
           expect(component.formGroup.controls.email.errors.emailTaken).toBeTruthy();
-        });
-      }));
+      });
     });
-
-
-
   });
+
   describe('when submitting the form', () => {
     let firstName;
     let lastName;
     let email;
-    let canLogIn;
+    let canLogIn: boolean;
     let requireCertificate;
 
     let expected;
@@ -380,6 +345,7 @@ describe('EPersonFormComponent', () => {
         requireCertificate: requireCertificate,
       });
       spyOn(component.submitForm, 'emit');
+      component.ngOnInit();
       component.firstName.value = firstName;
       component.lastName.value = lastName;
       component.email.value = email;
@@ -393,11 +359,9 @@ describe('EPersonFormComponent', () => {
         fixture.detectChanges();
       });
 
-      it('should emit a new eperson using the correct values', waitForAsync(() => {
-        fixture.whenStable().then(() => {
-          expect(component.submitForm.emit).toHaveBeenCalledWith(expected);
-        });
-      }));
+      it('should emit a new eperson using the correct values', () => {
+        expect(component.submitForm.emit).toHaveBeenCalledWith(expected);
+      });
     });
 
     describe('with an active eperson', () => {
@@ -421,18 +385,24 @@ describe('EPersonFormComponent', () => {
           email: email,
           canLogIn: canLogIn,
           requireCertificate: requireCertificate,
-          _links: undefined
+          _links: {
+            groups: {
+              href: '',
+            },
+            self: {
+              href: '',
+            },
+          },
         });
         spyOn(ePersonDataServiceStub, 'getActiveEPerson').and.returnValue(observableOf(expectedWithId));
+        component.ngOnInit();
         component.onSubmit();
         fixture.detectChanges();
       });
 
-      it('should emit the existing eperson using the correct values', waitForAsync(() => {
-        fixture.whenStable().then(() => {
-          expect(component.submitForm.emit).toHaveBeenCalledWith(expectedWithId);
-        });
-      }));
+      it('should emit the existing eperson using the correct values', () => {
+        expect(component.submitForm.emit).toHaveBeenCalledWith(expectedWithId);
+      });
     });
   });
 
@@ -473,34 +443,31 @@ describe('EPersonFormComponent', () => {
   });
 
   describe('delete', () => {
-
-    let ePersonId;
     let eperson: EPerson;
     let modalService;
 
     beforeEach(() => {
       spyOn(authService, 'impersonate').and.callThrough();
-      ePersonId = 'testEPersonId';
       eperson = EPersonMock;
       component.epersonInitial = eperson;
       component.canDelete$ = observableOf(true);
       spyOn(component.epersonService, 'getActiveEPerson').and.returnValue(observableOf(eperson));
       modalService = (component as any).modalService;
       spyOn(modalService, 'open').and.returnValue(Object.assign({ componentInstance: Object.assign({ response: observableOf(true) }) }));
+      component.ngOnInit();
       fixture.detectChanges();
-
     });
 
-    it('the delete button should be active if the eperson can be deleted', () => {
+    it('the delete button should be visible if the ePerson can be deleted', () => {
       const deleteButton = fixture.debugElement.query(By.css('.delete-button'));
-      expect(deleteButton.nativeElement.disabled).toBe(false);
+      expect(deleteButton).not.toBeNull();
     });
 
-    it('the delete button should be disabled if the eperson cannot be deleted', () => {
+    it('the delete button should be hidden if the ePerson cannot be deleted', () => {
       component.canDelete$ = observableOf(false);
       fixture.detectChanges();
       const deleteButton = fixture.debugElement.query(By.css('.delete-button'));
-      expect(deleteButton.nativeElement.disabled).toBe(true);
+      expect(deleteButton).toBeNull();
     });
 
     it('should call the epersonFormComponent delete when clicked on the button', () => {
@@ -515,7 +482,8 @@ describe('EPersonFormComponent', () => {
       // ePersonDataServiceStub.activeEPerson = eperson;
       spyOn(component.epersonService, 'deleteEPerson').and.returnValue(createSuccessfulRemoteDataObject$('No Content', 204));
       const deleteButton = fixture.debugElement.query(By.css('.delete-button'));
-      expect(deleteButton.nativeElement.disabled).toBe(false);
+      expect(deleteButton.nativeElement.getAttribute('aria-disabled')).toBeNull();
+      expect(deleteButton.nativeElement.classList.contains('disabled')).toBeFalse();
       deleteButton.triggerEventHandler('click', null);
       fixture.detectChanges();
       expect(component.epersonService.deleteEPerson).toHaveBeenCalledWith(eperson);
diff --git a/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.ts b/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.ts
index d009d56058..747fbca2f2 100644
--- a/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.ts
+++ b/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.ts
@@ -38,6 +38,8 @@ import { Registration } from '../../../core/shared/registration.model';
 import { EpersonRegistrationService } from '../../../core/data/eperson-registration.service';
 import { TYPE_REQUEST_FORGOT } from '../../../register-email-form/register-email-form.component';
 import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
+import { ActivatedRoute, Router } from '@angular/router';
+import { getEPersonsRoute } from '../../access-control-routing-paths';
 
 @Component({
   selector: 'ds-eperson-form',
@@ -137,6 +139,11 @@ export class EPersonFormComponent implements OnInit, OnDestroy {
    */
   canImpersonate$: Observable<boolean>;
 
+  /**
+   * The current {@link EPerson}
+   */
+  activeEPerson$: Observable<EPerson>;
+
   /**
    * List of subscriptions
    */
@@ -194,8 +201,14 @@ export class EPersonFormComponent implements OnInit, OnDestroy {
     public requestService: RequestService,
     private epersonRegistrationService: EpersonRegistrationService,
     public dsoNameService: DSONameService,
+    protected route: ActivatedRoute,
+    protected router: Router,
   ) {
-    this.subs.push(this.epersonService.getActiveEPerson().subscribe((eperson: EPerson) => {
+  }
+
+  ngOnInit() {
+    this.activeEPerson$ = this.epersonService.getActiveEPerson();
+    this.subs.push(this.activeEPerson$.subscribe((eperson: EPerson) => {
       this.epersonInitial = eperson;
       if (hasValue(eperson)) {
         this.isImpersonated = this.authService.isImpersonatingUser(eperson.id);
@@ -203,9 +216,6 @@ export class EPersonFormComponent implements OnInit, OnDestroy {
         this.submitLabel = 'form.submit';
       }
     }));
-  }
-
-  ngOnInit() {
     this.initialisePage();
   }
 
@@ -213,124 +223,117 @@ export class EPersonFormComponent implements OnInit, OnDestroy {
    * This method will initialise the page
    */
   initialisePage() {
-
-    observableCombineLatest([
-      this.translateService.get(`${this.messagePrefix}.firstName`),
-      this.translateService.get(`${this.messagePrefix}.lastName`),
-      this.translateService.get(`${this.messagePrefix}.email`),
-      this.translateService.get(`${this.messagePrefix}.canLogIn`),
-      this.translateService.get(`${this.messagePrefix}.requireCertificate`),
-      this.translateService.get(`${this.messagePrefix}.emailHint`),
-    ]).subscribe(([firstName, lastName, email, canLogIn, requireCertificate, emailHint]) => {
-      this.firstName = new DynamicInputModel({
-        id: 'firstName',
-        label: firstName,
-        name: 'firstName',
-        validators: {
-          required: null,
-        },
-        required: true,
-      });
-      this.lastName = new DynamicInputModel({
-        id: 'lastName',
-        label: lastName,
-        name: 'lastName',
-        validators: {
-          required: null,
-        },
-        required: true,
-      });
-      this.email = new DynamicInputModel({
-        id: 'email',
-        label: email,
-        name: 'email',
-        validators: {
-          required: null,
-          pattern: '^[a-z0-9._%+-]+@[a-z0-9.-]+\\.[a-z]{2,4}$',
-        },
-        required: true,
-        errorMessages: {
-          emailTaken: 'error.validation.emailTaken',
-          pattern: 'error.validation.NotValidEmail'
-        },
-        hint: emailHint
-      });
-      this.canLogIn = new DynamicCheckboxModel(
-        {
-          id: 'canLogIn',
-          label: canLogIn,
-          name: 'canLogIn',
-          value: (this.epersonInitial != null ? this.epersonInitial.canLogIn : true)
-        });
-      this.requireCertificate = new DynamicCheckboxModel(
-        {
-          id: 'requireCertificate',
-          label: requireCertificate,
-          name: 'requireCertificate',
-          value: (this.epersonInitial != null ? this.epersonInitial.requireCertificate : false)
-        });
-      this.formModel = [
-        this.firstName,
-        this.lastName,
-        this.email,
-        this.canLogIn,
-        this.requireCertificate,
-      ];
-      this.formGroup = this.formBuilderService.createFormGroup(this.formModel);
-      this.subs.push(this.epersonService.getActiveEPerson().subscribe((eperson: EPerson) => {
-        if (eperson != null) {
-          this.groups = this.groupsDataService.findListByHref(eperson._links.groups.href, {
-            currentPage: 1,
-            elementsPerPage: this.config.pageSize
-          });
-        }
-        this.formGroup.patchValue({
-          firstName: eperson != null ? eperson.firstMetadataValue('eperson.firstname') : '',
-          lastName: eperson != null ? eperson.firstMetadataValue('eperson.lastname') : '',
-          email: eperson != null ? eperson.email : '',
-          canLogIn: eperson != null ? eperson.canLogIn : true,
-          requireCertificate: eperson != null ? eperson.requireCertificate : false
-        });
-
-        if (eperson === null && !!this.formGroup.controls.email) {
-          this.formGroup.controls.email.setAsyncValidators(ValidateEmailNotTaken.createValidator(this.epersonService));
-          this.emailValueChangeSubscribe = this.email.valueChanges.pipe(debounceTime(300)).subscribe(() => {
-            this.changeDetectorRef.detectChanges();
-          });
-        }
+    if (this.route.snapshot.params.id) {
+      this.subs.push(this.epersonService.findById(this.route.snapshot.params.id).subscribe((ePersonRD: RemoteData<EPerson>) => {
+        this.epersonService.editEPerson(ePersonRD.payload);
       }));
-
-      const activeEPerson$ = this.epersonService.getActiveEPerson();
-
-      this.groups = activeEPerson$.pipe(
-        switchMap((eperson) => {
-          return observableCombineLatest([observableOf(eperson), this.paginationService.getFindListOptions(this.config.id, {
-            currentPage: 1,
-            elementsPerPage: this.config.pageSize
-          })]);
-        }),
-        switchMap(([eperson, findListOptions]) => {
-          if (eperson != null) {
-            return this.groupsDataService.findListByHref(eperson._links.groups.href, findListOptions, true, true, followLink('object'));
-          }
-          return observableOf(undefined);
-        })
-      );
-
-      this.canImpersonate$ = activeEPerson$.pipe(
-        switchMap((eperson) => {
-          if (hasValue(eperson)) {
-            return this.authorizationService.isAuthorized(FeatureID.LoginOnBehalfOf, eperson.self);
-          } else {
-            return observableOf(false);
-          }
-        })
-      );
-      this.canDelete$ = activeEPerson$.pipe(
-        switchMap((eperson) => this.authorizationService.isAuthorized(FeatureID.CanDelete, hasValue(eperson) ? eperson.self : undefined))
-      );
-      this.canReset$ = observableOf(true);
+    }
+    this.firstName = new DynamicInputModel({
+      id: 'firstName',
+      label: this.translateService.instant(`${this.messagePrefix}.firstName`),
+      name: 'firstName',
+      validators: {
+        required: null,
+      },
+      required: true,
     });
+    this.lastName = new DynamicInputModel({
+      id: 'lastName',
+      label: this.translateService.instant(`${this.messagePrefix}.lastName`),
+      name: 'lastName',
+      validators: {
+        required: null,
+      },
+      required: true,
+    });
+    this.email = new DynamicInputModel({
+      id: 'email',
+      label: this.translateService.instant(`${this.messagePrefix}.email`),
+      name: 'email',
+      validators: {
+        required: null,
+        pattern: '^[a-z0-9._%+-]+@[a-z0-9.-]+\\.[a-z]{2,4}$',
+      },
+      required: true,
+      errorMessages: {
+        emailTaken: 'error.validation.emailTaken',
+        pattern: 'error.validation.NotValidEmail'
+      },
+      hint: this.translateService.instant(`${this.messagePrefix}.emailHint`),
+    });
+    this.canLogIn = new DynamicCheckboxModel(
+      {
+        id: 'canLogIn',
+        label: this.translateService.instant(`${this.messagePrefix}.canLogIn`),
+        name: 'canLogIn',
+        value: (this.epersonInitial != null ? this.epersonInitial.canLogIn : true)
+      });
+    this.requireCertificate = new DynamicCheckboxModel(
+      {
+        id: 'requireCertificate',
+        label: this.translateService.instant(`${this.messagePrefix}.requireCertificate`),
+        name: 'requireCertificate',
+        value: (this.epersonInitial != null ? this.epersonInitial.requireCertificate : false)
+      });
+    this.formModel = [
+      this.firstName,
+      this.lastName,
+      this.email,
+      this.canLogIn,
+      this.requireCertificate,
+    ];
+    this.formGroup = this.formBuilderService.createFormGroup(this.formModel);
+    this.subs.push(this.activeEPerson$.subscribe((eperson: EPerson) => {
+      if (eperson != null) {
+        this.groups = this.groupsDataService.findListByHref(eperson._links.groups.href, {
+          currentPage: 1,
+          elementsPerPage: this.config.pageSize
+        }, undefined, undefined, followLink('object'));
+      }
+      this.formGroup.patchValue({
+        firstName: eperson != null ? eperson.firstMetadataValue('eperson.firstname') : '',
+        lastName: eperson != null ? eperson.firstMetadataValue('eperson.lastname') : '',
+        email: eperson != null ? eperson.email : '',
+        canLogIn: eperson != null ? eperson.canLogIn : true,
+        requireCertificate: eperson != null ? eperson.requireCertificate : false
+      });
+
+      if (eperson === null && !!this.formGroup.controls.email) {
+        this.formGroup.controls.email.setAsyncValidators(ValidateEmailNotTaken.createValidator(this.epersonService));
+        this.emailValueChangeSubscribe = this.email.valueChanges.pipe(debounceTime(300)).subscribe(() => {
+          this.changeDetectorRef.detectChanges();
+        });
+      }
+    }));
+
+    this.groups = this.activeEPerson$.pipe(
+      switchMap((eperson) => {
+        return observableCombineLatest([observableOf(eperson), this.paginationService.getFindListOptions(this.config.id, {
+          currentPage: 1,
+          elementsPerPage: this.config.pageSize
+        })]);
+      }),
+      switchMap(([eperson, findListOptions]) => {
+        if (eperson != null) {
+          return this.groupsDataService.findListByHref(eperson._links.groups.href, findListOptions, true, true, followLink('object'));
+        }
+        return observableOf(undefined);
+      })
+    );
+
+    this.canImpersonate$ = this.activeEPerson$.pipe(
+      switchMap((eperson) => {
+        if (hasValue(eperson)) {
+          return this.authorizationService.isAuthorized(FeatureID.LoginOnBehalfOf, eperson.self);
+        } else {
+          return observableOf(false);
+        }
+      })
+    );
+    this.canDelete$ = this.activeEPerson$.pipe(
+      switchMap((eperson) => this.authorizationService.isAuthorized(FeatureID.CanDelete, hasValue(eperson) ? eperson.self : undefined))
+    );
+    this.canReset$ = observableOf(true);
   }
 
   /**
@@ -339,6 +342,7 @@ export class EPersonFormComponent implements OnInit, OnDestroy {
   onCancel() {
     this.epersonService.cancelEditEPerson();
     this.cancelForm.emit();
+    void this.router.navigate([getEPersonsRoute()]);
   }
 
   /**
@@ -348,7 +352,7 @@ export class EPersonFormComponent implements OnInit, OnDestroy {
    * Emit the updated/created eperson using the EventEmitter submitForm
    */
   onSubmit() {
-    this.epersonService.getActiveEPerson().pipe(take(1)).subscribe(
+    this.activeEPerson$.pipe(take(1)).subscribe(
       (ePerson: EPerson) => {
         const values = {
           metadata: {
@@ -390,6 +394,8 @@ export class EPersonFormComponent implements OnInit, OnDestroy {
       if (rd.hasSucceeded) {
         this.notificationsService.success(this.translateService.get(this.labelPrefix + 'notification.created.success', { name: this.dsoNameService.getName(ePersonToCreate) }));
         this.submitForm.emit(ePersonToCreate);
+        this.epersonService.clearEPersonRequests();
+        void this.router.navigateByUrl(getEPersonsRoute());
       } else {
         this.notificationsService.error(this.translateService.get(this.labelPrefix + 'notification.created.failure', { name: this.dsoNameService.getName(ePersonToCreate) }));
         this.cancelForm.emit();
@@ -429,6 +435,7 @@ export class EPersonFormComponent implements OnInit, OnDestroy {
       if (rd.hasSucceeded) {
         this.notificationsService.success(this.translateService.get(this.labelPrefix + 'notification.edited.success', { name: this.dsoNameService.getName(editedEperson) }));
         this.submitForm.emit(editedEperson);
+        void this.router.navigateByUrl(getEPersonsRoute());
       } else {
         this.notificationsService.error(this.translateService.get(this.labelPrefix + 'notification.edited.failure', { name: this.dsoNameService.getName(editedEperson) }));
         this.cancelForm.emit();
@@ -464,7 +471,7 @@ export class EPersonFormComponent implements OnInit, OnDestroy {
    * It'll either show a success or error message depending on whether the delete was successful or not.
    */
   delete(): void {
-    this.epersonService.getActiveEPerson().pipe(
+    this.activeEPerson$.pipe(
       take(1),
       switchMap((eperson: EPerson) => {
         const modalRef = this.modalService.open(ConfirmationModalComponent);
@@ -495,6 +502,7 @@ export class EPersonFormComponent implements OnInit, OnDestroy {
     ).subscribe(({ restResponse, eperson }: { restResponse: RemoteData<NoContent> | null, eperson: EPerson }) => {
       if (restResponse?.hasSucceeded) {
         this.notificationsService.success(this.translateService.get(this.labelPrefix + 'notification.deleted.success', { name: this.dsoNameService.getName(eperson) }));
+        void this.router.navigate([getEPersonsRoute()]);
       } else {
         this.notificationsService.error(`Error occurred when trying to delete EPerson with id: ${eperson?.id} with code: ${restResponse?.statusCode} and message: ${restResponse?.errorMessage}`);
       }
@@ -541,16 +549,6 @@ export class EPersonFormComponent implements OnInit, OnDestroy {
     }
   }
 
-  /**
-   * This method will ensure that the page gets reset and that the cache is cleared
-   */
-  reset() {
-    this.epersonService.getActiveEPerson().pipe(take(1)).subscribe((eperson: EPerson) => {
-      this.requestService.removeByHrefSubstring(eperson.self);
-    });
-    this.initialisePage();
-  }
-
   /**
    * Checks for the given ePerson if there is already an ePerson in the system with that email
    * and shows notification if this is the case
@@ -577,7 +575,7 @@ export class EPersonFormComponent implements OnInit, OnDestroy {
    * Update the list of groups by fetching it from the rest api or cache
    */
   private updateGroups(options) {
-    this.subs.push(this.epersonService.getActiveEPerson().subscribe((eperson: EPerson) => {
+    this.subs.push(this.activeEPerson$.subscribe((eperson: EPerson) => {
       this.groups = this.groupsDataService.findListByHref(eperson._links.groups.href, options);
     }));
   }
diff --git a/src/app/access-control/epeople-registry/eperson-resolver.service.ts b/src/app/access-control/epeople-registry/eperson-resolver.service.ts
new file mode 100644
index 0000000000..1db8e70d89
--- /dev/null
+++ b/src/app/access-control/epeople-registry/eperson-resolver.service.ts
@@ -0,0 +1,53 @@
+import { Injectable } from '@angular/core';
+import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from '@angular/router';
+import { Observable } from 'rxjs';
+import { EPerson } from '../../core/eperson/models/eperson.model';
+import { RemoteData } from '../../core/data/remote-data';
+import { getFirstCompletedRemoteData } from '../../core/shared/operators';
+import { ResolvedAction } from '../../core/resolving/resolver.actions';
+import { EPersonDataService } from '../../core/eperson/eperson-data.service';
+import { Store } from '@ngrx/store';
+import { followLink, FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
+
+export const EPERSON_EDIT_FOLLOW_LINKS: FollowLinkConfig<EPerson>[] = [
+  followLink('groups'),
+];
+
+/**
+ * This class represents a resolver that requests a specific {@link EPerson} before the route is activated
+ */
+@Injectable({
+  providedIn: 'root',
+})
+export class EPersonResolver implements Resolve<RemoteData<EPerson>> {
+
+  constructor(
+    protected ePersonService: EPersonDataService,
+    protected store: Store<any>,
+  ) {
+  }
+
+  /**
+   * Method for resolving a {@link EPerson} based on the parameters in the current route
+   * @param {ActivatedRouteSnapshot} route The current ActivatedRouteSnapshot
+   * @param {RouterStateSnapshot} state The current RouterStateSnapshot
+   * @returns `Observable<<RemoteData<EPerson>>` Emits the found {@link EPerson} based on the parameters in the current
+   * route, or an error if something went wrong
+   */
+  resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<RemoteData<EPerson>> {
+    const ePersonRD$: Observable<RemoteData<EPerson>> = this.ePersonService.findById(route.params.id,
+      true,
+      false,
+      ...EPERSON_EDIT_FOLLOW_LINKS,
+    ).pipe(
+      getFirstCompletedRemoteData(),
+    );
+
+    ePersonRD$.subscribe((ePersonRD: RemoteData<EPerson>) => {
+      this.store.dispatch(new ResolvedAction(state.url, ePersonRD.payload));
+    });
+
+    return ePersonRD$;
+  }
+
+}
diff --git a/src/app/access-control/group-registry/group-form/group-form.component.html b/src/app/access-control/group-registry/group-form/group-form.component.html
index 77a81a8daa..13e4387664 100644
--- a/src/app/access-control/group-registry/group-form/group-form.component.html
+++ b/src/app/access-control/group-registry/group-form/group-form.component.html
@@ -2,14 +2,14 @@
   <div class="group-form row">
     <div class="col-12">
 
-      <div *ngIf="groupDataService.getActiveGroup() | async; then editheader; else createHeader"></div>
+      <div *ngIf="activeGroup$ | async; then editHeader; else createHeader"></div>
 
       <ng-template #createHeader>
-        <h2 class="border-bottom pb-2">{{messagePrefix + '.head.create' | translate}}</h2>
+        <h1 class="border-bottom pb-2">{{messagePrefix + '.head.create' | translate}}</h1>
       </ng-template>
 
-      <ng-template #editheader>
-        <h2 class="border-bottom pb-2">
+      <ng-template #editHeader>
+        <h1 class="border-bottom pb-2">
           <span
             *dsContextHelp="{
               content: 'admin.access-control.groups.form.tooltip.editGroupPage',
@@ -20,14 +20,18 @@
           >
             {{messagePrefix + '.head.edit' | translate}}
           </span>
-        </h2>
+        </h1>
       </ng-template>
 
-      <ds-alert *ngIf="groupBeingEdited?.permanent" [type]="AlertTypeEnum.Warning"
-                [content]="messagePrefix + '.alert.permanent'"></ds-alert>
-      <ds-alert *ngIf="!(canEdit$ | async) && (groupDataService.getActiveGroup() | async)" [type]="AlertTypeEnum.Warning"
-                [content]="(messagePrefix + '.alert.workflowGroup' | translate:{ name: dsoNameService.getName((getLinkedDSO(groupBeingEdited) | async)?.payload), comcol: (getLinkedDSO(groupBeingEdited) | async)?.payload?.type, comcolEditRolesRoute: (getLinkedEditRolesRoute(groupBeingEdited) | async) })">
-      </ds-alert>
+      <ng-container *ngIf="(activeGroup$ | async) as groupBeingEdited">
+        <ds-alert *ngIf="groupBeingEdited?.permanent" [type]="AlertType.Warning"
+                  [content]="messagePrefix + '.alert.permanent'"></ds-alert>
+        <ng-container *ngIf="(activeGroupLinkedDSO$ | async) as activeGroupLinkedDSO">
+          <ds-alert *ngIf="!(canEdit$ | async)" [type]="AlertType.Warning"
+                    [content]="(messagePrefix + '.alert.workflowGroup' | translate:{ name: dsoNameService.getName(activeGroupLinkedDSO), comcol: activeGroupLinkedDSO.type, comcolEditRolesRoute: (linkedEditRolesRoute$ | async) })">
+          </ds-alert>
+        </ng-container>
+      </ng-container>
 
       <ds-form [formId]="formId"
                [formModel]="formModel"
@@ -36,26 +40,24 @@
                [displayCancel]="false"
                (submitForm)="onSubmit()">
         <div before class="btn-group">
-          <button (click)="onCancel()"
+          <button (click)="onCancel()" type="button"
                   class="btn btn-outline-secondary"><i class="fas fa-arrow-left"></i> {{messagePrefix + '.return' | translate}}</button>
         </div>
-        <div after *ngIf="groupBeingEdited != null" class="btn-group">
-          <button class="btn btn-danger delete-button" [disabled]="!(canEdit$ | async) || groupBeingEdited.permanent"
-                  (click)="delete()">
+        <div after *ngIf="(canEdit$ | async) && !(activeGroup$ | async)?.permanent" class="btn-group">
+          <button (click)="delete()" class="btn btn-danger delete-button" type="button">
             <i class="fa fa-trash"></i> {{ messagePrefix + '.actions.delete' | translate}}
           </button>
         </div>
       </ds-form>
 
-      <div class="mb-5">
-        <ds-members-list *ngIf="groupBeingEdited != null"
-                         [messagePrefix]="messagePrefix + '.members-list'"></ds-members-list>
-      </div>
-      <ds-subgroups-list *ngIf="groupBeingEdited != null"
-                         [messagePrefix]="messagePrefix + '.subgroups-list'"></ds-subgroups-list>
-
-
-
+      <ng-container *ngIf="(activeGroup$ | async) as groupBeingEdited">
+        <div class="mb-5">
+          <ds-members-list *ngIf="groupBeingEdited != null"
+                           [messagePrefix]="messagePrefix + '.members-list'"></ds-members-list>
+        </div>
+        <ds-subgroups-list *ngIf="groupBeingEdited != null"
+                           [messagePrefix]="messagePrefix + '.subgroups-list'"></ds-subgroups-list>
+      </ng-container>
     </div>
   </div>
 </div>
diff --git a/src/app/access-control/group-registry/group-form/group-form.component.spec.ts b/src/app/access-control/group-registry/group-form/group-form.component.spec.ts
index f8c5f3cd87..81ecdae7c0 100644
--- a/src/app/access-control/group-registry/group-form/group-form.component.spec.ts
+++ b/src/app/access-control/group-registry/group-form/group-form.component.spec.ts
@@ -1,13 +1,13 @@
 import { CommonModule } from '@angular/common';
 import { HttpClient } from '@angular/common/http';
-import { NO_ERRORS_SCHEMA } from '@angular/core';
+import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
 import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
 import { UntypedFormControl, UntypedFormGroup, FormsModule, ReactiveFormsModule, Validators } from '@angular/forms';
 import { BrowserModule, By } from '@angular/platform-browser';
 import { ActivatedRoute, Router } from '@angular/router';
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
 import { Store } from '@ngrx/store';
-import { TranslateLoader, TranslateModule, TranslateService } from '@ngx-translate/core';
+import { TranslateModule } from '@ngx-translate/core';
 import { Observable, of as observableOf } from 'rxjs';
 import { RemoteDataBuildService } from '../../../core/cache/builders/remote-data-build.service';
 import { ObjectCacheService } from '../../../core/cache/object-cache.service';
@@ -23,14 +23,13 @@ import { DSpaceObject } from '../../../core/shared/dspace-object.model';
 import { HALEndpointService } from '../../../core/shared/hal-endpoint.service';
 import { PageInfo } from '../../../core/shared/page-info.model';
 import { UUIDService } from '../../../core/shared/uuid.service';
+import { XSRFService } from '../../../core/xsrf/xsrf.service';
 import { FormBuilderService } from '../../../shared/form/builder/form-builder.service';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
 import { GroupMock, GroupMock2 } from '../../../shared/testing/group-mock';
 import { GroupFormComponent } from './group-form.component';
 import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
 import { getMockFormBuilderService } from '../../../shared/mocks/form-builder-service.mock';
-import { getMockTranslateService } from '../../../shared/mocks/translate.service.mock';
-import { TranslateLoaderMock } from '../../../shared/testing/translate-loader.mock';
 import { RouterMock } from '../../../shared/mocks/router.mock';
 import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
 import { Operation } from 'fast-json-patch';
@@ -38,23 +37,24 @@ import { ValidateGroupExists } from './validators/group-exists.validator';
 import { NoContent } from '../../../core/shared/NoContent.model';
 import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
 import { DSONameServiceMock } from '../../../shared/mocks/dso-name.service.mock';
+import { ActivatedRouteStub } from '../../../shared/testing/active-router.stub';
 
 describe('GroupFormComponent', () => {
   let component: GroupFormComponent;
   let fixture: ComponentFixture<GroupFormComponent>;
-  let translateService: TranslateService;
   let builderService: FormBuilderService;
   let ePersonDataServiceStub: any;
   let groupsDataServiceStub: any;
   let dsoDataServiceStub: any;
   let authorizationService: AuthorizationDataService;
   let notificationService: NotificationsServiceStub;
-  let router;
+  let router: RouterMock;
+  let route: ActivatedRouteStub;
 
-  let groups;
-  let groupName;
-  let groupDescription;
-  let expected;
+  let groups: Group[];
+  let groupName: string;
+  let groupDescription: string;
+  let expected: Group;
 
   beforeEach(waitForAsync(() => {
     groups = [GroupMock, GroupMock2];
@@ -69,6 +69,15 @@ describe('GroupFormComponent', () => {
           }
         ],
       },
+      object: createSuccessfulRemoteDataObject$(undefined),
+      _links: {
+        self: {
+          href: 'group-selflink',
+        },
+        object: {
+          href: 'group-objectlink',
+        }
+      },
     });
     ePersonDataServiceStub = {};
     groupsDataServiceStub = {
@@ -105,7 +114,14 @@ describe('GroupFormComponent', () => {
       create(group: Group): Observable<RemoteData<Group>> {
         this.allGroups = [...this.allGroups, group];
         this.createdGroup = Object.assign({}, group, {
-          _links: { self: { href: 'group-selflink' } }
+          _links: {
+            self: {
+              href: 'group-selflink',
+            },
+            object: {
+              href: 'group-objectlink',
+            },
+          },
         });
         return createSuccessfulRemoteDataObject$(this.createdGroup);
       },
@@ -187,17 +203,13 @@ describe('GroupFormComponent', () => {
         return typeof value === 'object' && value !== null;
       }
     });
-    translateService = getMockTranslateService();
     router = new RouterMock();
+    route = new ActivatedRouteStub();
     notificationService = new NotificationsServiceStub();
+
     return TestBed.configureTestingModule({
       imports: [CommonModule, NgbModule, FormsModule, ReactiveFormsModule, BrowserModule,
-        TranslateModule.forRoot({
-          loader: {
-            provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
-        }),
+        TranslateModule.forRoot(),
       ],
       declarations: [GroupFormComponent],
       providers: [
@@ -211,17 +223,15 @@ describe('GroupFormComponent', () => {
         { provide: HttpClient, useValue: {} },
         { provide: ObjectCacheService, useValue: {} },
         { provide: UUIDService, useValue: {} },
+        { provide: XSRFService, useValue: {} },
         { provide: Store, useValue: {} },
         { provide: RemoteDataBuildService, useValue: {} },
         { provide: HALEndpointService, useValue: {} },
-        {
-          provide: ActivatedRoute,
-          useValue: { data: observableOf({ dso: { payload: {} } }), params: observableOf({}) }
-        },
+        { provide: ActivatedRoute, useValue: route },
         { provide: Router, useValue: router },
         { provide: AuthorizationDataService, useValue: authorizationService },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [CUSTOM_ELEMENTS_SCHEMA],
     }).compileComponents();
   }));
 
@@ -234,8 +244,8 @@ describe('GroupFormComponent', () => {
   describe('when submitting the form', () => {
     beforeEach(() => {
       spyOn(component.submitForm, 'emit');
-      component.groupName.value = groupName;
-      component.groupDescription.value = groupDescription;
+      component.groupName.setValue(groupName);
+      component.groupDescription.setValue(groupDescription);
     });
     describe('without active Group', () => {
       beforeEach(() => {
@@ -243,14 +253,22 @@ describe('GroupFormComponent', () => {
         fixture.detectChanges();
       });
 
-      it('should emit a new group using the correct values', (async () => {
-        await fixture.whenStable().then(() => {
-          expect(component.submitForm.emit).toHaveBeenCalledWith(expected);
-        });
+      it('should emit a new group using the correct values', (() => {
+        expect(component.submitForm.emit).toHaveBeenCalledWith(jasmine.objectContaining({
+          name: groupName,
+          metadata: {
+            'dc.description': [
+              {
+                value: groupDescription,
+              },
+            ],
+          },
+        }));
       }));
     });
+
     describe('with active Group', () => {
-      let expected2;
+      let expected2: Group;
       beforeEach(() => {
         expected2 = Object.assign(new Group(), {
           name: 'newGroupName',
@@ -261,15 +279,24 @@ describe('GroupFormComponent', () => {
               }
             ],
           },
+          object: createSuccessfulRemoteDataObject$(undefined),
+          _links: {
+            self: {
+              href: 'group-selflink',
+            },
+            object: {
+              href: 'group-objectlink',
+            },
+          },
         });
         spyOn(groupsDataServiceStub, 'getActiveGroup').and.returnValue(observableOf(expected));
         spyOn(groupsDataServiceStub, 'patch').and.returnValue(createSuccessfulRemoteDataObject$(expected2));
-        component.groupName.value = 'newGroupName';
-        component.onSubmit();
-        fixture.detectChanges();
+        component.ngOnInit();
       });
 
       it('should edit with name and description operations', () => {
+        component.groupName.setValue('newGroupName');
+        component.onSubmit();
         const operations = [{
           op: 'add',
           path: '/metadata/dc.description',
@@ -283,9 +310,8 @@ describe('GroupFormComponent', () => {
       });
 
       it('should edit with description operations', () => {
-        component.groupName.value = null;
+        component.groupName.setValue(null);
         component.onSubmit();
-        fixture.detectChanges();
         const operations = [{
           op: 'add',
           path: '/metadata/dc.description',
@@ -295,9 +321,9 @@ describe('GroupFormComponent', () => {
       });
 
       it('should edit with name operations', () => {
-        component.groupDescription.value = null;
+        component.groupName.setValue('newGroupName');
+        component.groupDescription.setValue(null);
         component.onSubmit();
-        fixture.detectChanges();
         const operations = [{
           op: 'replace',
           path: '/name',
@@ -306,12 +332,13 @@ describe('GroupFormComponent', () => {
         expect(groupsDataServiceStub.patch).toHaveBeenCalledWith(expected, operations);
       });
 
-      it('should emit the existing group using the correct new values', (async () => {
-        await fixture.whenStable().then(() => {
-          expect(component.submitForm.emit).toHaveBeenCalledWith(expected2);
-        });
-      }));
+      it('should emit the existing group using the correct new values', () => {
+        component.onSubmit();
+        expect(component.submitForm.emit).toHaveBeenCalledWith(expected2);
+      });
+
       it('should emit success notification', () => {
+        component.onSubmit();
         expect(notificationService.success).toHaveBeenCalled();
       });
     });
@@ -326,11 +353,8 @@ describe('GroupFormComponent', () => {
 
 
   describe('check form validation', () => {
-    let groupCommunity;
-
     beforeEach(() => {
       groupName = 'testName';
-      groupCommunity = 'testgroupCommunity';
       groupDescription = 'testgroupDescription';
 
       expected = Object.assign(new Group(), {
@@ -342,8 +366,17 @@ describe('GroupFormComponent', () => {
             }
           ],
         },
+        _links: {
+          self: {
+            href: 'group-selflink',
+          },
+          object: {
+            href: 'group-objectlink',
+          },
+        },
       });
       spyOn(component.submitForm, 'emit');
+      spyOn(dsoDataServiceStub, 'findByHref').and.returnValue(observableOf(expected));
 
       fixture.detectChanges();
       component.initialisePage();
@@ -393,21 +426,20 @@ describe('GroupFormComponent', () => {
   });
 
   describe('delete', () => {
-    let deleteButton;
-
-    beforeEach(() => {
-      component.initialisePage();
+    let deleteButton: HTMLButtonElement;
 
+    beforeEach(async () => {
+      spyOn(groupsDataServiceStub, 'delete').and.callThrough();
+      component.activeGroup$ = observableOf({
+        id: 'active-group',
+        permanent: false,
+      } as Group);
       component.canEdit$ = observableOf(true);
-      component.groupBeingEdited = {
-        permanent: false
-      } as Group;
+
+      component.initialisePage();
 
       fixture.detectChanges();
       deleteButton = fixture.debugElement.query(By.css('.delete-button')).nativeElement;
-
-      spyOn(groupsDataServiceStub, 'delete').and.callThrough();
-      spyOn(groupsDataServiceStub, 'getActiveGroup').and.returnValue(observableOf({ id: 'active-group' }));
     });
 
     describe('if confirmed via modal', () => {
diff --git a/src/app/access-control/group-registry/group-form/group-form.component.ts b/src/app/access-control/group-registry/group-form/group-form.component.ts
index 3c0547cca5..19b604358c 100644
--- a/src/app/access-control/group-registry/group-form/group-form.component.ts
+++ b/src/app/access-control/group-registry/group-form/group-form.component.ts
@@ -1,5 +1,5 @@
 import { Component, EventEmitter, HostListener, OnDestroy, OnInit, Output, ChangeDetectorRef } from '@angular/core';
-import { UntypedFormGroup } from '@angular/forms';
+import { UntypedFormGroup, AbstractControl } from '@angular/forms';
 import { ActivatedRoute, Router } from '@angular/router';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 import {
@@ -10,13 +10,11 @@ import {
 } from '@ng-dynamic-forms/core';
 import { TranslateService } from '@ngx-translate/core';
 import {
-  ObservedValueOf,
   combineLatest as observableCombineLatest,
   Observable,
-  of as observableOf,
   Subscription,
 } from 'rxjs';
-import { catchError, map, switchMap, take, filter, debounceTime } from 'rxjs/operators';
+import { map, switchMap, take, debounceTime } from 'rxjs/operators';
 import { getCollectionEditRolesRoute } from '../../../collection-page/collection-page-routing-paths';
 import { getCommunityEditRolesRoute } from '../../../community-page/community-page-routing-paths';
 import { DSpaceObjectDataService } from '../../../core/data/dspace-object-data.service';
@@ -25,19 +23,18 @@ import { FeatureID } from '../../../core/data/feature-authorization/feature-id';
 import { PaginatedList } from '../../../core/data/paginated-list.model';
 import { RemoteData } from '../../../core/data/remote-data';
 import { RequestService } from '../../../core/data/request.service';
-import { EPersonDataService } from '../../../core/eperson/eperson-data.service';
 import { GroupDataService } from '../../../core/eperson/group-data.service';
 import { Group } from '../../../core/eperson/models/group.model';
 import { Collection } from '../../../core/shared/collection.model';
 import { Community } from '../../../core/shared/community.model';
 import { DSpaceObject } from '../../../core/shared/dspace-object.model';
 import {
+  getAllCompletedRemoteData,
   getRemoteDataPayload,
   getFirstSucceededRemoteData,
   getFirstCompletedRemoteData,
-  getFirstSucceededRemoteDataPayload
 } from '../../../core/shared/operators';
-import { AlertType } from '../../../shared/alert/aletr-type';
+import { AlertType } from '../../../shared/alert/alert-type';
 import { ConfirmationModalComponent } from '../../../shared/confirmation-modal/confirmation-modal.component';
 import { hasValue, isNotEmpty, hasValueOperator } from '../../../shared/empty.util';
 import { FormBuilderService } from '../../../shared/form/builder/form-builder.service';
@@ -48,6 +45,7 @@ import { Operation } from 'fast-json-patch';
 import { ValidateGroupExists } from './validators/group-exists.validator';
 import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
 import { environment } from '../../../../environments/environment';
+import { getGroupEditRoute, getGroupsRoute } from '../../access-control-routing-paths';
 
 @Component({
   selector: 'ds-group-form',
@@ -68,9 +66,9 @@ export class GroupFormComponent implements OnInit, OnDestroy {
   /**
    * Dynamic models for the inputs of form
    */
-  groupName: DynamicInputModel;
-  groupCommunity: DynamicInputModel;
-  groupDescription: DynamicTextAreaModel;
+  groupName: AbstractControl;
+  groupCommunity: AbstractControl;
+  groupDescription: AbstractControl;
 
   /**
    * A list of all dynamic input models
@@ -113,21 +111,30 @@ export class GroupFormComponent implements OnInit, OnDestroy {
    */
   subs: Subscription[] = [];
 
-  /**
-   * Group currently being edited
-   */
-  groupBeingEdited: Group;
-
   /**
    * Observable whether or not the logged in user is allowed to delete the Group & doesn't have a linked object (community / collection linked to workspace group
    */
   canEdit$: Observable<boolean>;
 
   /**
-   * The AlertType enumeration
-   * @type {AlertType}
+   * The current {@link Group}
    */
-  public AlertTypeEnum = AlertType;
+  activeGroup$: Observable<Group>;
+
+  /**
+   * The current {@link Group}'s linked {@link Community}/{@link Collection}
+   */
+  activeGroupLinkedDSO$: Observable<DSpaceObject>;
+
+  /**
+   * Link to the current {@link Group}'s {@link Community}/{@link Collection} edit role tab
+   */
+  linkedEditRolesRoute$: Observable<string>;
+
+  /**
+   * The AlertType enumeration
+   */
+  public readonly AlertType = AlertType;
 
   /**
    * Subscription to email field value change
@@ -137,124 +144,121 @@ export class GroupFormComponent implements OnInit, OnDestroy {
 
   constructor(
     public groupDataService: GroupDataService,
-    private ePersonDataService: EPersonDataService,
-    private dSpaceObjectDataService: DSpaceObjectDataService,
-    private formBuilderService: FormBuilderService,
-    private translateService: TranslateService,
-    private notificationsService: NotificationsService,
-    private route: ActivatedRoute,
+    protected dSpaceObjectDataService: DSpaceObjectDataService,
+    protected formBuilderService: FormBuilderService,
+    protected translateService: TranslateService,
+    protected notificationsService: NotificationsService,
+    protected route: ActivatedRoute,
     protected router: Router,
-    private authorizationService: AuthorizationDataService,
-    private modalService: NgbModal,
+    protected authorizationService: AuthorizationDataService,
+    protected modalService: NgbModal,
     public requestService: RequestService,
     protected changeDetectorRef: ChangeDetectorRef,
     public dsoNameService: DSONameService,
   ) {
   }
 
-  ngOnInit() {
+  ngOnInit(): void {
+    if (this.route.snapshot.params.groupId !== 'newGroup') {
+      this.setActiveGroup(this.route.snapshot.params.groupId);
+    }
+    this.activeGroup$ = this.groupDataService.getActiveGroup();
+    this.activeGroupLinkedDSO$ = this.getActiveGroupLinkedDSO();
+    this.linkedEditRolesRoute$ = this.getLinkedEditRolesRoute();
+    this.canEdit$ = this.activeGroupLinkedDSO$.pipe(
+      switchMap((dso: DSpaceObject) => {
+        if (hasValue(dso)) {
+          return [false];
+        } else {
+          return this.activeGroup$.pipe(
+            hasValueOperator(),
+            switchMap((group: Group) => this.authorizationService.isAuthorized(FeatureID.CanDelete, group.self)),
+          );
+        }
+      }),
+    );
     this.initialisePage();
   }
 
   initialisePage() {
-    this.subs.push(this.route.params.subscribe((params) => {
-      if (params.groupId !== 'newGroup') {
-        this.setActiveGroup(params.groupId);
-      }
-    }));
-    this.canEdit$ = this.groupDataService.getActiveGroup().pipe(
-      hasValueOperator(),
-      switchMap((group: Group) => {
-        return observableCombineLatest(
-          this.authorizationService.isAuthorized(FeatureID.CanDelete, isNotEmpty(group) ? group.self : undefined),
-          this.hasLinkedDSO(group),
-          (isAuthorized: ObservedValueOf<Observable<boolean>>, hasLinkedDSO: ObservedValueOf<Observable<boolean>>) => {
-            return isAuthorized && !hasLinkedDSO;
-          });
+    const groupNameModel = new DynamicInputModel({
+      id: 'groupName',
+      label: this.translateService.instant(`${this.messagePrefix}.groupName`),
+      name: 'groupName',
+      validators: {
+        required: null,
+      },
+      required: true,
+    });
+    const groupCommunityModel = new DynamicInputModel({
+      id: 'groupCommunity',
+      label: this.translateService.instant(`${this.messagePrefix}.groupCommunity`),
+      name: 'groupCommunity',
+      required: false,
+      readOnly: true,
+    });
+    const groupDescriptionModel = new DynamicTextAreaModel({
+      id: 'groupDescription',
+      label: this.translateService.instant(`${this.messagePrefix}.groupDescription`),
+      name: 'groupDescription',
+      required: false,
+      spellCheck: environment.form.spellCheck,
+    });
+    this.formModel = [
+      groupNameModel,
+      groupDescriptionModel,
+    ];
+    this.formGroup = this.formBuilderService.createFormGroup(this.formModel);
+    this.groupName = this.formGroup.get('groupName');
+    this.groupDescription = this.formGroup.get('groupDescription');
+
+    if (hasValue(this.groupName)) {
+      this.groupName.setAsyncValidators(ValidateGroupExists.createValidator(this.groupDataService));
+      this.groupNameValueChangeSubscribe = this.groupName.valueChanges.pipe(debounceTime(300)).subscribe(() => {
+        this.changeDetectorRef.detectChanges();
+      });
+    }
+
+    this.subs.push(
+      observableCombineLatest([
+        this.activeGroup$,
+        this.canEdit$,
+        this.activeGroupLinkedDSO$,
+      ]).subscribe(([activeGroup, canEdit, linkedObject]) => {
+
+        if (activeGroup != null) {
+
+          // Disable group name exists validator
+          this.formGroup.controls.groupName.clearAsyncValidators();
+
+          if (isNotEmpty(linkedObject?.name)) {
+            if (!this.formGroup.controls.groupCommunity) {
+              this.formBuilderService.insertFormGroupControl(1, this.formGroup, this.formModel, groupCommunityModel);
+              this.groupDescription = this.formGroup.get('groupCommunity');
+            }
+            this.formGroup.patchValue({
+              groupName: activeGroup.name,
+              groupCommunity: linkedObject?.name ?? '',
+              groupDescription: activeGroup.firstMetadataValue('dc.description'),
+            });
+          } else {
+            this.formModel = [
+              groupNameModel,
+              groupDescriptionModel,
+            ];
+            this.formGroup.patchValue({
+              groupName: activeGroup.name,
+              groupDescription: activeGroup.firstMetadataValue('dc.description'),
+            });
+          }
+          if (!canEdit || activeGroup.permanent) {
+            this.formGroup.disable();
+          } else {
+            this.formGroup.enable();
+          }
+        }
       })
     );
-    observableCombineLatest(
-      this.translateService.get(`${this.messagePrefix}.groupName`),
-      this.translateService.get(`${this.messagePrefix}.groupCommunity`),
-      this.translateService.get(`${this.messagePrefix}.groupDescription`)
-    ).subscribe(([groupName, groupCommunity, groupDescription]) => {
-      this.groupName = new DynamicInputModel({
-        id: 'groupName',
-        label: groupName,
-        name: 'groupName',
-        validators: {
-          required: null,
-        },
-        required: true,
-      });
-      this.groupCommunity = new DynamicInputModel({
-        id: 'groupCommunity',
-        label: groupCommunity,
-        name: 'groupCommunity',
-        required: false,
-        readOnly: true,
-      });
-      this.groupDescription = new DynamicTextAreaModel({
-        id: 'groupDescription',
-        label: groupDescription,
-        name: 'groupDescription',
-        required: false,
-        spellCheck: environment.form.spellCheck,
-      });
-      this.formModel = [
-        this.groupName,
-        this.groupDescription,
-      ];
-      this.formGroup = this.formBuilderService.createFormGroup(this.formModel);
-
-      if (!!this.formGroup.controls.groupName) {
-        this.formGroup.controls.groupName.setAsyncValidators(ValidateGroupExists.createValidator(this.groupDataService));
-        this.groupNameValueChangeSubscribe = this.groupName.valueChanges.pipe(debounceTime(300)).subscribe(() => {
-          this.changeDetectorRef.detectChanges();
-        });
-      }
-
-      this.subs.push(
-        observableCombineLatest(
-          this.groupDataService.getActiveGroup(),
-          this.canEdit$,
-          this.groupDataService.getActiveGroup()
-            .pipe(filter((activeGroup) => hasValue(activeGroup)),switchMap((activeGroup) => this.getLinkedDSO(activeGroup).pipe(getFirstSucceededRemoteDataPayload())))
-        ).subscribe(([activeGroup, canEdit, linkedObject]) => {
-
-          if (activeGroup != null) {
-
-            // Disable group name exists validator
-            this.formGroup.controls.groupName.clearAsyncValidators();
-
-            this.groupBeingEdited = activeGroup;
-
-            if (linkedObject?.name) {
-              this.formBuilderService.insertFormGroupControl(1, this.formGroup, this.formModel, this.groupCommunity);
-              this.formGroup.patchValue({
-                groupName: activeGroup.name,
-                groupCommunity: linkedObject?.name ?? '',
-                groupDescription: activeGroup.firstMetadataValue('dc.description'),
-              });
-            } else {
-              this.formModel = [
-                this.groupName,
-                this.groupDescription,
-              ];
-              this.formGroup.patchValue({
-                groupName: activeGroup.name,
-                groupDescription: activeGroup.firstMetadataValue('dc.description'),
-              });
-            }
-            setTimeout(() => {
-              if (!canEdit || activeGroup.permanent) {
-                this.formGroup.disable();
-              }
-            }, 200);
-          }
-        })
-      );
-    });
   }
 
   /**
@@ -263,7 +267,7 @@ export class GroupFormComponent implements OnInit, OnDestroy {
   onCancel() {
     this.groupDataService.cancelEditGroup();
     this.cancelForm.emit();
-    this.router.navigate([this.groupDataService.getGroupRegistryRouterLink()]);
+    void this.router.navigate([getGroupsRoute()]);
   }
 
   /**
@@ -273,25 +277,22 @@ export class GroupFormComponent implements OnInit, OnDestroy {
    * Emit the updated/created eperson using the EventEmitter submitForm
    */
   onSubmit() {
-    this.groupDataService.getActiveGroup().pipe(take(1)).subscribe(
-      (group: Group) => {
-        const values = {
+    this.activeGroup$.pipe(take(1)).subscribe((group: Group) => {
+      if (group === null) {
+        this.createNewGroup({
           name: this.groupName.value,
           metadata: {
             'dc.description': [
               {
-                value: this.groupDescription.value
-              }
-            ]
+                value: this.groupDescription.value,
+              },
+            ],
           },
-        };
-        if (group === null) {
-          this.createNewGroup(values);
-        } else {
-          this.editGroup(group);
-        }
+        });
+      } else {
+        this.editGroup(group);
       }
-    );
+    });
   }
 
   /**
@@ -310,7 +311,7 @@ export class GroupFormComponent implements OnInit, OnDestroy {
           const groupSelfLink = rd.payload._links.self.href;
           this.setActiveGroupWithLink(groupSelfLink);
           this.groupDataService.clearGroupsRequests();
-          this.router.navigateByUrl(this.groupDataService.getGroupEditPageRouterLinkWithID(rd.payload.uuid));
+          void this.router.navigateByUrl(getGroupEditRoute(rd.payload.uuid));
         }
       } else {
         this.notificationsService.error(this.translateService.get(this.messagePrefix + '.notification.created.failure', { name: groupToCreate.name }));
@@ -397,7 +398,7 @@ export class GroupFormComponent implements OnInit, OnDestroy {
    * @param groupSelfLink   SelfLink of group to set as active
    */
   setActiveGroupWithLink(groupSelfLink: string) {
-    this.groupDataService.getActiveGroup().pipe(take(1)).subscribe((activeGroup: Group) => {
+    this.activeGroup$.pipe(take(1)).subscribe((activeGroup: Group) => {
       if (activeGroup === null) {
         this.groupDataService.cancelEditGroup();
         this.groupDataService.findByHref(groupSelfLink, false, false, followLink('subgroups'), followLink('epersons'), followLink('object'))
@@ -416,7 +417,7 @@ export class GroupFormComponent implements OnInit, OnDestroy {
    * It'll either show a success or error message depending on whether the delete was successful or not.
    */
   delete() {
-    this.groupDataService.getActiveGroup().pipe(take(1)).subscribe((group: Group) => {
+    this.activeGroup$.pipe(take(1)).subscribe((group: Group) => {
       const modalRef = this.modalService.open(ConfirmationModalComponent);
       modalRef.componentInstance.dso = group;
       modalRef.componentInstance.headerLabel = this.messagePrefix + '.delete-group.modal.header';
@@ -460,52 +461,38 @@ export class GroupFormComponent implements OnInit, OnDestroy {
   }
 
   /**
-   * Check if group has a linked object (community or collection linked to a workflow group)
-   * @param group
+   * Get the active {@link Group}'s linked object if it has one ({@link Community} or {@link Collection} linked to a
+   * workflow group)
    */
-  hasLinkedDSO(group: Group): Observable<boolean> {
-    if (hasValue(group) && hasValue(group._links.object.href)) {
-      return this.getLinkedDSO(group).pipe(
-        map((rd: RemoteData<DSpaceObject>) => {
-          return hasValue(rd) && hasValue(rd.payload);
-        }),
-        catchError(() => observableOf(false)),
-      );
-    }
+  getActiveGroupLinkedDSO(): Observable<DSpaceObject> {
+    return this.activeGroup$.pipe(
+      hasValueOperator(),
+      switchMap((group: Group) => {
+        if (group.object === undefined) {
+          return this.dSpaceObjectDataService.findByHref(group._links.object.href);
+        }
+        return group.object;
+      }),
+      getAllCompletedRemoteData(),
+      getRemoteDataPayload(),
+    );
   }
 
   /**
-   * Get group's linked object if it has one (community or collection linked to a workflow group)
-   * @param group
+   * Get the route to the edit roles tab of the active {@link Group}'s linked object (community or collection linked
+   * to a workflow group) if it has one
    */
-  getLinkedDSO(group: Group): Observable<RemoteData<DSpaceObject>> {
-    if (hasValue(group) && hasValue(group._links.object.href)) {
-      if (group.object === undefined) {
-        return this.dSpaceObjectDataService.findByHref(group._links.object.href);
-      }
-      return group.object;
-    }
-  }
-
-  /**
-   * Get the route to the edit roles tab of the group's linked object (community or collection linked to a workflow group) if it has one
-   * @param group
-   */
-  getLinkedEditRolesRoute(group: Group): Observable<string> {
-    if (hasValue(group) && hasValue(group._links.object.href)) {
-      return this.getLinkedDSO(group).pipe(
-        map((rd: RemoteData<DSpaceObject>) => {
-          if (hasValue(rd) && hasValue(rd.payload)) {
-            const dso = rd.payload;
-            switch ((dso as any).type) {
-              case Community.type.value:
-                return getCommunityEditRolesRoute(rd.payload.id);
-              case Collection.type.value:
-                return getCollectionEditRolesRoute(rd.payload.id);
-            }
-          }
-        })
-      );
-    }
+  getLinkedEditRolesRoute(): Observable<string> {
+    return this.activeGroupLinkedDSO$.pipe(
+      hasValueOperator(),
+      map((dso: DSpaceObject) => {
+        switch ((dso as any).type) {
+          case Community.type.value:
+            return getCommunityEditRolesRoute(dso.id);
+          case Collection.type.value:
+            return getCollectionEditRolesRoute(dso.id);
+        }
+      }),
+    );
   }
 }
diff --git a/src/app/access-control/group-registry/group-form/members-list/members-list.component.html b/src/app/access-control/group-registry/group-form/members-list/members-list.component.html
index cc9bf34d64..984442ebc4 100644
--- a/src/app/access-control/group-registry/group-form/members-list/members-list.component.html
+++ b/src/app/access-control/group-registry/group-form/members-list/members-list.component.html
@@ -1,110 +1,11 @@
 <ng-container>
-  <h3 class="border-bottom pb-2">{{messagePrefix + '.head' | translate}}</h3>
+  <h2 class="border-bottom pb-2">{{messagePrefix + '.head' | translate}}</h2>
 
-  <h4 id="search" class="border-bottom pb-2">
-    <span
-      *dsContextHelp="{
-        content: 'admin.access-control.groups.form.tooltip.editGroup.addEpeople',
-        id: 'edit-group-add-epeople',
-        iconPlacement: 'right',
-        tooltipPlacement: ['top', 'right', 'bottom']
-      }"
-    >
-      {{messagePrefix + '.search.head' | translate}}
-    </span>
-  </h4>
+  <h3>{{messagePrefix + '.headMembers' | translate}}</h3>
 
-  <form [formGroup]="searchForm" (ngSubmit)="search(searchForm.value)" class="d-flex justify-content-between">
-    <div>
-      <select name="scope" id="scope" formControlName="scope" class="form-control" aria-label="Search scope">
-        <option value="metadata">{{messagePrefix + '.search.scope.metadata' | translate}}</option>
-        <option value="email">{{messagePrefix + '.search.scope.email' | translate}}</option>
-      </select>
-    </div>
-    <div class="flex-grow-1 mr-3 ml-3">
-      <div class="form-group input-group">
-        <input type="text" name="query" id="query" formControlName="query"
-               class="form-control" aria-label="Search input">
-        <span class="input-group-append">
-            <button type="submit" class="search-button btn btn-primary">
-              <i class="fas fa-search"></i> {{ messagePrefix + '.search.button' | translate }}</button>
-        </span>
-      </div>
-    </div>
-    <div>
-      <button (click)="clearFormAndResetResult();"
-              class="btn btn-secondary">{{messagePrefix + '.button.see-all' | translate}}</button>
-    </div>
-  </form>
-
-  <ds-pagination *ngIf="(ePeopleSearchDtos | async)?.totalElements > 0"
-                 [paginationOptions]="configSearch"
-                 [pageInfoState]="(ePeopleSearchDtos | async)"
-                 [collectionSize]="(ePeopleSearchDtos | async)?.totalElements"
-                 [hideGear]="true"
-                 [hidePagerWhenSinglePage]="true">
-
-    <div class="table-responsive">
-      <table id="epersonsSearch" class="table table-striped table-hover table-bordered">
-        <thead>
-        <tr>
-          <th scope="col" class="align-middle">{{messagePrefix + '.table.id' | translate}}</th>
-          <th scope="col" class="align-middle">{{messagePrefix + '.table.name' | translate}}</th>
-          <th scope="col" class="align-middle">{{messagePrefix + '.table.identity' | translate}}</th>
-          <th class="align-middle">{{messagePrefix + '.table.edit' | translate}}</th>
-        </tr>
-        </thead>
-        <tbody>
-        <tr *ngFor="let ePerson of (ePeopleSearchDtos | async)?.page">
-          <td class="align-middle">{{ePerson.eperson.id}}</td>
-          <td class="align-middle">
-            <a (click)="ePersonDataService.startEditingNewEPerson(ePerson.eperson)"
-               [routerLink]="[ePersonDataService.getEPeoplePageRouterLink()]">
-              {{ dsoNameService.getName(ePerson.eperson) }}
-            </a>
-          </td>
-          <td class="align-middle">
-            {{messagePrefix + '.table.email' | translate}}: {{ ePerson.eperson.email ? ePerson.eperson.email : '-' }}<br/>
-            {{messagePrefix + '.table.netid' | translate}}: {{ ePerson.eperson.netid ? ePerson.eperson.netid : '-' }}
-          </td>
-          <td class="align-middle">
-            <div class="btn-group edit-field">
-              <button *ngIf="ePerson.memberOfGroup"
-                      (click)="deleteMemberFromGroup(ePerson)"
-                      [disabled]="actionConfig.remove.disabled"
-                      [ngClass]="['btn btn-sm', actionConfig.remove.css]"
-                      title="{{messagePrefix + '.table.edit.buttons.remove' | translate: { name: dsoNameService.getName(ePerson.eperson) } }}">
-                <i [ngClass]="actionConfig.remove.icon"></i>
-              </button>
-
-              <button *ngIf="!ePerson.memberOfGroup"
-                      (click)="addMemberToGroup(ePerson)"
-                      [disabled]="actionConfig.add.disabled"
-                      [ngClass]="['btn btn-sm', actionConfig.add.css]"
-                      title="{{messagePrefix + '.table.edit.buttons.add' | translate: { name: dsoNameService.getName(ePerson.eperson) } }}">
-                <i [ngClass]="actionConfig.add.icon"></i>
-              </button>
-            </div>
-          </td>
-        </tr>
-        </tbody>
-      </table>
-    </div>
-
-  </ds-pagination>
-
-  <div *ngIf="(ePeopleSearchDtos | async)?.totalElements == 0 && searchDone"
-       class="alert alert-info w-100 mb-2"
-       role="alert">
-    {{messagePrefix + '.no-items' | translate}}
-  </div>
-
-  <h4>{{messagePrefix + '.headMembers' | translate}}</h4>
-
-  <ds-pagination *ngIf="(ePeopleMembersOfGroupDtos | async)?.totalElements > 0"
+  <ds-pagination *ngIf="(ePeopleMembersOfGroup | async)?.totalElements > 0"
                  [paginationOptions]="config"
-                 [pageInfoState]="(ePeopleMembersOfGroupDtos | async)"
-                 [collectionSize]="(ePeopleMembersOfGroupDtos | async)?.totalElements"
+                 [collectionSize]="(ePeopleMembersOfGroup | async)?.totalElements"
                  [hideGear]="true"
                  [hidePagerWhenSinglePage]="true">
 
@@ -119,32 +20,103 @@
         </tr>
         </thead>
         <tbody>
-        <tr *ngFor="let ePerson of (ePeopleMembersOfGroupDtos | async)?.page">
-          <td class="align-middle">{{ePerson.eperson.id}}</td>
+        <tr *ngFor="let eperson of (ePeopleMembersOfGroup | async)?.page">
+          <td class="align-middle">{{eperson.id}}</td>
           <td class="align-middle">
-            <a (click)="ePersonDataService.startEditingNewEPerson(ePerson.eperson)"
-               [routerLink]="[ePersonDataService.getEPeoplePageRouterLink()]">
-              {{ dsoNameService.getName(ePerson.eperson) }}
+            <a [routerLink]="getEPersonEditRoute(eperson.id)">
+              {{ dsoNameService.getName(eperson) }}
             </a>
           </td>
           <td class="align-middle">
-            {{messagePrefix + '.table.email' | translate}}: {{ ePerson.eperson.email ? ePerson.eperson.email : '-' }}<br/>
-            {{messagePrefix + '.table.netid' | translate}}: {{ ePerson.eperson.netid ? ePerson.eperson.netid : '-' }}
+            {{messagePrefix + '.table.email' | translate}}: {{ eperson.email ? eperson.email : '-' }}<br/>
+            {{messagePrefix + '.table.netid' | translate}}: {{ eperson.netid ? eperson.netid : '-' }}
           </td>
           <td class="align-middle">
             <div class="btn-group edit-field">
-              <button *ngIf="ePerson.memberOfGroup"
-                      (click)="deleteMemberFromGroup(ePerson)"
-                      [disabled]="actionConfig.remove.disabled"
+              <button (click)="deleteMemberFromGroup(eperson)"
+                      [dsBtnDisabled]="actionConfig.remove.disabled"
                       [ngClass]="['btn btn-sm', actionConfig.remove.css]"
-                      title="{{messagePrefix + '.table.edit.buttons.remove' | translate: { name: dsoNameService.getName(ePerson.eperson) } }}">
+                      title="{{messagePrefix + '.table.edit.buttons.remove' | translate: { name: dsoNameService.getName(eperson) } }}">
                 <i [ngClass]="actionConfig.remove.icon"></i>
               </button>
-              <button *ngIf="!ePerson.memberOfGroup"
-                      (click)="addMemberToGroup(ePerson)"
-                      [disabled]="actionConfig.add.disabled"
+            </div>
+          </td>
+        </tr>
+        </tbody>
+      </table>
+    </div>
+
+  </ds-pagination>
+
+  <div *ngIf="(ePeopleMembersOfGroup | async) == undefined || (ePeopleMembersOfGroup | async)?.totalElements == 0" class="alert alert-info w-100 mb-2"
+       role="alert">
+    {{messagePrefix + '.no-members-yet' | translate}}
+  </div>
+
+  <h3 id="search" class="border-bottom pb-2">
+    <span
+      *dsContextHelp="{
+        content: 'admin.access-control.groups.form.tooltip.editGroup.addEpeople',
+        id: 'edit-group-add-epeople',
+        iconPlacement: 'right',
+        tooltipPlacement: ['top', 'right', 'bottom']
+      }"
+    >
+      {{messagePrefix + '.search.head' | translate}}
+    </span>
+  </h3>
+
+  <form [formGroup]="searchForm" (ngSubmit)="search(searchForm.value)" class="d-flex justify-content-between">
+    <div class="flex-grow-1 mr-3">
+      <div class="form-group input-group mr-3">
+        <input type="text" name="query" id="query" formControlName="query"
+               class="form-control" aria-label="Search input">
+        <span class="input-group-append">
+            <button type="submit" class="search-button btn btn-primary">
+              <i class="fas fa-search"></i> {{ messagePrefix + '.search.button' | translate }}</button>
+        </span>
+      </div>
+    </div>
+    <div>
+      <button (click)="clearFormAndResetResult();"
+              class="btn btn-secondary">{{messagePrefix + '.button.see-all' | translate}}</button>
+    </div>
+  </form>
+
+  <ds-pagination *ngIf="(ePeopleSearch | async)?.totalElements > 0"
+                 [paginationOptions]="configSearch"
+                 [collectionSize]="(ePeopleSearch | async)?.totalElements"
+                 [hideGear]="true"
+                 [hidePagerWhenSinglePage]="true">
+
+    <div class="table-responsive">
+      <table id="epersonsSearch" class="table table-striped table-hover table-bordered">
+        <thead>
+        <tr>
+          <th scope="col" class="align-middle">{{messagePrefix + '.table.id' | translate}}</th>
+          <th scope="col" class="align-middle">{{messagePrefix + '.table.name' | translate}}</th>
+          <th scope="col" class="align-middle">{{messagePrefix + '.table.identity' | translate}}</th>
+          <th class="align-middle">{{messagePrefix + '.table.edit' | translate}}</th>
+        </tr>
+        </thead>
+        <tbody>
+        <tr *ngFor="let eperson of (ePeopleSearch | async)?.page">
+          <td class="align-middle">{{eperson.id}}</td>
+          <td class="align-middle">
+            <a [routerLink]="getEPersonEditRoute(eperson.id)">
+              {{ dsoNameService.getName(eperson) }}
+            </a>
+          </td>
+          <td class="align-middle">
+            {{messagePrefix + '.table.email' | translate}}: {{ eperson.email ? eperson.email : '-' }}<br/>
+            {{messagePrefix + '.table.netid' | translate}}: {{ eperson.netid ? eperson.netid : '-' }}
+          </td>
+          <td class="align-middle">
+            <div class="btn-group edit-field">
+              <button (click)="addMemberToGroup(eperson)"
+                      [dsBtnDisabled]="actionConfig.add.disabled"
                       [ngClass]="['btn btn-sm', actionConfig.add.css]"
-                      title="{{messagePrefix + '.table.edit.buttons.add' | translate: { name: dsoNameService.getName(ePerson.eperson) } }}">
+                      title="{{messagePrefix + '.table.edit.buttons.add' | translate: { name: dsoNameService.getName(eperson) } }}">
                 <i [ngClass]="actionConfig.add.icon"></i>
               </button>
             </div>
@@ -156,9 +128,10 @@
 
   </ds-pagination>
 
-  <div *ngIf="(ePeopleMembersOfGroupDtos | async) == undefined || (ePeopleMembersOfGroupDtos | async)?.totalElements == 0" class="alert alert-info w-100 mb-2"
+  <div *ngIf="(ePeopleSearch | async)?.totalElements == 0 && searchDone"
+       class="alert alert-info w-100 mb-2"
        role="alert">
-    {{messagePrefix + '.no-members-yet' | translate}}
+    {{messagePrefix + '.no-items' | translate}}
   </div>
 
 </ng-container>
diff --git a/src/app/access-control/group-registry/group-form/members-list/members-list.component.spec.ts b/src/app/access-control/group-registry/group-form/members-list/members-list.component.spec.ts
index 7c8db399bc..99ee9827e8 100644
--- a/src/app/access-control/group-registry/group-form/members-list/members-list.component.spec.ts
+++ b/src/app/access-control/group-registry/group-form/members-list/members-list.component.spec.ts
@@ -17,7 +17,7 @@ import { Group } from '../../../../core/eperson/models/group.model';
 import { PageInfo } from '../../../../core/shared/page-info.model';
 import { FormBuilderService } from '../../../../shared/form/builder/form-builder.service';
 import { NotificationsService } from '../../../../shared/notifications/notifications.service';
-import { GroupMock, GroupMock2 } from '../../../../shared/testing/group-mock';
+import { GroupMock } from '../../../../shared/testing/group-mock';
 import { MembersListComponent } from './members-list.component';
 import { EPersonMock, EPersonMock2 } from '../../../../shared/testing/eperson.mock';
 import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
@@ -39,28 +39,26 @@ describe('MembersListComponent', () => {
   let ePersonDataServiceStub: any;
   let groupsDataServiceStub: any;
   let activeGroup;
-  let allEPersons: EPerson[];
-  let allGroups: Group[];
   let epersonMembers: EPerson[];
-  let subgroupMembers: Group[];
+  let epersonNonMembers: EPerson[];
   let paginationService;
 
   beforeEach(waitForAsync(() => {
     activeGroup = GroupMock;
     epersonMembers = [EPersonMock2];
-    subgroupMembers = [GroupMock2];
-    allEPersons = [EPersonMock, EPersonMock2];
-    allGroups = [GroupMock, GroupMock2];
+    epersonNonMembers = [EPersonMock];
     ePersonDataServiceStub = {
       activeGroup: activeGroup,
       epersonMembers: epersonMembers,
-      subgroupMembers: subgroupMembers,
+      epersonNonMembers: epersonNonMembers,
+      // This method is used to get all the current members
       findListByHref(_href: string): Observable<RemoteData<PaginatedList<EPerson>>> {
         return createSuccessfulRemoteDataObject$(buildPaginatedList<EPerson>(new PageInfo(), groupsDataServiceStub.getEPersonMembers()));
       },
-      searchByScope(scope: string, query: string): Observable<RemoteData<PaginatedList<EPerson>>> {
+      // This method is used to search across *non-members*
+      searchNonMembers(query: string, group: string): Observable<RemoteData<PaginatedList<EPerson>>> {
         if (query === '') {
-          return createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), allEPersons));
+          return createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), epersonNonMembers));
         }
         return createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), []));
       },
@@ -70,29 +68,26 @@ describe('MembersListComponent', () => {
       clearLinkRequests() {
         // empty
       },
-      getEPeoplePageRouterLink(): string {
-        return '/access-control/epeople';
-      }
     };
     groupsDataServiceStub = {
       activeGroup: activeGroup,
       epersonMembers: epersonMembers,
-      subgroupMembers: subgroupMembers,
-      allGroups: allGroups,
+      epersonNonMembers: epersonNonMembers,
       getActiveGroup(): Observable<Group> {
         return observableOf(activeGroup);
       },
       getEPersonMembers() {
         return this.epersonMembers;
       },
-      searchGroups(query: string): Observable<RemoteData<PaginatedList<Group>>> {
-        if (query === '') {
-          return createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), this.allGroups));
-        }
-        return createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), []));
-      },
-      addMemberToGroup(parentGroup, eperson: EPerson): Observable<RestResponse> {
-        this.epersonMembers = [...this.epersonMembers, eperson];
+      addMemberToGroup(parentGroup, epersonToAdd: EPerson): Observable<RestResponse> {
+        // Add eperson to list of members
+        this.epersonMembers = [...this.epersonMembers, epersonToAdd];
+        // Remove eperson from list of non-members
+        this.epersonNonMembers.forEach( (eperson: EPerson, index: number) => {
+          if (eperson.id === epersonToAdd.id) {
+            this.epersonNonMembers.splice(index, 1);
+          }
+        });
         return observableOf(new RestResponse(true, 200, 'Success'));
       },
       clearGroupsRequests() {
@@ -105,14 +100,14 @@ describe('MembersListComponent', () => {
         return '/access-control/groups/' + group.id;
       },
       deleteMemberFromGroup(parentGroup, epersonToDelete: EPerson): Observable<RestResponse> {
-        this.epersonMembers = this.epersonMembers.find((eperson: EPerson) => {
-          if (eperson.id !== epersonToDelete.id) {
-            return eperson;
+        // Remove eperson from list of members
+        this.epersonMembers.forEach( (eperson: EPerson, index: number) => {
+          if (eperson.id === epersonToDelete.id) {
+            this.epersonMembers.splice(index, 1);
           }
         });
-        if (this.epersonMembers === undefined) {
-          this.epersonMembers = [];
-        }
+        // Add eperson to list of non-members
+        this.epersonNonMembers = [...this.epersonNonMembers, epersonToDelete];
         return observableOf(new RestResponse(true, 200, 'Success'));
       }
     };
@@ -160,13 +155,37 @@ describe('MembersListComponent', () => {
     expect(comp).toBeDefined();
   }));
 
-  it('should show list of eperson members of current active group', () => {
-    const epersonIdsFound = fixture.debugElement.queryAll(By.css('#ePeopleMembersOfGroup tr td:first-child'));
-    expect(epersonIdsFound.length).toEqual(1);
-    epersonMembers.map((eperson: EPerson) => {
-      expect(epersonIdsFound.find((foundEl) => {
-        return (foundEl.nativeElement.textContent.trim() === eperson.uuid);
-      })).toBeTruthy();
+  describe('current members list', () => {
+    it('should show list of eperson members of current active group', () => {
+      const epersonIdsFound = fixture.debugElement.queryAll(By.css('#ePeopleMembersOfGroup tr td:first-child'));
+      expect(epersonIdsFound.length).toEqual(1);
+      epersonMembers.map((eperson: EPerson) => {
+        expect(epersonIdsFound.find((foundEl) => {
+          return (foundEl.nativeElement.textContent.trim() === eperson.uuid);
+        })).toBeTruthy();
+      });
+    });
+
+    it('should show a delete button next to each member', () => {
+      const epersonsFound = fixture.debugElement.queryAll(By.css('#ePeopleMembersOfGroup tbody tr'));
+      epersonsFound.map((foundEPersonRowElement: DebugElement) => {
+        const addButton: DebugElement = foundEPersonRowElement.query(By.css('td:last-child .fa-plus'));
+        const deleteButton: DebugElement = foundEPersonRowElement.query(By.css('td:last-child .fa-trash-alt'));
+        expect(addButton).toBeNull();
+        expect(deleteButton).not.toBeNull();
+      });
+    });
+
+    describe('if first delete button is pressed', () => {
+      beforeEach(() => {
+        const deleteButton: DebugElement = fixture.debugElement.query(By.css('#ePeopleMembersOfGroup tbody .fa-trash-alt'));
+        deleteButton.nativeElement.click();
+        fixture.detectChanges();
+      });
+      it('then no ePerson remains as a member of the active group.', () => {
+        const epersonsFound = fixture.debugElement.queryAll(By.css('#ePeopleMembersOfGroup tbody tr'));
+        expect(epersonsFound.length).toEqual(0);
+      });
     });
   });
 
@@ -174,76 +193,40 @@ describe('MembersListComponent', () => {
     describe('when searching without query', () => {
       let epersonsFound: DebugElement[];
       beforeEach(fakeAsync(() => {
-        spyOn(component, 'isMemberOfGroup').and.callFake((ePerson: EPerson) => {
-          return observableOf(activeGroup.epersons.includes(ePerson));
-        });
         component.search({ scope: 'metadata', query: '' });
         tick();
         fixture.detectChanges();
         epersonsFound = fixture.debugElement.queryAll(By.css('#epersonsSearch tbody tr'));
-        // Stop using the fake spy function (because otherwise the clicking on the buttons will not change anything
-        // because they don't change the value of activeGroup.epersons)
-        jasmine.getEnv().allowRespy(true);
-        spyOn(component, 'isMemberOfGroup').and.callThrough();
       }));
 
-      it('should display all epersons', () => {
-        expect(epersonsFound.length).toEqual(2);
+      it('should display only non-members of the group', () => {
+        const epersonIdsFound = fixture.debugElement.queryAll(By.css('#epersonsSearch tbody tr td:first-child'));
+        expect(epersonIdsFound.length).toEqual(1);
+        epersonNonMembers.map((eperson: EPerson) => {
+          expect(epersonIdsFound.find((foundEl) => {
+            return (foundEl.nativeElement.textContent.trim() === eperson.uuid);
+          })).toBeTruthy();
+        });
       });
 
-      describe('if eperson is already a eperson', () => {
-        it('should have delete button, else it should have add button', () => {
-          const memberIds: string[] = activeGroup.epersons.map((ePerson: EPerson) => ePerson.id);
-          epersonsFound.map((foundEPersonRowElement: DebugElement) => {
-            const epersonId: DebugElement = foundEPersonRowElement.query(By.css('td:first-child'));
-            const addButton: DebugElement = foundEPersonRowElement.query(By.css('td:last-child .fa-plus'));
-            const deleteButton: DebugElement = foundEPersonRowElement.query(By.css('td:last-child .fa-trash-alt'));
-            if (memberIds.includes(epersonId.nativeElement.textContent)) {
-              expect(addButton).toBeNull();
-              expect(deleteButton).not.toBeNull();
-            } else {
-              expect(deleteButton).toBeNull();
-              expect(addButton).not.toBeNull();
-            }
-          });
+      it('should display an add button next to non-members, not a delete button', () => {
+        epersonsFound.map((foundEPersonRowElement: DebugElement) => {
+          const addButton: DebugElement = foundEPersonRowElement.query(By.css('td:last-child .fa-plus'));
+          const deleteButton: DebugElement = foundEPersonRowElement.query(By.css('td:last-child .fa-trash-alt'));
+          expect(addButton).not.toBeNull();
+          expect(deleteButton).toBeNull();
         });
       });
 
       describe('if first add button is pressed', () => {
-        beforeEach(fakeAsync(() => {
+        beforeEach(() => {
           const addButton: DebugElement = fixture.debugElement.query(By.css('#epersonsSearch tbody .fa-plus'));
           addButton.nativeElement.click();
-          tick();
           fixture.detectChanges();
-        }));
-        it('then all the ePersons are member of the active group', () => {
-          epersonsFound = fixture.debugElement.queryAll(By.css('#epersonsSearch tbody tr'));
-          expect(epersonsFound.length).toEqual(2);
-          epersonsFound.map((foundEPersonRowElement: DebugElement) => {
-            const addButton: DebugElement = foundEPersonRowElement.query(By.css('td:last-child .fa-plus'));
-            const deleteButton: DebugElement = foundEPersonRowElement.query(By.css('td:last-child .fa-trash-alt'));
-            expect(addButton).toBeNull();
-            expect(deleteButton).not.toBeNull();
-          });
         });
-      });
-
-      describe('if first delete button is pressed', () => {
-        beforeEach(fakeAsync(() => {
-          const deleteButton: DebugElement = fixture.debugElement.query(By.css('#epersonsSearch tbody .fa-trash-alt'));
-          deleteButton.nativeElement.click();
-          tick();
-          fixture.detectChanges();
-        }));
-        it('then no ePerson is member of the active group', () => {
+        it('then all (two) ePersons are member of the active group. No non-members left', () => {
           epersonsFound = fixture.debugElement.queryAll(By.css('#epersonsSearch tbody tr'));
-          expect(epersonsFound.length).toEqual(2);
-          epersonsFound.map((foundEPersonRowElement: DebugElement) => {
-            const addButton: DebugElement = foundEPersonRowElement.query(By.css('td:last-child .fa-plus'));
-            const deleteButton: DebugElement = foundEPersonRowElement.query(By.css('td:last-child .fa-trash-alt'));
-            expect(deleteButton).toBeNull();
-            expect(addButton).not.toBeNull();
-          });
+          expect(epersonsFound.length).toEqual(0);
         });
       });
     });
diff --git a/src/app/access-control/group-registry/group-form/members-list/members-list.component.ts b/src/app/access-control/group-registry/group-form/members-list/members-list.component.ts
index b3e686c012..6129d4d02d 100644
--- a/src/app/access-control/group-registry/group-form/members-list/members-list.component.ts
+++ b/src/app/access-control/group-registry/group-form/members-list/members-list.component.ts
@@ -4,38 +4,34 @@ import { Router } from '@angular/router';
 import { TranslateService } from '@ngx-translate/core';
 import {
   Observable,
-  of as observableOf,
   Subscription,
-  BehaviorSubject,
-  combineLatest as observableCombineLatest,
-  ObservedValueOf,
+  BehaviorSubject
 } from 'rxjs';
-import { defaultIfEmpty, map, mergeMap, switchMap, take } from 'rxjs/operators';
-import { buildPaginatedList, PaginatedList } from '../../../../core/data/paginated-list.model';
+import { map, switchMap, take } from 'rxjs/operators';
+import { PaginatedList } from '../../../../core/data/paginated-list.model';
 import { RemoteData } from '../../../../core/data/remote-data';
 import { EPersonDataService } from '../../../../core/eperson/eperson-data.service';
 import { GroupDataService } from '../../../../core/eperson/group-data.service';
 import { EPerson } from '../../../../core/eperson/models/eperson.model';
 import { Group } from '../../../../core/eperson/models/group.model';
 import {
-  getFirstSucceededRemoteData,
   getFirstCompletedRemoteData,
   getAllCompletedRemoteData,
   getRemoteDataPayload
 } from '../../../../core/shared/operators';
 import { NotificationsService } from '../../../../shared/notifications/notifications.service';
 import { PaginationComponentOptions } from '../../../../shared/pagination/pagination-component-options.model';
-import { EpersonDtoModel } from '../../../../core/eperson/models/eperson-dto.model';
 import { PaginationService } from '../../../../core/pagination/pagination.service';
 import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
+import { getEPersonEditRoute } from '../../../access-control-routing-paths';
 
 /**
  * Keys to keep track of specific subscriptions
  */
 enum SubKey {
   ActiveGroup,
-  MembersDTO,
-  SearchResultsDTO,
+  Members,
+  SearchResults,
 }
 
 /**
@@ -96,11 +92,11 @@ export class MembersListComponent implements OnInit, OnDestroy {
   /**
    * EPeople being displayed in search result, initially all members, after search result of search
    */
-  ePeopleSearchDtos: BehaviorSubject<PaginatedList<EpersonDtoModel>> = new BehaviorSubject<PaginatedList<EpersonDtoModel>>(undefined);
+  ePeopleSearch: BehaviorSubject<PaginatedList<EPerson>> = new BehaviorSubject<PaginatedList<EPerson>>(undefined);
   /**
    * List of EPeople members of currently active group being edited
    */
-  ePeopleMembersOfGroupDtos: BehaviorSubject<PaginatedList<EpersonDtoModel>> = new BehaviorSubject<PaginatedList<EpersonDtoModel>>(undefined);
+  ePeopleMembersOfGroup: BehaviorSubject<PaginatedList<EPerson>> = new BehaviorSubject<PaginatedList<EPerson>>(undefined);
 
   /**
    * Pagination config used to display the list of EPeople that are result of EPeople search
@@ -129,7 +125,6 @@ export class MembersListComponent implements OnInit, OnDestroy {
 
   // Current search in edit group - epeople search form
   currentSearchQuery: string;
-  currentSearchScope: string;
 
   // Whether or not user has done a EPeople search yet
   searchDone: boolean;
@@ -137,6 +132,8 @@ export class MembersListComponent implements OnInit, OnDestroy {
   // current active group being edited
   groupBeingEdited: Group;
 
+  readonly getEPersonEditRoute = getEPersonEditRoute;
+
   constructor(
     protected groupDataService: GroupDataService,
     public ePersonDataService: EPersonDataService,
@@ -148,18 +145,17 @@ export class MembersListComponent implements OnInit, OnDestroy {
     public dsoNameService: DSONameService,
   ) {
     this.currentSearchQuery = '';
-    this.currentSearchScope = 'metadata';
   }
 
   ngOnInit(): void {
     this.searchForm = this.formBuilder.group(({
-      scope: 'metadata',
       query: '',
     }));
     this.subs.set(SubKey.ActiveGroup, this.groupDataService.getActiveGroup().subscribe((activeGroup: Group) => {
       if (activeGroup != null) {
         this.groupBeingEdited = activeGroup;
         this.retrieveMembers(this.config.currentPage);
+        this.search({query: ''});
       }
     }));
   }
@@ -171,8 +167,8 @@ export class MembersListComponent implements OnInit, OnDestroy {
    * @private
    */
   retrieveMembers(page: number): void {
-    this.unsubFrom(SubKey.MembersDTO);
-    this.subs.set(SubKey.MembersDTO,
+    this.unsubFrom(SubKey.Members);
+    this.subs.set(SubKey.Members,
       this.paginationService.getCurrentPagination(this.config.id, this.config).pipe(
         switchMap((currentPagination) => {
           return this.ePersonDataService.findListByHref(this.groupBeingEdited._links.epersons.href, {
@@ -189,49 +185,12 @@ export class MembersListComponent implements OnInit, OnDestroy {
             return rd;
           }
         }),
-        switchMap((epersonListRD: RemoteData<PaginatedList<EPerson>>) => {
-          const dtos$ = observableCombineLatest([...epersonListRD.payload.page.map((member: EPerson) => {
-            const dto$: Observable<EpersonDtoModel> = observableCombineLatest(
-              this.isMemberOfGroup(member), (isMember: ObservedValueOf<Observable<boolean>>) => {
-                const epersonDtoModel: EpersonDtoModel = new EpersonDtoModel();
-                epersonDtoModel.eperson = member;
-                epersonDtoModel.memberOfGroup = isMember;
-                return epersonDtoModel;
-              });
-            return dto$;
-          })]);
-          return dtos$.pipe(defaultIfEmpty([]), map((dtos: EpersonDtoModel[]) => {
-            return buildPaginatedList(epersonListRD.payload.pageInfo, dtos);
-          }));
-        }))
-        .subscribe((paginatedListOfDTOs: PaginatedList<EpersonDtoModel>) => {
-          this.ePeopleMembersOfGroupDtos.next(paginatedListOfDTOs);
+        getRemoteDataPayload())
+        .subscribe((paginatedListOfEPersons: PaginatedList<EPerson>) => {
+          this.ePeopleMembersOfGroup.next(paginatedListOfEPersons);
         }));
   }
 
-  /**
-   * Whether the given ePerson is a member of the group currently being edited
-   * @param possibleMember  EPerson that is a possible member (being tested) of the group currently being edited
-   */
-  isMemberOfGroup(possibleMember: EPerson): Observable<boolean> {
-    return this.groupDataService.getActiveGroup().pipe(take(1),
-      mergeMap((group: Group) => {
-        if (group != null) {
-          return this.ePersonDataService.findListByHref(group._links.epersons.href, {
-            currentPage: 1,
-            elementsPerPage: 9999
-          })
-            .pipe(
-              getFirstSucceededRemoteData(),
-              getRemoteDataPayload(),
-              map((listEPeopleInGroup: PaginatedList<EPerson>) => listEPeopleInGroup.page.filter((ePersonInList: EPerson) => ePersonInList.id === possibleMember.id)),
-              map((epeople: EPerson[]) => epeople.length > 0));
-        } else {
-          return observableOf(false);
-        }
-      }));
-  }
-
   /**
    * Unsubscribe from a subscription if it's still subscribed, and remove it from the map of
    * active subscriptions
@@ -248,14 +207,18 @@ export class MembersListComponent implements OnInit, OnDestroy {
 
   /**
    * Deletes a given EPerson from the members list of the group currently being edited
-   * @param ePerson   EPerson we want to delete as member from group that is currently being edited
+   * @param eperson   EPerson we want to delete as member from group that is currently being edited
    */
-  deleteMemberFromGroup(ePerson: EpersonDtoModel) {
-    ePerson.memberOfGroup = false;
+  deleteMemberFromGroup(eperson: EPerson) {
     this.groupDataService.getActiveGroup().pipe(take(1)).subscribe((activeGroup: Group) => {
       if (activeGroup != null) {
-        const response = this.groupDataService.deleteMemberFromGroup(activeGroup, ePerson.eperson);
-        this.showNotifications('deleteMember', response, this.dsoNameService.getName(ePerson.eperson), activeGroup);
+        const response = this.groupDataService.deleteMemberFromGroup(activeGroup, eperson);
+        this.showNotifications('deleteMember', response, this.dsoNameService.getName(eperson), activeGroup);
+        // Reload search results (if there is an active query).
+        // This will potentially add this deleted subgroup into the list of search results.
+        if (this.currentSearchQuery != null) {
+          this.search({query: this.currentSearchQuery});
+        }
       } else {
         this.notificationsService.error(this.translateService.get(this.messagePrefix + '.notification.failure.noActiveGroup'));
       }
@@ -264,14 +227,18 @@ export class MembersListComponent implements OnInit, OnDestroy {
 
   /**
    * Adds a given EPerson to the members list of the group currently being edited
-   * @param ePerson   EPerson we want to add as member to group that is currently being edited
+   * @param eperson   EPerson we want to add as member to group that is currently being edited
    */
-  addMemberToGroup(ePerson: EpersonDtoModel) {
-    ePerson.memberOfGroup = true;
+  addMemberToGroup(eperson: EPerson) {
     this.groupDataService.getActiveGroup().pipe(take(1)).subscribe((activeGroup: Group) => {
       if (activeGroup != null) {
-        const response = this.groupDataService.addMemberToGroup(activeGroup, ePerson.eperson);
-        this.showNotifications('addMember', response, this.dsoNameService.getName(ePerson.eperson), activeGroup);
+        const response = this.groupDataService.addMemberToGroup(activeGroup, eperson);
+        this.showNotifications('addMember', response, this.dsoNameService.getName(eperson), activeGroup);
+        // Reload search results (if there is an active query).
+        // This will potentially add this deleted subgroup into the list of search results.
+        if (this.currentSearchQuery != null) {
+          this.search({query: this.currentSearchQuery});
+        }
       } else {
         this.notificationsService.error(this.translateService.get(this.messagePrefix + '.notification.failure.noActiveGroup'));
       }
@@ -279,37 +246,25 @@ export class MembersListComponent implements OnInit, OnDestroy {
   }
 
   /**
-   * Search in the EPeople by name, email or metadata
-   * @param data  Contains scope and query param
+   * Search all EPeople who are NOT a member of the current group by name, email or metadata
+   * @param data  Contains query param
    */
   search(data: any) {
-    this.unsubFrom(SubKey.SearchResultsDTO);
-    this.subs.set(SubKey.SearchResultsDTO,
+    this.unsubFrom(SubKey.SearchResults);
+    this.subs.set(SubKey.SearchResults,
       this.paginationService.getCurrentPagination(this.configSearch.id, this.configSearch).pipe(
         switchMap((paginationOptions) => {
-
           const query: string = data.query;
-          const scope: string = data.scope;
           if (query != null && this.currentSearchQuery !== query && this.groupBeingEdited) {
-            this.router.navigate([], {
-              queryParamsHandling: 'merge'
-            });
             this.currentSearchQuery = query;
             this.paginationService.resetPage(this.configSearch.id);
           }
-          if (scope != null && this.currentSearchScope !== scope && this.groupBeingEdited) {
-            this.router.navigate([], {
-              queryParamsHandling: 'merge'
-            });
-            this.currentSearchScope = scope;
-            this.paginationService.resetPage(this.configSearch.id);
-          }
           this.searchDone = true;
 
-          return this.ePersonDataService.searchByScope(this.currentSearchScope, this.currentSearchQuery, {
+          return this.ePersonDataService.searchNonMembers(this.currentSearchQuery, this.groupBeingEdited.id, {
             currentPage: paginationOptions.currentPage,
             elementsPerPage: paginationOptions.pageSize
-          });
+          }, false, true);
         }),
         getAllCompletedRemoteData(),
         map((rd: RemoteData<any>) => {
@@ -319,23 +274,9 @@ export class MembersListComponent implements OnInit, OnDestroy {
             return rd;
           }
         }),
-        switchMap((epersonListRD: RemoteData<PaginatedList<EPerson>>) => {
-          const dtos$ = observableCombineLatest([...epersonListRD.payload.page.map((member: EPerson) => {
-            const dto$: Observable<EpersonDtoModel> = observableCombineLatest(
-              this.isMemberOfGroup(member), (isMember: ObservedValueOf<Observable<boolean>>) => {
-                const epersonDtoModel: EpersonDtoModel = new EpersonDtoModel();
-                epersonDtoModel.eperson = member;
-                epersonDtoModel.memberOfGroup = isMember;
-                return epersonDtoModel;
-              });
-            return dto$;
-          })]);
-          return dtos$.pipe(defaultIfEmpty([]), map((dtos: EpersonDtoModel[]) => {
-            return buildPaginatedList(epersonListRD.payload.pageInfo, dtos);
-          }));
-        }))
-        .subscribe((paginatedListOfDTOs: PaginatedList<EpersonDtoModel>) => {
-          this.ePeopleSearchDtos.next(paginatedListOfDTOs);
+        getRemoteDataPayload())
+        .subscribe((paginatedListOfEPersons: PaginatedList<EPerson>) => {
+          this.ePeopleSearch.next(paginatedListOfEPersons);
         }));
   }
 
diff --git a/src/app/access-control/group-registry/group-form/subgroup-list/subgroups-list.component.html b/src/app/access-control/group-registry/group-form/subgroup-list/subgroups-list.component.html
index d009f0283e..23cb03cd79 100644
--- a/src/app/access-control/group-registry/group-form/subgroup-list/subgroups-list.component.html
+++ b/src/app/access-control/group-registry/group-form/subgroup-list/subgroups-list.component.html
@@ -1,100 +1,10 @@
 <ng-container>
   <h3 class="border-bottom pb-2">{{messagePrefix + '.head' | translate}}</h3>
 
-  <h4 id="search" class="border-bottom pb-2">
-    <span *dsContextHelp="{
-            content: 'admin.access-control.groups.form.tooltip.editGroup.addSubgroups',
-            id: 'edit-group-add-subgroups',
-            iconPlacement: 'right',
-            tooltipPlacement: ['top', 'right', 'bottom']
-          }"
-    >
-      {{messagePrefix + '.search.head' | translate}}
-    </span>
-
-  </h4>
-  <form [formGroup]="searchForm" (ngSubmit)="search(searchForm.value)" class="d-flex justify-content-between">
-    <div class="flex-grow-1 mr-3">
-      <div class="form-group input-group mr-3">
-        <input type="text" name="query" id="query" formControlName="query"
-               class="form-control" aria-label="Search input">
-        <span class="input-group-append">
-            <button type="submit" class="search-button btn btn-primary">
-              <i class="fas fa-search"></i> {{ messagePrefix + '.search.button' | translate }}
-            </button>
-        </span>
-
-      </div>
-    </div>
-    <div>
-      <button (click)="clearFormAndResetResult();" class="btn btn-secondary float-right">
-        {{messagePrefix + '.button.see-all' | translate}}
-      </button>
-    </div>
-  </form>
-
-  <ds-pagination *ngIf="(searchResults$ | async)?.payload?.totalElements > 0"
-                 [paginationOptions]="configSearch"
-                 [pageInfoState]="(searchResults$ | async)?.payload"
-                 [collectionSize]="(searchResults$ | async)?.payload?.totalElements"
-                 [hideGear]="true"
-                 [hidePagerWhenSinglePage]="true">
-
-    <div class="table-responsive">
-      <table id="groupsSearch" class="table table-striped table-hover table-bordered">
-        <thead>
-        <tr>
-          <th scope="col" class="align-middle">{{messagePrefix + '.table.id' | translate}}</th>
-          <th scope="col" class="align-middle">{{messagePrefix + '.table.name' | translate}}</th>
-          <th scope="col" class="align-middle">{{messagePrefix + '.table.collectionOrCommunity' | translate}}</th>
-          <th class="align-middle">{{messagePrefix + '.table.edit' | translate}}</th>
-        </tr>
-        </thead>
-        <tbody>
-        <tr *ngFor="let group of (searchResults$ | async)?.payload?.page">
-          <td class="align-middle">{{group.id}}</td>
-          <td class="align-middle">
-            <a (click)="groupDataService.startEditingNewGroup(group)"
-               [routerLink]="[groupDataService.getGroupEditPageRouterLink(group)]">
-              {{ dsoNameService.getName(group) }}
-            </a>
-          </td>
-          <td class="align-middle">{{ dsoNameService.getName((group.object | async)?.payload) }}</td>
-          <td class="align-middle">
-            <div class="btn-group edit-field">
-              <button *ngIf="(isSubgroupOfGroup(group) | async) && !(isActiveGroup(group) | async)"
-                      (click)="deleteSubgroupFromGroup(group)"
-                      class="btn btn-outline-danger btn-sm deleteButton"
-                      title="{{messagePrefix + '.table.edit.buttons.remove' | translate: { name: dsoNameService.getName(group) } }}">
-                <i class="fas fa-trash-alt fa-fw"></i>
-              </button>
-
-              <span *ngIf="(isActiveGroup(group) | async)">{{ messagePrefix + '.table.edit.currentGroup' | translate }}</span>
-
-              <button *ngIf="!(isSubgroupOfGroup(group) | async) && !(isActiveGroup(group) | async)"
-                      (click)="addSubgroupToGroup(group)"
-                      class="btn btn-outline-primary btn-sm addButton"
-                      title="{{messagePrefix + '.table.edit.buttons.add' | translate: { name: dsoNameService.getName(group) } }}">
-                <i class="fas fa-plus fa-fw"></i>
-              </button>
-            </div>
-          </td>
-        </tr>
-        </tbody>
-      </table>
-    </div>
-  </ds-pagination>
-
-  <div *ngIf="(searchResults$ | async)?.payload?.totalElements == 0 && searchDone" class="alert alert-info w-100 mb-2"
-       role="alert">
-    {{messagePrefix + '.no-items' | translate}}
-  </div>
-
   <h4>{{messagePrefix + '.headSubgroups' | translate}}</h4>
 
   <ds-pagination *ngIf="(subGroups$ | async)?.payload?.totalElements > 0"
                  [paginationOptions]="config"
-                 [pageInfoState]="(subGroups$ | async)?.payload"
                  [collectionSize]="(subGroups$ | async)?.payload?.totalElements"
                  [hideGear]="true"
                  [hidePagerWhenSinglePage]="true">
@@ -139,4 +49,82 @@
     {{messagePrefix + '.no-subgroups-yet' | translate}}
   </div>
 
+  <h4 id="search" class="border-bottom pb-2">
+    <span *dsContextHelp="{
+            content: 'admin.access-control.groups.form.tooltip.editGroup.addSubgroups',
+            id: 'edit-group-add-subgroups',
+            iconPlacement: 'right',
+            tooltipPlacement: ['top', 'right', 'bottom']
+          }"
+    >
+      {{messagePrefix + '.search.head' | translate}}
+    </span>
+
+  </h4>
+  <form [formGroup]="searchForm" (ngSubmit)="search(searchForm.value)" class="d-flex justify-content-between">
+    <div class="flex-grow-1 mr-3">
+      <div class="form-group input-group mr-3">
+        <input type="text" name="query" id="query" formControlName="query"
+               class="form-control" aria-label="Search input">
+        <span class="input-group-append">
+            <button type="submit" class="search-button btn btn-primary">
+              <i class="fas fa-search"></i> {{ messagePrefix + '.search.button' | translate }}
+            </button>
+        </span>
+
+      </div>
+    </div>
+    <div>
+      <button (click)="clearFormAndResetResult();" class="btn btn-secondary float-right">
+        {{messagePrefix + '.button.see-all' | translate}}
+      </button>
+    </div>
+  </form>
+
+  <ds-pagination *ngIf="(searchResults$ | async)?.payload?.totalElements > 0"
+                 [paginationOptions]="configSearch"
+                 [collectionSize]="(searchResults$ | async)?.payload?.totalElements"
+                 [hideGear]="true"
+                 [hidePagerWhenSinglePage]="true">
+
+    <div class="table-responsive">
+      <table id="groupsSearch" class="table table-striped table-hover table-bordered">
+        <thead>
+        <tr>
+          <th scope="col" class="align-middle">{{messagePrefix + '.table.id' | translate}}</th>
+          <th scope="col" class="align-middle">{{messagePrefix + '.table.name' | translate}}</th>
+          <th scope="col" class="align-middle">{{messagePrefix + '.table.collectionOrCommunity' | translate}}</th>
+          <th class="align-middle">{{messagePrefix + '.table.edit' | translate}}</th>
+        </tr>
+        </thead>
+        <tbody>
+        <tr *ngFor="let group of (searchResults$ | async)?.payload?.page">
+          <td class="align-middle">{{group.id}}</td>
+          <td class="align-middle">
+            <a (click)="groupDataService.startEditingNewGroup(group)"
+               [routerLink]="[groupDataService.getGroupEditPageRouterLink(group)]">
+              {{ dsoNameService.getName(group) }}
+            </a>
+          </td>
+          <td class="align-middle">{{ dsoNameService.getName((group.object | async)?.payload) }}</td>
+          <td class="align-middle">
+            <div class="btn-group edit-field">
+              <button (click)="addSubgroupToGroup(group)"
+                      class="btn btn-outline-primary btn-sm addButton"
+                      title="{{messagePrefix + '.table.edit.buttons.add' | translate: { name: dsoNameService.getName(group) } }}">
+                <i class="fas fa-plus fa-fw"></i>
+              </button>
+            </div>
+          </td>
+        </tr>
+        </tbody>
+      </table>
+    </div>
+  </ds-pagination>
+
+  <div *ngIf="(searchResults$ | async)?.payload?.totalElements == 0 && searchDone" class="alert alert-info w-100 mb-2"
+       role="alert">
+    {{messagePrefix + '.no-items' | translate}}
+  </div>
+
 </ng-container>
diff --git a/src/app/access-control/group-registry/group-form/subgroup-list/subgroups-list.component.spec.ts b/src/app/access-control/group-registry/group-form/subgroup-list/subgroups-list.component.spec.ts
index ac5750dcac..6fe7c2cf67 100644
--- a/src/app/access-control/group-registry/group-form/subgroup-list/subgroups-list.component.spec.ts
+++ b/src/app/access-control/group-registry/group-form/subgroup-list/subgroups-list.component.spec.ts
@@ -1,12 +1,12 @@
 import { CommonModule } from '@angular/common';
 import { NO_ERRORS_SCHEMA, DebugElement } from '@angular/core';
-import { ComponentFixture, fakeAsync, flush, inject, TestBed, tick, waitForAsync } from '@angular/core/testing';
+import { ComponentFixture, fakeAsync, flush, inject, TestBed, waitForAsync } from '@angular/core/testing';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { BrowserModule, By } from '@angular/platform-browser';
 import { Router } from '@angular/router';
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateLoader, TranslateModule, TranslateService } from '@ngx-translate/core';
-import { Observable, of as observableOf, BehaviorSubject } from 'rxjs';
+import { Observable, of as observableOf } from 'rxjs';
 import { RestResponse } from '../../../../core/cache/response.models';
 import { buildPaginatedList, PaginatedList } from '../../../../core/data/paginated-list.model';
 import { RemoteData } from '../../../../core/data/remote-data';
@@ -18,19 +18,18 @@ import { NotificationsService } from '../../../../shared/notifications/notificat
 import { GroupMock, GroupMock2 } from '../../../../shared/testing/group-mock';
 import { SubgroupsListComponent } from './subgroups-list.component';
 import {
-  createSuccessfulRemoteDataObject$,
-  createSuccessfulRemoteDataObject
+  createSuccessfulRemoteDataObject$
 } from '../../../../shared/remote-data.utils';
 import { RouterMock } from '../../../../shared/mocks/router.mock';
 import { getMockFormBuilderService } from '../../../../shared/mocks/form-builder-service.mock';
 import { getMockTranslateService } from '../../../../shared/mocks/translate.service.mock';
 import { TranslateLoaderMock } from '../../../../shared/testing/translate-loader.mock';
 import { NotificationsServiceStub } from '../../../../shared/testing/notifications-service.stub';
-import { map } from 'rxjs/operators';
 import { PaginationService } from '../../../../core/pagination/pagination.service';
 import { PaginationServiceStub } from '../../../../shared/testing/pagination-service.stub';
 import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
 import { DSONameServiceMock } from '../../../../shared/mocks/dso-name.service.mock';
+import { EPersonMock2 } from 'src/app/shared/testing/eperson.mock';
 
 describe('SubgroupsListComponent', () => {
   let component: SubgroupsListComponent;
@@ -39,44 +38,70 @@ describe('SubgroupsListComponent', () => {
   let builderService: FormBuilderService;
   let ePersonDataServiceStub: any;
   let groupsDataServiceStub: any;
-  let activeGroup;
+  let activeGroup: Group;
   let subgroups: Group[];
-  let allGroups: Group[];
+  let groupNonMembers: Group[];
   let routerStub;
   let paginationService;
+  // Define a new mock activegroup for all tests below
+  let mockActiveGroup: Group = Object.assign(new Group(), {
+    handle: null,
+    subgroups: [GroupMock2],
+    epersons: [EPersonMock2],
+    selfRegistered: false,
+    permanent: false,
+    _links: {
+        self: {
+            href: 'https://rest.api/server/api/eperson/groups/activegroupid',
+        },
+        subgroups: { href: 'https://rest.api/server/api/eperson/groups/activegroupid/subgroups' },
+        object: { href: 'https://rest.api/server/api/eperson/groups/activegroupid/object' },
+        epersons: { href: 'https://rest.api/server/api/eperson/groups/activegroupid/epersons' }
+    },
+    _name: 'activegroupname',
+    id: 'activegroupid',
+    uuid: 'activegroupid',
+    type: 'group',
+  });
 
   beforeEach(waitForAsync(() => {
-    activeGroup = GroupMock;
+    activeGroup = mockActiveGroup;
     subgroups = [GroupMock2];
-    allGroups = [GroupMock, GroupMock2];
+    groupNonMembers = [GroupMock];
     ePersonDataServiceStub = {};
     groupsDataServiceStub = {
       activeGroup: activeGroup,
-      subgroups$: new BehaviorSubject(subgroups),
+      subgroups: subgroups,
+      groupNonMembers: groupNonMembers,
       getActiveGroup(): Observable<Group> {
         return observableOf(this.activeGroup);
       },
       getSubgroups(): Group {
-        return this.activeGroup;
+        return this.subgroups;
       },
+      // This method is used to get all the current subgroups
       findListByHref(_href: string): Observable<RemoteData<PaginatedList<Group>>> {
-        return this.subgroups$.pipe(
-          map((currentGroups: Group[]) => {
-            return createSuccessfulRemoteDataObject(buildPaginatedList<Group>(new PageInfo(), currentGroups));
-          })
-        );
+        return createSuccessfulRemoteDataObject$(buildPaginatedList<Group>(new PageInfo(), groupsDataServiceStub.getSubgroups()));
       },
       getGroupEditPageRouterLink(group: Group): string {
         return '/access-control/groups/' + group.id;
       },
-      searchGroups(query: string): Observable<RemoteData<PaginatedList<Group>>> {
+      // This method is used to get all groups which are NOT currently a subgroup member
+      searchNonMemberGroups(query: string, group: string): Observable<RemoteData<PaginatedList<Group>>> {
         if (query === '') {
-          return createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), allGroups));
+          return createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), groupNonMembers));
         }
         return createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), []));
       },
-      addSubGroupToGroup(parentGroup, subgroup: Group): Observable<RestResponse> {
-        this.subgroups$.next([...this.subgroups$.getValue(), subgroup]);
+      addSubGroupToGroup(parentGroup, subgroupToAdd: Group): Observable<RestResponse> {
+        // Add group to list of subgroups
+        this.subgroups = [...this.subgroups, subgroupToAdd];
+        // Remove group from list of non-members
+        this.groupNonMembers.forEach( (group: Group, index: number) => {
+          if (group.id === subgroupToAdd.id) {
+            this.groupNonMembers.splice(index, 1);
+          }
+        });
         return observableOf(new RestResponse(true, 200, 'Success'));
       },
       clearGroupsRequests() {
@@ -85,12 +110,15 @@ describe('SubgroupsListComponent', () => {
       clearGroupLinkRequests() {
         // empty
       },
-      deleteSubGroupFromGroup(parentGroup, subgroup: Group): Observable<RestResponse> {
-        this.subgroups$.next(this.subgroups$.getValue().filter((group: Group) => {
-          if (group.id !== subgroup.id) {
-            return group;
+      deleteSubGroupFromGroup(parentGroup, subgroupToDelete: Group): Observable<RestResponse> {
+        // Remove group from list of subgroups
+        this.subgroups.forEach( (group: Group, index: number) => {
+          if (group.id === subgroupToDelete.id) {
+            this.subgroups.splice(index, 1);
           }
-        }));
+        });
+        // Add group to list of non-members
+        this.groupNonMembers = [...this.groupNonMembers, subgroupToDelete];
         return observableOf(new RestResponse(true, 200, 'Success'));
       }
     };
@@ -99,7 +127,7 @@ describe('SubgroupsListComponent', () => {
     translateService = getMockTranslateService();
 
     paginationService = new PaginationServiceStub();
-    TestBed.configureTestingModule({
+    return TestBed.configureTestingModule({
       imports: [CommonModule, NgbModule, FormsModule, ReactiveFormsModule, BrowserModule,
         TranslateModule.forRoot({
           loader: {
@@ -137,30 +165,38 @@ describe('SubgroupsListComponent', () => {
     expect(comp).toBeDefined();
   }));
 
-  it('should show list of subgroups of current active group', () => {
-    const groupIdsFound = fixture.debugElement.queryAll(By.css('#subgroupsOfGroup tr td:first-child'));
-    expect(groupIdsFound.length).toEqual(1);
-    activeGroup.subgroups.map((group: Group) => {
-      expect(groupIdsFound.find((foundEl) => {
-        return (foundEl.nativeElement.textContent.trim() === group.uuid);
-      })).toBeTruthy();
-    });
-  });
-
-  describe('if first group delete button is pressed', () => {
-    let groupsFound: DebugElement[];
-    beforeEach(fakeAsync(() => {
-      const addButton = fixture.debugElement.query(By.css('#subgroupsOfGroup tbody .deleteButton'));
-      addButton.triggerEventHandler('click', {
-        preventDefault: () => {/**/
-        }
+  describe('current subgroup list', () => {
+    it('should show list of subgroups of current active group', () => {
+      const groupIdsFound = fixture.debugElement.queryAll(By.css('#subgroupsOfGroup tr td:first-child'));
+      expect(groupIdsFound.length).toEqual(1);
+      subgroups.map((group: Group) => {
+        expect(groupIdsFound.find((foundEl) => {
+          return (foundEl.nativeElement.textContent.trim() === group.uuid);
+        })).toBeTruthy();
+      });
+    });
+
+    it('should show a delete button next to each subgroup', () => {
+      const subgroupsFound = fixture.debugElement.queryAll(By.css('#subgroupsOfGroup tbody tr'));
+      subgroupsFound.map((foundGroupRowElement: DebugElement) => {
+        const addButton: DebugElement = foundGroupRowElement.query(By.css('td:last-child .fa-plus'));
+        const deleteButton: DebugElement = foundGroupRowElement.query(By.css('td:last-child .fa-trash-alt'));
+        expect(addButton).toBeNull();
+        expect(deleteButton).not.toBeNull();
+      });
+    });
+
+    describe('if first group delete button is pressed', () => {
+      let groupsFound: DebugElement[];
+      beforeEach(() => {
+        const deleteButton = fixture.debugElement.query(By.css('#subgroupsOfGroup tbody .deleteButton'));
+        deleteButton.nativeElement.click();
+        fixture.detectChanges();
+      });
+      it('then no subgroup remains as a member of the active group', () => {
+        groupsFound = fixture.debugElement.queryAll(By.css('#subgroupsOfGroup tbody tr'));
+        expect(groupsFound.length).toEqual(0);
       });
-      tick();
-      fixture.detectChanges();
-    }));
-    it('one less subgroup in list from 1 to 0 (of 2 total groups)', () => {
-      groupsFound = fixture.debugElement.queryAll(By.css('#subgroupsOfGroup tbody tr'));
-      expect(groupsFound.length).toEqual(0);
     });
   });
 
@@ -169,54 +205,38 @@ describe('SubgroupsListComponent', () => {
       let groupsFound: DebugElement[];
       beforeEach(fakeAsync(() => {
         component.search({ query: '' });
+        fixture.detectChanges();
         groupsFound = fixture.debugElement.queryAll(By.css('#groupsSearch tbody tr'));
       }));
 
-      it('should display all groups', () => {
-        fixture.detectChanges();
-        groupsFound = fixture.debugElement.queryAll(By.css('#groupsSearch tbody tr'));
-        expect(groupsFound.length).toEqual(2);
-        groupsFound = fixture.debugElement.queryAll(By.css('#groupsSearch tbody tr'));
+      it('should display only non-member groups (i.e. groups that are not a subgroup)', () => {
         const groupIdsFound: DebugElement[] = fixture.debugElement.queryAll(By.css('#groupsSearch tbody tr td:first-child'));
-        allGroups.map((group: Group) => {
+        expect(groupIdsFound.length).toEqual(1);
+        groupNonMembers.map((group: Group) => {
           expect(groupIdsFound.find((foundEl: DebugElement) => {
             return (foundEl.nativeElement.textContent.trim() === group.uuid);
           })).toBeTruthy();
         });
       });
 
-      describe('if group is already a subgroup', () => {
-        it('should have delete button, else it should have add button', () => {
+      it('should display an add button next to non-member groups, not a delete button', () => {
+        groupsFound.map((foundGroupRowElement: DebugElement) => {
+          const addButton: DebugElement = foundGroupRowElement.query(By.css('td:last-child .fa-plus'));
+          const deleteButton: DebugElement = foundGroupRowElement.query(By.css('td:last-child .fa-trash-alt'));
+          expect(addButton).not.toBeNull();
+          expect(deleteButton).toBeNull();
+        });
+      });
+
+      describe('if first add button is pressed', () => {
+        beforeEach(() => {
+          const addButton: DebugElement = fixture.debugElement.query(By.css('#groupsSearch tbody .fa-plus'));
+          addButton.nativeElement.click();
           fixture.detectChanges();
+        });
+        it('then all (two) Groups are subgroups of the active group. No non-members left', () => {
           groupsFound = fixture.debugElement.queryAll(By.css('#groupsSearch tbody tr'));
-          const getSubgroups = groupsDataServiceStub.getSubgroups().subgroups;
-          if (getSubgroups !== undefined && getSubgroups.length > 0) {
-            groupsFound.map((foundGroupRowElement: DebugElement) => {
-              const groupId: DebugElement = foundGroupRowElement.query(By.css('td:first-child'));
-              const addButton: DebugElement = foundGroupRowElement.query(By.css('td:last-child .fa-plus'));
-              const deleteButton: DebugElement = foundGroupRowElement.query(By.css('td:last-child .fa-trash-alt'));
-              expect(addButton).toBeNull();
-              if (activeGroup.id === groupId.nativeElement.textContent) {
-                expect(deleteButton).toBeNull();
-              } else {
-                expect(deleteButton).not.toBeNull();
-              }
-            });
-          } else {
-            const subgroupIds: string[] = activeGroup.subgroups.map((group: Group) => group.id);
-            groupsFound.map((foundGroupRowElement: DebugElement) => {
-              const groupId: DebugElement = foundGroupRowElement.query(By.css('td:first-child'));
-              const addButton: DebugElement = foundGroupRowElement.query(By.css('td:last-child .fa-plus'));
-              const deleteButton: DebugElement = foundGroupRowElement.query(By.css('td:last-child .fa-trash-alt'));
-              if (subgroupIds.includes(groupId.nativeElement.textContent)) {
-                expect(addButton).toBeNull();
-                expect(deleteButton).not.toBeNull();
-              } else {
-                expect(deleteButton).toBeNull();
-                expect(addButton).not.toBeNull();
-              }
-            });
-          }
+          expect(groupsFound.length).toEqual(0);
         });
       });
     });
diff --git a/src/app/access-control/group-registry/group-form/subgroup-list/subgroups-list.component.ts b/src/app/access-control/group-registry/group-form/subgroup-list/subgroups-list.component.ts
index 0cff730c62..aea545e554 100644
--- a/src/app/access-control/group-registry/group-form/subgroup-list/subgroups-list.component.ts
+++ b/src/app/access-control/group-registry/group-form/subgroup-list/subgroups-list.component.ts
@@ -2,16 +2,15 @@ import { Component, Input, OnDestroy, OnInit } from '@angular/core';
 import { UntypedFormBuilder } from '@angular/forms';
 import { Router } from '@angular/router';
 import { TranslateService } from '@ngx-translate/core';
-import { BehaviorSubject, Observable, of as observableOf, Subscription } from 'rxjs';
-import { map, mergeMap, switchMap, take } from 'rxjs/operators';
+import { BehaviorSubject, Observable, Subscription } from 'rxjs';
+import { map, switchMap, take } from 'rxjs/operators';
 import { PaginatedList } from '../../../../core/data/paginated-list.model';
 import { RemoteData } from '../../../../core/data/remote-data';
 import { GroupDataService } from '../../../../core/eperson/group-data.service';
 import { Group } from '../../../../core/eperson/models/group.model';
 import {
-  getFirstCompletedRemoteData,
-  getFirstSucceededRemoteData,
-  getRemoteDataPayload
+  getAllCompletedRemoteData,
+  getFirstCompletedRemoteData
 } from '../../../../core/shared/operators';
 import { NotificationsService } from '../../../../shared/notifications/notifications.service';
 import { PaginationComponentOptions } from '../../../../shared/pagination/pagination-component-options.model';
@@ -103,6 +102,7 @@ export class SubgroupsListComponent implements OnInit, OnDestroy {
       if (activeGroup != null) {
         this.groupBeingEdited = activeGroup;
         this.retrieveSubGroups();
+        this.search({query: ''});
       }
     }));
   }
@@ -131,47 +131,6 @@ export class SubgroupsListComponent implements OnInit, OnDestroy {
       }));
   }
 
-  /**
-   * Whether or not the given group is a subgroup of the group currently being edited
-   * @param possibleSubgroup Group that is a possible subgroup (being tested) of the group currently being edited
-   */
-  isSubgroupOfGroup(possibleSubgroup: Group): Observable<boolean> {
-    return this.groupDataService.getActiveGroup().pipe(take(1),
-      mergeMap((activeGroup: Group) => {
-        if (activeGroup != null) {
-          if (activeGroup.uuid === possibleSubgroup.uuid) {
-            return observableOf(false);
-          } else {
-            return this.groupDataService.findListByHref(activeGroup._links.subgroups.href, {
-              currentPage: 1,
-              elementsPerPage: 9999
-            })
-              .pipe(
-                getFirstSucceededRemoteData(),
-                getRemoteDataPayload(),
-                map((listTotalGroups: PaginatedList<Group>) => listTotalGroups.page.filter((groupInList: Group) => groupInList.id === possibleSubgroup.id)),
-                map((groups: Group[]) => groups.length > 0));
-          }
-        } else {
-          return observableOf(false);
-        }
-      }));
-  }
-
-  /**
-   * Whether or not the given group is the current group being edited
-   * @param group Group that is possibly the current group being edited
-   */
-  isActiveGroup(group: Group): Observable<boolean> {
-    return this.groupDataService.getActiveGroup().pipe(take(1),
-      mergeMap((activeGroup: Group) => {
-        if (activeGroup != null && activeGroup.uuid === group.uuid) {
-          return observableOf(true);
-        }
-        return observableOf(false);
-      }));
-  }
-
   /**
    * Deletes given subgroup from the group currently being edited
    * @param subgroup  Group we want to delete from the subgroups of the group currently being edited
@@ -181,6 +140,11 @@ export class SubgroupsListComponent implements OnInit, OnDestroy {
       if (activeGroup != null) {
         const response = this.groupDataService.deleteSubGroupFromGroup(activeGroup, subgroup);
         this.showNotifications('deleteSubgroup', response, this.dsoNameService.getName(subgroup), activeGroup);
+        // Reload search results (if there is an active query).
+        // This will potentially add this deleted subgroup into the list of search results.
+        if (this.currentSearchQuery != null) {
+          this.search({query: this.currentSearchQuery});
+        }
       } else {
         this.notificationsService.error(this.translateService.get(this.messagePrefix + '.notification.failure.noActiveGroup'));
       }
@@ -197,6 +161,11 @@ export class SubgroupsListComponent implements OnInit, OnDestroy {
         if (activeGroup.uuid !== subgroup.uuid) {
           const response = this.groupDataService.addSubGroupToGroup(activeGroup, subgroup);
           this.showNotifications('addSubgroup', response, this.dsoNameService.getName(subgroup), activeGroup);
+          // Reload search results (if there is an active query).
+          // This will potentially remove this added subgroup from search results.
+          if (this.currentSearchQuery != null) {
+            this.search({query: this.currentSearchQuery});
+          }
         } else {
           this.notificationsService.error(this.translateService.get(this.messagePrefix + '.notification.failure.subgroupToAddIsActiveGroup'));
         }
@@ -207,28 +176,38 @@ export class SubgroupsListComponent implements OnInit, OnDestroy {
   }
 
   /**
-   * Search in the groups (searches by group name and by uuid exact match)
+   * Search all non-member groups (searches by group name and by uuid exact match).  Used to search for
+   * groups that could be added to current group as a subgroup.
    * @param data  Contains query param
    */
   search(data: any) {
-    const query: string = data.query;
-    if (query != null && this.currentSearchQuery !== query) {
-      this.router.navigateByUrl(this.groupDataService.getGroupEditPageRouterLink(this.groupBeingEdited));
-      this.currentSearchQuery = query;
-      this.configSearch.currentPage = 1;
-    }
-    this.searchDone = true;
-
     this.unsubFrom(SubKey.SearchResults);
-    this.subs.set(SubKey.SearchResults, this.paginationService.getCurrentPagination(this.configSearch.id, this.configSearch).pipe(
-      switchMap((config) => this.groupDataService.searchGroups(this.currentSearchQuery, {
-        currentPage: config.currentPage,
-        elementsPerPage: config.pageSize
-      }, true, true, followLink('object')
-      ))
-    ).subscribe((rd: RemoteData<PaginatedList<Group>>) => {
-      this.searchResults$.next(rd);
-    }));
+    this.subs.set(SubKey.SearchResults,
+      this.paginationService.getCurrentPagination(this.configSearch.id, this.configSearch).pipe(
+        switchMap((paginationOptions) => {
+          const query: string = data.query;
+          if (query != null && this.currentSearchQuery !== query && this.groupBeingEdited) {
+            this.currentSearchQuery = query;
+            this.paginationService.resetPage(this.configSearch.id);
+          }
+          this.searchDone = true;
+
+          return this.groupDataService.searchNonMemberGroups(this.currentSearchQuery, this.groupBeingEdited.id, {
+            currentPage: paginationOptions.currentPage,
+            elementsPerPage: paginationOptions.pageSize
+          }, false, true, followLink('object'));
+        }),
+        getAllCompletedRemoteData(),
+        map((rd: RemoteData<any>) => {
+          if (rd.hasFailed) {
+            this.notificationsService.error(this.translateService.get(this.messagePrefix + '.notification.failure', { cause: rd.errorMessage }));
+          } else {
+            return rd;
+          }
+        }))
+        .subscribe((rd: RemoteData<PaginatedList<Group>>) => {
+          this.searchResults$.next(rd);
+        }));
   }
 
   /**
diff --git a/src/app/access-control/group-registry/groups-registry.component.html b/src/app/access-control/group-registry/groups-registry.component.html
index 828aadc95a..eb00017d8f 100644
--- a/src/app/access-control/group-registry/groups-registry.component.html
+++ b/src/app/access-control/group-registry/groups-registry.component.html
@@ -2,17 +2,17 @@
   <div class="groups-registry row">
     <div class="col-12">
       <div class="d-flex justify-content-between border-bottom mb-3">
-        <h2 id="header" class="pb-2">{{messagePrefix + 'head' | translate}}</h2>
+        <h1 id="header" class="pb-2">{{messagePrefix + 'head' | translate}}</h1>
         <div>
           <button class="mr-auto btn btn-success"
-                  [routerLink]="['newGroup']">
+                  [routerLink]="'create'">
             <i class="fas fa-plus"></i>
             <span class="d-none d-sm-inline ml-1">{{messagePrefix + 'button.add' | translate}}</span>
           </button>
         </div>
       </div>
 
-      <h3 id="search" class="border-bottom pb-2">{{messagePrefix + 'search.head' | translate}}</h3>
+      <h2 id="search" class="border-bottom pb-2">{{messagePrefix + 'search.head' | translate}}</h2>
       <form [formGroup]="searchForm" (ngSubmit)="search(searchForm.value)" class="d-flex justify-content-between">
         <div class="flex-grow-1 mr-3">
           <div class="form-group input-group">
@@ -37,7 +37,6 @@
       <ds-pagination
         *ngIf="(pageInfoState$ | async)?.totalElements > 0 && !(loading$ | async)"
         [paginationOptions]="config"
-        [pageInfoState]="pageInfoState$"
         [collectionSize]="(pageInfoState$ | async)?.totalElements"
         [hideGear]="true"
         [hidePagerWhenSinglePage]="true">
@@ -70,7 +69,7 @@
                       <i class="fas fa-edit fa-fw"></i>
                     </button>
                     <button *ngSwitchCase="false"
-                      [disabled]="true"
+                      [dsBtnDisabled]="true"
                       class="btn btn-outline-primary btn-sm btn-edit"
                       placement="left"
                       [ngbTooltip]="'admin.access-control.epeople.table.edit.buttons.edit-disabled' | translate"
diff --git a/src/app/access-control/group-registry/groups-registry.component.spec.ts b/src/app/access-control/group-registry/groups-registry.component.spec.ts
index 635ba727c2..fbf7e982d1 100644
--- a/src/app/access-control/group-registry/groups-registry.component.spec.ts
+++ b/src/app/access-control/group-registry/groups-registry.component.spec.ts
@@ -34,6 +34,7 @@ import { FeatureID } from '../../core/data/feature-authorization/feature-id';
 import { NoContent } from '../../core/shared/NoContent.model';
 import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
 import { DSONameServiceMock, UNDEFINED_NAME } from '../../shared/mocks/dso-name.service.mock';
+import {BtnDisabledDirective} from '../../shared/btn-disabled.directive';
 
 describe('GroupsRegistryComponent', () => {
   let component: GroupsRegistryComponent;
@@ -171,7 +172,7 @@ describe('GroupsRegistryComponent', () => {
           }
         }),
       ],
-      declarations: [GroupsRegistryComponent],
+      declarations: [GroupsRegistryComponent, BtnDisabledDirective],
       providers: [GroupsRegistryComponent,
         { provide: DSONameService, useValue: new DSONameServiceMock() },
         { provide: EPersonDataService, useValue: ePersonDataServiceStub },
@@ -231,7 +232,8 @@ describe('GroupsRegistryComponent', () => {
         const editButtonsFound = fixture.debugElement.queryAll(By.css('#groups tr td:nth-child(5) button.btn-edit'));
         expect(editButtonsFound.length).toEqual(2);
         editButtonsFound.forEach((editButtonFound) => {
-          expect(editButtonFound.nativeElement.disabled).toBeFalse();
+          expect(editButtonFound.nativeElement.getAttribute('aria-disabled')).toBeNull();
+          expect(editButtonFound.nativeElement.classList.contains('disabled')).toBeFalse();
         });
       });
 
@@ -265,7 +267,8 @@ describe('GroupsRegistryComponent', () => {
         const editButtonsFound = fixture.debugElement.queryAll(By.css('#groups tr td:nth-child(5) button.btn-edit'));
         expect(editButtonsFound.length).toEqual(2);
         editButtonsFound.forEach((editButtonFound) => {
-          expect(editButtonFound.nativeElement.disabled).toBeFalse();
+          expect(editButtonFound.nativeElement.getAttribute('aria-disabled')).toBeNull();
+          expect(editButtonFound.nativeElement.classList.contains('disabled')).toBeFalse();
         });
       });
     });
@@ -284,7 +287,8 @@ describe('GroupsRegistryComponent', () => {
         const editButtonsFound = fixture.debugElement.queryAll(By.css('#groups tr td:nth-child(5) button.btn-edit'));
         expect(editButtonsFound.length).toEqual(2);
         editButtonsFound.forEach((editButtonFound) => {
-          expect(editButtonFound.nativeElement.disabled).toBeTrue();
+          expect(editButtonFound.nativeElement.getAttribute('aria-disabled')).toBe('true');
+          expect(editButtonFound.nativeElement.classList.contains('disabled')).toBeTrue();
         });
       });
     });
diff --git a/src/app/access-control/group-registry/groups-registry.component.ts b/src/app/access-control/group-registry/groups-registry.component.ts
index ccfd155e39..06a048ad72 100644
--- a/src/app/access-control/group-registry/groups-registry.component.ts
+++ b/src/app/access-control/group-registry/groups-registry.component.ts
@@ -216,18 +216,28 @@ export class GroupsRegistryComponent implements OnInit, OnDestroy {
 
   /**
    * Get the members (epersons embedded value of a group)
+   * NOTE: At this time we only grab the *first* member in order to receive the `totalElements` value
+   * needed for our HTML template.
    * @param group
    */
   getMembers(group: Group): Observable<RemoteData<PaginatedList<EPerson>>> {
-    return this.ePersonDataService.findListByHref(group._links.epersons.href).pipe(getFirstSucceededRemoteData());
+    return this.ePersonDataService.findListByHref(group._links.epersons.href, {
+        currentPage: 1,
+        elementsPerPage: 1,
+      }).pipe(getFirstSucceededRemoteData());
   }
 
   /**
    * Get the subgroups (groups embedded value of a group)
+   * NOTE: At this time we only grab the *first* subgroup in order to receive the `totalElements` value
+   * needed for our HTML template.
    * @param group
    */
   getSubgroups(group: Group): Observable<RemoteData<PaginatedList<Group>>> {
-    return this.groupService.findListByHref(group._links.subgroups.href).pipe(getFirstSucceededRemoteData());
+    return this.groupService.findListByHref(group._links.subgroups.href, {
+        currentPage: 1,
+        elementsPerPage: 1,
+      }).pipe(getFirstSucceededRemoteData());
   }
 
   /**
diff --git a/src/app/admin/admin-curation-tasks/admin-curation-tasks.component.html b/src/app/admin/admin-curation-tasks/admin-curation-tasks.component.html
index a702a7e6b0..ba3a6f45d7 100644
--- a/src/app/admin/admin-curation-tasks/admin-curation-tasks.component.html
+++ b/src/app/admin/admin-curation-tasks/admin-curation-tasks.component.html
@@ -1,4 +1,4 @@
 <div class="container">
-    <h2>{{'admin.curation-tasks.header' |translate }}</h2>
+    <h1>{{'admin.curation-tasks.header' |translate }}</h1>
     <ds-curation-form></ds-curation-form>
 </div>
diff --git a/src/app/admin/admin-import-batch-page/batch-import-page.component.html b/src/app/admin/admin-import-batch-page/batch-import-page.component.html
index 1092443436..c51ee7597c 100644
--- a/src/app/admin/admin-import-batch-page/batch-import-page.component.html
+++ b/src/app/admin/admin-import-batch-page/batch-import-page.component.html
@@ -1,5 +1,5 @@
 <div class="container">
-  <h2 id="header">{{'admin.batch-import.page.header' | translate}}</h2>
+  <h1 id="header">{{'admin.batch-import.page.header' | translate}}</h1>
   <p>{{'admin.batch-import.page.help' | translate}}</p>
   <p *ngIf="dso">
     selected collection: <b>{{getDspaceObjectName()}}</b>&nbsp;
@@ -28,7 +28,7 @@
   <small class="form-text text-muted">
     {{'admin.batch-import.page.toggle.help' | translate}}
   </small>
-  
+
 
   <ds-file-dropzone-no-uploader
     *ngIf="isUpload"
diff --git a/src/app/admin/admin-import-metadata-page/metadata-import-page.component.html b/src/app/admin/admin-import-metadata-page/metadata-import-page.component.html
index 24901cc11d..73e69737ca 100644
--- a/src/app/admin/admin-import-metadata-page/metadata-import-page.component.html
+++ b/src/app/admin/admin-import-metadata-page/metadata-import-page.component.html
@@ -1,5 +1,5 @@
 <div class="container">
-  <h2 id="header">{{'admin.metadata-import.page.header' | translate}}</h2>
+  <h1 id="header">{{'admin.metadata-import.page.header' | translate}}</h1>
   <p>{{'admin.metadata-import.page.help' | translate}}</p>
   <div class="form-group">
     <div class="form-check">
diff --git a/src/app/admin/admin-registries/bitstream-formats/add-bitstream-format/add-bitstream-format.component.html b/src/app/admin/admin-registries/bitstream-formats/add-bitstream-format/add-bitstream-format.component.html
index 2b65b369b2..d1be68633f 100644
--- a/src/app/admin/admin-registries/bitstream-formats/add-bitstream-format/add-bitstream-format.component.html
+++ b/src/app/admin/admin-registries/bitstream-formats/add-bitstream-format/add-bitstream-format.component.html
@@ -1,11 +1,11 @@
 <div class="container">
     <div class="row">
         <div class="col-12 mb-4">
-            <h2 id="sub-header"
-                class="border-bottom mb-2">{{ 'admin.registries.bitstream-formats.create.new' | translate }}</h2>
+            <h1 id="sub-header"
+                class="border-bottom pb-2">{{ 'admin.registries.bitstream-formats.create.new' | translate }}</h1>
 
             <ds-bitstream-format-form (updatedFormat)="createBitstreamFormat($event)"></ds-bitstream-format-form>
 
         </div>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.html b/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.html
index 0a2e9f0f92..afb34dad49 100644
--- a/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.html
+++ b/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.html
@@ -2,24 +2,23 @@
   <div class="bitstream-formats row">
     <div class="col-12">
 
-      <h2 id="header" class="border-bottom pb-2 ">{{'admin.registries.bitstream-formats.head' | translate}}</h2>
+      <h1 id="header" class="border-bottom pb-2">{{'admin.registries.bitstream-formats.head' | translate}}</h1>
 
       <p id="description">{{'admin.registries.bitstream-formats.description' | translate}}</p>
       <p id="create-new" class="mb-2"><a [routerLink]="'add'" class="btn btn-success">{{'admin.registries.bitstream-formats.create.new' | translate}}</a></p>
 
 
       <ds-pagination
-        *ngIf="(bitstreamFormats | async)?.payload?.totalElements > 0"
+        *ngIf="(bitstreamFormats$ | async)?.payload?.totalElements > 0"
         [paginationOptions]="pageConfig"
-        [pageInfoState]="(bitstreamFormats | async)?.payload"
-        [collectionSize]="(bitstreamFormats | async)?.payload?.totalElements"
+        [collectionSize]="(bitstreamFormats$ | async)?.payload?.totalElements"
         [hideGear]="false"
         [hidePagerWhenSinglePage]="true">
         <div class="table-responsive">
           <table id="formats" class="table table-striped table-hover">
             <thead>
             <tr>
-              <th scope="col"></th>
+              <th scope="col"><span class="sr-only">{{'admin.registries.bitstream-formats.table.selected' | translate}}</span></th>
               <th scope="col">{{'admin.registries.bitstream-formats.table.id' | translate}}</th>
               <th scope="col">{{'admin.registries.bitstream-formats.table.name' | translate}}</th>
               <th scope="col">{{'admin.registries.bitstream-formats.table.mimetype' | translate}}</th>
@@ -27,13 +26,15 @@
             </tr>
             </thead>
             <tbody>
-            <tr *ngFor="let bitstreamFormat of (bitstreamFormats | async)?.payload?.page">
+            <tr *ngFor="let bitstreamFormat of (bitstreamFormats$ | async)?.payload?.page">
               <td>
                 <label class="mb-0">
                   <input type="checkbox"
-                         [checked]="isSelected(bitstreamFormat) | async"
+                         [attr.aria-label]="'admin.registries.bitstream-formats.select' | translate"
+                         [checked]="(selectedBitstreamFormatIDs$ | async)?.includes(bitstreamFormat.id)"
                          (change)="selectBitStreamFormat(bitstreamFormat, $event)"
                   >
+                  <span class="sr-only">{{'admin.registries.bitstream-formats.select' | translate}}}</span>
                 </label>
               </td>
               <td><a [routerLink]="['/admin/registries/bitstream-formats', bitstreamFormat.id, 'edit']">{{bitstreamFormat.id}}</a></td>
@@ -45,13 +46,13 @@
           </table>
         </div>
       </ds-pagination>
-      <div *ngIf="(bitstreamFormats | async)?.payload?.totalElements == 0" class="alert alert-info" role="alert">
+      <div *ngIf="(bitstreamFormats$ | async)?.payload?.totalElements == 0" class="alert alert-info" role="alert">
         {{'admin.registries.bitstream-formats.no-items' | translate}}
       </div>
 
       <div>
-        <button *ngIf="(bitstreamFormats | async)?.payload?.page?.length > 0" class="btn btn-primary deselect" (click)="deselectAll()">{{'admin.registries.bitstream-formats.table.deselect-all' | translate}}</button>
-        <button *ngIf="(bitstreamFormats | async)?.payload?.page?.length > 0" type="submit" class="btn btn-danger float-right" (click)="deleteFormats()">{{'admin.registries.bitstream-formats.table.delete' | translate}}</button>
+        <button *ngIf="(bitstreamFormats$ | async)?.payload?.page?.length > 0" class="btn btn-primary deselect" (click)="deselectAll()">{{'admin.registries.bitstream-formats.table.deselect-all' | translate}}</button>
+        <button *ngIf="(bitstreamFormats$ | async)?.payload?.page?.length > 0" type="submit" class="btn btn-danger float-right" (click)="deleteFormats()">{{'admin.registries.bitstream-formats.table.delete' | translate}}</button>
       </div>
     </div>
   </div>
diff --git a/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.spec.ts b/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.spec.ts
index 8a44240b7e..8041e21206 100644
--- a/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.spec.ts
+++ b/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.spec.ts
@@ -15,8 +15,8 @@ import { NotificationsService } from '../../../shared/notifications/notification
 import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
 import { BitstreamFormat } from '../../../core/shared/bitstream-format.model';
 import { BitstreamFormatSupportLevel } from '../../../core/shared/bitstream-format-support-level';
-import { cold, getTestScheduler, hot } from 'jasmine-marbles';
-import { TestScheduler } from 'rxjs/testing';
+import { XSRFService } from '../../../core/xsrf/xsrf.service';
+import { hot } from 'jasmine-marbles';
 import {
   createNoContentRemoteDataObject$,
   createSuccessfulRemoteDataObject,
@@ -31,7 +31,6 @@ describe('BitstreamFormatsComponent', () => {
   let comp: BitstreamFormatsComponent;
   let fixture: ComponentFixture<BitstreamFormatsComponent>;
   let bitstreamFormatService;
-  let scheduler: TestScheduler;
   let notificationsServiceStub;
   let paginationService;
 
@@ -86,8 +85,6 @@ describe('BitstreamFormatsComponent', () => {
   const initAsync = () => {
     notificationsServiceStub = new NotificationsServiceStub();
 
-    scheduler = getTestScheduler();
-
     bitstreamFormatService = jasmine.createSpyObj('bitstreamFormatService', {
       findAll: observableOf(mockFormatsRD),
       find: createSuccessfulRemoteDataObject$(mockFormatsList[0]),
@@ -108,7 +105,8 @@ describe('BitstreamFormatsComponent', () => {
         { provide: BitstreamFormatDataService, useValue: bitstreamFormatService },
         { provide: HostWindowService, useValue: new HostWindowServiceStub(0) },
         { provide: NotificationsService, useValue: notificationsServiceStub },
-        { provide: PaginationService, useValue: paginationService }
+        { provide: PaginationService, useValue: paginationService },
+        { provide: XSRFService, useValue: {} },
       ]
     }).compileComponents();
   };
@@ -178,17 +176,17 @@ describe('BitstreamFormatsComponent', () => {
     beforeEach(waitForAsync(initAsync));
     beforeEach(initBeforeEach);
     it('should return an observable of true if the provided bistream is in the list returned by the service', () => {
-      const result = comp.isSelected(bitstreamFormat1);
-
-      expect(result).toBeObservable(cold('b', { b: true }));
+      comp.selectedBitstreamFormatIDs().subscribe((selectedBitstreamFormatIDs: string[]) => {
+        expect(selectedBitstreamFormatIDs).toContain(bitstreamFormat1.id);
+      });
     });
     it('should return an observable of false if the provided bistream is not in the list returned by the service', () => {
       const format = new BitstreamFormat();
       format.uuid = 'new';
 
-      const result = comp.isSelected(format);
-
-      expect(result).toBeObservable(cold('b', { b: false }));
+      comp.selectedBitstreamFormatIDs().subscribe((selectedBitstreamFormatIDs: string[]) => {
+        expect(selectedBitstreamFormatIDs).not.toContain(format.id);
+      });
     });
   });
 
@@ -214,8 +212,6 @@ describe('BitstreamFormatsComponent', () => {
     beforeEach(waitForAsync(() => {
         notificationsServiceStub = new NotificationsServiceStub();
 
-        scheduler = getTestScheduler();
-
         bitstreamFormatService = jasmine.createSpyObj('bitstreamFormatService', {
           findAll: observableOf(mockFormatsRD),
           find: createSuccessfulRemoteDataObject$(mockFormatsList[0]),
@@ -263,8 +259,6 @@ describe('BitstreamFormatsComponent', () => {
     beforeEach(waitForAsync(() => {
         notificationsServiceStub = new NotificationsServiceStub();
 
-        scheduler = getTestScheduler();
-
         bitstreamFormatService = jasmine.createSpyObj('bitstreamFormatService', {
           findAll: observableOf(mockFormatsRD),
           find: createSuccessfulRemoteDataObject$(mockFormatsList[0]),
diff --git a/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.ts b/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.ts
index 162bf2bdb2..263c1aede2 100644
--- a/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.ts
+++ b/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.ts
@@ -1,5 +1,5 @@
 import { Component, OnDestroy, OnInit } from '@angular/core';
-import { combineLatest as observableCombineLatest, Observable} from 'rxjs';
+import { Observable} from 'rxjs';
 import { RemoteData } from '../../../core/data/remote-data';
 import { PaginatedList } from '../../../core/data/paginated-list.model';
 import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
@@ -7,7 +7,6 @@ import { BitstreamFormat } from '../../../core/shared/bitstream-format.model';
 import { BitstreamFormatDataService } from '../../../core/data/bitstream-format-data.service';
 import { map, mergeMap, switchMap, take, toArray } from 'rxjs/operators';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
-import { Router } from '@angular/router';
 import { TranslateService } from '@ngx-translate/core';
 import { NoContent } from '../../../core/shared/NoContent.model';
 import { PaginationService } from '../../../core/pagination/pagination.service';
@@ -26,7 +25,12 @@ export class BitstreamFormatsComponent implements OnInit, OnDestroy {
   /**
    * A paginated list of bitstream formats to be shown on the page
    */
-  bitstreamFormats: Observable<RemoteData<PaginatedList<BitstreamFormat>>>;
+  bitstreamFormats$: Observable<RemoteData<PaginatedList<BitstreamFormat>>>;
+
+  /**
+   * The currently selected {@link BitstreamFormat} IDs
+   */
+  selectedBitstreamFormatIDs$: Observable<string[]>;
 
   /**
    * The current pagination configuration for the page
@@ -39,7 +43,6 @@ export class BitstreamFormatsComponent implements OnInit, OnDestroy {
   });
 
   constructor(private notificationsService: NotificationsService,
-              private router: Router,
               private translateService: TranslateService,
               private bitstreamFormatService: BitstreamFormatDataService,
               private paginationService: PaginationService,
@@ -94,14 +97,11 @@ export class BitstreamFormatsComponent implements OnInit, OnDestroy {
   }
 
   /**
-   * Checks whether a given bitstream format is selected in the list (checkbox)
-   * @param bitstreamFormat
+   * Returns the list of all the bitstream formats that are selected in the list (checkbox)
    */
-  isSelected(bitstreamFormat: BitstreamFormat): Observable<boolean> {
+  selectedBitstreamFormatIDs(): Observable<string[]> {
     return this.bitstreamFormatService.getSelectedBitstreamFormats().pipe(
-      map((bitstreamFormats: BitstreamFormat[]) => {
-        return bitstreamFormats.find((selectedFormat) => selectedFormat.id === bitstreamFormat.id) != null;
-      })
+      map((bitstreamFormats: BitstreamFormat[]) => bitstreamFormats.map((selectedFormat) => selectedFormat.id)),
     );
   }
 
@@ -125,27 +125,23 @@ export class BitstreamFormatsComponent implements OnInit, OnDestroy {
     const prefix = 'admin.registries.bitstream-formats.delete';
     const suffix = success ? 'success' : 'failure';
 
-    const messages = observableCombineLatest(
-      this.translateService.get(`${prefix}.${suffix}.head`),
-      this.translateService.get(`${prefix}.${suffix}.amount`, {amount: amount})
-    );
-    messages.subscribe(([head, content]) => {
+    const head: string = this.translateService.instant(`${prefix}.${suffix}.head`);
+    const content: string = this.translateService.instant(`${prefix}.${suffix}.amount`, { amount: amount });
 
-      if (success) {
-        this.notificationsService.success(head, content);
-      } else {
-        this.notificationsService.error(head, content);
-      }
-    });
+    if (success) {
+      this.notificationsService.success(head, content);
+    } else {
+      this.notificationsService.error(head, content);
+    }
   }
 
   ngOnInit(): void {
-
-    this.bitstreamFormats = this.paginationService.getFindListOptions(this.pageConfig.id, this.pageConfig).pipe(
+    this.bitstreamFormats$ = this.paginationService.getFindListOptions(this.pageConfig.id, this.pageConfig).pipe(
       switchMap((findListOptions: FindListOptions) => {
         return this.bitstreamFormatService.findAll(findListOptions);
       })
     );
+    this.selectedBitstreamFormatIDs$ = this.selectedBitstreamFormatIDs();
   }
 
 
diff --git a/src/app/admin/admin-registries/bitstream-formats/edit-bitstream-format/edit-bitstream-format.component.html b/src/app/admin/admin-registries/bitstream-formats/edit-bitstream-format/edit-bitstream-format.component.html
index f57ec9cd38..efcced2a87 100644
--- a/src/app/admin/admin-registries/bitstream-formats/edit-bitstream-format/edit-bitstream-format.component.html
+++ b/src/app/admin/admin-registries/bitstream-formats/edit-bitstream-format/edit-bitstream-format.component.html
@@ -1,11 +1,11 @@
 <div class="container">
     <div class="row">
         <div class="col-12 mb-4">
-            <h2 id="sub-header"
-                class="border-bottom mb-2">{{'admin.registries.bitstream-formats.edit.head' | translate:{format: (bitstreamFormatRD$ | async)?.payload.shortDescription} }}</h2>
+            <h1 id="sub-header"
+                class="border-bottom pb-2">{{'admin.registries.bitstream-formats.edit.head' | translate:{format: (bitstreamFormatRD$ | async)?.payload.shortDescription} }}</h1>
 
              <ds-bitstream-format-form [bitstreamFormat]="(bitstreamFormatRD$ | async)?.payload" (updatedFormat)="updateFormat($event)"></ds-bitstream-format-form>
 
         </div>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.html b/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.html
index 35bffad185..4808132893 100644
--- a/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.html
+++ b/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.html
@@ -2,7 +2,7 @@
     <div class="metadata-registry row">
         <div class="col-12">
 
-            <h2 id="header" class="border-bottom pb-2">{{'admin.registries.metadata.head' | translate}}</h2>
+            <h1 id="header" class="border-bottom pb-2">{{'admin.registries.metadata.head' | translate}}</h1>
 
             <p id="description" class="pb-2">{{'admin.registries.metadata.description' | translate}}</p>
 
@@ -19,7 +19,7 @@
                     <table id="metadata-schemas" class="table table-striped table-hover">
                         <thead>
                         <tr>
-                            <th scope="col"></th>
+                            <th scope="col"><span class="sr-only">{{'admin.registries.metadata.schemas.table.selected' | translate}}</span></th>
                             <th scope="col">{{'admin.registries.metadata.schemas.table.id' | translate}}</th>
                             <th scope="col">{{'admin.registries.metadata.schemas.table.namespace' | translate}}</th>
                             <th scope="col">{{'admin.registries.metadata.schemas.table.name' | translate}}</th>
@@ -27,13 +27,15 @@
                         </thead>
                         <tbody>
                         <tr *ngFor="let schema of (metadataSchemas | async)?.payload?.page"
-                            [ngClass]="{'table-primary' : isActive(schema) | async}">
+                            [ngClass]="{'table-primary' : (activeMetadataSchema$ | async)?.id === schema.id}">
                             <td>
                                 <label class="mb-0">
                                     <input type="checkbox"
-                                           [checked]="isSelected(schema) | async"
+                                           [checked]="(selectedMetadataSchemaIDs$ | async)?.includes(schema.id)"
                                            (change)="selectMetadataSchema(schema, $event)"
                                     >
+                                    <span class="sr-only">{{(((selectedMetadataSchemaIDs$ | async)?.includes(schema.id)) ? 'admin.registries.metadata.schemas.deselect' : 'admin.registries.metadata.schemas.select') | translate}}</span>
+
                                 </label>
                             </td>
                             <td class="selectable-row" (click)="editSchema(schema)"><a [routerLink]="[schema.prefix]">{{schema.id}}</a></td>
diff --git a/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.spec.ts b/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.spec.ts
index 944288a7a5..d69d14aacf 100644
--- a/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.spec.ts
+++ b/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.spec.ts
@@ -1,7 +1,6 @@
 import { MetadataRegistryComponent } from './metadata-registry.component';
 import { ComponentFixture, inject, TestBed, waitForAsync } from '@angular/core/testing';
 import { of as observableOf } from 'rxjs';
-import { buildPaginatedList } from '../../../core/data/paginated-list.model';
 import { TranslateModule } from '@ngx-translate/core';
 import { By } from '@angular/platform-browser';
 import { CommonModule } from '@angular/common';
@@ -15,18 +14,21 @@ import { HostWindowService } from '../../../shared/host-window.service';
 import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
 import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
-import { RestResponse } from '../../../core/cache/response.models';
 import { MetadataSchema } from '../../../core/metadata/metadata-schema.model';
 import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
 import { PaginationService } from '../../../core/pagination/pagination.service';
 import { PaginationServiceStub } from '../../../shared/testing/pagination-service.stub';
+import { RegistryServiceStub } from '../../../shared/testing/registry.service.stub';
+import { createPaginatedList } from '../../../shared/testing/utils.test';
 
 describe('MetadataRegistryComponent', () => {
   let comp: MetadataRegistryComponent;
   let fixture: ComponentFixture<MetadataRegistryComponent>;
-  let registryService: RegistryService;
-  let paginationService;
-  const mockSchemasList = [
+
+  let paginationService: PaginationServiceStub;
+  let registryService: RegistryServiceStub;
+
+  const mockSchemasList: MetadataSchema[] = [
     {
       id: 1,
       _links: {
@@ -47,32 +49,18 @@ describe('MetadataRegistryComponent', () => {
       prefix: 'mock',
       namespace: 'http://dspace.org/mockschema'
     }
-  ];
-  const mockSchemas = createSuccessfulRemoteDataObject$(buildPaginatedList(null, mockSchemasList));
-  /* eslint-disable no-empty,@typescript-eslint/no-empty-function */
-  const registryServiceStub = {
-    getMetadataSchemas: () => mockSchemas,
-    getActiveMetadataSchema: () => observableOf(undefined),
-    getSelectedMetadataSchemas: () => observableOf([]),
-    editMetadataSchema: (schema) => {
-    },
-    cancelEditMetadataSchema: () => {
-    },
-    deleteMetadataSchema: () => observableOf(new RestResponse(true, 200, 'OK')),
-    deselectAllMetadataSchema: () => {
-    },
-    clearMetadataSchemaRequests: () => observableOf(undefined)
-  };
-  /* eslint-enable no-empty, @typescript-eslint/no-empty-function */
-
-  paginationService = new PaginationServiceStub();
+  ] as MetadataSchema[];
 
   beforeEach(waitForAsync(() => {
+    paginationService = new PaginationServiceStub();
+    registryService = new RegistryServiceStub();
+    spyOn(registryService, 'getMetadataSchemas').and.returnValue(createSuccessfulRemoteDataObject$(createPaginatedList(mockSchemasList)));
+
     TestBed.configureTestingModule({
       imports: [CommonModule, RouterTestingModule.withRoutes([]), TranslateModule.forRoot(), NgbModule],
       declarations: [MetadataRegistryComponent, PaginationComponent, EnumKeysPipe],
       providers: [
-        { provide: RegistryService, useValue: registryServiceStub },
+        { provide: RegistryService, useValue: registryService },
         { provide: HostWindowService, useValue: new HostWindowServiceStub(0) },
         { provide: PaginationService, useValue: paginationService },
         { provide: NotificationsService, useValue: new NotificationsServiceStub() }
@@ -123,7 +111,7 @@ describe('MetadataRegistryComponent', () => {
     }));
 
     it('should cancel editing the selected schema when clicked again', waitForAsync(() => {
-      spyOn(registryService, 'getActiveMetadataSchema').and.returnValue(observableOf(mockSchemasList[0] as MetadataSchema));
+      comp.activeMetadataSchema$ = observableOf(mockSchemasList[0] as MetadataSchema);
       spyOn(registryService, 'cancelEditMetadataSchema');
       row.click();
       fixture.detectChanges();
@@ -138,7 +126,7 @@ describe('MetadataRegistryComponent', () => {
 
     beforeEach(() => {
       spyOn(registryService, 'deleteMetadataSchema').and.callThrough();
-      spyOn(registryService, 'getSelectedMetadataSchemas').and.returnValue(observableOf(selectedSchemas as MetadataSchema[]));
+      comp.selectedMetadataSchemaIDs$ = observableOf(selectedSchemas.map((selectedSchema: MetadataSchema) => selectedSchema.id));
       comp.deleteSchemas();
       fixture.detectChanges();
     });
diff --git a/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.ts b/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.ts
index 857034604e..dbeb2b4f52 100644
--- a/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.ts
+++ b/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.ts
@@ -1,13 +1,11 @@
-import { Component } from '@angular/core';
+import { Component, OnInit, OnDestroy } from '@angular/core';
 import { RegistryService } from '../../../core/registry/registry.service';
-import { BehaviorSubject, combineLatest as observableCombineLatest, Observable, zip } from 'rxjs';
+import { BehaviorSubject, Observable, zip, Subscription } from 'rxjs';
 import { RemoteData } from '../../../core/data/remote-data';
 import { PaginatedList } from '../../../core/data/paginated-list.model';
 import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
 import { filter, map, switchMap, take } from 'rxjs/operators';
-import { hasValue } from '../../../shared/empty.util';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
-import { Router } from '@angular/router';
 import { TranslateService } from '@ngx-translate/core';
 import { MetadataSchema } from '../../../core/metadata/metadata-schema.model';
 import { toFindListOptions } from '../../../shared/pagination/pagination.utils';
@@ -24,13 +22,23 @@ import { PaginationService } from '../../../core/pagination/pagination.service';
  * A component used for managing all existing metadata schemas within the repository.
  * The admin can create, edit or delete metadata schemas here.
  */
-export class MetadataRegistryComponent {
+export class MetadataRegistryComponent implements OnDestroy, OnInit {
 
   /**
    * A list of all the current metadata schemas within the repository
    */
   metadataSchemas: Observable<RemoteData<PaginatedList<MetadataSchema>>>;
 
+  /**
+   * The {@link MetadataSchema}that is being edited
+   */
+  activeMetadataSchema$: Observable<MetadataSchema>;
+
+  /**
+   * The selected {@link MetadataSchema} IDs
+   */
+  selectedMetadataSchemaIDs$: Observable<number[]>;
+
   /**
    * Pagination config used to display the list of metadata schemas
    */
@@ -40,15 +48,25 @@ export class MetadataRegistryComponent {
   });
 
   /**
-   * Whether or not the list of MetadataSchemas needs an update
+   * Whether the list of MetadataSchemas needs an update
    */
   needsUpdate$: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(true);
 
-  constructor(private registryService: RegistryService,
-              private notificationsService: NotificationsService,
-              private router: Router,
-              private paginationService: PaginationService,
-              private translateService: TranslateService) {
+  subscriptions: Subscription[] = [];
+
+  constructor(
+    protected registryService: RegistryService,
+    protected notificationsService: NotificationsService,
+    protected paginationService: PaginationService,
+    protected translateService: TranslateService,
+  ) {
+  }
+
+  ngOnInit(): void {
+    this.activeMetadataSchema$ = this.registryService.getActiveMetadataSchema();
+    this.selectedMetadataSchemaIDs$ = this.registryService.getSelectedMetadataSchemas().pipe(
+      map((schemas: MetadataSchema[]) => schemas.map((schema: MetadataSchema) => schema.id)),
+    );
     this.updateSchemas();
   }
 
@@ -77,30 +95,13 @@ export class MetadataRegistryComponent {
    * @param schema
    */
   editSchema(schema: MetadataSchema) {
-    this.getActiveSchema().pipe(take(1)).subscribe((activeSchema) => {
+    this.subscriptions.push(this.activeMetadataSchema$.pipe(take(1)).subscribe((activeSchema: MetadataSchema) => {
       if (schema === activeSchema) {
         this.registryService.cancelEditMetadataSchema();
       } else {
         this.registryService.editMetadataSchema(schema);
       }
-    });
-  }
-
-  /**
-   * Checks whether the given metadata schema is active (being edited)
-   * @param schema
-   */
-  isActive(schema: MetadataSchema): Observable<boolean> {
-    return this.getActiveSchema().pipe(
-      map((activeSchema) => schema === activeSchema)
-    );
-  }
-
-  /**
-   * Gets the active metadata schema (being edited)
-   */
-  getActiveSchema(): Observable<MetadataSchema> {
-    return this.registryService.getActiveMetadataSchema();
+    }));
   }
 
   /**
@@ -114,42 +115,25 @@ export class MetadataRegistryComponent {
       this.registryService.deselectMetadataSchema(schema);
   }
 
-  /**
-   * Checks whether a given metadata schema is selected in the list (checkbox)
-   * @param schema
-   */
-  isSelected(schema: MetadataSchema): Observable<boolean> {
-    return this.registryService.getSelectedMetadataSchemas().pipe(
-      map((schemas) => schemas.find((selectedSchema) => selectedSchema === schema) != null)
-    );
-  }
-
   /**
    * Delete all the selected metadata schemas
    */
   deleteSchemas() {
-    this.registryService.getSelectedMetadataSchemas().pipe(take(1)).subscribe(
-      (schemas) => {
-        const tasks$ = [];
-        for (const schema of schemas) {
-          if (hasValue(schema.id)) {
-            tasks$.push(this.registryService.deleteMetadataSchema(schema.id).pipe(getFirstCompletedRemoteData()));
-          }
-        }
-        zip(...tasks$).subscribe((responses: RemoteData<NoContent>[]) => {
-          const successResponses = responses.filter((response: RemoteData<NoContent>) => response.hasSucceeded);
-          const failedResponses = responses.filter((response: RemoteData<NoContent>) => response.hasFailed);
-          if (successResponses.length > 0) {
-            this.showNotification(true, successResponses.length);
-          }
-          if (failedResponses.length > 0) {
-            this.showNotification(false, failedResponses.length);
-          }
-          this.registryService.deselectAllMetadataSchema();
-          this.registryService.cancelEditMetadataSchema();
-        });
+    this.subscriptions.push(this.selectedMetadataSchemaIDs$.pipe(
+      take(1),
+      switchMap((schemaIDs: number[]) => zip(schemaIDs.map((schemaID: number) => this.registryService.deleteMetadataSchema(schemaID).pipe(getFirstCompletedRemoteData())))),
+    ).subscribe((responses: RemoteData<NoContent>[]) => {
+      const successResponses: RemoteData<NoContent>[] = responses.filter((response: RemoteData<NoContent>) => response.hasSucceeded);
+      const failedResponses: RemoteData<NoContent>[] = responses.filter((response: RemoteData<NoContent>) => response.hasFailed);
+      if (successResponses.length > 0) {
+        this.showNotification(true, successResponses.length);
       }
-    );
+      if (failedResponses.length > 0) {
+        this.showNotification(false, failedResponses.length);
+      }
+      this.registryService.deselectAllMetadataSchema();
+      this.registryService.cancelEditMetadataSchema();
+    }));
   }
 
   /**
@@ -160,20 +144,20 @@ export class MetadataRegistryComponent {
   showNotification(success: boolean, amount: number) {
     const prefix = 'admin.registries.schema.notification';
     const suffix = success ? 'success' : 'failure';
-    const messages = observableCombineLatest(
-      this.translateService.get(success ? `${prefix}.${suffix}` : `${prefix}.${suffix}`),
-      this.translateService.get(`${prefix}.deleted.${suffix}`, {amount: amount})
-    );
-    messages.subscribe(([head, content]) => {
-      if (success) {
-        this.notificationsService.success(head, content);
-      } else {
-        this.notificationsService.error(head, content);
-      }
-    });
+
+    const head: string = this.translateService.instant(success ? `${prefix}.${suffix}` : `${prefix}.${suffix}`);
+    const content: string = this.translateService.instant(`${prefix}.deleted.${suffix}`, {amount: amount});
+
+    if (success) {
+      this.notificationsService.success(head, content);
+    } else {
+      this.notificationsService.error(head, content);
+    }
   }
+
   ngOnDestroy(): void {
     this.paginationService.clearPagination(this.config.id);
+    this.subscriptions.map((subscription: Subscription) => subscription.unsubscribe());
   }
 
 }
diff --git a/src/app/admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.html b/src/app/admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.html
index a4a4613565..15cc81d9ca 100644
--- a/src/app/admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.html
+++ b/src/app/admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.html
@@ -1,11 +1,11 @@
-<div *ngIf="registryService.getActiveMetadataSchema() | async; then editheader; else createHeader"></div>
+<div *ngIf="activeMetadataSchema$ | async; then editheader; else createHeader"></div>
 
 <ng-template #createHeader>
-    <h4>{{messagePrefix + '.create' | translate}}</h4>
+    <h2>{{messagePrefix + '.create' | translate}}</h2>
 </ng-template>
 
 <ng-template #editheader>
-    <h4>{{messagePrefix + '.edit' | translate}}</h4>
+    <h2>{{messagePrefix + '.edit' | translate}}</h2>
 </ng-template>
 
 <ds-form [formId]="formId"
diff --git a/src/app/admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.spec.ts b/src/app/admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.spec.ts
index b758767ddb..442a06dc67 100644
--- a/src/app/admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.spec.ts
+++ b/src/app/admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.spec.ts
@@ -1,6 +1,6 @@
 import { ComponentFixture, inject, TestBed, waitForAsync } from '@angular/core/testing';
 import { MetadataSchemaFormComponent } from './metadata-schema-form.component';
-import { NO_ERRORS_SCHEMA } from '@angular/core';
+import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { RouterTestingModule } from '@angular/router/testing';
 import { TranslateModule } from '@ngx-translate/core';
@@ -10,41 +10,26 @@ import { RegistryService } from '../../../../core/registry/registry.service';
 import { FormBuilderService } from '../../../../shared/form/builder/form-builder.service';
 import { of as observableOf } from 'rxjs';
 import { MetadataSchema } from '../../../../core/metadata/metadata-schema.model';
+import { RegistryServiceStub } from '../../../../shared/testing/registry.service.stub';
+import { getMockFormBuilderService } from '../../../../shared/mocks/form-builder-service.mock';
 
 describe('MetadataSchemaFormComponent', () => {
   let component: MetadataSchemaFormComponent;
   let fixture: ComponentFixture<MetadataSchemaFormComponent>;
-  let registryService: RegistryService;
 
-  /* eslint-disable no-empty,@typescript-eslint/no-empty-function */
-  const registryServiceStub = {
-    getActiveMetadataSchema: () => observableOf(undefined),
-    createOrUpdateMetadataSchema: (schema: MetadataSchema) => observableOf(schema),
-    cancelEditMetadataSchema: () => {
-    },
-    clearMetadataSchemaRequests: () => observableOf(undefined)
-  };
-  const formBuilderServiceStub = {
-    createFormGroup: () => {
-      return {
-        patchValue: () => {
-        },
-        reset(_value?: any, _options?: { onlySelf?: boolean; emitEvent?: boolean; }): void {
-        },
-      };
-    }
-  };
-  /* eslint-enable no-empty, @typescript-eslint/no-empty-function */
+  let registryService: RegistryServiceStub;
 
   beforeEach(waitForAsync(() => {
+    registryService = new RegistryServiceStub();
+
     return TestBed.configureTestingModule({
       imports: [CommonModule, RouterTestingModule.withRoutes([]), TranslateModule.forRoot(), NgbModule],
       declarations: [MetadataSchemaFormComponent, EnumKeysPipe],
       providers: [
-        { provide: RegistryService, useValue: registryServiceStub },
-        { provide: FormBuilderService, useValue: formBuilderServiceStub }
+        { provide: RegistryService, useValue: registryService },
+        { provide: FormBuilderService, useValue: getMockFormBuilderService() }
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [CUSTOM_ELEMENTS_SCHEMA],
     }).compileComponents();
   }));
 
@@ -75,7 +60,7 @@ describe('MetadataSchemaFormComponent', () => {
 
     describe('without an active schema', () => {
       beforeEach(() => {
-        spyOn(registryService, 'getActiveMetadataSchema').and.returnValue(observableOf(undefined));
+        component.activeMetadataSchema$ = observableOf(undefined);
         component.onSubmit();
         fixture.detectChanges();
       });
@@ -94,7 +79,7 @@ describe('MetadataSchemaFormComponent', () => {
       } as MetadataSchema);
 
       beforeEach(() => {
-        spyOn(registryService, 'getActiveMetadataSchema').and.returnValue(observableOf(expectedWithId));
+        component.activeMetadataSchema$ = observableOf(expectedWithId);
         component.onSubmit();
         fixture.detectChanges();
       });
diff --git a/src/app/admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.ts b/src/app/admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.ts
index 1992289ff7..c8ffd77861 100644
--- a/src/app/admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.ts
+++ b/src/app/admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.ts
@@ -8,10 +8,10 @@ import {
 import { UntypedFormGroup } from '@angular/forms';
 import { RegistryService } from '../../../../core/registry/registry.service';
 import { FormBuilderService } from '../../../../shared/form/builder/form-builder.service';
-import { take } from 'rxjs/operators';
+import { map, switchMap, take } from 'rxjs/operators';
 import { TranslateService } from '@ngx-translate/core';
-import { combineLatest } from 'rxjs';
 import { MetadataSchema } from '../../../../core/metadata/metadata-schema.model';
+import { Subscription, Observable } from 'rxjs';
 
 @Component({
   selector: 'ds-metadata-schema-form',
@@ -73,64 +73,71 @@ export class MetadataSchemaFormComponent implements OnInit, OnDestroy {
    */
   @Output() submitForm: EventEmitter<any> = new EventEmitter();
 
-  constructor(public registryService: RegistryService, private formBuilderService: FormBuilderService, private translateService: TranslateService) {
+  /**
+   * The {@link MetadataSchema} that is currently being edited
+   */
+  activeMetadataSchema$: Observable<MetadataSchema>;
+
+  subscriptions: Subscription[] = [];
+
+  constructor(
+    protected registryService: RegistryService,
+    protected formBuilderService: FormBuilderService,
+    protected translateService: TranslateService,
+  ) {
   }
 
   ngOnInit() {
-    combineLatest([
-      this.translateService.get(`${this.messagePrefix}.name`),
-      this.translateService.get(`${this.messagePrefix}.namespace`)
-    ]).subscribe(([name, namespace]) => {
-      this.name = new DynamicInputModel({
-          id: 'name',
-          label: name,
-          name: 'name',
-          validators: {
-            required: null,
-            pattern: '^[^. ,]*$',
-            maxLength: 32,
-          },
-          required: true,
-          errorMessages: {
-            pattern: 'error.validation.metadata.name.invalid-pattern',
-            maxLength: 'error.validation.metadata.name.max-length',
-          },
-        });
-      this.namespace = new DynamicInputModel({
-          id: 'namespace',
-          label: namespace,
-          name: 'namespace',
-          validators: {
-            required: null,
-            maxLength: 256,
-          },
-          required: true,
-          errorMessages: {
-            maxLength: 'error.validation.metadata.namespace.max-length',
-          },
-        });
-      this.formModel = [
-        new DynamicFormGroupModel(
-          {
-            id: 'metadatadataschemagroup',
-            group:[this.namespace, this.name]
-          })
-      ];
-      this.formGroup = this.formBuilderService.createFormGroup(this.formModel);
-      this.registryService.getActiveMetadataSchema().subscribe((schema: MetadataSchema) => {
-        if (schema == null) {
-          this.clearFields();
-        } else {
-          this.formGroup.patchValue({
-            metadatadataschemagroup: {
-              name: schema.prefix,
-              namespace: schema.namespace,
-            },
-          });
-          this.name.disabled = true;
-        }
+    this.name = new DynamicInputModel({
+        id: 'name',
+        label: this.translateService.instant(`${this.messagePrefix}.name`),
+        name: 'name',
+        validators: {
+          required: null,
+          pattern: '^[^. ,]*$',
+          maxLength: 32,
+        },
+        required: true,
+        errorMessages: {
+          pattern: 'error.validation.metadata.name.invalid-pattern',
+          maxLength: 'error.validation.metadata.name.max-length',
+        },
       });
-    });
+    this.namespace = new DynamicInputModel({
+        id: 'namespace',
+        label: this.translateService.instant(`${this.messagePrefix}.namespace`),
+        name: 'namespace',
+        validators: {
+          required: null,
+          maxLength: 256,
+        },
+        required: true,
+        errorMessages: {
+          maxLength: 'error.validation.metadata.namespace.max-length',
+        },
+      });
+    this.formModel = [
+      new DynamicFormGroupModel(
+        {
+          id: 'metadatadataschemagroup',
+          group:[this.namespace, this.name]
+        })
+    ];
+    this.formGroup = this.formBuilderService.createFormGroup(this.formModel);
+    this.activeMetadataSchema$ = this.registryService.getActiveMetadataSchema();
+    this.subscriptions.push(this.activeMetadataSchema$.subscribe((schema: MetadataSchema) => {
+      if (schema == null) {
+        this.clearFields();
+      } else {
+        this.formGroup.patchValue({
+          metadatadataschemagroup: {
+            name: schema.prefix,
+            namespace: schema.namespace,
+          },
+        });
+        this.name.disabled = true;
+      }
+    }));
   }
 
   /**
@@ -147,30 +154,29 @@ export class MetadataSchemaFormComponent implements OnInit, OnDestroy {
    * Emit the updated/created schema using the EventEmitter submitForm
    */
   onSubmit(): void {
-    this.registryService.clearMetadataSchemaRequests().subscribe();
-    this.registryService.getActiveMetadataSchema().pipe(take(1)).subscribe(
-      (schema: MetadataSchema) => {
-        const values = {
+    this.activeMetadataSchema$.pipe(
+      take(1),
+      switchMap((schema: MetadataSchema) => {
+        const metadataValues = {
           prefix: this.name.value,
-          namespace: this.namespace.value
+          namespace: this.namespace.value,
         };
         if (schema == null) {
-          this.registryService.createOrUpdateMetadataSchema(Object.assign(new MetadataSchema(), values)).subscribe((newSchema) => {
-            this.submitForm.emit(newSchema);
-          });
+          return this.registryService.createOrUpdateMetadataSchema(Object.assign(new MetadataSchema(), metadataValues));
         } else {
-          this.registryService.createOrUpdateMetadataSchema(Object.assign(new MetadataSchema(), schema, {
-            id: schema.id,
-            prefix: schema.prefix,
-            namespace: values.namespace,
-          })).subscribe((updatedSchema: MetadataSchema) => {
-            this.submitForm.emit(updatedSchema);
-          });
+          return this.registryService.createOrUpdateMetadataSchema(Object.assign(new MetadataSchema(), schema, {
+            namespace: metadataValues.namespace,
+          }));
         }
-        this.clearFields();
-        this.registryService.cancelEditMetadataSchema();
-      }
-    );
+      }),
+      switchMap((updatedOrCreatedSchema: MetadataSchema) => this.registryService.clearMetadataSchemaRequests().pipe(
+        map(() => updatedOrCreatedSchema),
+      )),
+    ).subscribe((updatedOrCreatedSchema: MetadataSchema) => {
+      this.submitForm.emit(updatedOrCreatedSchema);
+      this.clearFields();
+      this.registryService.cancelEditMetadataSchema();
+    });
   }
 
   /**
@@ -186,5 +192,6 @@ export class MetadataSchemaFormComponent implements OnInit, OnDestroy {
    */
   ngOnDestroy(): void {
     this.onCancel();
+    this.subscriptions.forEach((subscription: Subscription) => subscription.unsubscribe());
   }
 }
diff --git a/src/app/admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.html b/src/app/admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.html
index 4e29fbb6e8..44b6bfb697 100644
--- a/src/app/admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.html
+++ b/src/app/admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.html
@@ -1,11 +1,11 @@
 <div *ngIf="registryService.getActiveMetadataField() | async; then editheader; else createHeader"></div>
 
 <ng-template #createHeader>
-    <h4>{{messagePrefix + '.create' | translate}}</h4>
+    <h2>{{messagePrefix + '.create' | translate}}</h2>
 </ng-template>
 
 <ng-template #editheader>
-    <h4>{{messagePrefix + '.edit' | translate}}</h4>
+    <h2>{{messagePrefix + '.edit' | translate}}</h2>
 </ng-template>
 
 <ds-form [formId]="formId"
diff --git a/src/app/admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.spec.ts b/src/app/admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.spec.ts
index ad7b54945d..7ae672f9e1 100644
--- a/src/app/admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.spec.ts
+++ b/src/app/admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.spec.ts
@@ -9,14 +9,17 @@ import { TranslateModule } from '@ngx-translate/core';
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
 import { EnumKeysPipe } from '../../../../shared/utils/enum-keys-pipe';
 import { FormBuilderService } from '../../../../shared/form/builder/form-builder.service';
-import { NO_ERRORS_SCHEMA } from '@angular/core';
+import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
 import { MetadataField } from '../../../../core/metadata/metadata-field.model';
 import { MetadataSchema } from '../../../../core/metadata/metadata-schema.model';
+import { getMockFormBuilderService } from '../../../../shared/mocks/form-builder-service.mock';
+import { RegistryServiceStub } from '../../../../shared/testing/registry.service.stub';
 
 describe('MetadataFieldFormComponent', () => {
   let component: MetadataFieldFormComponent;
   let fixture: ComponentFixture<MetadataFieldFormComponent>;
-  let registryService: RegistryService;
+
+  let registryService: RegistryServiceStub;
 
   const metadataSchema = Object.assign(new MetadataSchema(), {
     id: 1,
@@ -24,38 +27,17 @@ describe('MetadataFieldFormComponent', () => {
     prefix: 'fake'
   });
 
-  /* eslint-disable no-empty,@typescript-eslint/no-empty-function */
-  const registryServiceStub = {
-    getActiveMetadataField: () => observableOf(undefined),
-    createMetadataField: (field: MetadataField) => observableOf(field),
-    updateMetadataField: (field: MetadataField) => observableOf(field),
-    cancelEditMetadataField: () => {
-    },
-    cancelEditMetadataSchema: () => {
-    },
-    clearMetadataFieldRequests: () => observableOf(undefined)
-  };
-  const formBuilderServiceStub = {
-    createFormGroup: () => {
-      return {
-        patchValue: () => {
-        },
-        reset(_value?: any, _options?: { onlySelf?: boolean; emitEvent?: boolean; }): void {
-        },
-      };
-    }
-  };
-  /* eslint-enable no-empty, @typescript-eslint/no-empty-function */
-
   beforeEach(waitForAsync(() => {
+    registryService = new RegistryServiceStub();
+
     return TestBed.configureTestingModule({
       imports: [CommonModule, RouterTestingModule.withRoutes([]), TranslateModule.forRoot(), NgbModule],
       declarations: [MetadataFieldFormComponent, EnumKeysPipe],
       providers: [
-        { provide: RegistryService, useValue: registryServiceStub },
-        { provide: FormBuilderService, useValue: formBuilderServiceStub }
+        { provide: RegistryService, useValue: registryService },
+        { provide: FormBuilderService, useValue: getMockFormBuilderService() }
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [CUSTOM_ELEMENTS_SCHEMA]
     }).compileComponents();
   }));
 
diff --git a/src/app/admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.ts b/src/app/admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.ts
index 773e0600fb..f04324bdc5 100644
--- a/src/app/admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.ts
+++ b/src/app/admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.ts
@@ -3,7 +3,8 @@ import {
   DynamicFormControlModel,
   DynamicFormGroupModel,
   DynamicFormLayout,
-  DynamicInputModel
+  DynamicInputModel,
+  DynamicTextAreaModel
 } from '@ng-dynamic-forms/core';
 import { UntypedFormGroup } from '@angular/forms';
 import { RegistryService } from '../../../../core/registry/registry.service';
@@ -51,7 +52,7 @@ export class MetadataFieldFormComponent implements OnInit, OnDestroy {
   /**
    * A dynamic input model for the scopeNote field
    */
-  scopeNote: DynamicInputModel;
+  scopeNote: DynamicTextAreaModel;
 
   /**
    * A list of all dynamic input models
@@ -132,11 +133,12 @@ export class MetadataFieldFormComponent implements OnInit, OnDestroy {
           maxLength: 'error.validation.metadata.qualifier.max-length',
         },
       });
-      this.scopeNote = new DynamicInputModel({
+      this.scopeNote = new DynamicTextAreaModel({
         id: 'scopeNote',
         label: scopenote,
         name: 'scopeNote',
         required: false,
+        rows: 5,
       });
       this.formModel = [
         new DynamicFormGroupModel(
diff --git a/src/app/admin/admin-registries/metadata-schema/metadata-schema.component.html b/src/app/admin/admin-registries/metadata-schema/metadata-schema.component.html
index 557741df80..254919e232 100644
--- a/src/app/admin/admin-registries/metadata-schema/metadata-schema.component.html
+++ b/src/app/admin/admin-registries/metadata-schema/metadata-schema.component.html
@@ -2,7 +2,7 @@
   <div class="metadata-schema row">
     <div class="col-12" *ngVar="(metadataSchema$ | async) as schema">
 
-      <h2 id="header" class="border-bottom pb-2">{{'admin.registries.schema.head' | translate}}: "{{schema?.prefix}}"</h2>
+      <h1 id="header" class="border-bottom pb-2">{{'admin.registries.schema.head' | translate}}: "{{schema?.prefix}}"</h1>
 
       <p id="description" class="pb-2">{{'admin.registries.schema.description' | translate:{ namespace: schema?.namespace } }}</p>
 
@@ -10,13 +10,12 @@
         [metadataSchema]="schema"
         (submitForm)="forceUpdateFields()"></ds-metadata-field-form>
 
-      <h3>{{'admin.registries.schema.fields.head' | translate}}</h3>
+      <h2>{{'admin.registries.schema.fields.head' | translate}}</h2>
 
       <ng-container *ngVar="(metadataFields$ | async)?.payload as fields">
         <ds-pagination
           *ngIf="fields?.totalElements > 0"
           [paginationOptions]="config"
-          [pageInfoState]="fields"
           [collectionSize]="fields?.totalElements"
           [hideGear]="false"
           [hidePagerWhenSinglePage]="true">
@@ -24,7 +23,7 @@
             <table id="metadata-fields" class="table table-striped table-hover">
               <thead>
               <tr>
-                <th></th>
+                <th><span class="sr-only">{{'admin.registries.schema.fields.table.selected' | translate}}</span></th>
                 <th scope="col">{{'admin.registries.schema.fields.table.id' | translate}}</th>
                 <th scope="col">{{'admin.registries.schema.fields.table.field' | translate}}</th>
                 <th scope="col">{{'admin.registries.schema.fields.table.scopenote' | translate}}</th>
@@ -32,16 +31,15 @@
               </thead>
               <tbody>
               <tr *ngFor="let field of fields?.page"
-                  [ngClass]="{'table-primary' : isActive(field) | async}">
-                <td>
-                  <label class="mb-0">
-                    <input type="checkbox"
-                           [checked]="isSelected(field) | async"
-                           (change)="selectMetadataField(field, $event)">
-                  </label>
+                  [ngClass]="{'table-primary' : (activeField$ | async)?.id === field.id}">
+                <td *ngVar="(selectedMetadataFieldIDs$ | async)?.includes(field.id) as selected">
+                  <input type="checkbox"
+                         [attr.aria-label]="(selected ? 'admin.registries.schema.fields.deselect' : 'admin.registries.schema.fields.select') | translate"
+                         [checked]="selected"
+                         (change)="selectMetadataField(field, $event)">
                 </td>
                 <td class="selectable-row" (click)="editField(field)">{{field.id}}</td>
-                <td class="selectable-row" (click)="editField(field)">{{schema?.prefix}}.{{field.element}}<label *ngIf="field.qualifier" class="mb-0">.</label>{{field.qualifier}}</td>
+                <td class="selectable-row" (click)="editField(field)">{{schema?.prefix}}.{{field.element}}{{field.qualifier ? '.' + field.qualifier : ''}}</td>
                 <td class="selectable-row" (click)="editField(field)">{{field.scopeNote}}</td>
               </tr>
               </tbody>
diff --git a/src/app/admin/admin-registries/metadata-schema/metadata-schema.component.spec.ts b/src/app/admin/admin-registries/metadata-schema/metadata-schema.component.spec.ts
index 2b660a6363..ce4987a02c 100644
--- a/src/app/admin/admin-registries/metadata-schema/metadata-schema.component.spec.ts
+++ b/src/app/admin/admin-registries/metadata-schema/metadata-schema.component.spec.ts
@@ -4,7 +4,7 @@ import { of as observableOf } from 'rxjs';
 import { buildPaginatedList } from '../../../core/data/paginated-list.model';
 import { TranslateModule } from '@ngx-translate/core';
 import { CommonModule } from '@angular/common';
-import { ActivatedRoute, Router } from '@angular/router';
+import { ActivatedRoute } from '@angular/router';
 import { By } from '@angular/platform-browser';
 import { RegistryService } from '../../../core/registry/registry.service';
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
@@ -12,25 +12,28 @@ import { EnumKeysPipe } from '../../../shared/utils/enum-keys-pipe';
 import { PaginationComponent } from '../../../shared/pagination/pagination.component';
 import { HostWindowServiceStub } from '../../../shared/testing/host-window-service.stub';
 import { HostWindowService } from '../../../shared/host-window.service';
-import { RouterStub } from '../../../shared/testing/router.stub';
 import { RouterTestingModule } from '@angular/router/testing';
 import { ActivatedRouteStub } from '../../../shared/testing/active-router.stub';
-import { NO_ERRORS_SCHEMA } from '@angular/core';
+import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
 import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
-import { RestResponse } from '../../../core/cache/response.models';
 import { MetadataSchema } from '../../../core/metadata/metadata-schema.model';
 import { MetadataField } from '../../../core/metadata/metadata-field.model';
 import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
 import { VarDirective } from '../../../shared/utils/var.directive';
 import { PaginationService } from '../../../core/pagination/pagination.service';
 import { PaginationServiceStub } from '../../../shared/testing/pagination-service.stub';
+import { RegistryServiceStub } from '../../../shared/testing/registry.service.stub';
 
 describe('MetadataSchemaComponent', () => {
   let comp: MetadataSchemaComponent;
   let fixture: ComponentFixture<MetadataSchemaComponent>;
-  let registryService: RegistryService;
-  const mockSchemasList = [
+
+  let registryService: RegistryServiceStub;
+  let activatedRoute: ActivatedRouteStub;
+  let paginationService: PaginationServiceStub;
+
+  const mockSchemasList: MetadataSchema[] = [
     {
       id: 1,
       _links: {
@@ -51,8 +54,8 @@ describe('MetadataSchemaComponent', () => {
       prefix: 'mock',
       namespace: 'http://dspace.org/mockschema'
     }
-  ];
-  const mockFieldsList = [
+  ] as MetadataSchema[];
+  const mockFieldsList: MetadataField[] = [
     {
       id: 1,
       _links: {
@@ -101,47 +104,29 @@ describe('MetadataSchemaComponent', () => {
       scopeNote: null,
       schema: createSuccessfulRemoteDataObject$(mockSchemasList[1])
     }
-  ];
-  const mockSchemas = createSuccessfulRemoteDataObject$(buildPaginatedList(null, mockSchemasList));
-  /* eslint-disable no-empty,@typescript-eslint/no-empty-function */
-  const registryServiceStub = {
-    getMetadataSchemas: () => mockSchemas,
-    getMetadataFieldsBySchema: (schema: MetadataSchema) => createSuccessfulRemoteDataObject$(buildPaginatedList(null, mockFieldsList.filter((value) => value.id === 3 || value.id === 4))),
-    getMetadataSchemaByPrefix: (schemaName: string) => createSuccessfulRemoteDataObject$(mockSchemasList.filter((value) => value.prefix === schemaName)[0]),
-    getActiveMetadataField: () => observableOf(undefined),
-    getSelectedMetadataFields: () => observableOf([]),
-    editMetadataField: (schema) => {
-    },
-    cancelEditMetadataField: () => {
-    },
-    deleteMetadataField: () => observableOf(new RestResponse(true, 200, 'OK')),
-    deselectAllMetadataField: () => {
-    },
-    clearMetadataFieldRequests: () => observableOf(undefined)
-  };
-  /* eslint-enable no-empty, @typescript-eslint/no-empty-function */
+  ] as MetadataField[];
   const schemaNameParam = 'mock';
-  const activatedRouteStub = Object.assign(new ActivatedRouteStub(), {
-    params: observableOf({
-      schemaName: schemaNameParam
-    })
-  });
-
-  const paginationService = new PaginationServiceStub();
 
   beforeEach(waitForAsync(() => {
+    activatedRoute = new ActivatedRouteStub({
+      schemaName: schemaNameParam,
+    });
+    paginationService = new PaginationServiceStub();
+    registryService = new RegistryServiceStub();
+    spyOn(registryService, 'getMetadataFieldsBySchema').and.returnValue(createSuccessfulRemoteDataObject$(buildPaginatedList(null, mockFieldsList.filter((value) => value.id === 3 || value.id === 4))));
+    spyOn(registryService, 'getMetadataSchemaByPrefix').and.callFake((schemaName) => createSuccessfulRemoteDataObject$(mockSchemasList.filter((value) => value.prefix === schemaName)[0]));
+
     TestBed.configureTestingModule({
       imports: [CommonModule, RouterTestingModule.withRoutes([]), TranslateModule.forRoot(), NgbModule],
       declarations: [MetadataSchemaComponent, PaginationComponent, EnumKeysPipe, VarDirective],
       providers: [
-        { provide: RegistryService, useValue: registryServiceStub },
-        { provide: ActivatedRoute, useValue: activatedRouteStub },
+        { provide: RegistryService, useValue: registryService },
+        { provide: ActivatedRoute, useValue: activatedRoute },
         { provide: HostWindowService, useValue: new HostWindowServiceStub(0) },
-        { provide: Router, useValue: new RouterStub() },
         { provide: PaginationService, useValue: paginationService },
         { provide: NotificationsService, useValue: new NotificationsServiceStub() }
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [CUSTOM_ELEMENTS_SCHEMA],
     }).compileComponents();
   }));
 
@@ -190,7 +175,7 @@ describe('MetadataSchemaComponent', () => {
     }));
 
     it('should cancel editing the selected field when clicked again', waitForAsync(() => {
-      spyOn(registryService, 'getActiveMetadataField').and.returnValue(observableOf(mockFieldsList[2] as MetadataField));
+      comp.activeField$ = observableOf(mockFieldsList[2] as MetadataField);
       spyOn(registryService, 'cancelEditMetadataField');
       row.click();
       fixture.detectChanges();
@@ -205,7 +190,7 @@ describe('MetadataSchemaComponent', () => {
 
     beforeEach(() => {
       spyOn(registryService, 'deleteMetadataField').and.callThrough();
-      spyOn(registryService, 'getSelectedMetadataFields').and.returnValue(observableOf(selectedFields as MetadataField[]));
+      comp.selectedMetadataFieldIDs$ = observableOf(selectedFields.map((metadataField: MetadataField) => metadataField.id));
       comp.deleteFields();
       fixture.detectChanges();
     });
diff --git a/src/app/admin/admin-registries/metadata-schema/metadata-schema.component.ts b/src/app/admin/admin-registries/metadata-schema/metadata-schema.component.ts
index d0827e6e4d..597e669d1c 100644
--- a/src/app/admin/admin-registries/metadata-schema/metadata-schema.component.ts
+++ b/src/app/admin/admin-registries/metadata-schema/metadata-schema.component.ts
@@ -1,19 +1,18 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit, OnDestroy } from '@angular/core';
 import { RegistryService } from '../../../core/registry/registry.service';
-import { ActivatedRoute, Router } from '@angular/router';
+import { ActivatedRoute } from '@angular/router';
 import {
   BehaviorSubject,
-  combineLatest as observableCombineLatest,
   combineLatest,
   Observable,
   of as observableOf,
-  zip
+  zip,
+  Subscription,
 } from 'rxjs';
 import { RemoteData } from '../../../core/data/remote-data';
 import { PaginatedList } from '../../../core/data/paginated-list.model';
 import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
 import { map, switchMap, take } from 'rxjs/operators';
-import { hasValue } from '../../../shared/empty.util';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
 import { TranslateService } from '@ngx-translate/core';
 import { MetadataField } from '../../../core/metadata/metadata-field.model';
@@ -32,7 +31,7 @@ import { PaginationService } from '../../../core/pagination/pagination.service';
  * A component used for managing all existing metadata fields within the current metadata schema.
  * The admin can create, edit or delete metadata fields here.
  */
-export class MetadataSchemaComponent implements OnInit {
+export class MetadataSchemaComponent implements OnDestroy, OnInit {
   /**
    * The metadata schema
    */
@@ -57,27 +56,33 @@ export class MetadataSchemaComponent implements OnInit {
    */
   needsUpdate$: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(true);
 
-  constructor(private registryService: RegistryService,
-              private route: ActivatedRoute,
-              private notificationsService: NotificationsService,
-              private router: Router,
-              private paginationService: PaginationService,
-              private translateService: TranslateService) {
+  /**
+   * The current {@link MetadataField} that is being edited
+   */
+  activeField$: Observable<MetadataField>;
 
+  /**
+   * The selected {@link MetadataField} IDs
+   */
+  selectedMetadataFieldIDs$: Observable<number[]>;
+
+  subscriptions: Subscription[] = [];
+
+  constructor(
+    protected registryService: RegistryService,
+    protected route: ActivatedRoute,
+    protected notificationsService: NotificationsService,
+    protected paginationService: PaginationService,
+    protected translateService: TranslateService,
+  ) {
   }
 
   ngOnInit(): void {
-    this.route.params.subscribe((params) => {
-      this.initialize(params);
-    });
-  }
-
-  /**
-   * Initialize the component using the params within the url (schemaName)
-   * @param params
-   */
-  initialize(params) {
-    this.metadataSchema$ = this.registryService.getMetadataSchemaByPrefix(params.schemaName).pipe(getFirstSucceededRemoteDataPayload());
+    this.metadataSchema$ = this.registryService.getMetadataSchemaByPrefix(this.route.snapshot.params.schemaName).pipe(getFirstSucceededRemoteDataPayload());
+    this.activeField$ = this.registryService.getActiveMetadataField();
+    this.selectedMetadataFieldIDs$ = this.registryService.getSelectedMetadataFields().pipe(
+      map((metadataFields: MetadataField[]) => metadataFields.map((metadataField: MetadataField) => metadataField.id)),
+    );
     this.updateFields();
   }
 
@@ -86,7 +91,7 @@ export class MetadataSchemaComponent implements OnInit {
    */
   private updateFields() {
     this.metadataFields$ = this.paginationService.getCurrentPagination(this.config.id, this.config).pipe(
-      switchMap((currentPagination) => combineLatest(this.metadataSchema$, this.needsUpdate$, observableOf(currentPagination))),
+      switchMap((currentPagination) => combineLatest([this.metadataSchema$, this.needsUpdate$, observableOf(currentPagination)])),
       switchMap(([schema, update, currentPagination]: [MetadataSchema, boolean, PaginationComponentOptions]) => {
         if (update) {
           this.needsUpdate$.next(false);
@@ -110,30 +115,13 @@ export class MetadataSchemaComponent implements OnInit {
    * @param field
    */
   editField(field: MetadataField) {
-    this.getActiveField().pipe(take(1)).subscribe((activeField) => {
+    this.subscriptions.push(this.activeField$.pipe(take(1)).subscribe((activeField) => {
       if (field === activeField) {
         this.registryService.cancelEditMetadataField();
       } else {
         this.registryService.editMetadataField(field);
       }
-    });
-  }
-
-  /**
-   * Checks whether the given metadata field is active (being edited)
-   * @param field
-   */
-  isActive(field: MetadataField): Observable<boolean> {
-    return this.getActiveField().pipe(
-      map((activeField) => field === activeField)
-    );
-  }
-
-  /**
-   * Gets the active metadata field (being edited)
-   */
-  getActiveField(): Observable<MetadataField> {
-    return this.registryService.getActiveMetadataField();
+    }));
   }
 
   /**
@@ -147,42 +135,25 @@ export class MetadataSchemaComponent implements OnInit {
       this.registryService.deselectMetadataField(field);
   }
 
-  /**
-   * Checks whether a given metadata field is selected in the list (checkbox)
-   * @param field
-   */
-  isSelected(field: MetadataField): Observable<boolean> {
-    return this.registryService.getSelectedMetadataFields().pipe(
-      map((fields) => fields.find((selectedField) => selectedField === field) != null)
-    );
-  }
-
   /**
    * Delete all the selected metadata fields
    */
   deleteFields() {
-    this.registryService.getSelectedMetadataFields().pipe(take(1)).subscribe(
-      (fields) => {
-        const tasks$ = [];
-        for (const field of fields) {
-          if (hasValue(field.id)) {
-            tasks$.push(this.registryService.deleteMetadataField(field.id).pipe(getFirstCompletedRemoteData()));
-          }
-        }
-        zip(...tasks$).subscribe((responses: RemoteData<NoContent>[]) => {
-          const successResponses = responses.filter((response: RemoteData<NoContent>) => response.hasSucceeded);
-          const failedResponses = responses.filter((response: RemoteData<NoContent>) => response.hasFailed);
-          if (successResponses.length > 0) {
-            this.showNotification(true, successResponses.length);
-          }
-          if (failedResponses.length > 0) {
-            this.showNotification(false, failedResponses.length);
-          }
-          this.registryService.deselectAllMetadataField();
-          this.registryService.cancelEditMetadataField();
-        });
+    this.subscriptions.push(this.selectedMetadataFieldIDs$.pipe(
+      take(1),
+      switchMap((fieldIDs) => zip(fieldIDs.map((fieldID) => this.registryService.deleteMetadataField(fieldID).pipe(getFirstCompletedRemoteData())))),
+    ).subscribe((responses: RemoteData<NoContent>[]) => {
+      const successResponses = responses.filter((response: RemoteData<NoContent>) => response.hasSucceeded);
+      const failedResponses = responses.filter((response: RemoteData<NoContent>) => response.hasFailed);
+      if (successResponses.length > 0) {
+        this.showNotification(true, successResponses.length);
       }
-    );
+      if (failedResponses.length > 0) {
+        this.showNotification(false, failedResponses.length);
+      }
+      this.registryService.deselectAllMetadataField();
+      this.registryService.cancelEditMetadataField();
+    }));
   }
 
   /**
@@ -193,20 +164,19 @@ export class MetadataSchemaComponent implements OnInit {
   showNotification(success: boolean, amount: number) {
     const prefix = 'admin.registries.schema.notification';
     const suffix = success ? 'success' : 'failure';
-    const messages = observableCombineLatest(
-      this.translateService.get(success ? `${prefix}.${suffix}` : `${prefix}.${suffix}`),
-      this.translateService.get(`${prefix}.field.deleted.${suffix}`, { amount: amount })
-    );
-    messages.subscribe(([head, content]) => {
-      if (success) {
-        this.notificationsService.success(head, content);
-      } else {
-        this.notificationsService.error(head, content);
-      }
-    });
+    const head = this.translateService.instant(success ? `${prefix}.${suffix}` : `${prefix}.${suffix}`);
+    const content = this.translateService.instant(`${prefix}.field.deleted.${suffix}`, { amount: amount });
+    if (success) {
+      this.notificationsService.success(head, content);
+    } else {
+      this.notificationsService.error(head, content);
+    }
   }
+
   ngOnDestroy(): void {
     this.paginationService.clearPagination(this.config.id);
+    this.registryService.deselectAllMetadataField();
+    this.subscriptions.forEach((subscription: Subscription) => subscription.unsubscribe());
   }
 
 }
diff --git a/src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/item-search-result/item-admin-search-result-grid-element.component.ts b/src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/item-search-result/item-admin-search-result-grid-element.component.ts
index dab6694f36..36707187dd 100644
--- a/src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/item-search-result/item-admin-search-result-grid-element.component.ts
+++ b/src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/item-search-result/item-admin-search-result-grid-element.component.ts
@@ -1,4 +1,4 @@
-import { Component, ComponentFactoryResolver, ElementRef, OnInit, ViewChild } from '@angular/core';
+import { Component, ElementRef, OnInit, ViewChild, ComponentRef, OnDestroy } from '@angular/core';
 import { Item } from '../../../../../core/shared/item.model';
 import { ViewMode } from '../../../../../core/shared/view-mode.model';
 import {
@@ -14,6 +14,7 @@ import { GenericConstructor } from '../../../../../core/shared/generic-construct
 import { ListableObjectDirective } from '../../../../../shared/object-collection/shared/listable-object/listable-object.directive';
 import { ThemeService } from '../../../../../shared/theme-support/theme.service';
 import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
+import { hasValue } from '../../../../../shared/empty.util';
 
 @listableObjectComponent(ItemSearchResult, ViewMode.GridElement, Context.AdminSearch)
 @Component({
@@ -24,17 +25,18 @@ import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service
 /**
  * The component for displaying a list element for an item search result on the admin search page
  */
-export class ItemAdminSearchResultGridElementComponent extends SearchResultGridElementComponent<ItemSearchResult, Item> implements OnInit {
+export class ItemAdminSearchResultGridElementComponent extends SearchResultGridElementComponent<ItemSearchResult, Item> implements OnDestroy, OnInit {
   @ViewChild(ListableObjectDirective, { static: true }) listableObjectDirective: ListableObjectDirective;
   @ViewChild('badges', { static: true }) badges: ElementRef;
   @ViewChild('buttons', { static: true }) buttons: ElementRef;
 
+  protected compRef: ComponentRef<Component>;
+
   constructor(
     public dsoNameService: DSONameService,
     protected truncatableService: TruncatableService,
     protected bitstreamDataService: BitstreamDataService,
     private themeService: ThemeService,
-    private componentFactoryResolver: ComponentFactoryResolver,
   ) {
     super(dsoNameService, truncatableService, bitstreamDataService);
   }
@@ -44,23 +46,32 @@ export class ItemAdminSearchResultGridElementComponent extends SearchResultGridE
    */
   ngOnInit(): void {
     super.ngOnInit();
-    const componentFactory = this.componentFactoryResolver.resolveComponentFactory(this.getComponent());
+    const component: GenericConstructor<Component> = this.getComponent();
 
     const viewContainerRef = this.listableObjectDirective.viewContainerRef;
     viewContainerRef.clear();
 
-    const componentRef = viewContainerRef.createComponent(
-      componentFactory,
-      0,
-      undefined,
-      [
-        [this.badges.nativeElement],
-        [this.buttons.nativeElement]
-      ]);
-    (componentRef.instance as any).object = this.object;
-    (componentRef.instance as any).index = this.index;
-    (componentRef.instance as any).linkType = this.linkType;
-    (componentRef.instance as any).listID = this.listID;
+    this.compRef = viewContainerRef.createComponent(
+      component, {
+        index: 0,
+        injector: undefined,
+        projectableNodes: [
+          [this.badges.nativeElement],
+          [this.buttons.nativeElement],
+        ],
+      },
+    );
+    this.compRef.setInput('object',this.object);
+    this.compRef.setInput('index', this.index);
+    this.compRef.setInput('linkType', this.linkType);
+    this.compRef.setInput('listID', this.listID);
+  }
+
+  ngOnDestroy(): void {
+    if (hasValue(this.compRef)) {
+      this.compRef.destroy();
+      this.compRef = undefined;
+    }
   }
 
   /**
diff --git a/src/app/admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.html b/src/app/admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.html
index 7f1e8716ba..24ba17fff4 100644
--- a/src/app/admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.html
+++ b/src/app/admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.html
@@ -1,23 +1,21 @@
-<div class="sidebar-section">
-    <a class="nav-item nav-link d-flex flex-row flex-nowrap"
-       [ngClass]="{ disabled: isDisabled }"
-       [attr.aria-disabled]="isDisabled"
-       [attr.aria-labelledby]="'sidebarName-' + section.id"
-       [title]="('menu.section.icon.' + section.id) | translate"
-       [routerLink]="itemModel.link"
-       (keyup.space)="navigate($event)"
-       (keyup.enter)="navigate($event)"
-       href="javascript:void(0);"
-    >
-      <div class="shortcut-icon">
-        <i class="fas fa-{{section.icon}} fa-fw"></i>
+<div>
+  <a class="sidebar-section-wrapper"
+     [ngClass]="{ disabled: isDisabled }"
+     role="menuitem"
+     [attr.aria-disabled]="isDisabled"
+     [attr.aria-labelledby]="adminMenuSectionTitleId(section.id)"
+     [routerLink]="itemModel.link"
+     (keyup.space)="navigate($event)"
+     (keyup.enter)="navigate($event)"
+     href="javascript:void(0);"
+  >
+    <div class="sidebar-fixed-element-wrapper" data-test="sidebar-section-icon" aria-hidden="true">
+      <i class="fas fa-{{section.icon}} fa-fw"></i>
+    </div>
+    <div class="sidebar-collapsible-element-outer-wrapper">
+      <div class="sidebar-collapsible-element-inner-wrapper sidebar-item">
+        <span [id]="adminMenuSectionTitleId(section.id)">{{itemModel.text | translate}}</span>
       </div>
-      <div class="sidebar-collapsible">
-        <div class="toggle">
-          <span id="sidebarName-{{section.id}}" class="section-header-text">
-            {{itemModel.text | translate}}
-          </span>
-        </div>
-      </div>
-    </a>
+    </div>
+  </a>
 </div>
diff --git a/src/app/admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.spec.ts b/src/app/admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.spec.ts
index 260a364d7a..296a70331c 100644
--- a/src/app/admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.spec.ts
+++ b/src/app/admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.spec.ts
@@ -48,7 +48,7 @@ describe('AdminSidebarSectionComponent', () => {
     });
 
     it('should set the right icon', () => {
-      const icon = fixture.debugElement.query(By.css('.shortcut-icon')).query(By.css('i.fas'));
+      const icon = fixture.debugElement.query(By.css('[data-test="sidebar-section-icon"]')).query(By.css('i.fas'));
       expect(icon.nativeElement.getAttribute('class')).toContain('fa-' + iconString);
     });
     it('should not contain the disabled class', () => {
@@ -88,7 +88,7 @@ describe('AdminSidebarSectionComponent', () => {
     });
 
     it('should set the right icon', () => {
-      const icon = fixture.debugElement.query(By.css('.shortcut-icon')).query(By.css('i.fas'));
+      const icon = fixture.debugElement.query(By.css('[data-test="sidebar-section-icon"]')).query(By.css('i.fas'));
       expect(icon.nativeElement.getAttribute('class')).toContain('fa-' + iconString);
     });
     it('should contain the disabled class', () => {
diff --git a/src/app/admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.ts b/src/app/admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.ts
index d6cd803622..51a0902f61 100644
--- a/src/app/admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.ts
+++ b/src/app/admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.ts
@@ -12,8 +12,7 @@ import { Router } from '@angular/router';
  * Represents a non-expandable section in the admin sidebar
  */
 @Component({
-  /* eslint-disable @angular-eslint/component-selector */
-  selector: 'li[ds-admin-sidebar-section]',
+  selector: 'ds-admin-sidebar-section',
   templateUrl: './admin-sidebar-section.component.html',
   styleUrls: ['./admin-sidebar-section.component.scss'],
 
@@ -53,4 +52,12 @@ export class AdminSidebarSectionComponent extends MenuSectionComponent implement
       this.router.navigate(this.itemModel.link);
     }
   }
+
+  adminMenuSectionId(sectionId: string) {
+    return `admin-menu-section-${sectionId}`;
+  }
+
+  adminMenuSectionTitleId(sectionId: string) {
+    return `admin-menu-section-${sectionId}-title`;
+  }
 }
diff --git a/src/app/admin/admin-sidebar/admin-sidebar.component.html b/src/app/admin/admin-sidebar/admin-sidebar.component.html
index ef220b834b..fcb33eb175 100644
--- a/src/app/admin/admin-sidebar/admin-sidebar.component.html
+++ b/src/app/admin/admin-sidebar/admin-sidebar.component.html
@@ -1,55 +1,63 @@
-<nav class="navbar navbar-dark p-0"
-     [ngClass]="{'active': sidebarOpen, 'inactive': sidebarClosed}"
+<nav class="navbar navbar-dark p-0 vh-100"
+     id="admin-sidebar"
+     [attr.aria-label]="'menu.header.nav.description' | translate"
+     [ngClass]="{'expanded': sidebarOpen, 'collapsed': sidebarClosed, 'transitioning': sidebarTransitioning}"
      [@slideSidebar]="{
       value: (!(sidebarExpanded | async) ? 'collapsed' : 'expanded'),
-      params: {sidebarWidth: (sidebarWidth | async)}
+      params: { collapsedWidth: (collapsedSidebarWidth$ | async), expandedWidth: (expandedSidebarWidth$ | async) }
      }" (@slideSidebar.done)="finishSlide($event)" (@slideSidebar.start)="startSlide($event)"
      *ngIf="menuVisible | async"
      (mouseenter)="handleMouseEnter($event)"
-     (mouseleave)="handleMouseLeave($event)"
-     role="navigation" [attr.aria-label]="'menu.header.admin.description' |translate">
-    <div class="sidebar-top-level-items">
-        <ul class="navbar-nav">
-            <li class="admin-menu-header">
-              <div class="sidebar-section">
-                <div href="javascript:void(0);" class="nav-item d-flex flex-row flex-nowrap py-0">
-                  <div class="shortcut-icon navbar-brand logo-wrapper">
-                    <img class="admin-logo" src="assets/images/dspace-logo-mini.svg"
-                         [alt]="('menu.header.image.logo') | translate">
-                  </div>
-                  <div class="sidebar-collapsible navbar-brand">
-                    <div class="mr-0">
-                      <h4 class="section-header-text mb-0">{{ 'menu.header.admin' | translate }}</h4>
-                    </div>
-                  </div>
-                </div>
-              </div>
-            </li>
+     (mouseleave)="handleMouseLeave($event)">
 
-            <ng-container *ngFor="let section of (sections | async)">
-                <ng-container
-                        *ngComponentOutlet="(sectionMap$ | async).get(section.id).component; injector: (sectionMap$ | async).get(section.id).injector;"></ng-container>
-            </ng-container>
-        </ul>
-    </div>
-    <div class="navbar-nav">
-        <div class="sidebar-section" id="sidebar-collapse-toggle">
-            <a class="nav-item nav-link sidebar-section d-flex flex-row flex-nowrap"
-               href="javascript:void(0);"
-               (click)="toggle($event)"
-               (keyup.space)="toggle($event)"
-            >
-              <div class="shortcut-icon">
-                <i *ngIf="(menuCollapsed | async)" class="fas fa-fw fa-angle-double-right"
-                   [title]="'menu.section.icon.pin' | translate"></i>
-                <i *ngIf="!(menuCollapsed | async)" class="fas fa-fw fa-angle-double-left"
-                   [title]="'menu.section.icon.unpin' | translate"></i>
-              </div>
-              <div class="sidebar-collapsible">
-                <span *ngIf="menuCollapsed | async" class="section-header-text">{{'menu.section.pin' | translate }}</span>
-                <span *ngIf="!(menuCollapsed | async)" class="section-header-text">{{'menu.section.unpin' | translate }}</span>
-              </div>
-            </a>
+  <!-- HEADER -->
+
+  <div class="sidebar-full-width-container" id="sidebar-header-container" aria-hidden="true">
+    <div class="sidebar-section-wrapper">
+      <div class="sidebar-fixed-element-wrapper">
+        <img id="admin-sidebar-logo" src="assets/images/dspace-logo-mini.svg" [alt]="('menu.header.image.logo') | translate" aria-hidden="true">
+      </div>
+      <div class="sidebar-collapsible-element-outer-wrapper">
+        <div class="sidebar-collapsible-element-inner-wrapper sidebar-item">
+          <h4 class="my-1">{{ 'menu.header.admin' | translate }}</h4>
         </div>
+      </div>
     </div>
+  </div>
+
+  <!-- ITEMS -->
+
+  <div class="sidebar-full-width-container" id="sidebar-top-level-items-container">
+    <div class="sidebar-full-width-container" id="sidebar-top-level-items" role="menubar"
+        [attr.aria-label]="'menu.header.admin.description' |translate">
+      <ng-container *ngFor="let section of (sections | async)">
+        <ng-container
+          *ngComponentOutlet="(sectionMap$ | async).get(section.id).component; injector: (sectionMap$ | async).get(section.id).injector;"></ng-container>
+      </ng-container>
+    </div>
+  </div>
+
+  <!-- TOGGLER -->
+
+  <div class="sidebar-full-width-container" id="sidebar-collapse-toggle-container">
+    <a class="sidebar-section-wrapper sidebar-full-width-container"
+       id="sidebar-collapse-toggle"
+       href="javascript:void(0);"
+       (click)="toggle($event)"
+       (keyup.space)="toggle($event)"
+    >
+      <div class="sidebar-fixed-element-wrapper">
+        <i *ngIf="(menuCollapsed | async)" class="fas fa-fw fa-angle-double-right"
+           [title]="'menu.section.icon.pin' | translate"></i>
+        <i *ngIf="!(menuCollapsed | async)" class="fas fa-fw fa-angle-double-left"
+           [title]="'menu.section.icon.unpin' | translate"></i>
+      </div>
+      <div class="sidebar-collapsible-element-outer-wrapper">
+        <div class="sidebar-collapsible-element-inner-wrapper sidebar-item">
+          {{ ((menuCollapsed | async) ? 'menu.section.pin' : 'menu.section.unpin' ) | translate }}
+        </div>
+      </div>
+    </a>
+  </div>
+
 </nav>
diff --git a/src/app/admin/admin-sidebar/admin-sidebar.component.scss b/src/app/admin/admin-sidebar/admin-sidebar.component.scss
index 5ed0142c7f..d3607ca625 100644
--- a/src/app/admin/admin-sidebar/admin-sidebar.component.scss
+++ b/src/app/admin/admin-sidebar/admin-sidebar.component.scss
@@ -1,123 +1,140 @@
 :host {
-  --ds-icon-z-index: 10;
 
-    left: 0;
-    top: 0;
-    height: 100vh;
-    flex: 1 1 auto;
-    nav {
-        background-color: var(--ds-admin-sidebar-bg);
-        height: 100%;
-        flex-direction: column;
-        > div {
-            width: 100%;
-            &.sidebar-top-level-items {
-                flex: 1;
-                overflow: auto;
-                @include dark-scrollbar;
-            }
+  /* SIDEBAR SIZE AND POSITION */
+
+  /* Sidebar hierarchy:
+   § nav
+     § .sidebar-full-width-container (any OPTIONAL full width element with no horizontal margin or padding - it can be nested)
+       § .sidebar-section-wrapper
+         § .sidebar-fixed-element-wrapper
+         § .sidebar-collapsible-element-outer-wrapper
+           § .sidebar-collapsible-element-inner-wrapper
+             § .sidebar-item
+   */
+
+  // Sidebar position
+  position: fixed;
+  left: 0;
+  top: 0;
+  z-index: var(--ds-sidebar-z-index);
+
+  // Sidebar size and content position
+  nav#admin-sidebar {
+
+    max-width: var(--ds-admin-sidebar-fixed-element-width); // Sidebar collapsed width
+
+    display: flex;
+    flex-direction: column;
+    flex-wrap: nowrap;
+
+    div#sidebar-top-level-items-container {
+      flex: 1 1 auto; // Fill available vertical space
+      overflow-x: hidden;
+      overflow-y: auto;
+      @include dark-scrollbar;
+    }
+
+    img#admin-sidebar-logo {
+      height: var(--ds-admin-sidebar-logo-height);
+    }
+
+    ::ng-deep {
+
+      // This class must be applied to any nested wrapper containing a sidebar section
+      .sidebar-full-width-container {
+        width: 100%;
+        padding-left: 0;
+        padding-right: 0;
+        margin-left: 0;
+        margin-right: 0;
+      }
+
+      // This class must be applied to the innermost block element containing a section or subsection link
+      // (it can be applied together with `sidebar-collapsible-element-inner-wrapper`)
+      .sidebar-item {
+        padding-top: var(--ds-admin-sidebar-item-padding);
+        padding-bottom: var(--ds-admin-sidebar-item-padding);
+      }
+
+      // These classes handle the collapsing behavior
+      .sidebar-section-wrapper {
+
+        display: flex;
+        flex-direction: row;
+        flex-wrap: nowrap;
+        align-items: stretch;
+
+        // These elements have fixed width and determine the width of the collapsed sidebar
+        & > .sidebar-fixed-element-wrapper {
+          min-width: var(--ds-admin-sidebar-fixed-element-width);
+          flex: 1 1 auto; // Fill available space
+
+          // Align the icons
+          display: flex;
+          flex-direction: row;
+          justify-content: center;
+          align-items: center;
         }
 
-        &.inactive ::ng-deep .sidebar-collapsible {
-            margin-left: calc(-1 * var(--ds-sidebar-items-width));
-        }
-
-        .navbar-nav {
-            .admin-menu-header {
-                background-color: var(--ds-admin-sidebar-header-bg);
-
-                .sidebar-section {
-                  background-color: inherit;
-                }
-
-                .logo-wrapper {
-                    img {
-                        height: 20px;
-                    }
-                }
-                .section-header-text {
-                    line-height: 1.5;
-                }
-
-                .navbar-brand {
-                  margin-right: 0;
-                }
-
-            }
-        }
-
-
-        ::ng-deep {
-            .navbar-nav {
-                .sidebar-section {
-                    display: flex;
-                    align-content: stretch;
-                    background-color: var(--ds-admin-sidebar-bg);
-                    overflow-x: visible;
-
-                    .nav-item {
-                        padding-top: var(--bs-spacer);
-                        padding-bottom: var(--bs-spacer);
-                        background-color: inherit;
-
-                      &:focus-visible {
-                        // since links fill the whole sidebar, we _inset_ the outline
-                        outline-offset: -4px;
-
-                        // replace padding with margins so it doesn't extend over the :focus-visible outline
-                        //  → can't remove the padding altogether; the icon needs to fill out
-                        //    the collapsed width of the sidebar for the slide animation to look decent.
-                        .shortcut-icon {
-                          padding-left: 0;
-                          padding-right: 0;
-                          margin-left: var(--ds-icon-padding);
-                          margin-right: var(--ds-icon-padding);
-                        }
-                        .logo-wrapper {
-                          margin-right: var(--bs-navbar-padding-x) !important;
-                        }
-                        .navbar-brand {
-                          padding-top: 0;
-                          padding-bottom: 0;
-                          margin-top: var(--bs-navbar-brand-padding-y);
-                          margin-bottom: var(--bs-navbar-brand-padding-y);
-                        }
-                      }
-                    }
-
-                    .shortcut-icon {
-                        background-color: inherit;
-                        padding-left: var(--ds-icon-padding);
-                        padding-right: var(--ds-icon-padding);
-                        z-index: var(--ds-icon-z-index);
-                        align-self: baseline;
-                    }
-
-                    .sidebar-collapsible {
-                        padding-left: 0;
-                        padding-right: var(--bs-spacer);
-                        width: var(--ds-sidebar-items-width);
-                        position: relative;
-                        .toggle {
-                          width: 100%;
-                        }
-
-                        ul {
-                          padding-top: var(--bs-spacer);
-
-                          li a {
-                            padding-left: var(--bs-spacer);
-                          }
-                        }
-                    }
-
-                    &.active > .sidebar-collapsible > .nav-link {
-                        color: var(--bs-navbar-dark-active-color);
-                    }
-                }
-            }
+        & > .sidebar-collapsible-element-outer-wrapper {
+          display: flex;
+          flex-wrap: wrap;
+          justify-content: flex-end; // make inner wrapper slide on the left when collapsing
+          max-width: calc(100% - var(--ds-admin-sidebar-fixed-element-width)); // fill available space
+          padding-left: var(--ds-dark-scrollbar-width); // leave room for scrollbar
+          overflow-x: hidden; // hide inner wrapper when sidebar is collapsed
+
+          // These elements have fixed width and slide on the left when the sidebar is collapsed
+          // Their content should fill all available space
+          & > .sidebar-collapsible-element-inner-wrapper {
+            min-width: calc(var(--ds-admin-sidebar-collapsible-element-width) - var(--ds-dark-scrollbar-width));
+            height: 100%;
+            padding-right: var(--ds-admin-sidebar-item-padding);
+          }
         }
+      }
 
     }
 
+    // Set here any style that depends on the sidebar status
+    &.collapsed, &.transitioning, &.expanded { }
+
+  }
+
+  /* SIDEBAR STYLE */
+
+  nav#admin-sidebar {
+
+    background-color: var(--ds-admin-sidebar-bg);
+
+    ::ng-deep {
+
+      color: white;
+
+      // Set here the style of the *-menu-item nested components
+      .ds-menu-item {
+      }
+
+      a {
+        color: var(--ds-admin-sidebar-link-color);
+        text-decoration: none;
+
+        &:hover, &:focus {
+          color: var(--ds-admin-sidebar-link-hover-color);
+        }
+      }
+    }
+
+    div#sidebar-header-container {
+      background-color: var(--ds-admin-sidebar-header-bg);
+      .sidebar-fixed-element-wrapper {
+        background-color: var(--ds-admin-sidebar-header-bg);
+      }
+    }
+
+    div#sidebar-collapse-toggle-container {
+      .sidebar-collapsible-element-inner-wrapper {
+      }
+    }
+  }
 }
diff --git a/src/app/admin/admin-sidebar/admin-sidebar.component.spec.ts b/src/app/admin/admin-sidebar/admin-sidebar.component.spec.ts
index 88efd2a711..058b81df2f 100644
--- a/src/app/admin/admin-sidebar/admin-sidebar.component.spec.ts
+++ b/src/app/admin/admin-sidebar/admin-sidebar.component.spec.ts
@@ -143,7 +143,7 @@ describe('AdminSidebarComponent', () => {
   describe('when the collapse link is clicked', () => {
     beforeEach(() => {
       spyOn(menuService, 'toggleMenu');
-      const sidebarToggler = fixture.debugElement.query(By.css('#sidebar-collapse-toggle > a'));
+      const sidebarToggler = fixture.debugElement.query(By.css('#sidebar-collapse-toggle-container > a'));
       sidebarToggler.triggerEventHandler('click', {
         preventDefault: () => {/**/
         }
diff --git a/src/app/admin/admin-sidebar/admin-sidebar.component.ts b/src/app/admin/admin-sidebar/admin-sidebar.component.ts
index 26ded965d4..741f9b7630 100644
--- a/src/app/admin/admin-sidebar/admin-sidebar.component.ts
+++ b/src/app/admin/admin-sidebar/admin-sidebar.component.ts
@@ -1,4 +1,4 @@
-import { Component, HostListener, Injector, OnInit } from '@angular/core';
+import { Component, HostListener, Injector, Input, OnInit } from '@angular/core';
 import { BehaviorSubject, combineLatest, Observable } from 'rxjs';
 import { debounceTime, distinctUntilChanged, first, map, withLatestFrom } from 'rxjs/operators';
 import { AuthService } from '../../core/auth/auth.service';
@@ -28,9 +28,14 @@ export class AdminSidebarComponent extends MenuComponent implements OnInit {
   menuID = MenuID.ADMIN;
 
   /**
-   * Observable that emits the width of the collapsible menu sections
+   * Observable that emits the width of the sidebar when expanded
    */
-  sidebarWidth: Observable<string>;
+  @Input() expandedSidebarWidth$: Observable<string>;
+
+  /**
+   * Observable that emits the width of the sidebar when collapsed
+   */
+  @Input() collapsedSidebarWidth$: Observable<string>;
 
   /**
    * Is true when the sidebar is open, is false when the sidebar is animating or closed
@@ -44,6 +49,12 @@ export class AdminSidebarComponent extends MenuComponent implements OnInit {
    */
   sidebarClosed = !this.sidebarOpen; // Closed in UI, animation finished
 
+  /**
+   * Is true when the sidebar is opening or closing
+   * @type {boolean}
+   */
+  sidebarTransitioning = !this.sidebarOpen; // Animation in progress
+
   /**
    * Emits true when either the menu OR the menu's preview is expanded, else emits false
    */
@@ -69,7 +80,6 @@ export class AdminSidebarComponent extends MenuComponent implements OnInit {
    */
   ngOnInit(): void {
     super.ngOnInit();
-    this.sidebarWidth = this.variableService.getVariable('--ds-sidebar-items-width');
     this.authService.isAuthenticated()
       .subscribe((loggedIn: boolean) => {
         if (loggedIn) {
@@ -134,6 +144,7 @@ export class AdminSidebarComponent extends MenuComponent implements OnInit {
    * @param event The animation event
    */
   startSlide(event: any): void {
+    this.sidebarTransitioning = true;
     if (event.toState === 'expanded') {
       this.sidebarClosed = false;
     } else if (event.toState === 'collapsed') {
@@ -146,6 +157,7 @@ export class AdminSidebarComponent extends MenuComponent implements OnInit {
    * @param event The animation event
    */
   finishSlide(event: any): void {
+    this.sidebarTransitioning = false;
     if (event.fromState === 'expanded') {
       this.sidebarClosed = true;
     } else if (event.fromState === 'collapsed') {
diff --git a/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.html b/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.html
index 1f4666bbd0..636938b7b6 100644
--- a/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.html
+++ b/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.html
@@ -1,37 +1,46 @@
-<div class="sidebar-section" [ngClass]="{'expanded': (expanded | async)}"
+<div [ngClass]="{'expanded': (isExpanded$ | async)}"
     [@bgColor]="{
-     value: ((expanded | async) ? 'endBackground' : 'startBackground'),
-     params: {endColor: (sidebarActiveBg | async)}}">
-  <div class="nav-item nav-link d-flex flex-row flex-nowrap"
-     role="button" tabindex="0"
-     [attr.aria-labelledby]="'sidebarName-' + section.id"
-     [attr.aria-expanded]="expanded | async"
-     [title]="('menu.section.icon.' + section.id) | translate"
-       [class.disabled]="section.model?.disabled"
+     value: ((isExpanded$ | async) ? 'endBackground' : 'startBackground'),
+     params: {endColor: (sidebarActiveBg$ | async)}
+     }">
+  <a class="sidebar-section-wrapper"
+     role="menuitem" tabindex="0"
+     aria-haspopup="menu"
+     [attr.aria-controls]="adminMenuSectionId(section.id)"
+     [attr.aria-expanded]="isExpanded$ | async"
+     [attr.aria-label]="('menu.section.toggle.' + section.id) | translate"
+     [class.disabled]="section.model?.disabled"
      (click)="toggleSection($event)"
      (keyup.space)="toggleSection($event)"
-     (keyup.enter)="toggleSection($event)"
+     href="javascript:void(0);"
   >
-    <div class="shortcut-icon h-100">
+    <div class="sidebar-fixed-element-wrapper" data-test="sidebar-section-icon" aria-hidden="true">
       <i class="fas fa-{{section.icon}} fa-fw"></i>
     </div>
-    <div class="sidebar-collapsible">
-      <div class="toggle">
-        <span id="sidebarName-{{section.id}}" class="section-header-text">
+    <div class="sidebar-collapsible-element-outer-wrapper">
+      <div class="sidebar-collapsible-element-inner-wrapper sidebar-item toggler-wrapper">
+        <span [id]="adminMenuSectionTitleId(section.id)">
           <ng-container
             *ngComponentOutlet="(sectionMap$ | async).get(section.id).component; injector: (sectionMap$ | async).get(section.id).injector;"></ng-container>
         </span>
-        <i class="fas fa-chevron-right fa-pull-right"
-           [@rotate]="(expanded | async) ? 'expanded' : 'collapsed'"
-           [title]="('menu.section.toggle.' + section.id) | translate"
+        <i class="fas fa-chevron-right fa-xs" aria-hidden="true"
+           [@rotate]="(isExpanded$ | async) ? 'expanded' : 'collapsed'"
         ></i>
       </div>
-      <ul class="sidebar-sub-level-items list-unstyled" @slide *ngIf="(expanded | async)">
-        <li *ngFor="let subSection of (subSections$ | async)">
-          <ng-container
-            *ngComponentOutlet="(sectionMap$ | async).get(subSection.id).component; injector: (sectionMap$ | async).get(subSection.id).injector;"></ng-container>
-        </li>
-      </ul>
+    </div>
+  </a>
+  <div class="sidebar-section-wrapper subsection" @slide *ngIf="(isExpanded$ | async)">
+    <div class="sidebar-fixed-element-wrapper"></div>
+    <div class="sidebar-collapsible-element-outer-wrapper">
+      <div class="sidebar-collapsible-element-inner-wrapper">
+        <div class="sidebar-sub-level-item-list" role="menu" [id]="adminMenuSectionId(section.id)" [attr.aria-label]="('menu.section.' + section.id) | translate">
+          <div class="sidebar-item" *ngFor="let subSection of (subSections$ | async)">
+            {{ (sectionMap$ | async).get(subSection.id).component | json}}
+            <ng-container
+              *ngComponentOutlet="(sectionMap$ | async).get(subSection.id).component; injector: (sectionMap$ | async).get(subSection.id).injector;"></ng-container>
+          </div>
+        </div>
+      </div>
     </div>
   </div>
 </div>
diff --git a/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.scss b/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.scss
index 802fade8c1..845ba734df 100644
--- a/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.scss
+++ b/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.scss
@@ -1,23 +1,24 @@
-:host ::ng-deep {
-    .fa-chevron-right {
-        padding-left: calc(var(--bs-spacer) / 2);
-        font-size: 0.5rem;
-        line-height: 3;
+:host {
+  .sidebar-sub-level-item-list  {
+    list-style: none;
+    margin: 0;
+    padding: 0;
+    ::ng-deep .ds-menu-item {
+      margin-left: var(--ds-admin-sidebar-section-indent);
     }
+  }
 
-    .sidebar-sub-level-items {
-        list-style: disc;
-        color: var(--bs-navbar-dark-color);
-        overflow: hidden;
-        margin-bottom: calc(-1 * var(--bs-spacer)); // the bottom-most nav-item is padded, no need for double spacing
-    }
+  .toggler-wrapper {
+    display: flex;
+    flex-direction: row;
+    flex-wrap: nowrap;
+    align-items: center;
+    justify-content: space-between;
+  }
 
-    .sidebar-collapsible {
-        display: flex;
-        flex-direction: column;
-    }
-
-    li.sidebar-section.expanded {
-      background-color: var(--ds-admin-sidebar-active-bg) !important;
+  .subsection {
+    .sidebar-collapsible-element-inner-wrapper {
+      overflow-y: hidden;
     }
+  }
 }
diff --git a/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.spec.ts b/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.spec.ts
index dd31f757c2..bd859d295d 100644
--- a/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.spec.ts
+++ b/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.spec.ts
@@ -49,14 +49,14 @@ describe('ExpandableAdminSidebarSectionComponent', () => {
   });
 
   it('should set the right icon', () => {
-    const icon = fixture.debugElement.query(By.css('.shortcut-icon > i.fas'));
+    const icon = fixture.debugElement.query(By.css('[data-test="sidebar-section-icon"] > i.fas'));
     expect(icon.nativeElement.getAttribute('class')).toContain('fa-' + iconString);
   });
 
   describe('when the header text is clicked', () => {
     beforeEach(() => {
       spyOn(menuService, 'toggleActiveSection');
-      const sidebarToggler = fixture.debugElement.query(By.css('.sidebar-section > div.nav-item'));
+      const sidebarToggler = fixture.debugElement.query(By.css('a.sidebar-section-wrapper'));
       sidebarToggler.triggerEventHandler('click', {
         preventDefault: () => {/**/
         }
diff --git a/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.ts b/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.ts
index 4555c0fa93..d25d7c6b40 100644
--- a/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.ts
+++ b/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.ts
@@ -15,8 +15,7 @@ import { Router } from '@angular/router';
  * Represents a expandable section in the sidebar
  */
 @Component({
-  /* eslint-disable @angular-eslint/component-selector */
-  selector: 'li[ds-expandable-admin-sidebar-section]',
+  selector: 'ds-expandable-admin-sidebar-section',
   templateUrl: './expandable-admin-sidebar-section.component.html',
   styleUrls: ['./expandable-admin-sidebar-section.component.scss'],
   animations: [rotate, slide, bgColor]
@@ -32,23 +31,23 @@ export class ExpandableAdminSidebarSectionComponent extends AdminSidebarSectionC
   /**
    * The background color of the section when it's active
    */
-  sidebarActiveBg;
+  sidebarActiveBg$: Observable<string>;
 
   /**
    * Emits true when the sidebar is currently collapsed, true when it's expanded
    */
-  sidebarCollapsed: Observable<boolean>;
+  isSidebarCollapsed$: Observable<boolean>;
 
   /**
    * Emits true when the sidebar's preview is currently collapsed, true when it's expanded
    */
-  sidebarPreviewCollapsed: Observable<boolean>;
+  isSidebarPreviewCollapsed$: Observable<boolean>;
 
   /**
    * Emits true when the menu section is expanded, else emits false
    * This is true when the section is active AND either the sidebar or it's preview is open
    */
-  expanded: Observable<boolean>;
+  isExpanded$: Observable<boolean>;
 
   constructor(
     @Inject('sectionDataProvider') menuSection,
@@ -65,12 +64,20 @@ export class ExpandableAdminSidebarSectionComponent extends AdminSidebarSectionC
    */
   ngOnInit(): void {
     super.ngOnInit();
-    this.sidebarActiveBg = this.variableService.getVariable('--ds-admin-sidebar-active-bg');
-    this.sidebarCollapsed = this.menuService.isMenuCollapsed(this.menuID);
-    this.sidebarPreviewCollapsed = this.menuService.isMenuPreviewCollapsed(this.menuID);
-    this.expanded = combineLatestObservable(this.active, this.sidebarCollapsed, this.sidebarPreviewCollapsed)
-      .pipe(
-        map(([active, sidebarCollapsed, sidebarPreviewCollapsed]) => (active && (!sidebarCollapsed || !sidebarPreviewCollapsed)))
-      );
+    this.sidebarActiveBg$ = this.variableService.getVariable('--ds-admin-sidebar-active-bg');
+    this.isSidebarCollapsed$ = this.menuService.isMenuCollapsed(this.menuID);
+    this.isSidebarPreviewCollapsed$ = this.menuService.isMenuPreviewCollapsed(this.menuID);
+    this.isExpanded$ = combineLatestObservable([this.active$, this.isSidebarCollapsed$, this.isSidebarPreviewCollapsed$]).pipe(
+      map(([active, sidebarCollapsed, sidebarPreviewCollapsed]) => (active && (!sidebarCollapsed || !sidebarPreviewCollapsed))),
+    );
+  }
+
+  toggleSection($event: Event) {
+    this.menuService.expandMenuPreview(this.menuID); // fixes accessibility issue
+    super.toggleSection($event);
+  }
+
+  adminMenuSubsectionId(sectionId: string, subsectionId: string) {
+    return `admin-menu-section-${sectionId}-${subsectionId}`;
   }
 }
diff --git a/src/app/admin/admin-sidebar/themed-admin-sidebar.component.ts b/src/app/admin/admin-sidebar/themed-admin-sidebar.component.ts
index f2f35725e8..03b783aeaf 100644
--- a/src/app/admin/admin-sidebar/themed-admin-sidebar.component.ts
+++ b/src/app/admin/admin-sidebar/themed-admin-sidebar.component.ts
@@ -1,6 +1,7 @@
-import { Component } from '@angular/core';
+import { Component, Input } from '@angular/core';
 import { ThemedComponent } from '../../shared/theme-support/themed.component';
 import { AdminSidebarComponent } from './admin-sidebar.component';
+import { Observable } from 'rxjs';
 
 /**
  * Themed wrapper for AdminSidebarComponent
@@ -11,6 +12,19 @@ import { AdminSidebarComponent } from './admin-sidebar.component';
   templateUrl: '../../shared/theme-support/themed.component.html',
 })
 export class ThemedAdminSidebarComponent extends ThemedComponent<AdminSidebarComponent> {
+
+  /**
+   * Observable that emits the width of the sidebar when expanded
+   */
+  @Input() expandedSidebarWidth$: Observable<string>;
+
+  /**
+   * Observable that emits the width of the sidebar when collapsed
+   */
+  @Input() collapsedSidebarWidth$: Observable<string>;
+
+  protected inAndOutputNames: (keyof AdminSidebarComponent & keyof this)[] = ['collapsedSidebarWidth$', 'expandedSidebarWidth$'];
+
   protected getComponentName(): string {
     return 'AdminSidebarComponent';
   }
diff --git a/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/workflow-item/workflow-item-search-result-admin-workflow-grid-element.component.ts b/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/workflow-item/workflow-item-search-result-admin-workflow-grid-element.component.ts
index fd9d21e227..4c25a9f998 100644
--- a/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/workflow-item/workflow-item-search-result-admin-workflow-grid-element.component.ts
+++ b/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/workflow-item/workflow-item-search-result-admin-workflow-grid-element.component.ts
@@ -1,4 +1,4 @@
-import { Component, ComponentFactoryResolver, ElementRef, ViewChild } from '@angular/core';
+import { Component, ElementRef, ViewChild, ComponentRef, OnDestroy, OnInit } from '@angular/core';
 import { Item } from '../../../../../core/shared/item.model';
 import { ViewMode } from '../../../../../core/shared/view-mode.model';
 import {
@@ -24,6 +24,7 @@ import { take } from 'rxjs/operators';
 import { WorkflowItemSearchResult } from '../../../../../shared/object-collection/shared/workflow-item-search-result.model';
 import { ThemeService } from '../../../../../shared/theme-support/theme.service';
 import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
+import { hasValue } from '../../../../../shared/empty.util';
 
 @listableObjectComponent(WorkflowItemSearchResult, ViewMode.GridElement, Context.AdminWorkflowSearch)
 @Component({
@@ -34,7 +35,7 @@ import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service
 /**
  * The component for displaying a grid element for an workflow item on the admin workflow search page
  */
-export class WorkflowItemSearchResultAdminWorkflowGridElementComponent extends SearchResultGridElementComponent<WorkflowItemSearchResult, WorkflowItem> {
+export class WorkflowItemSearchResultAdminWorkflowGridElementComponent extends SearchResultGridElementComponent<WorkflowItemSearchResult, WorkflowItem> implements OnDestroy, OnInit {
   /**
    * Directive used to render the dynamic component in
    */
@@ -55,9 +56,10 @@ export class WorkflowItemSearchResultAdminWorkflowGridElementComponent extends S
    */
   public item$: Observable<Item>;
 
+  protected compRef: ComponentRef<Component>;
+
   constructor(
     public dsoNameService: DSONameService,
-    private componentFactoryResolver: ComponentFactoryResolver,
     private linkService: LinkService,
     protected truncatableService: TruncatableService,
     private themeService: ThemeService,
@@ -75,26 +77,34 @@ export class WorkflowItemSearchResultAdminWorkflowGridElementComponent extends S
     this.dso = this.linkService.resolveLink(this.dso, followLink('item'));
     this.item$ = (this.dso.item as Observable<RemoteData<Item>>).pipe(getAllSucceededRemoteData(), getRemoteDataPayload());
     this.item$.pipe(take(1)).subscribe((item: Item) => {
-        const componentFactory = this.componentFactoryResolver.resolveComponentFactory(this.getComponent(item));
+      const component: GenericConstructor<Component> = this.getComponent(item);
 
-        const viewContainerRef = this.listableObjectDirective.viewContainerRef;
-        viewContainerRef.clear();
+      const viewContainerRef = this.listableObjectDirective.viewContainerRef;
+      viewContainerRef.clear();
 
-        const componentRef = viewContainerRef.createComponent(
-          componentFactory,
-          0,
-          undefined,
-          [
+      this.compRef = viewContainerRef.createComponent(
+        component, {
+          index: 0,
+          injector: undefined,
+          projectableNodes: [
             [this.badges.nativeElement],
-            [this.buttons.nativeElement]
-          ]);
-        (componentRef.instance as any).object = item;
-        (componentRef.instance as any).index = this.index;
-        (componentRef.instance as any).linkType = this.linkType;
-        (componentRef.instance as any).listID = this.listID;
-        componentRef.changeDetectorRef.detectChanges();
-      }
-    );
+            [this.buttons.nativeElement],
+          ],
+        },
+      );
+      this.compRef.setInput('object', item);
+      this.compRef.setInput('index', this.index);
+      this.compRef.setInput('linkType', this.linkType);
+      this.compRef.setInput('listID', this.listID);
+      this.compRef.changeDetectorRef.detectChanges();
+    });
+  }
+
+  ngOnDestroy(): void {
+    if (hasValue(this.compRef)) {
+      this.compRef.destroy();
+      this.compRef = undefined;
+    }
   }
 
   /**
diff --git a/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/workspace-item/workspace-item-search-result-admin-workflow-grid-element.component.ts b/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/workspace-item/workspace-item-search-result-admin-workflow-grid-element.component.ts
index d6f39e79fe..9404b02a2a 100644
--- a/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/workspace-item/workspace-item-search-result-admin-workflow-grid-element.component.ts
+++ b/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/workspace-item/workspace-item-search-result-admin-workflow-grid-element.component.ts
@@ -1,4 +1,4 @@
-import { Component, ComponentFactoryResolver, ElementRef, ViewChild, OnInit } from '@angular/core';
+import { Component, ElementRef, ViewChild, OnInit, OnDestroy, ComponentRef } from '@angular/core';
 
 import { BehaviorSubject, Observable } from 'rxjs';
 import { map, mergeMap, take, tap } from 'rxjs/operators';
@@ -37,6 +37,7 @@ import { SupervisionOrder } from '../../../../../core/supervision-order/models/s
 import { PaginatedList } from '../../../../../core/data/paginated-list.model';
 import { SupervisionOrderDataService } from '../../../../../core/supervision-order/supervision-order-data.service';
 import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
+import { hasValue } from '../../../../../shared/empty.util';
 
 @listableObjectComponent(WorkspaceItemSearchResult, ViewMode.GridElement, Context.AdminWorkflowSearch)
 @Component({
@@ -47,7 +48,7 @@ import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service
 /**
  * The component for displaying a grid element for an workflow item on the admin workflow search page
  */
-export class WorkspaceItemSearchResultAdminWorkflowGridElementComponent extends SearchResultGridElementComponent<WorkspaceItemSearchResult, WorkspaceItem> implements OnInit {
+export class WorkspaceItemSearchResultAdminWorkflowGridElementComponent extends SearchResultGridElementComponent<WorkspaceItemSearchResult, WorkspaceItem> implements OnDestroy, OnInit {
 
   /**
    * The item linked to the workspace item
@@ -79,9 +80,13 @@ export class WorkspaceItemSearchResultAdminWorkflowGridElementComponent extends
    */
   @ViewChild('buttons', { static: true }) buttons: ElementRef;
 
+  /**
+   * The reference to the dynamic component
+   */
+  protected compRef: ComponentRef<Component>;
+
   constructor(
     public dsoNameService: DSONameService,
-    private componentFactoryResolver: ComponentFactoryResolver,
     private linkService: LinkService,
     protected truncatableService: TruncatableService,
     private themeService: ThemeService,
@@ -100,24 +105,24 @@ export class WorkspaceItemSearchResultAdminWorkflowGridElementComponent extends
     this.dso = this.linkService.resolveLink(this.dso, followLink('item'));
     this.item$ = (this.dso.item as Observable<RemoteData<Item>>).pipe(getAllSucceededRemoteData(), getRemoteDataPayload());
     this.item$.pipe(take(1)).subscribe((item: Item) => {
-        const componentFactory = this.componentFactoryResolver.resolveComponentFactory(this.getComponent(item));
+        const component: GenericConstructor<Component> = this.getComponent(item);
 
         const viewContainerRef = this.listableObjectDirective.viewContainerRef;
         viewContainerRef.clear();
 
-        const componentRef = viewContainerRef.createComponent(
-          componentFactory,
-          0,
-          undefined,
-          [
+        this.compRef = viewContainerRef.createComponent(
+          component, {
+          index: 0,
+          projectableNodes: [
             [this.badges.nativeElement],
             [this.buttons.nativeElement]
-          ]);
-        (componentRef.instance as any).object = item;
-        (componentRef.instance as any).index = this.index;
-        (componentRef.instance as any).linkType = this.linkType;
-        (componentRef.instance as any).listID = this.listID;
-        componentRef.changeDetectorRef.detectChanges();
+          ],
+        });
+        this.compRef.setInput('object', item);
+        this.compRef.setInput('index', this.index);
+        this.compRef.setInput('linkType', this.linkType);
+        this.compRef.setInput('listID', this.listID);
+        this.compRef.changeDetectorRef.detectChanges();
       }
     );
 
@@ -130,6 +135,13 @@ export class WorkspaceItemSearchResultAdminWorkflowGridElementComponent extends
     });
   }
 
+  ngOnDestroy(): void {
+    if (hasValue(this.compRef)) {
+      this.compRef.destroy();
+      this.compRef = undefined;
+    }
+  }
+
   /**
    * Fetch the component depending on the item's entity type, view mode and context
    * @returns {GenericConstructor<Component>}
diff --git a/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workflow-item/workflow-item-search-result-admin-workflow-list-element.component.spec.ts b/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workflow-item/workflow-item-search-result-admin-workflow-list-element.component.spec.ts
index ab5d8b79a8..8c5258e9c6 100644
--- a/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workflow-item/workflow-item-search-result-admin-workflow-list-element.component.spec.ts
+++ b/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workflow-item/workflow-item-search-result-admin-workflow-list-element.component.spec.ts
@@ -9,6 +9,7 @@ import { CollectionElementLinkType } from '../../../../../shared/object-collecti
 import { ViewMode } from '../../../../../core/shared/view-mode.model';
 import { RouterTestingModule } from '@angular/router/testing';
 import { WorkflowItem } from '../../../../../core/submission/models/workflowitem.model';
+import { XSRFService } from '../../../../../core/xsrf/xsrf.service';
 import {
   WorkflowItemSearchResultAdminWorkflowListElementComponent
 } from './workflow-item-search-result-admin-workflow-list-element.component';
@@ -58,7 +59,8 @@ describe('WorkflowItemSearchResultAdminWorkflowListElementComponent', () => {
           { provide: TruncatableService, useValue: mockTruncatableService },
           { provide: LinkService, useValue: linkService },
           { provide: DSONameService, useClass: DSONameServiceMock },
-          { provide: APP_CONFIG, useValue: environment }
+          { provide: APP_CONFIG, useValue: environment },
+          { provide: XSRFService, useValue: {} },
         ],
         schemas: [NO_ERRORS_SCHEMA]
       })
diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
index deb68f1ea9..b81201dd01 100644
--- a/src/app/app-routing.module.ts
+++ b/src/app/app-routing.module.ts
@@ -40,6 +40,8 @@ import {
 import { ServerCheckGuard } from './core/server-check/server-check.guard';
 import { MenuResolver } from './menu.resolver';
 import { ThemedPageErrorComponent } from './page-error/themed-page-error.component';
+import { HomePageResolver } from './home-page/home-page.resolver';
+import { ViewTrackerResolverService } from './statistics/angulartics/dspace/view-tracker-resolver.service';
 
 @NgModule({
   imports: [
@@ -63,7 +65,15 @@ import { ThemedPageErrorComponent } from './page-error/themed-page-error.compone
             path: 'home',
             loadChildren: () => import('./home-page/home-page.module')
               .then((m) => m.HomePageModule),
-            data: { showBreadcrumbs: false },
+            data: {
+              showBreadcrumbs: false,
+              dsoPath: 'site'
+            },
+            resolve: {
+              site: HomePageResolver,
+              tracking: ViewTrackerResolverService,
+            },
+
             canActivate: [EndUserAgreementCurrentUserGuard]
           },
           {
@@ -251,6 +261,7 @@ import { ThemedPageErrorComponent } from './page-error/themed-page-error.compone
 })
   ],
   exports: [RouterModule],
+  providers: [HomePageResolver, ViewTrackerResolverService],
 })
 export class AppRoutingModule {
 
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index ba7b738227..b77d53c81d 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -1,4 +1,4 @@
-import { distinctUntilChanged, take, withLatestFrom } from 'rxjs/operators';
+import { distinctUntilChanged, take, withLatestFrom, delay } from 'rxjs/operators';
 import { DOCUMENT, isPlatformBrowser } from '@angular/common';
 import {
   AfterViewInit,
@@ -114,7 +114,10 @@ export class AppComponent implements OnInit, AfterViewInit {
   }
 
   ngAfterViewInit() {
-    this.router.events.subscribe((event) => {
+    this.router.events.pipe(
+      // delay(0) to prevent "Expression has changed after it was checked" errors
+      delay(0)
+    ).subscribe((event) => {
       if (event instanceof NavigationStart) {
         distinctNext(this.isRouteLoading$, true);
       } else if (
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 89e361821b..1aa5036bce 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -30,6 +30,7 @@ import { EagerThemesModule } from '../themes/eager-themes.module';
 import { APP_CONFIG, AppConfig } from '../config/app-config.interface';
 import { StoreDevModules } from '../config/store/devtools';
 import { RootModule } from './root.module';
+import { DspaceRestInterceptor } from './core/dspace-rest/dspace-rest.interceptor';
 
 export function getConfig() {
   return environment;
@@ -103,6 +104,12 @@ const PROVIDERS = [
     useClass: LogInterceptor,
     multi: true
   },
+  // register DspaceRestInterceptor as HttpInterceptor
+  {
+    provide: HTTP_INTERCEPTORS,
+    useClass: DspaceRestInterceptor,
+    multi: true
+  },
   // register the dynamic matcher used by form. MUST be provided by the app module
   ...DYNAMIC_MATCHER_PROVIDERS,
 ];
diff --git a/src/app/bitstream-page/bitstream-authorizations/bitstream-authorizations.component.ts b/src/app/bitstream-page/bitstream-authorizations/bitstream-authorizations.component.ts
index adc0638780..72683f5d74 100644
--- a/src/app/bitstream-page/bitstream-authorizations/bitstream-authorizations.component.ts
+++ b/src/app/bitstream-page/bitstream-authorizations/bitstream-authorizations.component.ts
@@ -8,11 +8,11 @@ import { RemoteData } from '../../core/data/remote-data';
 import { DSpaceObject } from '../../core/shared/dspace-object.model';
 
 @Component({
-  selector: 'ds-collection-authorizations',
+  selector: 'ds-bitstream-authorizations',
   templateUrl: './bitstream-authorizations.component.html',
 })
 /**
- * Component that handles the Collection Authorizations
+ * Component that handles the Bitstream Authorizations
  */
 export class BitstreamAuthorizationsComponent<TDomain extends DSpaceObject> implements OnInit {
 
diff --git a/src/app/bitstream-page/bitstream-download-page/bitstream-download-page.component.html b/src/app/bitstream-page/bitstream-download-page/bitstream-download-page.component.html
index af3afe98f8..1467ffb0cc 100644
--- a/src/app/bitstream-page/bitstream-download-page/bitstream-download-page.component.html
+++ b/src/app/bitstream-page/bitstream-download-page/bitstream-download-page.component.html
@@ -1,5 +1,5 @@
 <div class="container">
-  <h3>{{'bitstream.download.page' | translate:{ bitstream: dsoNameService.getName((bitstream$ | async)) } }}</h3>
+  <h1 class="h2">{{'bitstream.download.page' | translate:{ bitstream: dsoNameService.getName((bitstream$ | async)) } }}</h1>
   <div class="pt-3">
     <button (click)="back()" class="btn btn-outline-secondary">
       <i class="fas fa-arrow-left"></i> {{'bitstream.download.page.back' | translate}}
diff --git a/src/app/bitstream-page/bitstream-page-routing.module.ts b/src/app/bitstream-page/bitstream-page-routing.module.ts
index 3960ccb743..f378b301aa 100644
--- a/src/app/bitstream-page/bitstream-page-routing.module.ts
+++ b/src/app/bitstream-page/bitstream-page-routing.module.ts
@@ -8,7 +8,7 @@ import { ResourcePolicyCreateComponent } from '../shared/resource-policies/creat
 import { ResourcePolicyResolver } from '../shared/resource-policies/resolvers/resource-policy.resolver';
 import { ResourcePolicyEditComponent } from '../shared/resource-policies/edit/resource-policy-edit.component';
 import { BitstreamAuthorizationsComponent } from './bitstream-authorizations/bitstream-authorizations.component';
-import { LegacyBitstreamUrlResolver } from './legacy-bitstream-url.resolver';
+import { legacyBitstreamURLRedirectGuard } from './legacy-bitstream-url-redirect.guard';
 import { BitstreamBreadcrumbResolver } from '../core/breadcrumbs/bitstream-breadcrumb.resolver';
 import { BitstreamBreadcrumbsService } from '../core/breadcrumbs/bitstream-breadcrumbs.service';
 import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver';
@@ -27,17 +27,13 @@ const EDIT_BITSTREAM_AUTHORIZATIONS_PATH = ':id/authorizations';
         // Resolve XMLUI bitstream download URLs
         path: 'handle/:prefix/:suffix/:filename',
         component: BitstreamDownloadPageComponent,
-        resolve: {
-          bitstream: LegacyBitstreamUrlResolver
-        },
+        canActivate: [legacyBitstreamURLRedirectGuard],
       },
       {
         // Resolve JSPUI bitstream download URLs
         path: ':prefix/:suffix/:sequence_id/:filename',
         component: BitstreamDownloadPageComponent,
-        resolve: {
-          bitstream: LegacyBitstreamUrlResolver
-        },
+        canActivate: [legacyBitstreamURLRedirectGuard],
       },
       {
         // Resolve angular bitstream download URLs
diff --git a/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.html b/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.html
index 11aa3bfe75..1ac3300bca 100644
--- a/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.html
+++ b/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.html
@@ -1,6 +1,6 @@
 <ng-container *ngVar="(bitstreamRD$ | async) as bitstreamRD">
-  <div class="container" *ngVar="(bitstreamFormatsRD$ | async) as formatsRD">
-    <div class="row" *ngIf="bitstreamRD?.hasSucceeded && formatsRD?.hasSucceeded">
+  <div class="container">
+    <div class="row" *ngIf="bitstreamRD?.hasSucceeded">
       <div class="col-md-2">
         <ds-themed-thumbnail [thumbnail]="bitstreamRD?.payload"></ds-themed-thumbnail>
       </div>
@@ -8,7 +8,7 @@
         <div class="container">
           <div class="row">
             <div class="col-12">
-              <h3>{{dsoNameService.getName(bitstreamRD?.payload)}} <span class="text-muted">({{bitstreamRD?.payload?.sizeBytes | dsFileSize}})</span></h3>
+              <h1 class="h2">{{dsoNameService.getName(bitstreamRD?.payload)}} <span class="text-muted">({{bitstreamRD?.payload?.sizeBytes | dsFileSize}})</span></h1>
             </div>
           </div>
         </div>
@@ -27,7 +27,7 @@
       </div>
     </div>
     <ds-error *ngIf="bitstreamRD?.hasFailed" message="{{'error.bitstream' | translate}}"></ds-error>
-    <ds-themed-loading *ngIf="!bitstreamRD || !formatsRD || bitstreamRD?.isLoading || formatsRD?.isLoading"
+    <ds-themed-loading *ngIf="!bitstreamRD || bitstreamRD?.isLoading"
                 message="{{'loading.bitstream' | translate}}"></ds-themed-loading>
   </div>
 </ng-container>
diff --git a/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.spec.ts b/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.spec.ts
index b83f2b9664..c81926d83d 100644
--- a/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.spec.ts
+++ b/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.spec.ts
@@ -239,7 +239,7 @@ describe('EditBitstreamPageComponent', () => {
       });
 
       it('should select the correct format', () => {
-        expect(rawForm.formatContainer.selectedFormat).toEqual(selectedFormat.id);
+        expect(rawForm.formatContainer.selectedFormat).toEqual(selectedFormat.shortDescription);
       });
 
       it('should put the \"New Format\" input on invisible', () => {
@@ -270,7 +270,13 @@ describe('EditBitstreamPageComponent', () => {
 
     describe('when an unknown format is selected', () => {
       beforeEach(() => {
-        comp.updateNewFormatLayout(allFormats[0].id);
+        comp.onChange({
+          model: {
+            id: 'selectedFormat',
+            value: allFormats[0],
+          },
+        });
+        comp.updateNewFormatLayout();
       });
 
       it('should remove the invisible class from the \"New Format\" input', () => {
@@ -372,10 +378,11 @@ describe('EditBitstreamPageComponent', () => {
 
       describe('when selected format has changed', () => {
         beforeEach(() => {
-          comp.formGroup.patchValue({
-            formatContainer: {
-              selectedFormat: allFormats[2].id
-            }
+          comp.onChange({
+            model: {
+              id: 'selectedFormat',
+              value: allFormats[2],
+            },
           });
           fixture.detectChanges();
           comp.onSubmit();
diff --git a/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.ts b/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.ts
index b77d2151a9..082ffd55a9 100644
--- a/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.ts
+++ b/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.ts
@@ -2,14 +2,20 @@ import { ChangeDetectionStrategy, ChangeDetectorRef, Component, OnDestroy, OnIni
 import { Bitstream } from '../../core/shared/bitstream.model';
 import { ActivatedRoute, Router } from '@angular/router';
 import { filter, map, switchMap, tap } from 'rxjs/operators';
-import { combineLatest, combineLatest as observableCombineLatest, Observable, of as observableOf, Subscription } from 'rxjs';
-import { DynamicFormControlModel, DynamicFormGroupModel, DynamicFormLayout, DynamicFormService, DynamicInputModel, DynamicSelectModel } from '@ng-dynamic-forms/core';
+import {
+  combineLatest,
+  combineLatest as observableCombineLatest,
+  Observable,
+  of as observableOf,
+  Subscription, take
+} from 'rxjs';
+import { DynamicFormControlModel, DynamicFormGroupModel, DynamicFormLayout, DynamicFormService, DynamicInputModel } from '@ng-dynamic-forms/core';
 import { UntypedFormGroup } from '@angular/forms';
 import { TranslateService } from '@ngx-translate/core';
 import { DynamicCustomSwitchModel } from '../../shared/form/builder/ds-dynamic-form-ui/models/custom-switch/custom-switch.model';
 import cloneDeep from 'lodash/cloneDeep';
 import { BitstreamDataService } from '../../core/data/bitstream-data.service';
-import { getAllSucceededRemoteDataPayload, getFirstCompletedRemoteData, getFirstSucceededRemoteData, getFirstSucceededRemoteDataPayload, getRemoteDataPayload } from '../../core/shared/operators';
+import { getFirstCompletedRemoteData, getFirstSucceededRemoteData, getFirstSucceededRemoteDataPayload, getRemoteDataPayload } from '../../core/shared/operators';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { BitstreamFormatDataService } from '../../core/data/bitstream-format-data.service';
 import { BitstreamFormat } from '../../core/shared/bitstream-format.model';
@@ -18,7 +24,6 @@ import { hasValue, hasValueOperator, isEmpty, isNotEmpty } from '../../shared/em
 import { Metadata } from '../../core/shared/metadata.utils';
 import { Location } from '@angular/common';
 import { RemoteData } from '../../core/data/remote-data';
-import { PaginatedList } from '../../core/data/paginated-list.model';
 import { getEntityEditRoute } from '../../item-page/item-page-routing-paths';
 import { Bundle } from '../../core/shared/bundle.model';
 import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
@@ -26,6 +31,8 @@ import { Item } from '../../core/shared/item.model';
 import { DsDynamicInputModel } from '../../shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-input.model';
 import { DsDynamicTextAreaModel } from '../../shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-textarea.model';
 import { PrimaryBitstreamService } from '../../core/data/primary-bitstream.service';
+import { DynamicScrollableDropdownModel } from 'src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.model';
+import { FindAllDataImpl } from '../../core/data/base/find-all-data';
 
 @Component({
   selector: 'ds-edit-bitstream-page',
@@ -44,12 +51,6 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
    */
   bitstreamRD$: Observable<RemoteData<Bitstream>>;
 
-  /**
-   * The formats their remote data observable
-   * Tracks changes and updates the view
-   */
-  bitstreamFormatsRD$: Observable<RemoteData<PaginatedList<BitstreamFormat>>>;
-
   /**
    * The UUID of the primary bitstream for this bundle
    */
@@ -65,11 +66,6 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
    */
   originalFormat: BitstreamFormat;
 
-  /**
-   * A list of all available bitstream formats
-   */
-  formats: BitstreamFormat[];
-
   /**
    * @type {string} Key prefix used to generate form messages
    */
@@ -113,7 +109,10 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
   /**
    * Options for fetching all bitstream formats
    */
-  findAllOptions = { elementsPerPage: 9999 };
+  findAllOptions = {
+    elementsPerPage: 20,
+    currentPage: 1
+  };
 
   /**
    * The Dynamic Input Model for the file's name
@@ -153,9 +152,22 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
   /**
    * The Dynamic Input Model for the selected format
    */
-  selectedFormatModel = new DynamicSelectModel({
+  selectedFormatModel = new DynamicScrollableDropdownModel({
     id: 'selectedFormat',
-    name: 'selectedFormat'
+    name: 'selectedFormat',
+    displayKey: 'shortDescription',
+    repeatable: false,
+    metadataFields: [],
+    submissionId: '',
+    hasSelectableMetadata: false,
+    findAllFactory: this.findAllFormatsServiceFactory(),
+    formatFunction: (format: BitstreamFormat | string) => {
+      if (format instanceof  BitstreamFormat) {
+        return hasValue(format) && format.supportLevel === BitstreamFormatSupportLevel.Unknown ? this.translate.instant(this.KEY_PREFIX + 'selectedFormat.unknown') : format.shortDescription;
+      } else {
+        return format;
+      }
+    },
   });
 
   /**
@@ -370,6 +382,11 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
    * @private
    */
   private bundle: Bundle;
+  /**
+   * The currently selected format
+   * @private
+   */
+  private selectedFormat: BitstreamFormat;
 
   constructor(private route: ActivatedRoute,
               private router: Router,
@@ -396,18 +413,12 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
     this.itemId = this.route.snapshot.queryParams.itemId;
     this.entityType = this.route.snapshot.queryParams.entityType;
     this.bitstreamRD$ = this.route.data.pipe(map((data: any) => data.bitstream));
-    this.bitstreamFormatsRD$ = this.bitstreamFormatService.findAll(this.findAllOptions);
 
     const bitstream$ = this.bitstreamRD$.pipe(
       getFirstSucceededRemoteData(),
       getRemoteDataPayload(),
     );
 
-    const allFormats$ = this.bitstreamFormatsRD$.pipe(
-      getFirstSucceededRemoteData(),
-      getRemoteDataPayload(),
-    );
-
     const bundle$ = bitstream$.pipe(
       switchMap((bitstream: Bitstream) => bitstream.bundle),
       getFirstSucceededRemoteDataPayload(),
@@ -423,24 +434,31 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
       switchMap((bundle: Bundle) => bundle.item),
       getFirstSucceededRemoteDataPayload(),
     );
+    const format$ = bitstream$.pipe(
+      switchMap(bitstream => bitstream.format),
+      getFirstSucceededRemoteDataPayload(),
+    );
+
     this.subs.push(
       observableCombineLatest(
         bitstream$,
-        allFormats$,
         bundle$,
         primaryBitstream$,
         item$,
-      ).pipe()
-        .subscribe(([bitstream, allFormats, bundle, primaryBitstream, item]) => {
-          this.bitstream = bitstream as Bitstream;
-          this.formats = allFormats.page;
-          this.bundle = bundle;
-          // hasValue(primaryBitstream) because if there's no primaryBitstream on the bundle it will
-          // be a success response, but empty
-          this.primaryBitstreamUUID = hasValue(primaryBitstream) ? primaryBitstream.uuid : null;
-          this.itemId = item.uuid;
-          this.setIiifStatus(this.bitstream);
-        })
+        format$,
+      ).subscribe(([bitstream, bundle, primaryBitstream, item, format]) => {
+        this.bitstream = bitstream as Bitstream;
+        this.bundle = bundle;
+        this.selectedFormat = format;
+        // hasValue(primaryBitstream) because if there's no primaryBitstream on the bundle it will
+        // be a success response, but empty
+        this.primaryBitstreamUUID = hasValue(primaryBitstream) ? primaryBitstream.uuid : null;
+        this.itemId = item.uuid;
+        this.setIiifStatus(this.bitstream);
+      }),
+      format$.pipe(take(1)).subscribe(
+        (format) => this.originalFormat = format,
+      ),
     );
 
     this.subs.push(
@@ -456,7 +474,6 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
    */
   setForm() {
     this.formGroup = this.formService.createFormGroup(this.formModel);
-    this.updateFormatModel();
     this.updateForm(this.bitstream);
     this.updateFieldTranslations();
   }
@@ -475,8 +492,9 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
         description: bitstream.firstMetadataValue('dc.description')
       },
       formatContainer: {
-        newFormat: hasValue(bitstream.firstMetadata('dc.format')) ? bitstream.firstMetadata('dc.format').value : undefined
-      }
+        selectedFormat: this.selectedFormat.shortDescription,
+        newFormat: hasValue(bitstream.firstMetadata('dc.format')) ? bitstream.firstMetadata('dc.format').value : undefined,
+      },
     });
     if (this.isIIIF) {
       this.formGroup.patchValue({
@@ -494,36 +512,16 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
         }
       });
     }
-    this.bitstream.format.pipe(
-      getAllSucceededRemoteDataPayload()
-    ).subscribe((format: BitstreamFormat) => {
-      this.originalFormat = format;
-      this.formGroup.patchValue({
-        formatContainer: {
-          selectedFormat: format.id
-        }
-      });
-      this.updateNewFormatLayout(format.id);
-    });
+    this.updateNewFormatLayout();
   }
 
-  /**
-   * Create the list of unknown format IDs an add options to the selectedFormatModel
-   */
-  updateFormatModel() {
-    this.selectedFormatModel.options = this.formats.map((format: BitstreamFormat) =>
-      Object.assign({
-        value: format.id,
-        label: this.isUnknownFormat(format.id) ? this.translate.instant(this.KEY_PREFIX + 'selectedFormat.unknown') : format.shortDescription
-      }));
-  }
 
   /**
    * Update the layout of the "Other Format" input depending on the selected format
    * @param selectedId
    */
-  updateNewFormatLayout(selectedId: string) {
-    if (this.isUnknownFormat(selectedId)) {
+  updateNewFormatLayout() {
+    if (this.isUnknownFormat()) {
       this.formLayout.newFormat.grid.host = this.newFormatBaseLayout;
     } else {
       this.formLayout.newFormat.grid.host = this.newFormatBaseLayout + ' invisible';
@@ -534,9 +532,8 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
    * Is the provided format (id) part of the list of unknown formats?
    * @param id
    */
-  isUnknownFormat(id: string): boolean {
-    const format = this.formats.find((f: BitstreamFormat) => f.id === id);
-    return hasValue(format) && format.supportLevel === BitstreamFormatSupportLevel.Unknown;
+  isUnknownFormat(): boolean {
+    return hasValue(this.selectedFormat) &&  this.selectedFormat.supportLevel === BitstreamFormatSupportLevel.Unknown;
   }
 
   /**
@@ -568,7 +565,8 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
   onChange(event) {
     const model = event.model;
     if (model.id === this.selectedFormatModel.id) {
-      this.updateNewFormatLayout(model.value);
+      this.selectedFormat = model.value;
+      this.updateNewFormatLayout();
     }
   }
 
@@ -578,8 +576,7 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
   onSubmit() {
     const updatedValues = this.formGroup.getRawValue();
     const updatedBitstream = this.formToBitstream(updatedValues);
-    const selectedFormat = this.formats.find((f: BitstreamFormat) => f.id === updatedValues.formatContainer.selectedFormat);
-    const isNewFormat = selectedFormat.id !== this.originalFormat.id;
+    const isNewFormat = this.selectedFormat.id !== this.originalFormat.id;
     const isPrimary = updatedValues.fileNamePrimaryContainer.primaryBitstream;
     const wasPrimary = this.primaryBitstreamUUID === this.bitstream.uuid;
 
@@ -631,7 +628,7 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
       bundle$ = observableOf(this.bundle);
     }
     if (isNewFormat) {
-      bitstream$ = this.bitstreamService.updateFormat(this.bitstream, selectedFormat).pipe(
+      bitstream$ = this.bitstreamService.updateFormat(this.bitstream, this.selectedFormat).pipe(
         getFirstCompletedRemoteData(),
         map((formatResponse: RemoteData<Bitstream>) => {
           if (hasValue(formatResponse) && formatResponse.hasFailed) {
@@ -789,4 +786,7 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
       .forEach((subscription) => subscription.unsubscribe());
   }
 
+  findAllFormatsServiceFactory() {
+    return () => this.bitstreamFormatService as any as FindAllDataImpl<BitstreamFormat>;
+  }
 }
diff --git a/src/app/bitstream-page/legacy-bitstream-url-redirect.guard.spec.ts b/src/app/bitstream-page/legacy-bitstream-url-redirect.guard.spec.ts
new file mode 100644
index 0000000000..38be4dbb38
--- /dev/null
+++ b/src/app/bitstream-page/legacy-bitstream-url-redirect.guard.spec.ts
@@ -0,0 +1,158 @@
+import { cold } from 'jasmine-marbles';
+import { EMPTY } from 'rxjs';
+
+import { PAGE_NOT_FOUND_PATH } from '../app-routing-paths';
+import { BitstreamDataService } from '../core/data/bitstream-data.service';
+import { RemoteData } from '../core/data/remote-data';
+import { RequestEntryState } from '../core/data/request-entry-state.model';
+import { BrowserHardRedirectService } from '../core/services/browser-hard-redirect.service';
+import { HardRedirectService } from '../core/services/hard-redirect.service';
+import { Bitstream } from '../core/shared/bitstream.model';
+import { RouterStub } from '../shared/testing/router.stub';
+import { legacyBitstreamURLRedirectGuard } from './legacy-bitstream-url-redirect.guard';
+
+describe('legacyBitstreamURLRedirectGuard', () => {
+  let resolver: any;
+  let bitstreamDataService: BitstreamDataService;
+  let remoteDataMocks: { [type: string]: RemoteData<any> };
+  let route;
+  let state;
+  let hardRedirectService: HardRedirectService;
+  let router: RouterStub;
+
+  let bitstream: Bitstream;
+
+  beforeEach(() => {
+    route = {
+      params: {},
+      queryParams: {}
+    };
+    router = new RouterStub();
+    hardRedirectService = new BrowserHardRedirectService(window.location);
+    state = {};
+    bitstream = Object.assign(new Bitstream(), {
+      uuid: 'bitstream-id',
+    });
+    remoteDataMocks = {
+      RequestPending: new RemoteData(undefined, 0, 0, RequestEntryState.RequestPending, undefined, undefined, undefined),
+      ResponsePending: new RemoteData(undefined, 0, 0, RequestEntryState.ResponsePending, undefined, undefined, undefined),
+      Success: new RemoteData(0, 0, 0, RequestEntryState.Success, undefined, bitstream, 200),
+      NoContent: new RemoteData(0, 0, 0, RequestEntryState.Success, undefined, undefined, 204),
+      Error: new RemoteData(0, 0, 0, RequestEntryState.Error, 'Internal server error', undefined, 500),
+    };
+    bitstreamDataService = {
+      findByItemHandle: () => undefined
+    } as any;
+    resolver = legacyBitstreamURLRedirectGuard;
+  });
+
+  describe(`resolve`, () => {
+    describe(`For JSPUI-style URLs`, () => {
+      beforeEach(() => {
+        spyOn(bitstreamDataService, 'findByItemHandle').and.returnValue(EMPTY);
+        route = Object.assign({}, route, {
+          params: {
+            prefix: '123456789',
+            suffix: '1234',
+            filename: 'some-file.pdf',
+            sequence_id: '5'
+          }
+        });
+      });
+      it(`should call findByItemHandle with the handle, sequence id, and filename from the route`, () => {
+        resolver(route, state, bitstreamDataService, hardRedirectService, router);
+        expect(bitstreamDataService.findByItemHandle).toHaveBeenCalledWith(
+          `${route.params.prefix}/${route.params.suffix}`,
+          route.params.sequence_id,
+          route.params.filename
+        );
+      });
+    });
+
+    describe(`For XMLUI-style URLs`, () => {
+      describe(`when there is a sequenceId query parameter`, () => {
+        beforeEach(() => {
+          spyOn(bitstreamDataService, 'findByItemHandle').and.returnValue(EMPTY);
+          route = Object.assign({}, route, {
+            params: {
+              prefix: '123456789',
+              suffix: '1234',
+              filename: 'some-file.pdf',
+            },
+            queryParams: {
+              sequenceId: '5'
+            }
+          });
+        });
+        it(`should call findByItemHandle with the handle and filename from the route, and the sequence ID from the queryParams`, () => {
+          resolver(route, state, bitstreamDataService, hardRedirectService, router);
+          expect(bitstreamDataService.findByItemHandle).toHaveBeenCalledWith(
+            `${route.params.prefix}/${route.params.suffix}`,
+            route.queryParams.sequenceId,
+            route.params.filename
+          );
+        });
+      });
+      describe(`when there's no sequenceId query parameter`, () => {
+        beforeEach(() => {
+          spyOn(bitstreamDataService, 'findByItemHandle').and.returnValue(EMPTY);
+          route = Object.assign({}, route, {
+            params: {
+              prefix: '123456789',
+              suffix: '1234',
+              filename: 'some-file.pdf',
+            },
+          });
+        });
+        it(`should call findByItemHandle with the handle, and filename from the route`, () => {
+          resolver(route, state, bitstreamDataService, hardRedirectService, router);
+          expect(bitstreamDataService.findByItemHandle).toHaveBeenCalledWith(
+            `${route.params.prefix}/${route.params.suffix}`,
+            undefined,
+            route.params.filename
+          );
+        });
+      });
+    });
+    describe('should return and complete after the RemoteData has...', () => {
+      it('...failed', () => {
+        spyOn(router, 'createUrlTree').and.callThrough();
+        spyOn(bitstreamDataService, 'findByItemHandle').and.returnValue(cold('a-b-c', {
+          a: remoteDataMocks.RequestPending,
+          b: remoteDataMocks.ResponsePending,
+          c: remoteDataMocks.Error,
+        }));
+        resolver(route, state, bitstreamDataService, hardRedirectService, router).subscribe(() => {
+          expect(bitstreamDataService.findByItemHandle).toHaveBeenCalled();
+          expect(router.createUrlTree).toHaveBeenCalledWith([PAGE_NOT_FOUND_PATH]);
+        });
+      });
+
+      it('...succeeded without content', () => {
+        spyOn(router, 'createUrlTree').and.callThrough();
+        spyOn(bitstreamDataService, 'findByItemHandle').and.returnValue(cold('a-b-c', {
+          a: remoteDataMocks.RequestPending,
+          b: remoteDataMocks.ResponsePending,
+          c: remoteDataMocks.NoContent,
+        }));
+        resolver(route, state, bitstreamDataService, hardRedirectService, router).subscribe(() => {
+          expect(bitstreamDataService.findByItemHandle).toHaveBeenCalled();
+          expect(router.createUrlTree).toHaveBeenCalledWith([PAGE_NOT_FOUND_PATH]);
+        });
+      });
+
+      it('...succeeded', () => {
+        spyOn(hardRedirectService, 'redirect');
+        spyOn(bitstreamDataService, 'findByItemHandle').and.returnValue(cold('a-b-c', {
+          a: remoteDataMocks.RequestPending,
+          b: remoteDataMocks.ResponsePending,
+          c: remoteDataMocks.Success,
+        }));
+        resolver(route, state, bitstreamDataService, hardRedirectService, router).subscribe(() => {
+          expect(bitstreamDataService.findByItemHandle).toHaveBeenCalled();
+          expect(hardRedirectService.redirect).toHaveBeenCalledWith(new URL(`/bitstreams/${bitstream.uuid}/download`, window.location.origin).href, 301);
+        });
+      });
+    });
+  });
+});
diff --git a/src/app/bitstream-page/legacy-bitstream-url-redirect.guard.ts b/src/app/bitstream-page/legacy-bitstream-url-redirect.guard.ts
new file mode 100644
index 0000000000..d8d8932c30
--- /dev/null
+++ b/src/app/bitstream-page/legacy-bitstream-url-redirect.guard.ts
@@ -0,0 +1,56 @@
+import { inject } from '@angular/core';
+import {
+  ActivatedRouteSnapshot,
+  CanActivateFn,
+  Router,
+  RouterStateSnapshot,
+  UrlTree,
+} from '@angular/router';
+import { Observable } from 'rxjs';
+import { map } from 'rxjs/operators';
+
+import { PAGE_NOT_FOUND_PATH } from '../app-routing-paths';
+import { BitstreamDataService } from '../core/data/bitstream-data.service';
+import { RemoteData } from '../core/data/remote-data';
+import { HardRedirectService } from '../core/services/hard-redirect.service';
+import { Bitstream } from '../core/shared/bitstream.model';
+import { getFirstCompletedRemoteData } from '../core/shared/operators';
+import { hasNoValue } from '../shared/empty.util';
+
+/**
+ * Redirects to a bitstream based on the handle of the item, and the sequence id or the filename of the
+ * bitstream. In production mode the status code will also be set the status code to 301 marking it as a permanent URL
+ * redirect for bots.
+ *
+ * @returns Observable<UrlTree> Returns a URL to redirect the user to the new URL format
+ */
+export const legacyBitstreamURLRedirectGuard: CanActivateFn = (
+  route: ActivatedRouteSnapshot,
+  state: RouterStateSnapshot,
+  bitstreamDataService: BitstreamDataService = inject(BitstreamDataService),
+  serverHardRedirectService: HardRedirectService = inject(HardRedirectService),
+  router: Router = inject(Router),
+): Observable<UrlTree | boolean> => {
+  const prefix = route.params.prefix;
+  const suffix = route.params.suffix;
+  const filename = route.params.filename;
+  let sequenceId = route.params.sequence_id;
+  if (hasNoValue(sequenceId)) {
+    sequenceId = route.queryParams.sequenceId;
+  }
+  return bitstreamDataService.findByItemHandle(
+    `${prefix}/${suffix}`,
+    sequenceId,
+    filename,
+  ).pipe(
+    getFirstCompletedRemoteData(),
+    map((rd: RemoteData<Bitstream>) => {
+      if (rd.hasSucceeded && !rd.hasNoContent) {
+        serverHardRedirectService.redirect(new URL(`/bitstreams/${rd.payload.uuid}/download`, serverHardRedirectService.getCurrentOrigin()).href, 301);
+        return false;
+      } else {
+        return router.createUrlTree([PAGE_NOT_FOUND_PATH]);
+      }
+    })
+  );
+};
diff --git a/src/app/bitstream-page/legacy-bitstream-url.resolver.spec.ts b/src/app/bitstream-page/legacy-bitstream-url.resolver.spec.ts
deleted file mode 100644
index aec8cd22f4..0000000000
--- a/src/app/bitstream-page/legacy-bitstream-url.resolver.spec.ts
+++ /dev/null
@@ -1,145 +0,0 @@
-import { LegacyBitstreamUrlResolver } from './legacy-bitstream-url.resolver';
-import { EMPTY } from 'rxjs';
-import { BitstreamDataService } from '../core/data/bitstream-data.service';
-import { RemoteData } from '../core/data/remote-data';
-import { TestScheduler } from 'rxjs/testing';
-import { RequestEntryState } from '../core/data/request-entry-state.model';
-
-describe(`LegacyBitstreamUrlResolver`, () => {
-  let resolver: LegacyBitstreamUrlResolver;
-  let bitstreamDataService: BitstreamDataService;
-  let testScheduler;
-  let remoteDataMocks;
-  let route;
-  let state;
-
-  beforeEach(() => {
-    testScheduler = new TestScheduler((actual, expected) => {
-      expect(actual).toEqual(expected);
-    });
-
-    route = {
-      params: {},
-      queryParams: {}
-    };
-    state = {};
-    remoteDataMocks = {
-      RequestPending: new RemoteData(undefined, 0, 0, RequestEntryState.RequestPending, undefined, undefined, undefined),
-      ResponsePending: new RemoteData(undefined, 0, 0, RequestEntryState.ResponsePending, undefined, undefined, undefined),
-      Success: new RemoteData(0, 0, 0, RequestEntryState.Success, undefined, {}, 200),
-      Error: new RemoteData(0, 0, 0, RequestEntryState.Error, 'Internal server error', undefined, 500),
-    };
-    bitstreamDataService = {
-      findByItemHandle: () => undefined
-    } as any;
-    resolver = new LegacyBitstreamUrlResolver(bitstreamDataService);
-  });
-
-  describe(`resolve`, () => {
-    describe(`For JSPUI-style URLs`, () => {
-      beforeEach(() => {
-        spyOn(bitstreamDataService, 'findByItemHandle').and.returnValue(EMPTY);
-        route = Object.assign({}, route, {
-          params: {
-            prefix: '123456789',
-            suffix: '1234',
-            filename: 'some-file.pdf',
-            sequence_id: '5'
-          }
-        });
-      });
-      it(`should call findByItemHandle with the handle, sequence id, and filename from the route`, () => {
-        testScheduler.run(() => {
-          resolver.resolve(route, state);
-          expect(bitstreamDataService.findByItemHandle).toHaveBeenCalledWith(
-            `${route.params.prefix}/${route.params.suffix}`,
-            route.params.sequence_id,
-            route.params.filename
-          );
-        });
-      });
-    });
-
-    describe(`For XMLUI-style URLs`, () => {
-      describe(`when there is a sequenceId query parameter`, () => {
-        beforeEach(() => {
-          spyOn(bitstreamDataService, 'findByItemHandle').and.returnValue(EMPTY);
-          route = Object.assign({}, route, {
-            params: {
-              prefix: '123456789',
-              suffix: '1234',
-              filename: 'some-file.pdf',
-            },
-            queryParams: {
-              sequenceId: '5'
-            }
-          });
-        });
-        it(`should call findByItemHandle with the handle and filename from the route, and the sequence ID from the queryParams`, () => {
-          testScheduler.run(() => {
-            resolver.resolve(route, state);
-            expect(bitstreamDataService.findByItemHandle).toHaveBeenCalledWith(
-              `${route.params.prefix}/${route.params.suffix}`,
-              route.queryParams.sequenceId,
-              route.params.filename
-            );
-          });
-        });
-      });
-      describe(`when there's no sequenceId query parameter`, () => {
-        beforeEach(() => {
-          spyOn(bitstreamDataService, 'findByItemHandle').and.returnValue(EMPTY);
-          route = Object.assign({}, route, {
-            params: {
-              prefix: '123456789',
-              suffix: '1234',
-              filename: 'some-file.pdf',
-            },
-          });
-        });
-        it(`should call findByItemHandle with the handle, and filename from the route`, () => {
-          testScheduler.run(() => {
-            resolver.resolve(route, state);
-            expect(bitstreamDataService.findByItemHandle).toHaveBeenCalledWith(
-              `${route.params.prefix}/${route.params.suffix}`,
-              undefined,
-              route.params.filename
-            );
-          });
-        });
-      });
-    });
-    describe(`should return and complete after the remotedata has...`, () => {
-      it(`...failed`, () => {
-        testScheduler.run(({ cold, expectObservable }) => {
-          spyOn(bitstreamDataService, 'findByItemHandle').and.returnValue(cold('a-b-c', {
-            a: remoteDataMocks.RequestPending,
-            b: remoteDataMocks.ResponsePending,
-            c: remoteDataMocks.Error,
-          }));
-          const expected = '----(c|)';
-          const values = {
-            c: remoteDataMocks.Error,
-          };
-
-          expectObservable(resolver.resolve(route, state)).toBe(expected, values);
-        });
-      });
-      it(`...succeeded`, () => {
-        testScheduler.run(({ cold, expectObservable }) => {
-          spyOn(bitstreamDataService, 'findByItemHandle').and.returnValue(cold('a-b-c', {
-            a: remoteDataMocks.RequestPending,
-            b: remoteDataMocks.ResponsePending,
-            c: remoteDataMocks.Success,
-          }));
-          const expected = '----(c|)';
-          const values = {
-            c: remoteDataMocks.Success,
-          };
-
-          expectObservable(resolver.resolve(route, state)).toBe(expected, values);
-        });
-      });
-    });
-  });
-});
diff --git a/src/app/bitstream-page/legacy-bitstream-url.resolver.ts b/src/app/bitstream-page/legacy-bitstream-url.resolver.ts
deleted file mode 100644
index 948bec2473..0000000000
--- a/src/app/bitstream-page/legacy-bitstream-url.resolver.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-import { Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from '@angular/router';
-import { Observable } from 'rxjs';
-import { RemoteData } from '../core/data/remote-data';
-import { Bitstream } from '../core/shared/bitstream.model';
-import { getFirstCompletedRemoteData } from '../core/shared/operators';
-import { hasNoValue } from '../shared/empty.util';
-import { BitstreamDataService } from '../core/data/bitstream-data.service';
-
-/**
- * This class resolves a bitstream based on the DSpace 6 XMLUI or JSPUI bitstream download URLs
- */
-@Injectable({
-  providedIn: 'root'
-})
-export class LegacyBitstreamUrlResolver implements Resolve<RemoteData<Bitstream>> {
-  constructor(protected bitstreamDataService: BitstreamDataService) {
-  }
-
-  /**
-   * Resolve a bitstream based on the handle of the item, and the sequence id or the filename of the
-   * bitstream
-   *
-   * @param {ActivatedRouteSnapshot} route The current ActivatedRouteSnapshot
-   * @param {RouterStateSnapshot} state The current RouterStateSnapshot
-   * @returns Observable<<RemoteData<Item>> Emits the found bitstream based on the parameters in
-   * current route, or an error if something went wrong
-   */
-  resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot):
-    Observable<RemoteData<Bitstream>> {
-      const prefix = route.params.prefix;
-      const suffix = route.params.suffix;
-      const filename = route.params.filename;
-
-      let sequenceId = route.params.sequence_id;
-      if (hasNoValue(sequenceId)) {
-        sequenceId = route.queryParams.sequenceId;
-      }
-
-      return this.bitstreamDataService.findByItemHandle(
-        `${prefix}/${suffix}`,
-        sequenceId,
-        filename,
-      ).pipe(
-        getFirstCompletedRemoteData()
-      );
-  }
-}
diff --git a/src/app/breadcrumbs/breadcrumbs.component.html b/src/app/breadcrumbs/breadcrumbs.component.html
index bff792eeff..1d95c39cc0 100644
--- a/src/app/breadcrumbs/breadcrumbs.component.html
+++ b/src/app/breadcrumbs/breadcrumbs.component.html
@@ -1,6 +1,6 @@
 <ng-container *ngVar="(breadcrumbs$ | async) as breadcrumbs">
     <nav *ngIf="(showBreadcrumbs$ | async)" aria-label="breadcrumb" class="nav-breadcrumb">
-        <ol class="container breadcrumb">
+        <ol class="container breadcrumb my-0">
             <ng-container
                     *ngTemplateOutlet="breadcrumbs?.length > 0 ? breadcrumb : activeBreadcrumb; context: {text: 'home.breadcrumbs', url: '/'}"></ng-container>
             <ng-container *ngFor="let bc of breadcrumbs; let last = last;">
@@ -10,7 +10,7 @@
     </nav>
 
     <ng-template #breadcrumb let-text="text" let-url="url">
-        <li class="breadcrumb-item"><div class="breadcrumb-item-limiter"><a [routerLink]="url" class="text-truncate" [ngbTooltip]="text | translate" placement="bottom" >{{text | translate}}</a></div></li>
+        <li class="breadcrumb-item"><div class="breadcrumb-item-limiter"><a [routerLink]="url" class="text-truncate" [ngbTooltip]="text | translate" placement="bottom" role="link" tabindex="0">{{text | translate}}</a></div></li>
     </ng-template>
 
     <ng-template #activeBreadcrumb let-text="text">
diff --git a/src/app/breadcrumbs/breadcrumbs.component.scss b/src/app/breadcrumbs/breadcrumbs.component.scss
index a4d83b82ea..ac9cb42ce5 100644
--- a/src/app/breadcrumbs/breadcrumbs.component.scss
+++ b/src/app/breadcrumbs/breadcrumbs.component.scss
@@ -4,9 +4,8 @@
 
 .breadcrumb {
   border-radius: 0;
-  margin-top: calc(-1 * var(--ds-content-spacing));
-  padding-bottom: var(--ds-content-spacing / 3);
-  padding-top: var(--ds-content-spacing / 3);
+  padding-bottom: calc(var(--ds-content-spacing) / 2);
+  padding-top: calc(var(--ds-content-spacing) / 2);
   background-color: var(--ds-breadcrumb-bg);
 }
 
diff --git a/src/app/browse-by/browse-by-date-page/browse-by-date-page.component.spec.ts b/src/app/browse-by/browse-by-date-page/browse-by-date-page.component.spec.ts
index e41d3a45b2..f64091e41f 100644
--- a/src/app/browse-by/browse-by-date-page/browse-by-date-page.component.spec.ts
+++ b/src/app/browse-by/browse-by-date-page/browse-by-date-page.component.spec.ts
@@ -1,5 +1,5 @@
 import { BrowseByDatePageComponent } from './browse-by-date-page.component';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { ComponentFixture, fakeAsync, TestBed, tick, waitForAsync } from '@angular/core/testing';
 import { CommonModule } from '@angular/common';
 import { RouterTestingModule } from '@angular/router/testing';
 import { TranslateModule } from '@ngx-translate/core';
@@ -9,7 +9,7 @@ import { ActivatedRoute, Router } from '@angular/router';
 import { BrowseService } from '../../core/browse/browse.service';
 import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service';
 import { RouterMock } from '../../shared/mocks/router.mock';
-import { ChangeDetectorRef, NO_ERRORS_SCHEMA } from '@angular/core';
+import { ChangeDetectorRef, NO_ERRORS_SCHEMA, PLATFORM_ID } from '@angular/core';
 import { of as observableOf } from 'rxjs';
 import { ActivatedRouteStub } from '../../shared/testing/active-router.stub';
 import { Community } from '../../core/shared/community.model';
@@ -23,6 +23,9 @@ import { PaginationServiceStub } from '../../shared/testing/pagination-service.s
 import { APP_CONFIG } from '../../../config/app-config.interface';
 import { environment } from '../../../environments/environment';
 import { SortDirection } from '../../core/cache/models/sort-options.model';
+import { cold } from 'jasmine-marbles';
+import { Store } from '@ngrx/store';
+import { BrowseEntry } from '../../core/shared/browse-entry.model';
 
 describe('BrowseByDatePageComponent', () => {
   let comp: BrowseByDatePageComponent;
@@ -94,7 +97,10 @@ describe('BrowseByDatePageComponent', () => {
         { provide: Router, useValue: new RouterMock() },
         { provide: PaginationService, useValue: paginationService },
         { provide: ChangeDetectorRef, useValue: mockCdRef },
-        { provide: APP_CONFIG, useValue: environment }
+        { provide: APP_CONFIG, useValue: environment },
+        { provide: Store, useValue: {} },
+        { provide: APP_CONFIG, useValue: environment },
+        { provide: PLATFORM_ID, useValue: 'browser' },
       ],
       schemas: [NO_ERRORS_SCHEMA]
     }).compileComponents();
@@ -112,9 +118,13 @@ describe('BrowseByDatePageComponent', () => {
     fixture.detectChanges();
   });
 
-  it('should initialize the list of items', () => {
+  it('should initialize the list of items', (done: DoneFn) => {
+    expect(comp.loading$).toBeObservable(cold('(a|)', {
+      a: false,
+    }));
     comp.items$.subscribe((result) => {
       expect(result.payload.page).toEqual([firstItem]);
+      done();
     });
   });
 
@@ -126,4 +136,33 @@ describe('BrowseByDatePageComponent', () => {
     //expect(comp.startsWithOptions[0]).toEqual(new Date().getUTCFullYear());
     expect(comp.startsWithOptions[0]).toEqual(1960);
   });
+
+  describe('when rendered in SSR', () => {
+    beforeEach(() => {
+      comp.platformId = 'server';
+      spyOn((comp as any).browseService, 'getBrowseItemsFor');
+    });
+
+    it('should not call getBrowseItemsFor on init', (done) => {
+      comp.ngOnInit();
+      expect((comp as any).browseService.getBrowseItemsFor).not.toHaveBeenCalled();
+      comp.loading$.subscribe((res) => {
+        expect(res).toBeFalsy();
+        done();
+      });
+    });
+  });
+
+  describe('when rendered in CSR', () => {
+    beforeEach(() => {
+      comp.platformId = 'browser';
+      spyOn((comp as any).browseService, 'getBrowseItemsFor').and.returnValue(createSuccessfulRemoteDataObject$(new BrowseEntry()));
+    });
+
+    it('should call getBrowseItemsFor on init', fakeAsync(() => {
+      comp.ngOnInit();
+      tick(100);
+      expect((comp as any).browseService.getBrowseItemsFor).toHaveBeenCalled();
+    }));
+  });
 });
diff --git a/src/app/browse-by/browse-by-date-page/browse-by-date-page.component.ts b/src/app/browse-by/browse-by-date-page/browse-by-date-page.component.ts
index 7074190e1e..cca56647d8 100644
--- a/src/app/browse-by/browse-by-date-page/browse-by-date-page.component.ts
+++ b/src/app/browse-by/browse-by-date-page/browse-by-date-page.component.ts
@@ -1,17 +1,17 @@
-import { ChangeDetectorRef, Component, Inject } from '@angular/core';
+import { ChangeDetectorRef, Component, Inject, PLATFORM_ID } from '@angular/core';
 import {
   BrowseByMetadataPageComponent,
-  browseParamsToOptions,
-  getBrowseSearchOptions
+  browseParamsToOptions
 } from '../browse-by-metadata-page/browse-by-metadata-page.component';
-import { combineLatest as observableCombineLatest } from 'rxjs';
+import { combineLatest as observableCombineLatest, Observable } from 'rxjs';
 import { hasValue, isNotEmpty } from '../../shared/empty.util';
 import { ActivatedRoute, Params, Router } from '@angular/router';
 import { BrowseService } from '../../core/browse/browse.service';
 import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service';
 import { StartsWithType } from '../../shared/starts-with/starts-with-decorator';
 import { PaginationService } from '../../core/pagination/pagination.service';
-import { map } from 'rxjs/operators';
+import { map, distinctUntilChanged } from 'rxjs/operators';
+import { of as observableOf } from 'rxjs';
 import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
 import { SortDirection, SortOptions } from '../../core/cache/models/sort-options.model';
 import { isValidDate } from '../../shared/date.util';
@@ -19,6 +19,8 @@ import { APP_CONFIG, AppConfig } from '../../../config/app-config.interface';
 import { RemoteData } from '../../core/data/remote-data';
 import { Item } from '../../core/shared/item.model';
 import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
+import { isPlatformServer } from '@angular/common';
+import { environment } from '../../../environments/environment';
 
 @Component({
   selector: 'ds-browse-by-date-page',
@@ -45,24 +47,33 @@ export class BrowseByDatePageComponent extends BrowseByMetadataPageComponent {
                      protected cdRef: ChangeDetectorRef,
                      @Inject(APP_CONFIG) public appConfig: AppConfig,
                      public dsoNameService: DSONameService,
+                     @Inject(PLATFORM_ID) public platformId: any,
   ) {
-    super(route, browseService, dsoService, paginationService, router, appConfig, dsoNameService);
+    super(route, browseService, dsoService, paginationService, router, appConfig, dsoNameService, platformId);
   }
 
   ngOnInit(): void {
+    if (!this.renderOnServerSide && !environment.universal.enableBrowseComponent && isPlatformServer(this.platformId)) {
+      this.loading$ = observableOf(false);
+      return;
+    }
     const sortConfig = new SortOptions('default', SortDirection.ASC);
     this.startsWithType = StartsWithType.date;
-    // include the thumbnail configuration in browse search options
-    this.updatePage(getBrowseSearchOptions(this.defaultBrowseId, this.paginationConfig, sortConfig, this.fetchThumbnails));
     this.currentPagination$ = this.paginationService.getCurrentPagination(this.paginationConfig.id, this.paginationConfig);
     this.currentSort$ = this.paginationService.getCurrentSort(this.paginationConfig.id, sortConfig);
+    const routeParams$: Observable<Params> = observableCombineLatest([
+      this.route.params,
+      this.route.queryParams,
+    ]).pipe(
+      map(([params, queryParams]: [Params, Params]) => Object.assign({}, params, queryParams)),
+      distinctUntilChanged((prev: Params, curr: Params) => prev.id === curr.id && prev.startsWith === curr.startsWith),
+    );
     this.subs.push(
-      observableCombineLatest([this.route.params, this.route.queryParams, this.route.data,
-        this.currentPagination$, this.currentSort$]).pipe(
-        map(([routeParams, queryParams, data, currentPage, currentSort]) => {
-          return [Object.assign({}, routeParams, queryParams, data), currentPage, currentSort];
-        })
-      ).subscribe(([params, currentPage, currentSort]: [Params, PaginationComponentOptions, SortOptions]) => {
+      observableCombineLatest([
+        routeParams$,
+        this.currentPagination$,
+        this.currentSort$,
+      ]).subscribe(([params, currentPage, currentSort]: [Params, PaginationComponentOptions, SortOptions]) => {
         const metadataKeys = params.browseDefinition ? params.browseDefinition.metadataKeys : this.defaultMetadataKeys;
         this.browseId = params.id || this.defaultBrowseId;
         this.startsWith = +params.startsWith || params.startsWith;
@@ -85,15 +96,24 @@ export class BrowseByDatePageComponent extends BrowseByMetadataPageComponent {
    * @param scope           The scope under which to fetch the earliest item for
    */
   updateStartsWithOptions(definition: string, metadataKeys: string[], scope?: string) {
-    const firstItemRD = this.browseService.getFirstItemFor(definition, scope, SortDirection.ASC);
-    const lastItemRD = this.browseService.getFirstItemFor(definition, scope, SortDirection.DESC);
+    const firstItemRD$: Observable<RemoteData<Item>> = this.browseService.getFirstItemFor(definition, scope, SortDirection.ASC);
+    const lastItemRD$: Observable<RemoteData<Item>> = this.browseService.getFirstItemFor(definition, scope, SortDirection.DESC);
+    this.loading$ = observableCombineLatest([
+      firstItemRD$,
+      lastItemRD$,
+    ]).pipe(
+      map(([firstItemRD, lastItemRD]: [RemoteData<Item>, RemoteData<Item>]) => firstItemRD.isLoading || lastItemRD.isLoading)
+    );
     this.subs.push(
-      observableCombineLatest([firstItemRD, lastItemRD]).subscribe(([firstItem, lastItem]) => {
-        let lowerLimit = this.getLimit(firstItem, metadataKeys, this.appConfig.browseBy.defaultLowerLimit);
-        let upperLimit = this.getLimit(lastItem, metadataKeys, new Date().getUTCFullYear());
-        const options = [];
-        const oneYearBreak = Math.floor((upperLimit - this.appConfig.browseBy.oneYearLimit) / 5) * 5;
-        const fiveYearBreak = Math.floor((upperLimit - this.appConfig.browseBy.fiveYearLimit) / 10) * 10;
+      observableCombineLatest([
+        firstItemRD$,
+        lastItemRD$,
+      ]).subscribe(([firstItemRD, lastItemRD]: [RemoteData<Item>, RemoteData<Item>]) => {
+        let lowerLimit: number = this.getLimit(firstItemRD, metadataKeys, this.appConfig.browseBy.defaultLowerLimit);
+        let upperLimit: number = this.getLimit(lastItemRD, metadataKeys, new Date().getUTCFullYear());
+        const options: number[] = [];
+        const oneYearBreak: number = Math.floor((upperLimit - this.appConfig.browseBy.oneYearLimit) / 5) * 5;
+        const fiveYearBreak: number = Math.floor((upperLimit - this.appConfig.browseBy.fiveYearLimit) / 10) * 10;
         if (lowerLimit <= fiveYearBreak) {
           lowerLimit -= 10;
         } else if (lowerLimit <= oneYearBreak) {
@@ -101,7 +121,7 @@ export class BrowseByDatePageComponent extends BrowseByMetadataPageComponent {
         } else {
           lowerLimit -= 1;
         }
-        let i = upperLimit;
+        let i: number = upperLimit;
         while (i > lowerLimit) {
           options.push(i);
           if (i <= fiveYearBreak) {
diff --git a/src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.html b/src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.html
index 8d062d739f..9628de44b2 100644
--- a/src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.html
+++ b/src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.html
@@ -1,4 +1,4 @@
-<div class="container">
+<div class="container" *ngIf="(!ssrRenderingDisabled)">
     <ng-container *ngVar="(parent$ | async) as parent">
     <ng-container *ngIf="parent?.payload as parentContext">
         <div class="d-flex flex-row border-bottom mb-4 pb-4">
@@ -32,7 +32,7 @@
 
     <section class="comcol-page-browse-section">
     <div class="browse-by-metadata w-100">
-    <ds-browse-by *ngIf="startsWithOptions" class="col-xs-12 w-100"
+    <ds-themed-browse-by *ngIf="!(loading$ | async)" class="col-xs-12 w-100"
       title="{{'browse.title' | translate:
       {
         collection: dsoNameService.getName((parent$ | async)?.payload),
@@ -48,8 +48,8 @@
       [startsWithOptions]="startsWithOptions"
       (prev)="goPrev()"
       (next)="goNext()">
-    </ds-browse-by>
-    <ds-themed-loading *ngIf="!startsWithOptions" message="{{'loading.browse-by-page' | translate}}"></ds-themed-loading>
+    </ds-themed-browse-by>
+    <ds-themed-loading *ngIf="loading$ | async" message="{{'loading.browse-by-page' | translate}}"></ds-themed-loading>
   </div>
   </section>
   <ng-container *ngVar="(parent$ | async) as parent">
diff --git a/src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.spec.ts b/src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.spec.ts
index a5beeb8a45..4ea68eaa0c 100644
--- a/src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.spec.ts
+++ b/src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.spec.ts
@@ -3,7 +3,7 @@ import {
   browseParamsToOptions,
   getBrowseSearchOptions
 } from './browse-by-metadata-page.component';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { ComponentFixture, fakeAsync, TestBed, tick, waitForAsync } from '@angular/core/testing';
 import { BrowseService } from '../../core/browse/browse.service';
 import { CommonModule } from '@angular/common';
 import { RouterTestingModule } from '@angular/router/testing';
@@ -13,7 +13,7 @@ import { EnumKeysPipe } from '../../shared/utils/enum-keys-pipe';
 import { ActivatedRoute, Router } from '@angular/router';
 import { ActivatedRouteStub } from '../../shared/testing/active-router.stub';
 import { Observable, of as observableOf } from 'rxjs';
-import { NO_ERRORS_SCHEMA } from '@angular/core';
+import { NO_ERRORS_SCHEMA, PLATFORM_ID } from '@angular/core';
 import { RemoteData } from '../../core/data/remote-data';
 import { buildPaginatedList, PaginatedList } from '../../core/data/paginated-list.model';
 import { PageInfo } from '../../core/shared/page-info.model';
@@ -30,6 +30,7 @@ import { PaginationService } from '../../core/pagination/pagination.service';
 import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
 import { PaginationServiceStub } from '../../shared/testing/pagination-service.stub';
 import { APP_CONFIG } from '../../../config/app-config.interface';
+import { cold } from 'jasmine-marbles';
 
 describe('BrowseByMetadataPageComponent', () => {
   let comp: BrowseByMetadataPageComponent;
@@ -110,7 +111,8 @@ describe('BrowseByMetadataPageComponent', () => {
         { provide: DSpaceObjectDataService, useValue: mockDsoService },
         { provide: PaginationService, useValue: paginationService },
         { provide: Router, useValue: new RouterMock() },
-        { provide: APP_CONFIG, useValue: environmentMock }
+        { provide: APP_CONFIG, useValue: environmentMock },
+        { provide: PLATFORM_ID, useValue: 'browser' },
       ],
       schemas: [NO_ERRORS_SCHEMA]
     }).compileComponents();
@@ -149,9 +151,13 @@ describe('BrowseByMetadataPageComponent', () => {
       fixture.detectChanges();
     });
 
-    it('should fetch items', () => {
+    it('should fetch items', (done: DoneFn) => {
+      expect(comp.loading$).toBeObservable(cold('(a|)', {
+        a: false,
+      }));
       comp.items$.subscribe((result) => {
         expect(result.payload.page).toEqual(mockItems);
+        done();
       });
     });
 
@@ -219,6 +225,35 @@ describe('BrowseByMetadataPageComponent', () => {
       expect(result.fetchThumbnail).toBeTrue();
     });
   });
+
+  describe('when rendered in SSR', () => {
+    beforeEach(() => {
+      comp.ssrRenderingDisabled = true;
+      spyOn((comp as any).browseService, 'getBrowseEntriesFor').and.returnValue(createSuccessfulRemoteDataObject$(null));
+    });
+
+    it('should not call getBrowseEntriesFor on init', (done) => {
+      comp.ngOnInit();
+      expect((comp as any).browseService.getBrowseEntriesFor).not.toHaveBeenCalled();
+      comp.loading$.subscribe((res) => {
+        expect(res).toBeFalsy();
+        done();
+      });
+    });
+  });
+
+  describe('when rendered in CSR', () => {
+    beforeEach(() => {
+      comp.ssrRenderingDisabled = false;
+      spyOn((comp as any).browseService, 'getBrowseEntriesFor').and.returnValue(createSuccessfulRemoteDataObject$(new BrowseEntry()));
+    });
+
+    it('should call getBrowseEntriesFor on init', fakeAsync(() => {
+      comp.ngOnInit();
+      tick(100);
+      expect((comp as any).browseService.getBrowseEntriesFor).toHaveBeenCalled();
+    }));
+  });
 });
 
 export function toRemoteData(objects: any[]): Observable<RemoteData<PaginatedList<any>>> {
diff --git a/src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.ts b/src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.ts
index 113bc67c92..5f921667bf 100644
--- a/src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.ts
+++ b/src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.ts
@@ -1,5 +1,5 @@
-import { combineLatest as observableCombineLatest, Observable, Subscription } from 'rxjs';
-import { Component, Inject, OnInit, OnDestroy } from '@angular/core';
+import { combineLatest as observableCombineLatest, Observable, Subscription, of as observableOf } from 'rxjs';
+import { Component, Inject, OnInit, OnDestroy, Input, PLATFORM_ID } from '@angular/core';
 import { RemoteData } from '../../core/data/remote-data';
 import { PaginatedList } from '../../core/data/paginated-list.model';
 import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
@@ -15,13 +15,15 @@ import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.serv
 import { DSpaceObject } from '../../core/shared/dspace-object.model';
 import { StartsWithType } from '../../shared/starts-with/starts-with-decorator';
 import { PaginationService } from '../../core/pagination/pagination.service';
-import { filter, map, mergeMap } from 'rxjs/operators';
+import { filter, map, mergeMap, distinctUntilChanged } from 'rxjs/operators';
 import { followLink, FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
 import { Bitstream } from '../../core/shared/bitstream.model';
 import { Collection } from '../../core/shared/collection.model';
 import { Community } from '../../core/shared/community.model';
 import { APP_CONFIG, AppConfig } from '../../../config/app-config.interface';
 import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
+import { isPlatformServer } from '@angular/common';
+import { environment } from '../../../environments/environment';
 
 export const BBM_PAGINATION_ID = 'bbm';
 
@@ -37,7 +39,10 @@ export const BBM_PAGINATION_ID = 'bbm';
  * 'dc.contributor.*'
  */
 export class BrowseByMetadataPageComponent implements OnInit, OnDestroy {
-
+  /**
+   * Defines whether to fetch search results during SSR execution
+   */
+  @Input() renderOnServerSide = false;
   /**
    * The list of browse-entries to display
    */
@@ -122,6 +127,15 @@ export class BrowseByMetadataPageComponent implements OnInit, OnDestroy {
    */
   fetchThumbnails: boolean;
 
+  /**
+   * Observable determining if the loading animation needs to be shown
+   */
+  loading$ = observableOf(true);
+  /**
+   * Whether this component should be rendered or not in SSR
+   */
+  ssrRenderingDisabled = false;
+
   public constructor(protected route: ActivatedRoute,
                      protected browseService: BrowseService,
                      protected dsoService: DSpaceObjectDataService,
@@ -129,6 +143,7 @@ export class BrowseByMetadataPageComponent implements OnInit, OnDestroy {
                      protected router: Router,
                      @Inject(APP_CONFIG) public appConfig: AppConfig,
                      public dsoNameService: DSONameService,
+                     @Inject(PLATFORM_ID) public platformId: any,
   ) {
 
     this.fetchThumbnails = this.appConfig.browseBy.showThumbnails;
@@ -137,22 +152,32 @@ export class BrowseByMetadataPageComponent implements OnInit, OnDestroy {
         currentPage: 1,
         pageSize: this.appConfig.browseBy.pageSize,
         });
-    }
+    this.ssrRenderingDisabled = !this.renderOnServerSide && !environment.universal.enableBrowseComponent && isPlatformServer(this.platformId);
+  }
 
 
   ngOnInit(): void {
-
+    if (this.ssrRenderingDisabled) {
+      this.loading$ = observableOf(false);
+      return;
+    }
     const sortConfig = new SortOptions('default', SortDirection.ASC);
-    this.updatePage(getBrowseSearchOptions(this.defaultBrowseId, this.paginationConfig, sortConfig));
     this.currentPagination$ = this.paginationService.getCurrentPagination(this.paginationConfig.id, this.paginationConfig);
     this.currentSort$ = this.paginationService.getCurrentSort(this.paginationConfig.id, sortConfig);
+    const routeParams$: Observable<Params> = observableCombineLatest([
+      this.route.params,
+      this.route.queryParams,
+    ]).pipe(
+      map(([params, queryParams]: [Params, Params]) => Object.assign({}, params, queryParams)),
+      distinctUntilChanged((prev: Params, curr: Params) => prev.id === curr.id && prev.authority === curr.authority && prev.value === curr.value && prev.startsWith === curr.startsWith),
+    );
     this.subs.push(
-      observableCombineLatest([this.route.params, this.route.queryParams, this.currentPagination$, this.currentSort$]).pipe(
-        map(([routeParams, queryParams, currentPage, currentSort]) => {
-          return [Object.assign({}, routeParams, queryParams),currentPage,currentSort];
-        })
-      ).subscribe(([params, currentPage, currentSort]: [Params, PaginationComponentOptions, SortOptions]) => {
-          this.browseId = params.id || this.defaultBrowseId;
+      observableCombineLatest([
+        routeParams$,
+        this.currentPagination$,
+        this.currentSort$,
+      ]).subscribe(([params, currentPage, currentSort]: [Params, PaginationComponentOptions, SortOptions]) => {
+        this.browseId = params.id || this.defaultBrowseId;
           this.authority = params.authority;
 
           if (typeof params.value === 'string'){
@@ -161,7 +186,11 @@ export class BrowseByMetadataPageComponent implements OnInit, OnDestroy {
             this.value = '';
           }
 
-          if (typeof params.startsWith === 'string'){
+          if (params.startsWith === undefined || params.startsWith === '') {
+            this.startsWith = undefined;
+          }
+
+        if (typeof params.startsWith === 'string'){
             this.startsWith = params.startsWith.trim();
           }
 
@@ -196,6 +225,9 @@ export class BrowseByMetadataPageComponent implements OnInit, OnDestroy {
    */
   updatePage(searchOptions: BrowseEntrySearchOptions) {
     this.browseEntries$ = this.browseService.getBrowseEntriesFor(searchOptions);
+    this.loading$ = this.browseEntries$.pipe(
+      map((browseEntriesRD: RemoteData<PaginatedList<BrowseEntry>>) => browseEntriesRD.isLoading),
+    );
     this.items$ = undefined;
   }
 
@@ -210,6 +242,9 @@ export class BrowseByMetadataPageComponent implements OnInit, OnDestroy {
    */
   updatePageWithItems(searchOptions: BrowseEntrySearchOptions, value: string, authority: string) {
     this.items$ = this.browseService.getBrowseItemsFor(value, authority, searchOptions);
+    this.loading$ = this.items$.pipe(
+      map((itemsRD: RemoteData<PaginatedList<Item>>) => itemsRD.isLoading),
+    );
   }
 
   /**
diff --git a/src/app/browse-by/browse-by-taxonomy-page/browse-by-taxonomy-page.component.html b/src/app/browse-by/browse-by-taxonomy-page/browse-by-taxonomy-page.component.html
index 0ae3da6847..6a46de108c 100644
--- a/src/app/browse-by/browse-by-taxonomy-page/browse-by-taxonomy-page.component.html
+++ b/src/app/browse-by/browse-by-taxonomy-page/browse-by-taxonomy-page.component.html
@@ -1,4 +1,5 @@
 <div class="container">
+  <h1>{{ ('browse.taxonomy_' + vocabularyName + '.title') | translate }}</h1>
   <div class="mb-3">
     <ds-vocabulary-treeview [vocabularyOptions]=vocabularyOptions
                             [multiSelect]="true"
@@ -9,6 +10,8 @@
   <a class="btn btn-primary"
      [routerLink]="['/search']"
      [queryParams]="queryParams"
-     [queryParamsHandling]="'merge'">
+     [queryParamsHandling]="'merge'"
+     role="link"
+     tabindex="0">
     {{ 'browse.taxonomy.button' | translate }}</a>
 </div>
diff --git a/src/app/browse-by/browse-by-title-page/browse-by-title-page.component.spec.ts b/src/app/browse-by/browse-by-title-page/browse-by-title-page.component.spec.ts
index e32c0ac430..1b8eb352a3 100644
--- a/src/app/browse-by/browse-by-title-page/browse-by-title-page.component.spec.ts
+++ b/src/app/browse-by/browse-by-title-page/browse-by-title-page.component.spec.ts
@@ -1,4 +1,4 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { ComponentFixture, fakeAsync, TestBed, tick, waitForAsync } from '@angular/core/testing';
 import { ActivatedRoute, Router } from '@angular/router';
 import { Item } from '../../core/shared/item.model';
 import { ActivatedRouteStub } from '../../shared/testing/active-router.stub';
@@ -22,6 +22,7 @@ import { PaginationService } from '../../core/pagination/pagination.service';
 import { PaginationServiceStub } from '../../shared/testing/pagination-service.stub';
 import { APP_CONFIG } from '../../../config/app-config.interface';
 import { environment } from '../../../environments/environment';
+import { BrowseEntry } from '../../core/shared/browse-entry.model';
 
 
 describe('BrowseByTitlePageComponent', () => {
@@ -63,7 +64,8 @@ describe('BrowseByTitlePageComponent', () => {
 
   const activatedRouteStub = Object.assign(new ActivatedRouteStub(), {
     params: observableOf({}),
-    data: observableOf({ metadata: 'title' })
+    queryParams: observableOf({}),
+    data: observableOf({ metadata: 'title' }),
   });
 
   const paginationService = new PaginationServiceStub();
@@ -97,4 +99,35 @@ describe('BrowseByTitlePageComponent', () => {
       expect(result.payload.page).toEqual(mockItems);
     });
   });
+
+  describe('when rendered in SSR', () => {
+    beforeEach(() => {
+      comp.platformId = 'server';
+      spyOn((comp as any).browseService, 'getBrowseItemsFor');
+      fixture.detectChanges();
+    });
+
+    it('should not call getBrowseItemsFor on init', (done) => {
+      comp.ngOnInit();
+      expect((comp as any).browseService.getBrowseItemsFor).not.toHaveBeenCalled();
+      comp.loading$.subscribe((res) => {
+        expect(res).toBeFalsy();
+        done();
+      });
+    });
+  });
+
+  describe('when rendered in CSR', () => {
+    beforeEach(() => {
+      comp.platformId = 'browser';
+      fixture.detectChanges();
+      spyOn((comp as any).browseService, 'getBrowseItemsFor').and.returnValue(createSuccessfulRemoteDataObject$(new BrowseEntry()));
+    });
+
+    it('should call getBrowseItemsFor on init', fakeAsync(() => {
+      comp.ngOnInit();
+      tick(100);
+      expect((comp as any).browseService.getBrowseItemsFor).toHaveBeenCalled();
+    }));
+  });
 });
diff --git a/src/app/browse-by/browse-by-title-page/browse-by-title-page.component.ts b/src/app/browse-by/browse-by-title-page/browse-by-title-page.component.ts
index 58df79ebe8..10968d265f 100644
--- a/src/app/browse-by/browse-by-title-page/browse-by-title-page.component.ts
+++ b/src/app/browse-by/browse-by-title-page/browse-by-title-page.component.ts
@@ -1,19 +1,22 @@
-import { combineLatest as observableCombineLatest } from 'rxjs';
-import { Component, Inject } from '@angular/core';
+import { combineLatest as observableCombineLatest, Observable } from 'rxjs';
+import { Component, Inject, PLATFORM_ID } from '@angular/core';
 import { ActivatedRoute, Params, Router } from '@angular/router';
 import { hasValue } from '../../shared/empty.util';
 import {
   BrowseByMetadataPageComponent,
-  browseParamsToOptions, getBrowseSearchOptions
+  browseParamsToOptions
 } from '../browse-by-metadata-page/browse-by-metadata-page.component';
 import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service';
 import { BrowseService } from '../../core/browse/browse.service';
 import { SortDirection, SortOptions } from '../../core/cache/models/sort-options.model';
 import { PaginationService } from '../../core/pagination/pagination.service';
-import { map } from 'rxjs/operators';
+import { map, distinctUntilChanged } from 'rxjs/operators';
+import { of as observableOf } from 'rxjs';
 import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
 import { AppConfig, APP_CONFIG } from '../../../config/app-config.interface';
 import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
+import { isPlatformServer } from '@angular/common';
+import { environment } from '../../../environments/environment';
 
 @Component({
   selector: 'ds-browse-by-title-page',
@@ -32,22 +35,32 @@ export class BrowseByTitlePageComponent extends BrowseByMetadataPageComponent {
                      protected router: Router,
                      @Inject(APP_CONFIG) public appConfig: AppConfig,
                      public dsoNameService: DSONameService,
+                     @Inject(PLATFORM_ID) public platformId: any,
   ) {
-    super(route, browseService, dsoService, paginationService, router, appConfig, dsoNameService);
+    super(route, browseService, dsoService, paginationService, router, appConfig, dsoNameService, platformId);
   }
 
   ngOnInit(): void {
+    if (!this.renderOnServerSide && !environment.universal.enableBrowseComponent && isPlatformServer(this.platformId)) {
+      this.loading$ = observableOf(false);
+      return;
+    }
     const sortConfig = new SortOptions('dc.title', SortDirection.ASC);
-    // include the thumbnail configuration in browse search options
-    this.updatePage(getBrowseSearchOptions(this.defaultBrowseId, this.paginationConfig, sortConfig, this.fetchThumbnails));
     this.currentPagination$ = this.paginationService.getCurrentPagination(this.paginationConfig.id, this.paginationConfig);
     this.currentSort$ = this.paginationService.getCurrentSort(this.paginationConfig.id, sortConfig);
+    const routeParams$: Observable<Params> = observableCombineLatest([
+      this.route.params,
+      this.route.queryParams,
+    ]).pipe(
+      map(([params, queryParams]: [Params, Params]) => Object.assign({}, params, queryParams)),
+      distinctUntilChanged((prev: Params, curr: Params) => prev.id === curr.id && prev.startsWith === curr.startsWith),
+    );
     this.subs.push(
-      observableCombineLatest([this.route.params, this.route.queryParams, this.currentPagination$, this.currentSort$]).pipe(
-        map(([routeParams, queryParams, currentPage, currentSort]) => {
-          return [Object.assign({}, routeParams, queryParams),currentPage,currentSort];
-        })
-      ).subscribe(([params, currentPage, currentSort]: [Params, PaginationComponentOptions, SortOptions]) => {
+      observableCombineLatest([
+        routeParams$,
+        this.currentPagination$,
+        this.currentSort$,
+      ]).subscribe(([params, currentPage, currentSort]: [Params, PaginationComponentOptions, SortOptions]) => {
         this.startsWith = +params.startsWith || params.startsWith;
         this.browseId = params.id || this.defaultBrowseId;
         this.updatePageWithItems(browseParamsToOptions(params, currentPage, currentSort, this.browseId, this.fetchThumbnails), undefined, undefined);
diff --git a/src/app/browse-by/browse-by.module.ts b/src/app/browse-by/browse-by.module.ts
index c0e2d3f9ff..ec9f22347f 100644
--- a/src/app/browse-by/browse-by.module.ts
+++ b/src/app/browse-by/browse-by.module.ts
@@ -14,6 +14,7 @@ import { ThemedBrowseByTaxonomyPageComponent } from './browse-by-taxonomy-page/t
 import { SharedBrowseByModule } from '../shared/browse-by/shared-browse-by.module';
 import { DsoPageModule } from '../shared/dso-page/dso-page.module';
 import { FormModule } from '../shared/form/form.module';
+import { SharedModule } from '../shared/shared.module';
 
 const ENTRY_COMPONENTS = [
   // put only entry components that use custom decorator
@@ -35,6 +36,7 @@ const ENTRY_COMPONENTS = [
     ComcolModule,
     DsoPageModule,
     FormModule,
+    SharedModule,
   ],
   declarations: [
     BrowseBySwitcherComponent,
diff --git a/src/app/collection-page/collection-form/collection-form.component.ts b/src/app/collection-page/collection-form/collection-form.component.ts
index ebb03df3b9..aae200b401 100644
--- a/src/app/collection-page/collection-form/collection-form.component.ts
+++ b/src/app/collection-page/collection-form/collection-form.component.ts
@@ -98,9 +98,8 @@ export class CollectionFormComponent extends ComColFormComponent<Collection> imp
     // retrieve all entity types to populate the dropdowns selection
     entities$.subscribe((entityTypes: ItemType[]) => {
 
-        entityTypes
-          .filter((type: ItemType) => type.label !== NONE_ENTITY_TYPE)
-          .forEach((type: ItemType, index: number) => {
+      entityTypes = entityTypes.filter((type: ItemType) => type.label !== NONE_ENTITY_TYPE);
+          entityTypes.forEach((type: ItemType, index: number) => {
           this.entityTypeSelection.add({
             disabled: false,
             label: type.label,
@@ -112,7 +111,7 @@ export class CollectionFormComponent extends ComColFormComponent<Collection> imp
           }
         });
 
-        this.formModel = [...collectionFormModels, this.entityTypeSelection];
+      this.formModel = entityTypes.length === 0 ? collectionFormModels : [...collectionFormModels, this.entityTypeSelection];
 
         super.ngOnInit();
         this.chd.detectChanges();
diff --git a/src/app/collection-page/collection-item-mapper/collection-item-mapper.component.html b/src/app/collection-page/collection-item-mapper/collection-item-mapper.component.html
index a48c4d15bf..77f85d5f78 100644
--- a/src/app/collection-page/collection-item-mapper/collection-item-mapper.component.html
+++ b/src/app/collection-page/collection-item-mapper/collection-item-mapper.component.html
@@ -6,7 +6,7 @@
       <p>{{'collection.edit.item-mapper.description' | translate}}</p>
 
       <ul ngbNav (navChange)="tabChange($event)" [destroyOnHide]="true" #tabs="ngbNav" class="nav-tabs">
-        <li [ngbNavItem]="'browseTab'">
+        <li [ngbNavItem]="'browseTab'" role="presentation" data-test="browseTab">
           <a ngbNavLink>{{'collection.edit.item-mapper.tabs.browse' | translate}}</a>
           <ng-template ngbNavContent>
             <div class="mt-2">
@@ -23,7 +23,7 @@
             </div>
           </ng-template>
         </li>
-        <li [ngbNavItem]="'mapTab'">
+        <li [ngbNavItem]="'mapTab'" role="presentation" data-test="mapTab">
           <a ngbNavLink>{{'collection.edit.item-mapper.tabs.map' | translate}}</a>
           <ng-template ngbNavContent>
             <div class="row mt-2">
diff --git a/src/app/collection-page/collection-item-mapper/collection-item-mapper.component.ts b/src/app/collection-page/collection-item-mapper/collection-item-mapper.component.ts
index e0e4aaf930..776b82f9b4 100644
--- a/src/app/collection-page/collection-item-mapper/collection-item-mapper.component.ts
+++ b/src/app/collection-page/collection-item-mapper/collection-item-mapper.component.ts
@@ -144,7 +144,9 @@ export class CollectionItemMapperComponent implements OnInit {
           this.shouldUpdate$.next(false);
         }
         return this.itemDataService.findListByHref(collectionRD.payload._links.mappedItems.href, Object.assign(options, {
-          sort: this.defaultSortOptions
+          currentPage: options.pagination.currentPage,
+          elementsPerPage: options.pagination.pageSize,
+          sort: this.defaultSortOptions,
         }),!shouldUpdate, false, followLink('owningCollection')).pipe(
           getAllSucceededRemoteData()
         );
diff --git a/src/app/collection-page/collection-page-routing.module.ts b/src/app/collection-page/collection-page-routing.module.ts
index 9dc25b778e..7d657e52db 100644
--- a/src/app/collection-page/collection-page-routing.module.ts
+++ b/src/app/collection-page/collection-page-routing.module.ts
@@ -22,21 +22,40 @@ import { LinkMenuItemModel } from '../shared/menu/menu-item/models/link.model';
 import { ThemedCollectionPageComponent } from './themed-collection-page.component';
 import { MenuItemType } from '../shared/menu/menu-item-type.model';
 import { DSOEditMenuResolver } from '../shared/dso-page/dso-edit-menu.resolver';
+import { CommunityBreadcrumbResolver } from '../core/breadcrumbs/community-breadcrumb.resolver';
+import { ViewTrackerResolverService } from '../statistics/angulartics/dspace/view-tracker-resolver.service';
 
 @NgModule({
   imports: [
     RouterModule.forChild([
       {
         path: COLLECTION_CREATE_PATH,
-        component: CreateCollectionPageComponent,
-        canActivate: [AuthenticatedGuard, CreateCollectionPageGuard]
+        children: [
+          {
+            path: '',
+            component: CreateCollectionPageComponent,
+            resolve: {
+              breadcrumb: I18nBreadcrumbResolver,
+            },
+            data: {
+              breadcrumbKey: 'collection.create',
+            },
+          },
+        ],
+        canActivate: [AuthenticatedGuard, CreateCollectionPageGuard],
+        data: {
+          breadcrumbQueryParam: 'parent',
+        },
+        resolve: {
+          breadcrumb: CommunityBreadcrumbResolver,
+        },
+        runGuardsAndResolvers: 'always',
       },
       {
         path: ':id',
         resolve: {
           dso: CollectionPageResolver,
           breadcrumb: CollectionBreadcrumbResolver,
-          menu: DSOEditMenuResolver
         },
         runGuardsAndResolvers: 'always',
         children: [
@@ -66,6 +85,10 @@ import { DSOEditMenuResolver } from '../shared/dso-page/dso-edit-menu.resolver';
             path: '',
             component: ThemedCollectionPageComponent,
             pathMatch: 'full',
+            resolve: {
+              menu: DSOEditMenuResolver,
+              tracking: ViewTrackerResolverService,
+            },
           }
         ],
         data: {
@@ -94,6 +117,8 @@ import { DSOEditMenuResolver } from '../shared/dso-page/dso-edit-menu.resolver';
     LinkService,
     CreateCollectionPageGuard,
     CollectionPageAdministratorGuard,
+    CommunityBreadcrumbResolver,
+    ViewTrackerResolverService,
   ]
 })
 export class CollectionPageRoutingModule {
diff --git a/src/app/collection-page/collection-page.component.html b/src/app/collection-page/collection-page.component.html
index 02c63d316d..ec8da3c7e7 100644
--- a/src/app/collection-page/collection-page.component.html
+++ b/src/app/collection-page/collection-page.component.html
@@ -3,7 +3,6 @@
          *ngVar="(collectionRD$ | async) as collectionRD">
               <div *ngIf="collectionRD?.hasSucceeded" @fadeInOut>
                       <div *ngIf="collectionRD?.payload as collection">
-              <ds-view-tracker [object]="collection"></ds-view-tracker>
               <div class="d-flex flex-row border-bottom mb-4 pb-4">
                 <header class="comcol-header mr-auto">
                   <!-- Collection Name -->
@@ -13,7 +12,7 @@
                   <!-- Collection logo -->
                   <ds-comcol-page-logo *ngIf="logoRD$"
                                    [logo]="(logoRD$ | async)?.payload"
-                                   [alternateText]="'Collection Logo'">
+                                   [alternateText]="'collection.logo' | translate">
                   </ds-comcol-page-logo>
 
                   <!-- Handle -->
@@ -34,9 +33,6 @@
                   </ds-comcol-page-content>
                 </header>
                 <ds-dso-edit-menu></ds-dso-edit-menu>
-                <div class="pl-2 space-children-mr">
-                  <ds-dso-page-subscription-button [dso]="collection"></ds-dso-page-subscription-button>
-                </div>
               </div>
               <section class="comcol-page-browse-section">
               <!-- Browse-By Links -->
diff --git a/src/app/collection-page/collection-page.component.ts b/src/app/collection-page/collection-page.component.ts
index 16704cef52..e74db09f24 100644
--- a/src/app/collection-page/collection-page.component.ts
+++ b/src/app/collection-page/collection-page.component.ts
@@ -28,7 +28,7 @@ import { AuthorizationDataService } from '../core/data/feature-authorization/aut
 import { FeatureID } from '../core/data/feature-authorization/feature-id';
 import { getCollectionPageRoute } from './collection-page-routing-paths';
 import { redirectOn4xx } from '../core/shared/authorized.operators';
-import { BROWSE_LINKS_TO_FOLLOW } from '../core/browse/browse.service';
+import { getBrowseLinksToFollow } from '../core/browse/browse.service';
 import { DSONameService } from '../core/breadcrumbs/dso-name.service';
 import { APP_CONFIG, AppConfig } from '../../../src/config/app-config.interface';
 
@@ -115,7 +115,7 @@ export class CollectionPageComponent implements OnInit {
               pagination: currentPagination,
               sort: currentSort,
               dsoTypes: [DSpaceObjectType.ITEM]
-            }), null, true, true, ...BROWSE_LINKS_TO_FOLLOW)
+            }), null, true, true, ...getBrowseLinksToFollow())
             .pipe(toDSpaceObjectListRD()) as Observable<RemoteData<PaginatedList<Item>>>;
         }),
         startWith(undefined) // Make sure switching pages shows loading component
diff --git a/src/app/collection-page/create-collection-page/create-collection-page.component.html b/src/app/collection-page/create-collection-page/create-collection-page.component.html
index f3f9785692..4a09d25aed 100644
--- a/src/app/collection-page/create-collection-page/create-collection-page.component.html
+++ b/src/app/collection-page/create-collection-page/create-collection-page.component.html
@@ -1,7 +1,7 @@
 <div class="container">
     <div class="row">
         <div class="col-12 pb-4">
-            <h2 id="sub-header" class="border-bottom pb-2">{{'collection.create.sub-head' | translate:{ parent: dsoNameService.getName((parentRD$| async)?.payload) } }}</h2>
+            <h1 id="sub-header" class="border-bottom pb-2">{{'collection.create.sub-head' | translate:{ parent: dsoNameService.getName((parentRD$| async)?.payload) } }}</h1>
         </div>
     </div>
     <ds-collection-form (submitForm)="onSubmit($event)"
diff --git a/src/app/collection-page/delete-collection-page/delete-collection-page.component.html b/src/app/collection-page/delete-collection-page/delete-collection-page.component.html
index ba54bbabd5..6327eed944 100644
--- a/src/app/collection-page/delete-collection-page/delete-collection-page.component.html
+++ b/src/app/collection-page/delete-collection-page/delete-collection-page.component.html
@@ -2,14 +2,14 @@
     <div class="row">
         <ng-container *ngVar="(dsoRD$ | async)?.payload as dso">
             <div class="col-12 pb-4">
-                <h2 id="header" class="border-bottom pb-2">{{ 'collection.delete.head' | translate}}</h2>
+                <h1 id="header" class="border-bottom pb-2">{{ 'collection.delete.head' | translate}}</h1>
                 <p class="pb-2">{{ 'collection.delete.text' | translate:{ dso: dsoNameService.getName(dso) } }}</p>
                 <div class="form-group row">
                   <div class="col text-right space-children-mr">
-                    <button class="btn btn-outline-secondary" (click)="onCancel(dso)" [disabled]="(processing$ | async)">
+                    <button class="btn btn-outline-secondary" (click)="onCancel(dso)" [dsBtnDisabled]="(processing$ | async)">
                       <i class="fas fa-times"></i> {{'collection.delete.cancel' | translate}}
                     </button>
-                    <button class="btn btn-danger" (click)="onConfirm(dso)" [disabled]="(processing$ | async)">
+                    <button class="btn btn-danger" (click)="onConfirm(dso)" [dsBtnDisabled]="(processing$ | async)">
                       <span *ngIf="processing$ | async"><i class='fas fa-circle-notch fa-spin'></i> {{'collection.delete.processing' | translate}}</span>
                       <span *ngIf="!(processing$ | async)"><i class="fas fa-trash"></i> {{'collection.delete.confirm' | translate}}</span>
                     </button>
diff --git a/src/app/collection-page/edit-collection-page/collection-curate/collection-curate.component.html b/src/app/collection-page/edit-collection-page/collection-curate/collection-curate.component.html
index 38c9d22f4e..4fbe60d6b1 100644
--- a/src/app/collection-page/edit-collection-page/collection-curate/collection-curate.component.html
+++ b/src/app/collection-page/edit-collection-page/collection-curate/collection-curate.component.html
@@ -1,5 +1,5 @@
 <div class="container">
-    <h3>{{'collection.curate.header' |translate:{collection: (collectionName$ |async)} }}</h3>
+    <h2>{{'collection.curate.header' |translate:{collection: (collectionName$ |async)} }}</h2>
     <ds-curation-form
             [dsoHandle]="(dsoRD$|async)?.payload.handle"
     ></ds-curation-form>
diff --git a/src/app/collection-page/edit-collection-page/collection-metadata/collection-metadata.component.html b/src/app/collection-page/edit-collection-page/collection-metadata/collection-metadata.component.html
index ffd8f71343..1cf40159ec 100644
--- a/src/app/collection-page/edit-collection-page/collection-metadata/collection-metadata.component.html
+++ b/src/app/collection-page/edit-collection-page/collection-metadata/collection-metadata.component.html
@@ -1,17 +1,17 @@
 <div class="container-fluid mb-2" *ngVar="(itemTemplateRD$ | async) as itemTemplateRD">
-  <label>{{ 'collection.edit.template.label' | translate}}</label>
+  <span class="d-inline-block mb-2">{{ 'collection.edit.template.label' | translate}}</span>
   <div class="button-row space-children-mr">
     <button *ngIf="!itemTemplateRD?.payload" class="btn btn-success" (click)="addItemTemplate()">
-      <i class="fas fa-plus"></i>
+      <i class="fas fa-plus" aria-hidden="true"></i>
       <span class="d-none d-sm-inline">&nbsp;{{"collection.edit.template.add-button" | translate}}</span>
     </button>
     <button *ngIf="itemTemplateRD?.payload" class="btn btn-danger" (click)="deleteItemTemplate()">
-      <i class="fas fa-trash-alt"></i>
+      <i class="fas fa-trash-alt" aria-hidden="true"></i>
       <span class="d-none d-sm-inline">&nbsp;{{"collection.edit.template.delete-button" | translate}}</span>
     </button>
     <button *ngIf="itemTemplateRD?.payload" class="btn btn-primary"
             [routerLink]="'/collections/' + (dsoRD$ | async)?.payload.uuid + '/itemtemplate'">
-      <i class="fas fa-edit"></i>
+      <i class="fas fa-edit" aria-hidden="true"></i>
       <span class="d-none d-sm-inline">&nbsp;{{"collection.edit.template.edit-button" | translate}}</span>
     </button>
   </div>
diff --git a/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.html b/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.html
index 4d7b3e657e..05307b86ee 100644
--- a/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.html
+++ b/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.html
@@ -1,6 +1,6 @@
 <div *ngVar="(contentSource$ |async) as contentSource">
     <div class="container-fluid space-children-mr" *ngIf="shouldShow">
-        <h4>{{ 'collection.source.controls.head' | translate }}</h4>
+        <h3>{{ 'collection.source.controls.head' | translate }}</h3>
         <div>
             <span class="font-weight-bold">{{'collection.source.controls.harvest.status' | translate}}</span>
             <span>{{contentSource?.harvestStatus}}</span>
@@ -19,32 +19,32 @@
         </div>
 
         <button *ngIf="!(testConfigRunning$ |async)" class="btn btn-secondary"
-                [disabled]="!(isEnabled)"
+                [dsBtnDisabled]="!(isEnabled)"
                 (click)="testConfiguration(contentSource)">
             <span>{{'collection.source.controls.test.submit' | translate}}</span>
         </button>
         <button *ngIf="(testConfigRunning$ |async)" class="btn btn-secondary"
-                [disabled]="true">
+                [dsBtnDisabled]="true">
             <span class="spinner-border spinner-border-sm spinner-button" role="status" aria-hidden="true"></span>
             <span>{{'collection.source.controls.test.running' | translate}}</span>
         </button>
         <button *ngIf="!(importRunning$ |async)" class="btn btn-primary"
-                [disabled]="!(isEnabled)"
+                [dsBtnDisabled]="!(isEnabled)"
                 (click)="importNow()">
             <span class="d-none d-sm-inline">{{'collection.source.controls.import.submit' | translate}}</span>
         </button>
         <button *ngIf="(importRunning$ |async)" class="btn btn-primary"
-                [disabled]="true">
+                [dsBtnDisabled]="true">
             <span class="spinner-border spinner-border-sm spinner-button" role="status" aria-hidden="true"></span>
             <span class="d-none d-sm-inline">{{'collection.source.controls.import.running' | translate}}</span>
         </button>
         <button *ngIf="!(reImportRunning$ |async)" class="btn btn-primary"
-                [disabled]="!(isEnabled)"
+                [dsBtnDisabled]="!(isEnabled)"
                 (click)="resetAndReimport()">
             <span class="d-none d-sm-inline">&nbsp;{{'collection.source.controls.reset.submit' | translate}}</span>
         </button>
         <button *ngIf="(reImportRunning$ |async)" class="btn btn-primary"
-                [disabled]="true">
+                [dsBtnDisabled]="true">
             <span class="spinner-border spinner-border-sm spinner-button" role="status" aria-hidden="true"></span>
             <span class="d-none d-sm-inline">&nbsp;{{'collection.source.controls.reset.running' | translate}}</span>
         </button>
diff --git a/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.spec.ts b/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.spec.ts
index 3eb83ebe8a..ed53f8ab2f 100644
--- a/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.spec.ts
+++ b/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.spec.ts
@@ -22,6 +22,7 @@ import { TestScheduler } from 'rxjs/testing';
 import { By } from '@angular/platform-browser';
 import { VarDirective } from '../../../../shared/utils/var.directive';
 import { ContentSourceSetSerializer } from '../../../../core/shared/content-source-set-serializer';
+import {BtnDisabledDirective} from '../../../../shared/btn-disabled.directive';
 
 describe('CollectionSourceControlsComponent', () => {
   let comp: CollectionSourceControlsComponent;
@@ -100,7 +101,7 @@ describe('CollectionSourceControlsComponent', () => {
 
     TestBed.configureTestingModule({
       imports: [TranslateModule.forRoot(), RouterTestingModule],
-      declarations: [CollectionSourceControlsComponent, VarDirective],
+      declarations: [CollectionSourceControlsComponent, VarDirective, BtnDisabledDirective],
       providers: [
         {provide: ScriptDataService, useValue: scriptDataService},
         {provide: ProcessDataService, useValue: processDataService},
@@ -189,9 +190,10 @@ describe('CollectionSourceControlsComponent', () => {
 
       const buttons = fixture.debugElement.queryAll(By.css('button'));
 
-      expect(buttons[0].nativeElement.disabled).toBeTrue();
-      expect(buttons[1].nativeElement.disabled).toBeTrue();
-      expect(buttons[2].nativeElement.disabled).toBeTrue();
+      buttons.forEach(button => {
+        expect(button.nativeElement.getAttribute('aria-disabled')).toBe('true');
+        expect(button.nativeElement.classList.contains('disabled')).toBeTrue();
+      });
     });
     it('should be enabled when isEnabled is true', () => {
       comp.shouldShow = true;
@@ -201,9 +203,10 @@ describe('CollectionSourceControlsComponent', () => {
 
       const buttons = fixture.debugElement.queryAll(By.css('button'));
 
-      expect(buttons[0].nativeElement.disabled).toBeFalse();
-      expect(buttons[1].nativeElement.disabled).toBeFalse();
-      expect(buttons[2].nativeElement.disabled).toBeFalse();
+      buttons.forEach(button => {
+        expect(button.nativeElement.getAttribute('aria-disabled')).toBe('false');
+        expect(button.nativeElement.classList.contains('disabled')).toBeFalse();
+      });
     });
     it('should call the corresponding button when clicked', () => {
       spyOn(comp, 'testConfiguration');
diff --git a/src/app/collection-page/edit-collection-page/collection-source/collection-source.component.html b/src/app/collection-page/edit-collection-page/collection-source/collection-source.component.html
index d7b0d0c475..2839ba8fbf 100644
--- a/src/app/collection-page/edit-collection-page/collection-source/collection-source.component.html
+++ b/src/app/collection-page/edit-collection-page/collection-source/collection-source.component.html
@@ -1,24 +1,24 @@
 <div class="container-fluid">
     <div class="d-inline-block float-right space-children-mr">
-        <button class=" btn btn-danger" *ngIf="!(isReinstatable() | async)"
-                [disabled]="!(hasChanges() | async)"
+        <button class=" btn btn-danger" *ngIf="(isReinstatable$ | async) !== true"
+                [dsBtnDisabled]="(hasChanges$ | async) !== true"
                 (click)="discard()"><i
                 class="fas fa-times"></i>
             <span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.discard-button" | translate}}</span>
         </button>
-        <button class="btn btn-warning" *ngIf="isReinstatable() | async"
+        <button class="btn btn-warning" *ngIf="isReinstatable$ | async"
                 (click)="reinstate()"><i
                 class="fas fa-undo-alt"></i>
             <span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.reinstate-button" | translate}}</span>
         </button>
         <button class="btn btn-primary"
-                [disabled]="!(hasChanges() | async) || !isValid() || (initialHarvestType === harvestTypeNone && contentSource.harvestType === initialHarvestType)"
+                [dsBtnDisabled]="(hasChanges$ | async) !== true || !isValid() || (initialHarvestType === harvestTypeNone && contentSource.harvestType === initialHarvestType)"
                 (click)="onSubmit()"><i
                 class="fas fa-save"></i>
             <span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.save-button" | translate}}</span>
         </button>
     </div>
-    <h4>{{ 'collection.edit.tabs.source.head' | translate }}</h4>
+    <h2>{{ 'collection.edit.tabs.source.head' | translate }}</h2>
     <div *ngIf="contentSource" class="form-check mb-4">
         <input type="checkbox" class="form-check-input" id="externalSourceCheck"
                [checked]="(contentSource?.harvestType !== harvestTypeNone)" (change)="changeExternalSource()">
@@ -26,7 +26,7 @@
                for="externalSourceCheck">{{ 'collection.edit.tabs.source.external' | translate }}</label>
     </div>
     <ds-themed-loading *ngIf="!contentSource" [message]="'loading.content-source' | translate"></ds-themed-loading>
-    <h4 *ngIf="contentSource && (contentSource?.harvestType !== harvestTypeNone)">{{ 'collection.edit.tabs.source.form.head' | translate }}</h4>
+    <h3 *ngIf="contentSource && (contentSource?.harvestType !== harvestTypeNone)">{{ 'collection.edit.tabs.source.form.head' | translate }}</h3>
 </div>
 <div class="row">
     <ds-form *ngIf="formGroup && contentSource && (contentSource?.harvestType !== harvestTypeNone)"
@@ -44,19 +44,19 @@
     <div class="row">
         <div class="col-12">
             <div class="d-inline-block float-right ml-1 space-children-mr">
-                <button class=" btn btn-danger" *ngIf="!(isReinstatable() | async)"
-                        [disabled]="!(hasChanges() | async)"
+                <button class=" btn btn-danger" *ngIf="(isReinstatable$ | async) !== true"
+                        [dsBtnDisabled]="(hasChanges$ | async) !== true"
                         (click)="discard()"><i
                         class="fas fa-times"></i>
                     <span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.discard-button" | translate}}</span>
                 </button>
-                <button class="btn btn-warning" *ngIf="isReinstatable() | async"
+                <button class="btn btn-warning" *ngIf="isReinstatable$ | async"
                         (click)="reinstate()"><i
                         class="fas fa-undo-alt"></i>
                     <span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.reinstate-button" | translate}}</span>
                 </button>
                 <button class="btn btn-primary"
-                        [disabled]="!(hasChanges() | async) || !isValid() || (initialHarvestType === harvestTypeNone && contentSource.harvestType === initialHarvestType)"
+                        [dsBtnDisabled]="(hasChanges$ | async) !== true || !isValid() || (initialHarvestType === harvestTypeNone && contentSource.harvestType === initialHarvestType)"
                         (click)="onSubmit()"><i
                         class="fas fa-save"></i>
                     <span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.save-button" | translate}}</span>
@@ -66,7 +66,7 @@
     </div>
 </div>
 <ds-collection-source-controls
-        [isEnabled]="!(hasChanges()|async)"
+        [isEnabled]="(hasChanges$ | async) !== true"
         [shouldShow]="contentSource?.harvestType !== harvestTypeNone"
         [collection]="(collectionRD$ |async)?.payload"
 >
diff --git a/src/app/collection-page/edit-collection-page/collection-source/collection-source.component.ts b/src/app/collection-page/edit-collection-page/collection-source/collection-source.component.ts
index 2d1308cc83..95295386c0 100644
--- a/src/app/collection-page/edit-collection-page/collection-source/collection-source.component.ts
+++ b/src/app/collection-page/edit-collection-page/collection-source/collection-source.component.ts
@@ -204,11 +204,6 @@ export class CollectionSourceComponent extends AbstractTrackableComponent implem
    */
   formGroup: UntypedFormGroup;
 
-  /**
-   * Subscription to update the current form
-   */
-  updateSub: Subscription;
-
   /**
    * The content harvesting type used when harvesting is disabled
    */
@@ -228,28 +223,29 @@ export class CollectionSourceComponent extends AbstractTrackableComponent implem
    */
   displayedNotifications: INotification[] = [];
 
-  public constructor(public objectUpdatesService: ObjectUpdatesService,
-                     public notificationsService: NotificationsService,
-                     protected location: Location,
-                     protected formService: DynamicFormService,
-                     protected translate: TranslateService,
-                     protected route: ActivatedRoute,
-                     protected router: Router,
-                     protected collectionService: CollectionDataService,
-                     protected requestService: RequestService) {
-    super(objectUpdatesService, notificationsService, translate);
+  subs: Subscription[] = [];
+
+  public constructor(
+    public objectUpdatesService: ObjectUpdatesService,
+    public notificationsService: NotificationsService,
+    public translateService: TranslateService,
+    public router: Router,
+    protected location: Location,
+    protected formService: DynamicFormService,
+    protected route: ActivatedRoute,
+    protected collectionService: CollectionDataService,
+    protected requestService: RequestService,
+  ) {
+    super(objectUpdatesService, notificationsService, translateService, router);
   }
 
   /**
    * Initialize properties to setup the Field Update and Form
    */
   ngOnInit(): void {
+    super.ngOnInit();
     this.notificationsPrefix = 'collection.edit.tabs.source.notifications.';
     this.discardTimeOut = environment.collection.edit.undoTimeout;
-    this.url = this.router.url;
-    if (this.url.indexOf('?') > 0) {
-      this.url = this.url.substr(0, this.url.indexOf('?'));
-    }
     this.formGroup = this.formService.createFormGroup(this.formModel);
     this.collectionRD$ = this.route.parent.data.pipe(first(), map((data) => data.dso));
 
@@ -263,10 +259,9 @@ export class CollectionSourceComponent extends AbstractTrackableComponent implem
     });
 
     this.updateFieldTranslations();
-    this.translate.onLangChange
-      .subscribe(() => {
-        this.updateFieldTranslations();
-      });
+    this.subs.push(this.translateService.onLangChange.subscribe(() => {
+      this.updateFieldTranslations();
+    }));
   }
 
   /**
@@ -281,7 +276,7 @@ export class CollectionSourceComponent extends AbstractTrackableComponent implem
     this.update$ = this.objectUpdatesService.getFieldUpdates(this.url, [initialContentSource]).pipe(
       map((updates: FieldUpdates) => updates[initialContentSource.uuid])
     );
-    this.updateSub = this.update$.subscribe((update: FieldUpdate) => {
+    this.subs.push(this.update$.subscribe((update: FieldUpdate) => {
       if (update) {
         const field = update.field as ContentSource;
         let configId;
@@ -308,7 +303,7 @@ export class CollectionSourceComponent extends AbstractTrackableComponent implem
         }
         this.contentSource.metadataConfigId = configId;
       }
-    });
+    }));
   }
 
   /**
@@ -342,18 +337,18 @@ export class CollectionSourceComponent extends AbstractTrackableComponent implem
    * @param fieldModel
    */
   private updateFieldTranslation(fieldModel: DynamicFormControlModel) {
-    fieldModel.label = this.translate.instant(this.LABEL_KEY_PREFIX + fieldModel.id);
+    fieldModel.label = this.translateService.instant(this.LABEL_KEY_PREFIX + fieldModel.id);
     if (isNotEmpty(fieldModel.validators)) {
       fieldModel.errorMessages = {};
       Object.keys(fieldModel.validators).forEach((key) => {
-        fieldModel.errorMessages[key] = this.translate.instant(this.ERROR_KEY_PREFIX + fieldModel.id + '.' + key);
+        fieldModel.errorMessages[key] = this.translateService.instant(this.ERROR_KEY_PREFIX + fieldModel.id + '.' + key);
       });
     }
     if (fieldModel instanceof DynamicOptionControlModel) {
       if (isNotEmpty(fieldModel.options)) {
         fieldModel.options.forEach((option) => {
           if (hasNoValue(option.label)) {
-            option.label = this.translate.instant(this.OPTIONS_KEY_PREFIX + fieldModel.id + '.' + option.value);
+            option.label = this.translateService.instant(this.OPTIONS_KEY_PREFIX + fieldModel.id + '.' + option.value);
           }
         });
       }
@@ -470,8 +465,6 @@ export class CollectionSourceComponent extends AbstractTrackableComponent implem
    * Make sure open subscriptions are closed
    */
   ngOnDestroy(): void {
-    if (this.updateSub) {
-      this.updateSub.unsubscribe();
-    }
+    this.subs.forEach((sub: Subscription) => sub.unsubscribe());
   }
 }
diff --git a/src/app/collection-page/edit-item-template-page/edit-item-template-page.component.html b/src/app/collection-page/edit-item-template-page/edit-item-template-page.component.html
index 20afd701ff..8d095dd229 100644
--- a/src/app/collection-page/edit-item-template-page/edit-item-template-page.component.html
+++ b/src/app/collection-page/edit-item-template-page/edit-item-template-page.component.html
@@ -2,7 +2,7 @@
   <div class="row">
     <div class="col-12" *ngVar="(itemRD$ | async) as itemRD">
       <ng-container *ngIf="itemRD?.hasSucceeded">
-        <h2 class="border-bottom">{{ 'collection.edit.template.head' | translate:{ collection: dsoNameService.getName(collection) } }}</h2>
+        <h1 class="border-bottom">{{ 'collection.edit.template.head' | translate:{ collection: dsoNameService.getName(collection) } }}</h1>
         <ds-themed-dso-edit-metadata [updateDataService]="itemTemplateService" [dso]="itemRD?.payload"></ds-themed-dso-edit-metadata>
         <button [routerLink]="getCollectionEditUrl(collection)" class="btn btn-outline-secondary">{{ 'collection.edit.template.cancel' | translate }}</button>
       </ng-container>
diff --git a/src/app/collection-page/edit-item-template-page/edit-item-template-page.component.ts b/src/app/collection-page/edit-item-template-page/edit-item-template-page.component.ts
index 6425996fd2..238ec5e37a 100644
--- a/src/app/collection-page/edit-item-template-page/edit-item-template-page.component.ts
+++ b/src/app/collection-page/edit-item-template-page/edit-item-template-page.component.ts
@@ -8,7 +8,7 @@ import { ItemTemplateDataService } from '../../core/data/item-template-data.serv
 import { getCollectionEditRoute } from '../collection-page-routing-paths';
 import { Item } from '../../core/shared/item.model';
 import { getFirstSucceededRemoteDataPayload } from '../../core/shared/operators';
-import { AlertType } from '../../shared/alert/aletr-type';
+import { AlertType } from '../../shared/alert/alert-type';
 import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
 
 @Component({
diff --git a/src/app/community-list-page/community-list-page.component.html b/src/app/community-list-page/community-list-page.component.html
index 9759f4405d..4392fb87d0 100644
--- a/src/app/community-list-page/community-list-page.component.html
+++ b/src/app/community-list-page/community-list-page.component.html
@@ -1,4 +1,4 @@
 <div class="container">
-  <h2>{{ 'communityList.title' | translate }}</h2>
+  <h1>{{ 'communityList.title' | translate }}</h1>
   <ds-themed-community-list></ds-themed-community-list>
 </div>
diff --git a/src/app/community-list-page/community-list-service.ts b/src/app/community-list-page/community-list-service.ts
index 99e9dbeb0d..bbf1c7cdb5 100644
--- a/src/app/community-list-page/community-list-service.ts
+++ b/src/app/community-list-page/community-list-service.ts
@@ -24,8 +24,9 @@ import { FlatNode } from './flat-node.model';
 import { ShowMoreFlatNode } from './show-more-flat-node.model';
 import { FindListOptions } from '../core/data/find-list-options.model';
 import { AppConfig, APP_CONFIG } from 'src/config/app-config.interface';
+import { v4 as uuidv4 } from 'uuid';
 
-// Helper method to combine an flatten an array of observables of flatNode arrays
+// Helper method to combine and flatten an array of observables of flatNode arrays
 export const combineAndFlatten = (obsList: Observable<FlatNode[]>[]): Observable<FlatNode[]> =>
   observableCombineLatest([...obsList]).pipe(
     map((matrix: any[][]) => [].concat(...matrix)),
@@ -186,7 +187,7 @@ export class CommunityListService {
           return this.transformCommunity(community, level, parent, expandedNodes);
         });
       if (currentPage < listOfPaginatedCommunities.totalPages && currentPage === listOfPaginatedCommunities.currentPage) {
-        obsList = [...obsList, observableOf([showMoreFlatNode('community', level, parent)])];
+        obsList = [...obsList, observableOf([showMoreFlatNode(`community-${uuidv4()}`, level, parent)])];
       }
 
       return combineAndFlatten(obsList);
@@ -199,7 +200,7 @@ export class CommunityListService {
    * Transforms a community in a list of FlatNodes containing firstly a flatnode of the community itself,
    *      followed by flatNodes of its possible subcommunities and collection
    * It gets called recursively for each subcommunity to add its subcommunities and collections to the list
-   * Number of subcommunities and collections added, is dependant on the current page the parent is at for respectively subcommunities and collections.
+   * Number of subcommunities and collections added, is dependent on the current page the parent is at for respectively subcommunities and collections.
    * @param community         Community being transformed
    * @param level             Depth of the community in the list, subcommunities and collections go one level deeper
    * @param parent            Flatnode of the parent community
@@ -257,7 +258,7 @@ export class CommunityListService {
                 let nodes = rd.payload.page
                   .map((collection: Collection) => toFlatNode(collection, observableOf(false), level + 1, false, communityFlatNode));
                 if (currentCollectionPage < rd.payload.totalPages && currentCollectionPage === rd.payload.currentPage) {
-                  nodes = [...nodes, showMoreFlatNode('collection', level + 1, communityFlatNode)];
+                  nodes = [...nodes, showMoreFlatNode(`collection-${uuidv4()}`, level + 1, communityFlatNode)];
                 }
                 return nodes;
               } else {
@@ -275,7 +276,7 @@ export class CommunityListService {
 
   /**
    * Checks if a community has subcommunities or collections by querying the respective services with a pageSize = 0
-   *      Returns an observable that combines the result.payload.totalElements fo the observables that the
+   *      Returns an observable that combines the result.payload.totalElements of the observables that the
    *          respective services return when queried
    * @param community     Community being checked whether it is expandable (if it has subcommunities or collections)
    */
diff --git a/src/app/community-list-page/community-list/community-list.component.html b/src/app/community-list-page/community-list/community-list.component.html
index d6fd77e79b..268c92dc12 100644
--- a/src/app/community-list-page/community-list/community-list.component.html
+++ b/src/app/community-list-page/community-list/community-list.component.html
@@ -1,15 +1,15 @@
 <ds-themed-loading *ngIf="(dataSource.loading$ | async) && !loadingNode" class="ds-themed-loading"></ds-themed-loading>
-<cdk-tree [dataSource]="dataSource" [treeControl]="treeControl">
+<cdk-tree [dataSource]="dataSource" [treeControl]="treeControl" [trackBy]="trackBy">
   <!-- This is the tree node template for show more node -->
   <cdk-tree-node *cdkTreeNodeDef="let node; when: isShowMore" cdkTreeNodePadding
                  class="example-tree-node show-more-node">
     <div class="btn-group">
-      <button type="button" class="btn btn-default" cdkTreeNodeToggle>
-        <span class="fa fa-chevron-right invisible" aria-hidden="true"></span>
-      </button>
+      <span aria-hidden="true" class="btn btn-default invisible" cdkTreeNodeToggle>
+        <span class="fa fa-chevron-right"></span>
+      </span>
       <div class="align-middle pt-2">
-        <button *ngIf="node!==loadingNode" (click)="getNextPage(node)"
-           class="btn btn-outline-primary btn-sm" role="button">
+        <button *ngIf="!(dataSource.loading$ | async)" (click)="getNextPage(node)"
+           class="btn btn-outline-primary btn-sm" role="button" tabindex="0">
            <i class="fas fa-angle-down"></i> {{ 'communityList.showMore' | translate }}
         </button>
         <ds-themed-loading *ngIf="node===loadingNode && dataSource.loading$ | async" class="ds-themed-loading"></ds-themed-loading>
@@ -24,32 +24,36 @@
   <cdk-tree-node *cdkTreeNodeDef="let node; when: hasChild" cdkTreeNodePadding
                  class="example-tree-node expandable-node">
     <div class="btn-group">
-      <button type="button" class="btn btn-default" cdkTreeNodeToggle
-              [title]="'toggle ' + dsoNameService.getName(node.payload)"
-              [attr.aria-label]="'toggle ' + dsoNameService.getName(node.payload)"
+      <button *ngIf="hasChild(null, node) | async" type="button" class="btn btn-default" cdkTreeNodeToggle
+              [attr.aria-label]="(node.isExpanded ? 'communityList.collapse' : 'communityList.expand') | translate:{ name: dsoNameService.getName(node.payload) }"
               (click)="toggleExpanded(node)"
-              [ngClass]="(hasChild(null, node)| async) ? 'visible' : 'invisible'"
-              [attr.data-test]="(hasChild(null, node)| async) ? 'expand-button' : ''">
+              data-test="expand-button"
+              (keyup.enter)="toggleExpanded(node)"
+              (keyup.space)="toggleExpanded(node)"
+              role="button"
+              tabindex="0">
         <span class="{{node.isExpanded ? 'fa fa-chevron-down' : 'fa fa-chevron-right'}}"
               aria-hidden="true"></span>
+        <span class="sr-only">{{ (node.isExpanded ? 'communityList.collapse' : 'communityList.expand') | translate:{ name: dsoNameService.getName(node.payload) } }}</span>
       </button>
+      <!--Don't render the button when non-expandable otherwise it's still accessible, instead render this placeholder-->
+      <span *ngIf="!(hasChild(null, node) | async)" aria-hidden="true" class="btn btn-default invisible">
+        <span class="fa fa-chevron-right"></span>
+      </span>
       <div class="d-flex flex-row">
-        <h5 class="align-middle pt-2">
-          <a [routerLink]="node.route" class="lead">
-            {{ dsoNameService.getName(node.payload) }}
-          </a>
+        <span class="align-middle pt-2 lead">
+          <a [routerLink]="node.route" class="lead" role="link" tabindex="0">{{ dsoNameService.getName(node.payload) }}</a>
           <span class="pr-2">&nbsp;</span>
           <span *ngIf="node.payload.archivedItemsCount >= 0" class="badge badge-pill badge-secondary align-top archived-items-lead">{{node.payload.archivedItemsCount}}</span>
-        </h5>
+        </span>
       </div>
     </div>
     <ds-truncatable [id]="node.id">
       <div class="text-muted" cdkTreeNodePadding>
         <div class="d-flex" *ngIf="node.payload.shortDescription">
-          <button type="button" class="btn btn-default invisible">
-            <span class="{{node.isExpanded ? 'fa fa-chevron-down' : 'fa fa-chevron-right'}}"
-                  aria-hidden="true"></span>
-          </button>
+          <span aria-hidden="true" class="btn btn-default invisible">
+            <span class="fa fa-chevron-right"></span>
+          </span>
           <ds-truncatable-part [id]="node.id" [minLines]="3">
             <span>{{node.payload.shortDescription}}</span>
           </ds-truncatable-part>
@@ -58,10 +62,9 @@
     </ds-truncatable>
     <div class="d-flex" *ngIf="node===loadingNode && dataSource.loading$ | async"
          cdkTreeNodePadding>
-      <button type="button" class="btn btn-default invisible">
-        <span class="{{node.isExpanded ? 'fa fa-chevron-down' : 'fa fa-chevron-right'}}"
-              aria-hidden="true"></span>
-      </button>
+      <span aria-hidden="true" class="btn btn-default invisible">
+        <span class="fa fa-chevron-right"></span>
+      </span>
       <ds-themed-loading class="ds-themed-loading"></ds-themed-loading>
     </div>
   </cdk-tree-node>
@@ -69,22 +72,19 @@
   <cdk-tree-node *cdkTreeNodeDef="let node; when: !(hasChild && isShowMore)" cdkTreeNodePadding
                  class="example-tree-node childless-node">
     <div class="btn-group">
-      <button type="button" class="btn btn-default" cdkTreeNodeToggle>
-        <span class="fa fa-chevron-right invisible" aria-hidden="true"></span>
-      </button>
+      <span aria-hidden="true" class="btn btn-default invisible" cdkTreeNodeToggle>
+        <span class="fa fa-chevron-right"></span>
+      </span>
       <h6 class="align-middle pt-2">
-        <a [routerLink]="node.route" class="lead">
-          {{ dsoNameService.getName(node.payload) }}
-        </a>
+        <a [routerLink]="node.route" class="lead" role="link" tabindex="0">{{ dsoNameService.getName(node.payload) }}</a>
       </h6>
     </div>
     <ds-truncatable [id]="node.id">
       <div class="text-muted" cdkTreeNodePadding>
         <div class="d-flex" *ngIf="node.payload.shortDescription">
-          <button type="button" class="btn btn-default invisible">
-            <span class="{{node.isExpanded ? 'fa fa-chevron-down' : 'fa fa-chevron-right'}}"
-                  aria-hidden="true"></span>
-          </button>
+          <span aria-hidden="true" class="btn btn-default invisible">
+            <span class="fa fa-chevron-right"></span>
+          </span>
           <ds-truncatable-part [id]="node.id" [minLines]="3">
             <span>{{node.payload.shortDescription}}</span>
           </ds-truncatable-part>
diff --git a/src/app/community-list-page/community-list/community-list.component.scss b/src/app/community-list-page/community-list/community-list.component.scss
new file mode 100644
index 0000000000..2e33380a29
--- /dev/null
+++ b/src/app/community-list-page/community-list/community-list.component.scss
@@ -0,0 +1,4 @@
+::ng-deep .fa-chevron-right::before {
+  display: block;
+  width: 16px;
+}
diff --git a/src/app/community-list-page/community-list/community-list.component.spec.ts b/src/app/community-list-page/community-list/community-list.component.spec.ts
index ce6b27dbeb..cec1b555ab 100644
--- a/src/app/community-list-page/community-list/community-list.component.spec.ts
+++ b/src/app/community-list-page/community-list/community-list.component.spec.ts
@@ -5,7 +5,7 @@ import { CommunityListService, showMoreFlatNode, toFlatNode } from '../community
 import { CdkTreeModule } from '@angular/cdk/tree';
 import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
 import { TranslateLoaderMock } from '../../shared/mocks/translate-loader.mock';
-import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
+import { CUSTOM_ELEMENTS_SCHEMA, DebugElement } from '@angular/core';
 import { RouterTestingModule } from '@angular/router/testing';
 import { Community } from '../../core/shared/community.model';
 import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
@@ -17,6 +17,7 @@ import { By } from '@angular/platform-browser';
 import { isEmpty, isNotEmpty } from '../../shared/empty.util';
 import { FlatNode } from '../flat-node.model';
 import { RouterLinkWithHref } from '@angular/router';
+import { v4 as uuidv4 } from 'uuid';
 
 describe('CommunityListComponent', () => {
   let component: CommunityListComponent;
@@ -138,7 +139,7 @@ describe('CommunityListComponent', () => {
         }
         if (expandedNodes === null || isEmpty(expandedNodes)) {
           if (showMoreTopComNode) {
-            return observableOf([...mockTopFlatnodesUnexpanded.slice(0, endPageIndex), showMoreFlatNode('community', 0, null)]);
+            return observableOf([...mockTopFlatnodesUnexpanded.slice(0, endPageIndex), showMoreFlatNode(`community-${uuidv4()}`, 0, null)]);
           } else {
             return observableOf(mockTopFlatnodesUnexpanded.slice(0, endPageIndex));
           }
@@ -165,21 +166,21 @@ describe('CommunityListComponent', () => {
                   const endSubComIndex = this.pageSize * expandedParent.currentCommunityPage;
                   flatnodes = [...flatnodes, ...subComFlatnodes.slice(0, endSubComIndex)];
                   if (subComFlatnodes.length > endSubComIndex) {
-                    flatnodes = [...flatnodes, showMoreFlatNode('community', topNode.level + 1, expandedParent)];
+                    flatnodes = [...flatnodes, showMoreFlatNode(`community-${uuidv4()}`, topNode.level + 1, expandedParent)];
                   }
                 }
                 if (isNotEmpty(collFlatnodes)) {
                   const endColIndex = this.pageSize * expandedParent.currentCollectionPage;
                   flatnodes = [...flatnodes, ...collFlatnodes.slice(0, endColIndex)];
                   if (collFlatnodes.length > endColIndex) {
-                    flatnodes = [...flatnodes, showMoreFlatNode('collection', topNode.level + 1, expandedParent)];
+                    flatnodes = [...flatnodes, showMoreFlatNode(`collection-${uuidv4()}`, topNode.level + 1, expandedParent)];
                   }
                 }
               }
             }
           });
           if (showMoreTopComNode) {
-            flatnodes = [...flatnodes, showMoreFlatNode('community', 0, null)];
+            flatnodes = [...flatnodes, showMoreFlatNode(`community-${uuidv4()}`, 0, null)];
           }
           return observableOf(flatnodes);
         }
@@ -299,12 +300,14 @@ describe('CommunityListComponent', () => {
 
   describe('second top community node is expanded and has more children (collections) than page size of collection', () => {
     describe('children of second top com are added (page-limited pageSize 2)', () => {
-      let allNodes;
+      let allNodes: DebugElement[];
       beforeEach(fakeAsync(() => {
-        const chevronExpand = fixture.debugElement.queryAll(By.css('.expandable-node button'));
-        const chevronExpandSpan = fixture.debugElement.queryAll(By.css('.expandable-node button span'));
-        if (chevronExpandSpan[1].nativeElement.classList.contains('fa-chevron-right')) {
-          chevronExpand[1].nativeElement.click();
+        const toggleButtons: DebugElement[] = fixture.debugElement.queryAll(By.css('.expandable-node button'));
+        const toggleButtonText: DebugElement = toggleButtons[1].query(By.css('span'));
+        expect(toggleButtonText).not.toBeNull();
+
+        if (toggleButtonText.nativeElement.classList.contains('fa-chevron-right')) {
+          toggleButtons[1].nativeElement.click();
           tick();
           fixture.detectChanges();
         }
@@ -314,17 +317,18 @@ describe('CommunityListComponent', () => {
         allNodes = [...expandableNodesFound, ...childlessNodesFound];
       }));
       it('tree contains 2 (page-limited) top com, 2 (page-limited) coll of 2nd top com, a show more for those page-limited coll and show more for page-limited top com', () => {
-        mockTopFlatnodesUnexpanded.slice(0, 2).map((topFlatnode: FlatNode) => {
-          expect(allNodes.find((foundEl) => {
-            return (foundEl.nativeElement.textContent.trim() === topFlatnode.name);
-          })).toBeTruthy();
-        });
-        mockCollectionsPage1.map((coll) => {
-          expect(allNodes.find((foundEl) => {
-            return (foundEl.nativeElement.textContent.trim() === coll.name);
-          })).toBeTruthy();
-        });
+        const allNodeNames: string[] = allNodes.map((node: DebugElement) => node.nativeElement.innerText.trim());
         expect(allNodes.length).toEqual(4);
+        const flatNodes: string[] = mockTopFlatnodesUnexpanded.slice(0, 2).map((flatNode: FlatNode) => flatNode.name);
+        for (const flatNode of flatNodes) {
+          expect(allNodeNames).toContain(flatNode);
+        }
+        expect(flatNodes.length).toBe(2);
+        const page1CollectionNames: string[] = mockCollectionsPage1.map((collection: Collection) => collection.name);
+        for (const collectionName of page1CollectionNames) {
+          expect(allNodeNames).toContain(collectionName);
+        }
+        expect(page1CollectionNames.length).toBe(2);
         const showMoreEl = fixture.debugElement.queryAll(By.css('.show-more-node'));
         expect(showMoreEl.length).toEqual(2);
       });
diff --git a/src/app/community-list-page/community-list/community-list.component.ts b/src/app/community-list-page/community-list/community-list.component.ts
index 5b2f930813..031a422469 100644
--- a/src/app/community-list-page/community-list/community-list.component.ts
+++ b/src/app/community-list-page/community-list/community-list.component.ts
@@ -19,6 +19,7 @@ import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
 @Component({
   selector: 'ds-community-list',
   templateUrl: './community-list.component.html',
+  styleUrls: ['./community-list.component.scss'],
 })
 export class CommunityListComponent implements OnInit, OnDestroy {
 
@@ -28,10 +29,9 @@ export class CommunityListComponent implements OnInit, OnDestroy {
   treeControl = new FlatTreeControl<FlatNode>(
     (node: FlatNode) => node.level, (node: FlatNode) => true
   );
-
   dataSource: CommunityListDatasource;
-
   paginationConfig: FindListOptions;
+  trackBy = (index, node: FlatNode) => node.id;
 
   constructor(
     protected communityListService: CommunityListService,
@@ -58,24 +58,34 @@ export class CommunityListComponent implements OnInit, OnDestroy {
     this.communityListService.saveCommunityListStateToStore(this.expandedNodes, this.loadingNode);
   }
 
-  // whether or not this node has children (subcommunities or collections)
+  /**
+   * Whether this node has children (subcommunities or collections)
+   * @param _
+   * @param node
+   */
   hasChild(_: number, node: FlatNode) {
     return node.isExpandable$;
   }
 
-  // whether or not it is a show more node (contains no data, but is indication that there are more topcoms, subcoms or collections
+  /**
+   * Whether this is a show more node that contains no data, but indicates that there is
+   * one or more community or collection.
+   * @param _
+   * @param node
+   */
   isShowMore(_: number, node: FlatNode) {
     return node.isShowMoreNode;
   }
 
   /**
-   * Toggles the expanded variable of a node, adds it to the expanded nodes list and reloads the tree so this node is expanded
+   * Toggles the expanded variable of a node, adds it to the expanded nodes list and reloads the tree
+   * so this node is expanded
    * @param node  Node we want to expand
    */
   toggleExpanded(node: FlatNode) {
     this.loadingNode = node;
     if (node.isExpanded) {
-      this.expandedNodes = this.expandedNodes.filter((node2) => node2.name !== node.name);
+      this.expandedNodes = this.expandedNodes.filter((node2) => node2.id !== node.id);
       node.isExpanded = false;
     } else {
       this.expandedNodes.push(node);
@@ -92,26 +102,28 @@ export class CommunityListComponent implements OnInit, OnDestroy {
 
   /**
    * Makes sure the next page of a node is added to the tree (top community, sub community of collection)
-   *      > Finds its parent (if not top community) and increases its corresponding collection/subcommunity currentPage
-   *      > Reloads tree with new page added to corresponding top community lis, sub community list or collection list
-   * @param node  The show more node indicating whether it's an increase in top communities, sub communities or collections
+   *      > Finds its parent (if not top community) and increases its corresponding collection/subcommunity
+   *      currentPage
+   *      > Reloads tree with new page added to corresponding top community lis, sub community list or
+   *      collection list
+   * @param node  The show more node indicating whether it's an increase in top communities, sub communities
+   *              or collections
    */
   getNextPage(node: FlatNode): void {
     this.loadingNode = node;
     if (node.parent != null) {
-      if (node.id === 'collection') {
+      if (node.id.startsWith('collection')) {
         const parentNodeInExpandedNodes = this.expandedNodes.find((node2: FlatNode) => node.parent.id === node2.id);
         parentNodeInExpandedNodes.currentCollectionPage++;
       }
-      if (node.id === 'community') {
+      if (node.id.startsWith('community')) {
         const parentNodeInExpandedNodes = this.expandedNodes.find((node2: FlatNode) => node.parent.id === node2.id);
         parentNodeInExpandedNodes.currentCommunityPage++;
       }
-      this.dataSource.loadCommunities(this.paginationConfig, this.expandedNodes);
     } else {
       this.paginationConfig.currentPage++;
-      this.dataSource.loadCommunities(this.paginationConfig, this.expandedNodes);
     }
+    this.dataSource.loadCommunities(this.paginationConfig, this.expandedNodes);
   }
 
 }
diff --git a/src/app/community-list-page/show-more-flat-node.model.ts b/src/app/community-list-page/show-more-flat-node.model.ts
index 801c9e7388..c7b7162d21 100644
--- a/src/app/community-list-page/show-more-flat-node.model.ts
+++ b/src/app/community-list-page/show-more-flat-node.model.ts
@@ -1,6 +1,6 @@
 /**
  * The show more links in the community tree are also represented by a flatNode so we know where in
- *  the tree it should be rendered an who its parent is (needed for the action resulting in clicking this link)
+ *  the tree it should be rendered and who its parent is (needed for the action resulting in clicking this link)
  */
 export class ShowMoreFlatNode {
 }
diff --git a/src/app/community-page/community-page-routing.module.ts b/src/app/community-page/community-page-routing.module.ts
index c37f8832f8..58a60854da 100644
--- a/src/app/community-page/community-page-routing.module.ts
+++ b/src/app/community-page/community-page-routing.module.ts
@@ -15,21 +15,40 @@ import { LinkMenuItemModel } from '../shared/menu/menu-item/models/link.model';
 import { ThemedCommunityPageComponent } from './themed-community-page.component';
 import { MenuItemType } from '../shared/menu/menu-item-type.model';
 import { DSOEditMenuResolver } from '../shared/dso-page/dso-edit-menu.resolver';
+import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver';
+import { ViewTrackerResolverService } from '../statistics/angulartics/dspace/view-tracker-resolver.service';
 
 @NgModule({
   imports: [
     RouterModule.forChild([
       {
         path: COMMUNITY_CREATE_PATH,
-        component: CreateCommunityPageComponent,
-        canActivate: [AuthenticatedGuard, CreateCommunityPageGuard]
+        children: [
+          {
+            path: '',
+            component: CreateCommunityPageComponent,
+            resolve: {
+              breadcrumb: I18nBreadcrumbResolver,
+            },
+            data: {
+              breadcrumbKey: 'community.create',
+            },
+          }
+        ],
+        canActivate: [AuthenticatedGuard, CreateCommunityPageGuard],
+        data: {
+          breadcrumbQueryParam: 'parent',
+        },
+        resolve: {
+          breadcrumb: CommunityBreadcrumbResolver,
+        },
+        runGuardsAndResolvers: 'always',
       },
       {
         path: ':id',
         resolve: {
           dso: CommunityPageResolver,
           breadcrumb: CommunityBreadcrumbResolver,
-          menu: DSOEditMenuResolver
         },
         runGuardsAndResolvers: 'always',
         children: [
@@ -49,6 +68,10 @@ import { DSOEditMenuResolver } from '../shared/dso-page/dso-edit-menu.resolver';
             path: '',
             component: ThemedCommunityPageComponent,
             pathMatch: 'full',
+            resolve: {
+              menu: DSOEditMenuResolver,
+              tracking: ViewTrackerResolverService,
+            },
           }
         ],
         data: {
@@ -76,6 +99,7 @@ import { DSOEditMenuResolver } from '../shared/dso-page/dso-edit-menu.resolver';
     LinkService,
     CreateCommunityPageGuard,
     CommunityPageAdministratorGuard,
+    ViewTrackerResolverService,
   ]
 })
 export class CommunityPageRoutingModule {
diff --git a/src/app/community-page/community-page.component.html b/src/app/community-page/community-page.component.html
index 6d5262d933..f588510455 100644
--- a/src/app/community-page/community-page.component.html
+++ b/src/app/community-page/community-page.component.html
@@ -1,13 +1,12 @@
 <div class="container" *ngVar="(communityRD$ | async) as communityRD">
   <div class="community-page" *ngIf="communityRD?.hasSucceeded" @fadeInOut>
     <div *ngIf="communityRD?.payload; let communityPayload">
-      <ds-view-tracker [object]="communityPayload"></ds-view-tracker>
       <div class="d-flex flex-row border-bottom mb-4 pb-4">
         <header class="comcol-header mr-auto">
           <!-- Community name -->
           <ds-comcol-page-header [name]="dsoNameService.getName(communityPayload)"></ds-comcol-page-header>
           <!-- Community logo -->
-          <ds-comcol-page-logo *ngIf="logoRD$" [logo]="(logoRD$ | async)?.payload" [alternateText]="'Community Logo'">
+          <ds-comcol-page-logo *ngIf="logoRD$" [logo]="(logoRD$ | async)?.payload" [alternateText]="'community.logo' | translate">
           </ds-comcol-page-logo>
           <!-- Handle -->
           <ds-themed-comcol-page-handle [content]="communityPayload.handle" [title]="'community.page.handle'">
@@ -21,9 +20,6 @@
           </ds-comcol-page-content>
         </header>
         <ds-dso-edit-menu></ds-dso-edit-menu>
-        <div class="pl-2 space-children-mr">
-          <ds-dso-page-subscription-button [dso]="communityPayload"></ds-dso-page-subscription-button>
-        </div>
       </div>
       <section class="comcol-page-browse-section">
 
diff --git a/src/app/community-page/create-community-page/create-community-page.component.html b/src/app/community-page/create-community-page/create-community-page.component.html
index 57039040c2..a421b6468a 100644
--- a/src/app/community-page/create-community-page/create-community-page.component.html
+++ b/src/app/community-page/create-community-page/create-community-page.component.html
@@ -2,8 +2,8 @@
   <div class="row">
     <div class="col-12 pb-4">
       <ng-container *ngVar="(parentRD$ | async)?.payload as parent">
-        <h2 *ngIf="!parent" id="header" class="border-bottom pb-2">{{ 'community.create.head' | translate }}</h2>
-        <h2 *ngIf="parent" id="sub-header" class="border-bottom pb-2">{{ 'community.create.sub-head' | translate:{ parent: dsoNameService.getName(parent) } }}</h2>
+        <h1 *ngIf="!parent" id="header" class="border-bottom pb-2">{{ 'community.create.head' | translate }}</h1>
+        <h1 *ngIf="parent" id="sub-header" class="border-bottom pb-2">{{ 'community.create.sub-head' | translate:{ parent: dsoNameService.getName(parent) } }}</h1>
       </ng-container>
     </div>
   </div>
diff --git a/src/app/community-page/delete-community-page/delete-community-page.component.html b/src/app/community-page/delete-community-page/delete-community-page.component.html
index 6bb8460bc9..8c20240354 100644
--- a/src/app/community-page/delete-community-page/delete-community-page.component.html
+++ b/src/app/community-page/delete-community-page/delete-community-page.component.html
@@ -2,16 +2,16 @@
     <div class="row">
         <ng-container *ngVar="(dsoRD$ | async)?.payload as dso">
             <div class="col-12 pb-4">
-                <h2 id="header" class="border-bottom pb-2">{{ 'community.delete.head' | translate}}</h2>
+                <h1 id="header" class="border-bottom pb-2">{{ 'community.delete.head' | translate}}</h1>
                 <p class="pb-2">{{ 'community.delete.text' | translate:{ dso: dsoNameService.getName(dso) } }}</p>
                 <div class="form-group row">
                     <div class="col text-right space-children-mr">
-                        <button class="btn btn-outline-secondary" (click)="onCancel(dso)" [disabled]="(processing$ | async)">
-                            <i class="fas fa-times"></i> {{'community.delete.cancel' | translate}}
+                        <button class="btn btn-outline-secondary" (click)="onCancel(dso)" [dsBtnDisabled]="(processing$ | async)">
+                            <i class="fas fa-times" aria-hidden="true"></i> {{'community.delete.cancel' | translate}}
                         </button>
-                        <button class="btn btn-danger" (click)="onConfirm(dso)" [disabled]="(processing$ | async)">
-                            <span *ngIf="processing$ | async"><i class='fas fa-circle-notch fa-spin'></i> {{'community.delete.processing' | translate}}</span>
-                            <span *ngIf="!(processing$ | async)"><i class="fas fa-trash"></i> {{'community.delete.confirm' | translate}}</span>
+                        <button class="btn btn-danger" (click)="onConfirm(dso)" [dsBtnDisabled]="(processing$ | async)">
+                            <span *ngIf="processing$ | async"><i class='fas fa-circle-notch fa-spin' aria-hidden="true"></i> {{'community.delete.processing' | translate}}</span>
+                            <span *ngIf="!(processing$ | async)"><i class="fas fa-trash" aria-hidden="true"></i> {{'community.delete.confirm' | translate}}</span>
                         </button>
                     </div>
                 </div>
diff --git a/src/app/community-page/edit-community-page/community-curate/community-curate.component.html b/src/app/community-page/edit-community-page/community-curate/community-curate.component.html
index 6c041d1725..5e11fdfbce 100644
--- a/src/app/community-page/edit-community-page/community-curate/community-curate.component.html
+++ b/src/app/community-page/edit-community-page/community-curate/community-curate.component.html
@@ -1,5 +1,5 @@
 <div class="container">
-    <h3>{{'community.curate.header' |translate:{community: (communityName$ |async)} }}</h3>
+    <h2>{{'community.curate.header' |translate:{community: (communityName$ |async)} }}</h2>
     <ds-curation-form
            [dsoHandle]="(dsoRD$|async)?.payload.handle"
     ></ds-curation-form>
diff --git a/src/app/community-page/sub-collection-list/community-page-sub-collection-list.component.ts b/src/app/community-page/sub-collection-list/community-page-sub-collection-list.component.ts
index 3a77149e5b..ed14096ce0 100644
--- a/src/app/community-page/sub-collection-list/community-page-sub-collection-list.component.ts
+++ b/src/app/community-page/sub-collection-list/community-page-sub-collection-list.component.ts
@@ -1,7 +1,7 @@
 import { Component, Input, OnDestroy, OnInit } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
 
-import { BehaviorSubject, combineLatest as observableCombineLatest } from 'rxjs';
+import { BehaviorSubject, combineLatest as observableCombineLatest, Subscription } from 'rxjs';
 
 import { RemoteData } from '../../core/data/remote-data';
 import { Collection } from '../../core/shared/collection.model';
@@ -50,6 +50,8 @@ export class CommunityPageSubCollectionListComponent implements OnInit, OnDestro
    */
   subCollectionsRDObs: BehaviorSubject<RemoteData<PaginatedList<Collection>>> = new BehaviorSubject<RemoteData<PaginatedList<Collection>>>({} as any);
 
+  subscriptions: Subscription[] = [];
+
   constructor(
     protected cds: CollectionDataService,
     protected paginationService: PaginationService,
@@ -77,7 +79,7 @@ export class CommunityPageSubCollectionListComponent implements OnInit, OnDestro
      const pagination$ = this.paginationService.getCurrentPagination(this.config.id, this.config);
      const sort$ = this.paginationService.getCurrentSort(this.config.id, this.sortConfig);
 
-    observableCombineLatest([pagination$, sort$]).pipe(
+    this.subscriptions.push(observableCombineLatest([pagination$, sort$]).pipe(
       switchMap(([currentPagination, currentSort]) => {
         return this.cds.findByParent(this.community.id, {
           currentPage: currentPagination.currentPage,
@@ -87,11 +89,12 @@ export class CommunityPageSubCollectionListComponent implements OnInit, OnDestro
       })
     ).subscribe((results) => {
       this.subCollectionsRDObs.next(results);
-    });
+    }));
   }
 
   ngOnDestroy(): void {
-    this.paginationService.clearPagination(this.config.id);
+    this.paginationService.clearPagination(this.config?.id);
+    this.subscriptions.map((subscription: Subscription) => subscription.unsubscribe());
   }
 
 }
diff --git a/src/app/community-page/sub-community-list/community-page-sub-community-list.component.ts b/src/app/community-page/sub-community-list/community-page-sub-community-list.component.ts
index 5a0409a051..08c9509edb 100644
--- a/src/app/community-page/sub-community-list/community-page-sub-community-list.component.ts
+++ b/src/app/community-page/sub-community-list/community-page-sub-community-list.component.ts
@@ -1,7 +1,7 @@
 import { Component, Input, OnDestroy, OnInit } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
 
-import { BehaviorSubject, combineLatest as observableCombineLatest } from 'rxjs';
+import { BehaviorSubject, combineLatest as observableCombineLatest, Subscription } from 'rxjs';
 
 import { RemoteData } from '../../core/data/remote-data';
 import { Community } from '../../core/shared/community.model';
@@ -52,6 +52,8 @@ export class CommunityPageSubCommunityListComponent implements OnInit, OnDestroy
    */
   subCommunitiesRDObs: BehaviorSubject<RemoteData<PaginatedList<Community>>> = new BehaviorSubject<RemoteData<PaginatedList<Community>>>({} as any);
 
+  subscriptions: Subscription[] = [];
+
   constructor(
     protected cds: CommunityDataService,
     protected paginationService: PaginationService,
@@ -79,7 +81,7 @@ export class CommunityPageSubCommunityListComponent implements OnInit, OnDestroy
     const pagination$ = this.paginationService.getCurrentPagination(this.config.id, this.config);
     const sort$ = this.paginationService.getCurrentSort(this.config.id, this.sortConfig);
 
-    observableCombineLatest([pagination$, sort$]).pipe(
+    this.subscriptions.push(observableCombineLatest([pagination$, sort$]).pipe(
       switchMap(([currentPagination, currentSort]) => {
         return     this.cds.findByParent(this.community.id, {
           currentPage: currentPagination.currentPage,
@@ -89,11 +91,12 @@ export class CommunityPageSubCommunityListComponent implements OnInit, OnDestroy
       })
     ).subscribe((results) => {
       this.subCommunitiesRDObs.next(results);
-    });
+    }));
   }
 
   ngOnDestroy(): void {
-    this.paginationService.clearPagination(this.config.id);
+    this.paginationService.clearPagination(this.config?.id);
+    this.subscriptions.map((subscription: Subscription) => subscription.unsubscribe());
   }
 
 }
diff --git a/src/app/core/auth/auth.interceptor.ts b/src/app/core/auth/auth.interceptor.ts
index 672879f436..751ac44049 100644
--- a/src/app/core/auth/auth.interceptor.ts
+++ b/src/app/core/auth/auth.interceptor.ts
@@ -116,12 +116,24 @@ export class AuthInterceptor implements HttpInterceptor {
    */
   private sortAuthMethods(authMethodModels: AuthMethod[]): AuthMethod[] {
     const sortedAuthMethodModels: AuthMethod[] = [];
+    let passwordAuthFound = false;
+    let ldapAuthFound = false;
+
     authMethodModels.forEach((method) => {
       if (method.authMethodType === AuthMethodType.Password) {
         sortedAuthMethodModels.push(method);
+        passwordAuthFound = true;
+      }
+      if (method.authMethodType === AuthMethodType.Ldap) {
+        ldapAuthFound = true;
       }
     });
 
+    // Using password authentication method to provide UI for LDAP authentication even if password auth is not present in server
+    if (ldapAuthFound && !(passwordAuthFound)) {
+      sortedAuthMethodModels.push(new AuthMethod(AuthMethodType.Password,0));
+    }
+
     authMethodModels.forEach((method) => {
       if (method.authMethodType !== AuthMethodType.Password) {
         sortedAuthMethodModels.push(method);
@@ -152,12 +164,12 @@ export class AuthInterceptor implements HttpInterceptor {
 
         let authMethodModel: AuthMethod;
         if (splittedRealm.length === 1) {
-          authMethodModel = new AuthMethod(methodName);
+          authMethodModel = new AuthMethod(methodName, Number(j));
           authMethodModels.push(authMethodModel);
         } else if (splittedRealm.length > 1) {
           let location = splittedRealm[1];
           location = this.parseLocation(location);
-          authMethodModel = new AuthMethod(methodName, location);
+          authMethodModel = new AuthMethod(methodName, Number(j), location);
           authMethodModels.push(authMethodModel);
         }
       }
@@ -165,7 +177,7 @@ export class AuthInterceptor implements HttpInterceptor {
       // make sure the email + password login component gets rendered first
       authMethodModels = this.sortAuthMethods(authMethodModels);
     } else {
-      authMethodModels.push(new AuthMethod(AuthMethodType.Password));
+      authMethodModels.push(new AuthMethod(AuthMethodType.Password, 0));
     }
 
     return authMethodModels;
diff --git a/src/app/core/auth/auth.reducer.spec.ts b/src/app/core/auth/auth.reducer.spec.ts
index c0619adf79..41c0312653 100644
--- a/src/app/core/auth/auth.reducer.spec.ts
+++ b/src/app/core/auth/auth.reducer.spec.ts
@@ -598,9 +598,9 @@ describe('authReducer', () => {
       authMethods: [],
       idle: false
     };
-    const authMethods = [
-      new AuthMethod(AuthMethodType.Password),
-      new AuthMethod(AuthMethodType.Shibboleth, 'location')
+    const authMethods: AuthMethod[] = [
+      new AuthMethod(AuthMethodType.Password, 0),
+      new AuthMethod(AuthMethodType.Shibboleth, 1, 'location'),
     ];
     const action = new RetrieveAuthMethodsSuccessAction(authMethods);
     const newState = authReducer(initialState, action);
@@ -632,7 +632,7 @@ describe('authReducer', () => {
       loaded: false,
       blocking: false,
       loading: false,
-      authMethods: [new AuthMethod(AuthMethodType.Password)],
+      authMethods: [new AuthMethod(AuthMethodType.Password, 0)],
       idle: false
     };
     expect(newState).toEqual(state);
diff --git a/src/app/core/auth/auth.reducer.ts b/src/app/core/auth/auth.reducer.ts
index ba9c41326a..437c19fd26 100644
--- a/src/app/core/auth/auth.reducer.ts
+++ b/src/app/core/auth/auth.reducer.ts
@@ -236,7 +236,7 @@ export function authReducer(state: any = initialState, action: AuthActions): Aut
       return Object.assign({}, state, {
         loading: false,
         blocking: false,
-        authMethods: [new AuthMethod(AuthMethodType.Password)]
+        authMethods: [new AuthMethod(AuthMethodType.Password, 0)]
       });
 
     case AuthActionTypes.SET_REDIRECT_URL:
diff --git a/src/app/core/auth/auth.service.spec.ts b/src/app/core/auth/auth.service.spec.ts
index b38d17aecd..32ceee35d6 100644
--- a/src/app/core/auth/auth.service.spec.ts
+++ b/src/app/core/auth/auth.service.spec.ts
@@ -260,7 +260,7 @@ describe('AuthService test', () => {
           (state as any).core = Object.create({});
           (state as any).core.auth = authenticatedState;
         });
-      authService = new AuthService({}, window, undefined, authReqService, mockEpersonDataService, router, routeService, cookieService, store, hardRedirectService, notificationsService, translateService);
+      authService = new AuthService(window, authReqService, mockEpersonDataService, router, routeService, cookieService, store, hardRedirectService, notificationsService, translateService);
     }));
 
     it('should return true when user is logged in', () => {
@@ -345,7 +345,7 @@ describe('AuthService test', () => {
           (state as any).core = Object.create({});
           (state as any).core.auth = authenticatedState;
         });
-      authService = new AuthService({}, window, undefined, authReqService, mockEpersonDataService, router, routeService, cookieService, store, hardRedirectService, notificationsService, translateService);
+      authService = new AuthService(window, authReqService, mockEpersonDataService, router, routeService, cookieService, store, hardRedirectService, notificationsService, translateService);
       storage = (authService as any).storage;
       routeServiceMock = TestBed.inject(RouteService);
       routerStub = TestBed.inject(Router);
@@ -565,7 +565,7 @@ describe('AuthService test', () => {
           (state as any).core = Object.create({});
           (state as any).core.auth = unAuthenticatedState;
         });
-      authService = new AuthService({}, window, undefined, authReqService, mockEpersonDataService, router, routeService, cookieService, store, hardRedirectService, notificationsService, translateService);
+      authService = new AuthService(window, authReqService, mockEpersonDataService, router, routeService, cookieService, store, hardRedirectService, notificationsService, translateService);
     }));
 
     it('should return null for the shortlived token', () => {
@@ -605,7 +605,7 @@ describe('AuthService test', () => {
           (state as any).core = Object.create({});
           (state as any).core.auth = idleState;
         });
-      authService = new AuthService({}, window, undefined, authReqService, mockEpersonDataService, router, routeService, cookieService, store, hardRedirectService, notificationsService, translateService);
+      authService = new AuthService(window, authReqService, mockEpersonDataService, router, routeService, cookieService, store, hardRedirectService, notificationsService, translateService);
     }));
 
     it('isUserIdle should return true when user is not idle', () => {
diff --git a/src/app/core/auth/auth.service.ts b/src/app/core/auth/auth.service.ts
index 6604936cde..3a83674b7f 100644
--- a/src/app/core/auth/auth.service.ts
+++ b/src/app/core/auth/auth.service.ts
@@ -1,7 +1,6 @@
-import { Inject, Injectable, Optional } from '@angular/core';
+import { Inject, Injectable } from '@angular/core';
 import { Router } from '@angular/router';
 import { HttpHeaders } from '@angular/common/http';
-import { REQUEST, RESPONSE } from '@nguniversal/express-engine/tokens';
 
 import { Observable, of as observableOf } from 'rxjs';
 import { filter, map, startWith, switchMap, take } from 'rxjs/operators';
@@ -79,18 +78,17 @@ export class AuthService {
    */
   private tokenRefreshTimer;
 
-  constructor(@Inject(REQUEST) protected req: any,
-              @Inject(NativeWindowService) protected _window: NativeWindowRef,
-              @Optional() @Inject(RESPONSE) private response: any,
-              protected authRequestService: AuthRequestService,
-              protected epersonService: EPersonDataService,
-              protected router: Router,
-              protected routeService: RouteService,
-              protected storage: CookieService,
-              protected store: Store<AppState>,
-              protected hardRedirectService: HardRedirectService,
-              private notificationService: NotificationsService,
-              private translateService: TranslateService
+  constructor(
+    @Inject(NativeWindowService) protected _window: NativeWindowRef,
+    protected authRequestService: AuthRequestService,
+    protected epersonService: EPersonDataService,
+    protected router: Router,
+    protected routeService: RouteService,
+    protected storage: CookieService,
+    protected store: Store<AppState>,
+    protected hardRedirectService: HardRedirectService,
+    protected notificationService: NotificationsService,
+    protected translateService: TranslateService
   ) {
     this.store.pipe(
       // when this service is constructed the store is not fully initialized yet
@@ -119,7 +117,7 @@ export class AuthService {
         if (hasValue(rd.payload) && rd.payload.authenticated) {
           return rd.payload;
         } else {
-          throw (new Error('Invalid email or password'));
+          throw (new Error('auth.errors.invalid-user'));
         }
       }));
 
@@ -473,10 +471,6 @@ export class AuthService {
     if (this._window.nativeWindow.location) {
       // Hard redirect to login page, so that all state is definitely lost
       this._window.nativeWindow.location.href = redirectUrl;
-    } else if (this.response) {
-      if (!this.response._headerSent) {
-        this.response.redirect(302, redirectUrl);
-      }
     } else {
       this.router.navigateByUrl(redirectUrl);
     }
diff --git a/src/app/core/auth/models/auth.method.ts b/src/app/core/auth/models/auth.method.ts
index 0579ae0cd1..b84e7a308a 100644
--- a/src/app/core/auth/models/auth.method.ts
+++ b/src/app/core/auth/models/auth.method.ts
@@ -2,11 +2,12 @@ import { AuthMethodType } from './auth.method-type';
 
 export class AuthMethod {
   authMethodType: AuthMethodType;
+  position: number;
   location?: string;
 
-  // isStandalonePage? = true;
+  constructor(authMethodName: string, position: number, location?: string) {
+    this.position = position;
 
-  constructor(authMethodName: string, location?: string) {
     switch (authMethodName) {
       case 'ip': {
         this.authMethodType = AuthMethodType.Ip;
diff --git a/src/app/core/auth/server-auth.service.ts b/src/app/core/auth/server-auth.service.ts
index fc8ab18bfb..e2d5ec8131 100644
--- a/src/app/core/auth/server-auth.service.ts
+++ b/src/app/core/auth/server-auth.service.ts
@@ -1,15 +1,25 @@
-import { Injectable } from '@angular/core';
+import { Injectable, Inject, Optional } from '@angular/core';
 import { HttpHeaders } from '@angular/common/http';
-
+import { REQUEST, RESPONSE } from '@nguniversal/express-engine/tokens';
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
-
 import { hasValue, isNotEmpty } from '../../shared/empty.util';
 import { HttpOptions } from '../dspace-rest/dspace-rest.service';
-import { AuthService } from './auth.service';
+import { AuthService, LOGIN_ROUTE } from './auth.service';
 import { AuthStatus } from './models/auth-status.model';
 import { AuthTokenInfo } from './models/auth-token-info.model';
 import { RemoteData } from '../data/remote-data';
+import { NativeWindowService, NativeWindowRef } from '../services/window.service';
+import { AuthRequestService } from './auth-request.service';
+import { EPersonDataService } from '../eperson/eperson-data.service';
+import { Router } from '@angular/router';
+import { RouteService } from '../services/route.service';
+import { CookieService } from '../services/cookie.service';
+import { Store } from '@ngrx/store';
+import { AppState } from '../../app.reducer';
+import { HardRedirectService } from '../services/hard-redirect.service';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { TranslateService } from '@ngx-translate/core';
 
 /**
  * The auth service.
@@ -17,6 +27,34 @@ import { RemoteData } from '../data/remote-data';
 @Injectable()
 export class ServerAuthService extends AuthService {
 
+  constructor(
+    @Inject(REQUEST) protected req: any,
+    @Optional() @Inject(RESPONSE) private response: any,
+    @Inject(NativeWindowService) protected _window: NativeWindowRef,
+    protected authRequestService: AuthRequestService,
+    protected epersonService: EPersonDataService,
+    protected router: Router,
+    protected routeService: RouteService,
+    protected storage: CookieService,
+    protected store: Store<AppState>,
+    protected hardRedirectService: HardRedirectService,
+    protected notificationService: NotificationsService,
+    protected translateService: TranslateService
+  ) {
+    super(
+      _window,
+      authRequestService,
+      epersonService,
+      router,
+      routeService,
+      storage,
+      store,
+      hardRedirectService,
+      notificationService,
+      translateService
+    );
+  }
+
   /**
    * Returns the authenticated user
    * @returns {User}
@@ -60,4 +98,18 @@ export class ServerAuthService extends AuthService {
       map((rd: RemoteData<AuthStatus>) => Object.assign(new AuthStatus(), rd.payload))
     );
   }
+
+  override redirectToLoginWhenTokenExpired() {
+    const redirectUrl = LOGIN_ROUTE + '?expired=true';
+    if (this._window.nativeWindow.location) {
+      // Hard redirect to login page, so that all state is definitely lost
+      this._window.nativeWindow.location.href = redirectUrl;
+    } else if (this.response) {
+      if (!this.response._headerSent) {
+        this.response.redirect(302, redirectUrl);
+      }
+    } else {
+      this.router.navigateByUrl(redirectUrl);
+    }
+  }
 }
diff --git a/src/app/core/breadcrumbs/community-breadcrumb.resolver.ts b/src/app/core/breadcrumbs/community-breadcrumb.resolver.ts
index 309927771d..ea96f6d43a 100644
--- a/src/app/core/breadcrumbs/community-breadcrumb.resolver.ts
+++ b/src/app/core/breadcrumbs/community-breadcrumb.resolver.ts
@@ -5,6 +5,10 @@ import { CommunityDataService } from '../data/community-data.service';
 import { Community } from '../shared/community.model';
 import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
 import { COMMUNITY_PAGE_LINKS_TO_FOLLOW } from '../../community-page/community-page.resolver';
+import { ActivatedRouteSnapshot, RouterStateSnapshot } from '@angular/router';
+import { Observable } from 'rxjs';
+import { BreadcrumbConfig } from '../../breadcrumbs/breadcrumb/breadcrumb-config.model';
+import { hasValue } from '../../shared/empty.util';
 
 /**
  * The class that resolves the BreadcrumbConfig object for a Community
@@ -17,6 +21,23 @@ export class CommunityBreadcrumbResolver extends DSOBreadcrumbResolver<Community
     super(breadcrumbService, dataService);
   }
 
+  /**
+   * Method to retrieve the breadcrumb config by the route id. It is also possible to retrieve the id through the
+   * query parameters. This is done by defining the name of the query parameter in the data section under the property
+   * breadcrumbQueryParam.
+   *
+   * @param route The current {@link ActivatedRouteSnapshot}
+   * @param state The current {@link RouterStateSnapshot}
+   * @returns BreadcrumbConfig object
+   */
+  override resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<BreadcrumbConfig<Community>> {
+    if (hasValue(route.data.breadcrumbQueryParam) && hasValue(route.queryParams[route.data.breadcrumbQueryParam])) {
+      return this.resolveById(route.queryParams[route.data.breadcrumbQueryParam]);
+    } else {
+      return super.resolve(route, state);
+    }
+  }
+
   /**
    * Method that returns the follow links to already resolve
    * The self links defined in this list are expected to be requested somewhere in the near future
diff --git a/src/app/core/breadcrumbs/dso-breadcrumb.resolver.spec.ts b/src/app/core/breadcrumbs/dso-breadcrumb.resolver.spec.ts
index e35e26e46f..d7d63669f1 100644
--- a/src/app/core/breadcrumbs/dso-breadcrumb.resolver.spec.ts
+++ b/src/app/core/breadcrumbs/dso-breadcrumb.resolver.spec.ts
@@ -18,7 +18,10 @@ describe('DSOBreadcrumbResolver', () => {
       uuid = '1234-65487-12354-1235';
       breadcrumbUrl = '/collections/' + uuid;
       currentUrl = breadcrumbUrl + '/edit';
-      testCollection = Object.assign(new Collection(), { uuid });
+      testCollection = Object.assign(new Collection(), {
+        uuid: uuid,
+        type: 'collection',
+      });
       dsoBreadcrumbService = {};
       collectionService = {
         findById: (id: string) => createSuccessfulRemoteDataObject$(testCollection)
diff --git a/src/app/core/breadcrumbs/dso-breadcrumb.resolver.ts b/src/app/core/breadcrumbs/dso-breadcrumb.resolver.ts
index 8be4e5e099..165cfd0382 100644
--- a/src/app/core/breadcrumbs/dso-breadcrumb.resolver.ts
+++ b/src/app/core/breadcrumbs/dso-breadcrumb.resolver.ts
@@ -10,6 +10,7 @@ import { ChildHALResource } from '../shared/child-hal-resource.model';
 import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
 import { hasValue } from '../../shared/empty.util';
 import { IdentifiableDataService } from '../data/base/identifiable-data.service';
+import { getDSORoute } from '../../app-routing-paths';
 
 /**
  * The class that resolves the BreadcrumbConfig object for a DSpaceObject
@@ -31,15 +32,22 @@ export abstract class DSOBreadcrumbResolver<T extends ChildHALResource & DSpaceO
    * @returns BreadcrumbConfig object
    */
   resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<BreadcrumbConfig<T>> {
-    const uuid = route.params.id;
+    return this.resolveById(route.params.id);
+  }
+
+  /**
+   * Method for resolving a breadcrumb by id
+   *
+   * @param uuid The uuid to resolve
+   * @returns BreadcrumbConfig object
+   */
+  resolveById(uuid: string): Observable<BreadcrumbConfig<T>> {
     return this.dataService.findById(uuid, true, false, ...this.followLinks).pipe(
       getFirstCompletedRemoteData(),
       getRemoteDataPayload(),
       map((object: T) => {
         if (hasValue(object)) {
-          const fullPath = state.url;
-          const url = fullPath.substr(0, fullPath.indexOf(uuid)) + uuid;
-          return { provider: this.breadcrumbService, key: object, url: url };
+          return { provider: this.breadcrumbService, key: object, url: getDSORoute(object) };
         } else {
           return undefined;
         }
diff --git a/src/app/core/breadcrumbs/dso-name.service.spec.ts b/src/app/core/breadcrumbs/dso-name.service.spec.ts
index 9f2f76599a..81c7591334 100644
--- a/src/app/core/breadcrumbs/dso-name.service.spec.ts
+++ b/src/app/core/breadcrumbs/dso-name.service.spec.ts
@@ -9,6 +9,10 @@ describe(`DSONameService`, () => {
   let service: DSONameService;
   let mockPersonName: string;
   let mockPerson: DSpaceObject;
+  let mockEPersonNameFirst: string;
+  let mockEPersonFirst: DSpaceObject;
+  let mockEPersonName: string;
+  let mockEPerson: DSpaceObject;
   let mockOrgUnitName: string;
   let mockOrgUnit: DSpaceObject;
   let mockDSOName: string;
@@ -25,6 +29,26 @@ describe(`DSONameService`, () => {
       }
     });
 
+    mockEPersonName = 'John Doe';
+    mockEPerson = Object.assign(new DSpaceObject(), {
+      firstMetadataValue(keyOrKeys: string | string[], valueFilter?: MetadataValueFilter): string {
+        return mockEPersonName;
+      },
+      getRenderTypes(): (string | GenericConstructor<ListableObject>)[] {
+        return ['EPerson', Item, DSpaceObject];
+      },
+    });
+
+    mockEPersonNameFirst = 'John';
+    mockEPersonFirst = Object.assign(new DSpaceObject(), {
+      firstMetadataValue(keyOrKeys: string | string[], valueFilter?: MetadataValueFilter): string {
+        return mockEPersonNameFirst;
+      },
+      getRenderTypes(): (string | GenericConstructor<ListableObject>)[] {
+        return ['EPerson', Item, DSpaceObject];
+      },
+    });
+
     mockOrgUnitName = 'Molecular Spectroscopy';
     mockOrgUnit = Object.assign(new DSpaceObject(), {
       firstMetadataValue(keyOrKeys: string | string[], valueFilter?: MetadataValueFilter): string {
@@ -67,6 +91,15 @@ describe(`DSONameService`, () => {
       expect(result).toBe('Bingo!');
     });
 
+    it(`should use the EPerson factory for EPerson objects`, () => {
+      spyOn((service as any).factories, 'EPerson').and.returnValue('Bingo!');
+
+      const result = service.getName(mockEPerson);
+
+      expect((service as any).factories.EPerson).toHaveBeenCalledWith(mockEPerson);
+      expect(result).toBe('Bingo!');
+    });
+
     it(`should use the Default factory for regular DSpaceObjects`, () => {
       spyOn((service as any).factories, 'Default').and.returnValue('Bingo!');
 
@@ -107,6 +140,35 @@ describe(`DSONameService`, () => {
     });
   });
 
+  describe(`factories.EPerson`, () => {
+    describe(`with eperson.firstname and without eperson.lastname`, () => {
+      beforeEach(() => {
+        spyOn(mockEPerson, 'firstMetadataValue').and.returnValues(...mockEPersonName.split(' '));
+      });
+
+      it(`should return 'eperson.firstname' and 'eperson.lastname'`, () => {
+        const result = (service as any).factories.EPerson(mockEPerson);
+        expect(result).toBe(mockEPersonName);
+        expect(mockEPerson.firstMetadataValue).toHaveBeenCalledWith('eperson.firstname');
+        expect(mockEPerson.firstMetadataValue).toHaveBeenCalledWith('eperson.lastname');
+      });
+    });
+
+    describe(` with eperson.firstname and without eperson.lastname`, () => {
+      beforeEach(() => {
+        spyOn(mockEPersonFirst, 'firstMetadataValue').and.returnValues(mockEPersonNameFirst, undefined);
+      });
+
+      it(`should return 'eperson.firstname'`, () => {
+        const result = (service as any).factories.EPerson(mockEPersonFirst);
+        expect(result).toBe(mockEPersonNameFirst);
+        expect(mockEPersonFirst.firstMetadataValue).toHaveBeenCalledWith('eperson.firstname');
+        expect(mockEPersonFirst.firstMetadataValue).toHaveBeenCalledWith('eperson.lastname');
+      });
+    });
+  });
+
+
   describe(`factories.OrgUnit`, () => {
     beforeEach(() => {
       spyOn(mockOrgUnit, 'firstMetadataValue').and.callThrough();
diff --git a/src/app/core/breadcrumbs/dso-name.service.ts b/src/app/core/breadcrumbs/dso-name.service.ts
index ddd97705b0..8e4fb771c6 100644
--- a/src/app/core/breadcrumbs/dso-name.service.ts
+++ b/src/app/core/breadcrumbs/dso-name.service.ts
@@ -50,7 +50,7 @@ export class DSONameService {
       }
     },
     OrgUnit: (dso: DSpaceObject): string => {
-      return dso.firstMetadataValue('organization.legalName');
+      return dso.firstMetadataValue('organization.legalName') || this.translateService.instant('dso.name.untitled');
     },
     Default: (dso: DSpaceObject): string => {
       // If object doesn't have dc.title metadata use name property
@@ -106,7 +106,7 @@ export class DSONameService {
       }
       return `${familyName}, ${givenName}`;
     } else if (entityType === 'OrgUnit') {
-      return this.firstMetadataValue(object, dso, 'organization.legalName');
+      return this.firstMetadataValue(object, dso, 'organization.legalName') || this.translateService.instant('dso.name.untitled');
     }
     return this.firstMetadataValue(object, dso, 'dc.title') || dso.name || this.translateService.instant('dso.name.untitled');
   }
diff --git a/src/app/core/breadcrumbs/item-breadcrumb.resolver.ts b/src/app/core/breadcrumbs/item-breadcrumb.resolver.ts
index 3005b6f09a..f396fd08dd 100644
--- a/src/app/core/breadcrumbs/item-breadcrumb.resolver.ts
+++ b/src/app/core/breadcrumbs/item-breadcrumb.resolver.ts
@@ -4,7 +4,7 @@ import { ItemDataService } from '../data/item-data.service';
 import { Item } from '../shared/item.model';
 import { DSOBreadcrumbResolver } from './dso-breadcrumb.resolver';
 import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
-import { ITEM_PAGE_LINKS_TO_FOLLOW } from '../../item-page/item.resolver';
+import { getItemPageLinksToFollow } from '../../item-page/item.resolver';
 
 /**
  * The class that resolves the BreadcrumbConfig object for an Item
@@ -23,6 +23,6 @@ export class ItemBreadcrumbResolver extends DSOBreadcrumbResolver<Item> {
    * Requesting them as embeds will limit the number of requests
    */
   get followLinks(): FollowLinkConfig<Item>[] {
-    return ITEM_PAGE_LINKS_TO_FOLLOW;
+    return getItemPageLinksToFollow();
   }
 }
diff --git a/src/app/core/browse/browse.service.spec.ts b/src/app/core/browse/browse.service.spec.ts
index 9f166e3d19..f7027fc91e 100644
--- a/src/app/core/browse/browse.service.spec.ts
+++ b/src/app/core/browse/browse.service.spec.ts
@@ -1,10 +1,8 @@
 import { cold, getTestScheduler, hot } from 'jasmine-marbles';
 import { of as observableOf } from 'rxjs';
 import { TestScheduler } from 'rxjs/testing';
-import { getMockRemoteDataBuildService } from '../../shared/mocks/remote-data-build.service.mock';
 import { getMockRequestService } from '../../shared/mocks/request.service.mock';
 import { HALEndpointServiceStub } from '../../shared/testing/hal-endpoint-service.stub';
-import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { RequestService } from '../data/request.service';
 import { BrowseEntrySearchOptions } from './browse-entry-search-options.model';
 import { BrowseService } from './browse.service';
@@ -20,7 +18,6 @@ describe('BrowseService', () => {
   let scheduler: TestScheduler;
   let service: BrowseService;
   let requestService: RequestService;
-  let rdbService: RemoteDataBuildService;
 
   const browsesEndpointURL = 'https://rest.api/browses';
   const halService: any = new HALEndpointServiceStub(browsesEndpointURL);
@@ -118,7 +115,6 @@ describe('BrowseService', () => {
       halService,
       browseDefinitionDataService,
       hrefOnlyDataService,
-      rdbService
     );
   }
 
@@ -130,11 +126,9 @@ describe('BrowseService', () => {
 
     beforeEach(() => {
       requestService = getMockRequestService(getRequestEntry$(true));
-      rdbService = getMockRemoteDataBuildService();
       service = initTestService();
       spyOn(halService, 'getEndpoint').and
         .returnValue(hot('--a-', { a: browsesEndpointURL }));
-      spyOn(rdbService, 'buildList').and.callThrough();
     });
 
     it('should call BrowseDefinitionDataService to create the RemoteData Observable', () => {
@@ -151,9 +145,7 @@ describe('BrowseService', () => {
 
     beforeEach(() => {
       requestService = getMockRequestService(getRequestEntry$(true));
-      rdbService = getMockRemoteDataBuildService();
       service = initTestService();
-      spyOn(rdbService, 'buildList').and.callThrough();
     });
 
     describe('when getBrowseEntriesFor is called with a valid browse definition id', () => {
@@ -204,7 +196,6 @@ describe('BrowseService', () => {
     describe('if getBrowseDefinitions fires', () => {
       beforeEach(() => {
         requestService = getMockRequestService(getRequestEntry$(true));
-        rdbService = getMockRemoteDataBuildService();
         service = initTestService();
         spyOn(service, 'getBrowseDefinitions').and
           .returnValue(hot('--a-', {
@@ -259,7 +250,6 @@ describe('BrowseService', () => {
     describe('if getBrowseDefinitions doesn\'t fire', () => {
       it('should return undefined', () => {
         requestService = getMockRequestService(getRequestEntry$(true));
-        rdbService = getMockRemoteDataBuildService();
         service = initTestService();
         spyOn(service, 'getBrowseDefinitions').and
           .returnValue(hot('----'));
@@ -277,9 +267,7 @@ describe('BrowseService', () => {
   describe('getFirstItemFor', () => {
     beforeEach(() => {
       requestService = getMockRequestService();
-      rdbService = getMockRemoteDataBuildService();
       service = initTestService();
-      spyOn(rdbService, 'buildList').and.callThrough();
     });
 
     describe('when getFirstItemFor is called with a valid browse definition id', () => {
diff --git a/src/app/core/browse/browse.service.ts b/src/app/core/browse/browse.service.ts
index b210b34949..db1edf8b11 100644
--- a/src/app/core/browse/browse.service.ts
+++ b/src/app/core/browse/browse.service.ts
@@ -2,7 +2,6 @@ import { Injectable } from '@angular/core';
 import { Observable } from 'rxjs';
 import { distinctUntilChanged, map, startWith } from 'rxjs/operators';
 import { hasValue, hasValueOperator, isEmpty, isNotEmpty } from '../../shared/empty.util';
-import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { PaginatedList } from '../data/paginated-list.model';
 import { RemoteData } from '../data/remote-data';
 import { RequestService } from '../data/request.service';
@@ -24,11 +23,18 @@ import { HrefOnlyDataService } from '../data/href-only-data.service';
 import { followLink, FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
 import { BrowseDefinitionDataService } from './browse-definition-data.service';
 import { SortDirection } from '../cache/models/sort-options.model';
+import { environment } from '../../../environments/environment';
 
 
-export const BROWSE_LINKS_TO_FOLLOW: FollowLinkConfig<BrowseEntry | Item>[] = [
-  followLink('thumbnail')
-];
+export function getBrowseLinksToFollow(): FollowLinkConfig<BrowseEntry | Item>[] {
+  const followLinks = [
+    followLink('thumbnail'),
+  ];
+  if (environment.item.showAccessStatuses) {
+    followLinks.push(followLink('accessStatus'));
+  }
+  return followLinks;
+}
 
 /**
  * The service handling all browse requests
@@ -55,7 +61,6 @@ export class BrowseService {
     protected halService: HALEndpointService,
     private browseDefinitionDataService: BrowseDefinitionDataService,
     private hrefOnlyDataService: HrefOnlyDataService,
-    private rdb: RemoteDataBuildService,
   ) {
   }
 
@@ -105,7 +110,7 @@ export class BrowseService {
       })
     );
     if (options.fetchThumbnail ) {
-      return this.hrefOnlyDataService.findListByHref<BrowseEntry>(href$, {}, null, null, ...BROWSE_LINKS_TO_FOLLOW);
+      return this.hrefOnlyDataService.findListByHref<BrowseEntry>(href$, {}, undefined, undefined, ...getBrowseLinksToFollow());
     }
     return this.hrefOnlyDataService.findListByHref<BrowseEntry>(href$);
   }
@@ -153,7 +158,7 @@ export class BrowseService {
       }),
     );
     if (options.fetchThumbnail) {
-      return this.hrefOnlyDataService.findListByHref<Item>(href$, {}, null, null, ...BROWSE_LINKS_TO_FOLLOW);
+      return this.hrefOnlyDataService.findListByHref<Item>(href$, {}, undefined, undefined, ...getBrowseLinksToFollow());
     }
     return this.hrefOnlyDataService.findListByHref<Item>(href$);
   }
diff --git a/src/app/core/cache/models/request-param.model.ts b/src/app/core/cache/models/request-param.model.ts
index ac21fe0b8a..b78fa45e33 100644
--- a/src/app/core/cache/models/request-param.model.ts
+++ b/src/app/core/cache/models/request-param.model.ts
@@ -1,9 +1,14 @@
-
 /**
  * Class representing a query parameter (query?fieldName=fieldValue) used in FindListOptions object
  */
 export class RequestParam {
-  constructor(public fieldName: string, public fieldValue: any) {
-
+  constructor(
+    public fieldName: string,
+    public fieldValue: any,
+    public encodeValue = true,
+  ) {
+    if (encodeValue) {
+      this.fieldValue = encodeURIComponent(fieldValue);
+    }
   }
 }
diff --git a/src/app/core/cache/object-cache.reducer.ts b/src/app/core/cache/object-cache.reducer.ts
index dc3f50db68..21dc729f1b 100644
--- a/src/app/core/cache/object-cache.reducer.ts
+++ b/src/app/core/cache/object-cache.reducer.ts
@@ -166,20 +166,25 @@ export function objectCacheReducer(state = initialState, action: ObjectCacheActi
  *    the new state, with the object added, or overwritten.
  */
 function addToObjectCache(state: ObjectCacheState, action: AddToObjectCacheAction): ObjectCacheState {
-  const existing = state[action.payload.objectToCache._links.self.href] || {} as any;
+  const cacheLink = hasValue(action.payload.objectToCache?._links?.self) ? action.payload.objectToCache._links.self.href : action.payload.alternativeLink;
+  const existing = state[cacheLink] || {} as any;
   const newAltLinks = hasValue(action.payload.alternativeLink) ? [action.payload.alternativeLink] : [];
-  return Object.assign({}, state, {
-    [action.payload.objectToCache._links.self.href]: {
-      data: action.payload.objectToCache,
-      timeCompleted: action.payload.timeCompleted,
-      msToLive: action.payload.msToLive,
-      requestUUIDs: [action.payload.requestUUID, ...(existing.requestUUIDs || [])],
-      dependentRequestUUIDs: existing.dependentRequestUUIDs || [],
-      isDirty: isNotEmpty(existing.patches),
-      patches: existing.patches || [],
-      alternativeLinks: [...(existing.alternativeLinks || []), ...newAltLinks]
-    } as ObjectCacheEntry
-  });
+  if (hasValue(cacheLink)) {
+    return Object.assign({}, state, {
+      [cacheLink]: {
+        data: action.payload.objectToCache,
+        timeCompleted: action.payload.timeCompleted,
+        msToLive: action.payload.msToLive,
+        requestUUIDs: [action.payload.requestUUID, ...(existing.requestUUIDs || [])],
+        dependentRequestUUIDs: existing.dependentRequestUUIDs || [],
+        isDirty: isNotEmpty(existing.patches),
+        patches: existing.patches || [],
+        alternativeLinks: [...(existing.alternativeLinks || []), ...newAltLinks]
+      } as ObjectCacheEntry
+    });
+  } else {
+    return state;
+  }
 }
 
 /**
diff --git a/src/app/core/cache/object-cache.service.ts b/src/app/core/cache/object-cache.service.ts
index 9ca0216210..0330a03f02 100644
--- a/src/app/core/cache/object-cache.service.ts
+++ b/src/app/core/cache/object-cache.service.ts
@@ -63,7 +63,9 @@ export class ObjectCacheService {
    *    An optional alternative link to this object
    */
   add(object: CacheableObject, msToLive: number, requestUUID: string, alternativeLink?: string): void {
-    object = this.linkService.removeResolvedLinks(object); // Ensure the object we're storing has no resolved links
+    if (hasValue(object)) {
+      object = this.linkService.removeResolvedLinks(object); // Ensure the object we're storing has no resolved links
+    }
     this.store.dispatch(new AddToObjectCacheAction(object, new Date().getTime(), msToLive, requestUUID, alternativeLink));
   }
 
@@ -139,11 +141,15 @@ export class ObjectCacheService {
         }
       ),
       map((entry: ObjectCacheEntry) => {
-        const type: GenericConstructor<T> = getClassForType((entry.data as any).type);
-        if (typeof type !== 'function') {
-          throw new Error(`${type} is not a valid constructor for ${JSON.stringify(entry.data)}`);
+        if (hasValue(entry.data)) {
+          const type: GenericConstructor<T> = getClassForType((entry.data as any).type);
+          if (typeof type !== 'function') {
+            throw new Error(`${type} is not a valid constructor for ${JSON.stringify(entry.data)}`);
+          }
+          return Object.assign(new type(), entry.data) as T;
+        } else {
+          return null;
         }
-        return Object.assign(new type(), entry.data) as T;
       })
     );
   }
diff --git a/src/app/core/core.effects.ts b/src/app/core/core.effects.ts
index b569df290d..1724e88743 100644
--- a/src/app/core/core.effects.ts
+++ b/src/app/core/core.effects.ts
@@ -7,6 +7,7 @@ import { ServerSyncBufferEffects } from './cache/server-sync-buffer.effects';
 import { ObjectUpdatesEffects } from './data/object-updates/object-updates.effects';
 import { RouteEffects } from './services/route.effects';
 import { RouterEffects } from './router/router.effects';
+import { MenuEffects } from '../shared/menu/menu.effects';
 
 export const coreEffects = [
   RequestEffects,
@@ -18,4 +19,5 @@ export const coreEffects = [
   ObjectUpdatesEffects,
   RouteEffects,
   RouterEffects,
+  MenuEffects,
 ];
diff --git a/src/app/core/core.module.ts b/src/app/core/core.module.ts
index dbca773375..dd46509315 100644
--- a/src/app/core/core.module.ts
+++ b/src/app/core/core.module.ts
@@ -182,6 +182,7 @@ import { FlatBrowseDefinition } from './shared/flat-browse-definition.model';
 import { ValueListBrowseDefinition } from './shared/value-list-browse-definition.model';
 import { NonHierarchicalBrowseDefinition } from './shared/non-hierarchical-browse-definition';
 import { BulkAccessConditionOptions } from './config/models/bulk-access-condition-options.model';
+import { SubmissionParentBreadcrumbsService } from './submission/submission-parent-breadcrumb.service';
 
 /**
  * When not in production, endpoint responses can be mocked for testing purposes
@@ -245,6 +246,7 @@ const PROVIDERS = [
   NotificationsService,
   WorkspaceitemDataService,
   WorkflowItemDataService,
+  SubmissionParentBreadcrumbsService,
   DSpaceObjectDataService,
   ConfigurationDataService,
   DSOChangeAnalyzer,
diff --git a/src/app/core/data/base/base-data.service.spec.ts b/src/app/core/data/base/base-data.service.spec.ts
index 098f075c10..1397e3ce9a 100644
--- a/src/app/core/data/base/base-data.service.spec.ts
+++ b/src/app/core/data/base/base-data.service.spec.ts
@@ -50,6 +50,7 @@ describe('BaseDataService', () => {
   let selfLink;
   let linksToFollow;
   let testScheduler;
+  let remoteDataTimestamp: number;
   let remoteDataMocks;
 
   function initTestService(): TestService {
@@ -86,19 +87,22 @@ describe('BaseDataService', () => {
       expect(actual).toEqual(expected);
     });
 
-    const timeStamp = new Date().getTime();
+    // The response's lastUpdated equals the time of 60 seconds after the test started, ensuring they are not perceived
+    // as cached values.
+    remoteDataTimestamp = new Date().getTime() + 60 * 1000;
     const msToLive = 15 * 60 * 1000;
     const payload = { foo: 'bar' };
     const statusCodeSuccess = 200;
     const statusCodeError = 404;
     const errorMessage = 'not found';
     remoteDataMocks = {
-      RequestPending: new RemoteData(undefined, msToLive, timeStamp, RequestEntryState.RequestPending, undefined, undefined, undefined),
-      ResponsePending: new RemoteData(undefined, msToLive, timeStamp, RequestEntryState.ResponsePending, undefined, undefined, undefined),
-      Success: new RemoteData(timeStamp, msToLive, timeStamp, RequestEntryState.Success, undefined, payload, statusCodeSuccess),
-      SuccessStale: new RemoteData(timeStamp, msToLive, timeStamp, RequestEntryState.SuccessStale, undefined, payload, statusCodeSuccess),
-      Error: new RemoteData(timeStamp, msToLive, timeStamp, RequestEntryState.Error, errorMessage, undefined, statusCodeError),
-      ErrorStale: new RemoteData(timeStamp, msToLive, timeStamp, RequestEntryState.ErrorStale, errorMessage, undefined, statusCodeError),
+      RequestPending: new RemoteData(undefined, msToLive, remoteDataTimestamp, RequestEntryState.RequestPending, undefined, undefined, undefined),
+      ResponsePending: new RemoteData(undefined, msToLive, remoteDataTimestamp, RequestEntryState.ResponsePending, undefined, undefined, undefined),
+      ResponsePendingStale: new RemoteData(undefined, msToLive, remoteDataTimestamp, RequestEntryState.ResponsePendingStale, undefined, undefined, undefined),
+      Success: new RemoteData(remoteDataTimestamp, msToLive, remoteDataTimestamp, RequestEntryState.Success, undefined, payload, statusCodeSuccess),
+      SuccessStale: new RemoteData(remoteDataTimestamp, msToLive, remoteDataTimestamp, RequestEntryState.SuccessStale, undefined, payload, statusCodeSuccess),
+      Error: new RemoteData(remoteDataTimestamp, msToLive, remoteDataTimestamp, RequestEntryState.Error, errorMessage, undefined, statusCodeError),
+      ErrorStale: new RemoteData(remoteDataTimestamp, msToLive, remoteDataTimestamp, RequestEntryState.ErrorStale, errorMessage, undefined, statusCodeError),
     };
 
     return new TestService(
@@ -303,19 +307,21 @@ describe('BaseDataService', () => {
 
       it(`should not emit a cached stale RemoteData, but only start emitting after the state first changes to RequestPending`, () => {
         testScheduler.run(({ cold, expectObservable }) => {
-          spyOn(rdbService, 'buildSingle').and.returnValue(cold('a-b-c-d-e', {
-            a: remoteDataMocks.SuccessStale,
-            b: remoteDataMocks.RequestPending,
-            c: remoteDataMocks.ResponsePending,
-            d: remoteDataMocks.Success,
-            e: remoteDataMocks.SuccessStale,
+          spyOn(rdbService, 'buildSingle').and.returnValue(cold('a-b-c-d-e-f-g', {
+            a: remoteDataMocks.ResponsePendingStale,
+            b: remoteDataMocks.SuccessStale,
+            c: remoteDataMocks.ErrorStale,
+            d: remoteDataMocks.RequestPending,
+            e: remoteDataMocks.ResponsePending,
+            f: remoteDataMocks.Success,
+            g: remoteDataMocks.SuccessStale,
           }));
-          const expected = '--b-c-d-e';
+          const expected = '------d-e-f-g';
           const values = {
-            b: remoteDataMocks.RequestPending,
-            c: remoteDataMocks.ResponsePending,
-            d: remoteDataMocks.Success,
-            e: remoteDataMocks.SuccessStale,
+            d: remoteDataMocks.RequestPending,
+            e: remoteDataMocks.ResponsePending,
+            f: remoteDataMocks.Success,
+            g: remoteDataMocks.SuccessStale,
           };
 
           expectObservable(service.findByHref(selfLink, true, true, ...linksToFollow)).toBe(expected, values);
@@ -330,11 +336,15 @@ describe('BaseDataService', () => {
         spyOn(service as any, 'reRequestStaleRemoteData').and.callFake(() => (source) => source);
       });
 
-
-      it(`should not emit a cached completed RemoteData, but only start emitting after the state first changes to RequestPending`, () => {
+      it('should not emit a cached completed RemoteData', () => {
+        // Old cached value from 1 minute before the test started
+        const oldCachedSucceededData: RemoteData<any> = Object.assign({}, remoteDataMocks.Success, {
+          timeCompleted: remoteDataTimestamp - 2 * 60 * 1000,
+          lastUpdated: remoteDataTimestamp - 2 * 60 * 1000,
+        } as RemoteData<any>);
         testScheduler.run(({ cold, expectObservable }) => {
           spyOn(rdbService, 'buildSingle').and.returnValue(cold('a-b-c-d-e', {
-            a: remoteDataMocks.Success,
+            a: oldCachedSucceededData,
             b: remoteDataMocks.RequestPending,
             c: remoteDataMocks.ResponsePending,
             d: remoteDataMocks.Success,
@@ -352,21 +362,39 @@ describe('BaseDataService', () => {
         });
       });
 
+      it('should emit the first completed RemoteData since the request was made', () => {
+        testScheduler.run(({ cold, expectObservable }) => {
+          spyOn(rdbService, 'buildSingle').and.returnValue(cold('a-b', {
+            a: remoteDataMocks.Success,
+            b: remoteDataMocks.SuccessStale,
+          }));
+          const expected = 'a-b';
+          const values = {
+            a: remoteDataMocks.Success,
+            b: remoteDataMocks.SuccessStale,
+          };
+
+          expectObservable(service.findByHref(selfLink, false, true, ...linksToFollow)).toBe(expected, values);
+        });
+      });
+
       it(`should not emit a cached stale RemoteData, but only start emitting after the state first changes to RequestPending`, () => {
         testScheduler.run(({ cold, expectObservable }) => {
-          spyOn(rdbService, 'buildSingle').and.returnValue(cold('a-b-c-d-e', {
-            a: remoteDataMocks.SuccessStale,
-            b: remoteDataMocks.RequestPending,
-            c: remoteDataMocks.ResponsePending,
-            d: remoteDataMocks.Success,
-            e: remoteDataMocks.SuccessStale,
+          spyOn(rdbService, 'buildSingle').and.returnValue(cold('a-b-c-d-e-f-g', {
+            a: remoteDataMocks.ResponsePendingStale,
+            b: remoteDataMocks.SuccessStale,
+            c: remoteDataMocks.ErrorStale,
+            d: remoteDataMocks.RequestPending,
+            e: remoteDataMocks.ResponsePending,
+            f: remoteDataMocks.Success,
+            g: remoteDataMocks.SuccessStale,
           }));
-          const expected = '--b-c-d-e';
+          const expected = '------d-e-f-g';
           const values = {
-            b: remoteDataMocks.RequestPending,
-            c: remoteDataMocks.ResponsePending,
-            d: remoteDataMocks.Success,
-            e: remoteDataMocks.SuccessStale,
+            d: remoteDataMocks.RequestPending,
+            e: remoteDataMocks.ResponsePending,
+            f: remoteDataMocks.Success,
+            g: remoteDataMocks.SuccessStale,
           };
 
           expectObservable(service.findByHref(selfLink, false, true, ...linksToFollow)).toBe(expected, values);
@@ -487,19 +515,21 @@ describe('BaseDataService', () => {
 
       it(`should not emit a cached stale RemoteData, but only start emitting after the state first changes to RequestPending`, () => {
         testScheduler.run(({ cold, expectObservable }) => {
-          spyOn(rdbService, 'buildList').and.returnValue(cold('a-b-c-d-e', {
-            a: remoteDataMocks.SuccessStale,
-            b: remoteDataMocks.RequestPending,
-            c: remoteDataMocks.ResponsePending,
-            d: remoteDataMocks.Success,
-            e: remoteDataMocks.SuccessStale,
+          spyOn(rdbService, 'buildList').and.returnValue(cold('a-b-c-d-e-f-g', {
+            a: remoteDataMocks.ResponsePendingStale,
+            b: remoteDataMocks.SuccessStale,
+            c: remoteDataMocks.ErrorStale,
+            d: remoteDataMocks.RequestPending,
+            e: remoteDataMocks.ResponsePending,
+            f: remoteDataMocks.Success,
+            g: remoteDataMocks.SuccessStale,
           }));
-          const expected = '--b-c-d-e';
+          const expected = '------d-e-f-g';
           const values = {
-            b: remoteDataMocks.RequestPending,
-            c: remoteDataMocks.ResponsePending,
-            d: remoteDataMocks.Success,
-            e: remoteDataMocks.SuccessStale,
+            d: remoteDataMocks.RequestPending,
+            e: remoteDataMocks.ResponsePending,
+            f: remoteDataMocks.Success,
+            g: remoteDataMocks.SuccessStale,
           };
 
           expectObservable(service.findListByHref(selfLink, findListOptions, true, true, ...linksToFollow)).toBe(expected, values);
@@ -514,11 +544,15 @@ describe('BaseDataService', () => {
         spyOn(service as any, 'reRequestStaleRemoteData').and.callFake(() => (source) => source);
       });
 
-
-      it(`should not emit a cached completed RemoteData, but only start emitting after the state first changes to RequestPending`, () => {
+      it('should not emit a cached completed RemoteData', () => {
         testScheduler.run(({ cold, expectObservable }) => {
+          // Old cached value from 1 minute before the test started
+          const oldCachedSucceededData: RemoteData<any> = Object.assign({}, remoteDataMocks.Success, {
+            timeCompleted: remoteDataTimestamp - 2 * 60 * 1000,
+            lastUpdated: remoteDataTimestamp - 2 * 60 * 1000,
+          } as RemoteData<any>);
           spyOn(rdbService, 'buildList').and.returnValue(cold('a-b-c-d-e', {
-            a: remoteDataMocks.Success,
+            a: oldCachedSucceededData,
             b: remoteDataMocks.RequestPending,
             c: remoteDataMocks.ResponsePending,
             d: remoteDataMocks.Success,
@@ -536,23 +570,42 @@ describe('BaseDataService', () => {
         });
       });
 
+      it('should emit the first completed RemoteData since the request was made', () => {
+        testScheduler.run(({ cold, expectObservable }) => {
+          spyOn(rdbService, 'buildList').and.returnValue(cold('a-b', {
+            a: remoteDataMocks.Success,
+            b: remoteDataMocks.SuccessStale,
+          }));
+          const expected = 'a-b';
+          const values = {
+            a: remoteDataMocks.Success,
+            b: remoteDataMocks.SuccessStale,
+          };
+
+          expectObservable(service.findListByHref(selfLink, findListOptions, false, true, ...linksToFollow)).toBe(expected, values);
+        });
+      });
+
       it(`should not emit a cached stale RemoteData, but only start emitting after the state first changes to RequestPending`, () => {
         testScheduler.run(({ cold, expectObservable }) => {
-          spyOn(rdbService, 'buildList').and.returnValue(cold('a-b-c-d-e', {
-            a: remoteDataMocks.SuccessStale,
-            b: remoteDataMocks.RequestPending,
-            c: remoteDataMocks.ResponsePending,
-            d: remoteDataMocks.Success,
-            e: remoteDataMocks.SuccessStale,
+          spyOn(rdbService, 'buildList').and.returnValue(cold('a-b-c-d-e-f-g', {
+            a: remoteDataMocks.ResponsePendingStale,
+            b: remoteDataMocks.SuccessStale,
+            c: remoteDataMocks.ErrorStale,
+            d: remoteDataMocks.RequestPending,
+            e: remoteDataMocks.ResponsePending,
+            f: remoteDataMocks.Success,
+            g: remoteDataMocks.SuccessStale,
           }));
-          const expected = '--b-c-d-e';
+          const expected = '------d-e-f-g';
           const values = {
-            b: remoteDataMocks.RequestPending,
-            c: remoteDataMocks.ResponsePending,
-            d: remoteDataMocks.Success,
-            e: remoteDataMocks.SuccessStale,
+            d: remoteDataMocks.RequestPending,
+            e: remoteDataMocks.ResponsePending,
+            f: remoteDataMocks.Success,
+            g: remoteDataMocks.SuccessStale,
           };
 
+
           expectObservable(service.findListByHref(selfLink, findListOptions, false, true, ...linksToFollow)).toBe(expected, values);
         });
       });
diff --git a/src/app/core/data/base/base-data.service.ts b/src/app/core/data/base/base-data.service.ts
index edd6d9e2a4..234e7272a6 100644
--- a/src/app/core/data/base/base-data.service.ts
+++ b/src/app/core/data/base/base-data.service.ts
@@ -6,7 +6,7 @@
  * http://www.dspace.org/license/
  */
 
-import { AsyncSubject, from as observableFrom, Observable, of as observableOf } from 'rxjs';
+import { AsyncSubject, from as observableFrom, Observable, of as observableOf, shareReplay } from 'rxjs';
 import { map, mergeMap, skipWhile, switchMap, take, tap, toArray } from 'rxjs/operators';
 import { hasValue, isNotEmpty, isNotEmptyOperator } from '../../../shared/empty.util';
 import { FollowLinkConfig } from '../../../shared/utils/follow-link-config.model';
@@ -264,8 +264,10 @@ export class BaseDataService<T extends CacheableObject> implements HALDataServic
       isNotEmptyOperator(),
       take(1),
       map((href: string) => this.buildHrefFromFindOptions(href, {}, [], ...linksToFollow)),
+      shareReplay(1),
     );
 
+    const startTime: number = new Date().getTime();
     this.createAndSendGetRequest(requestHref$, useCachedVersionIfAvailable);
 
     return this.rdbService.buildSingle<T>(requestHref$, ...linksToFollow).pipe(
@@ -273,7 +275,7 @@ export class BaseDataService<T extends CacheableObject> implements HALDataServic
       // call it isn't immediately returned, but we wait until the remote data for the new request
       // is created. If useCachedVersionIfAvailable is false it also ensures you don't get a
       // cached completed object
-      skipWhile((rd: RemoteData<T>) => useCachedVersionIfAvailable ? rd.isStale : rd.hasCompleted),
+      skipWhile((rd: RemoteData<T>) => rd.isStale || (!useCachedVersionIfAvailable && rd.lastUpdated < startTime)),
       this.reRequestStaleRemoteData(reRequestOnStale, () =>
         this.findByHref(href$, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow)),
     );
@@ -298,8 +300,10 @@ export class BaseDataService<T extends CacheableObject> implements HALDataServic
       isNotEmptyOperator(),
       take(1),
       map((href: string) => this.buildHrefFromFindOptions(href, options, [], ...linksToFollow)),
+      shareReplay(1),
     );
 
+    const startTime: number = new Date().getTime();
     this.createAndSendGetRequest(requestHref$, useCachedVersionIfAvailable);
 
     return this.rdbService.buildList<T>(requestHref$, ...linksToFollow).pipe(
@@ -307,7 +311,7 @@ export class BaseDataService<T extends CacheableObject> implements HALDataServic
       // call it isn't immediately returned, but we wait until the remote data for the new request
       // is created. If useCachedVersionIfAvailable is false it also ensures you don't get a
       // cached completed object
-      skipWhile((rd: RemoteData<PaginatedList<T>>) => useCachedVersionIfAvailable ? rd.isStale : rd.hasCompleted),
+      skipWhile((rd: RemoteData<PaginatedList<T>>) => rd.isStale || (!useCachedVersionIfAvailable && rd.lastUpdated < startTime)),
       this.reRequestStaleRemoteData(reRequestOnStale, () =>
         this.findListByHref(href$, options, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow)),
     );
diff --git a/src/app/core/data/base/delete-data.spec.ts b/src/app/core/data/base/delete-data.spec.ts
index a076473b0f..8ffb471528 100644
--- a/src/app/core/data/base/delete-data.spec.ts
+++ b/src/app/core/data/base/delete-data.spec.ts
@@ -198,6 +198,11 @@ describe('DeleteDataImpl', () => {
             method: RestRequestMethod.DELETE,
             href: 'some-href?copyVirtualMetadata=a&copyVirtualMetadata=b&copyVirtualMetadata=c',
           }));
+
+          const callback = (rdbService.buildFromRequestUUIDAndAwait as jasmine.Spy).calls.argsFor(0)[1];
+          callback();
+          expect(service.invalidateByHref).toHaveBeenCalledWith('some-href');
+
           done();
         });
       });
diff --git a/src/app/core/data/base/delete-data.ts b/src/app/core/data/base/delete-data.ts
index 807d9d838e..26f9d1cc53 100644
--- a/src/app/core/data/base/delete-data.ts
+++ b/src/app/core/data/base/delete-data.ts
@@ -68,15 +68,16 @@ export class DeleteDataImpl<T extends CacheableObject> extends IdentifiableDataS
   deleteByHref(href: string, copyVirtualMetadata?: string[]): Observable<RemoteData<NoContent>> {
     const requestId = this.requestService.generateRequestId();
 
+    let deleteHref: string = href;
     if (copyVirtualMetadata) {
       copyVirtualMetadata.forEach((id) =>
-        href += (href.includes('?') ? '&' : '?')
+        deleteHref += (deleteHref.includes('?') ? '&' : '?')
           + 'copyVirtualMetadata='
           + id,
       );
     }
 
-    const request = new DeleteRequest(requestId, href);
+    const request = new DeleteRequest(requestId, deleteHref);
     if (hasValue(this.responseMsToLive)) {
       request.responseMsToLive = this.responseMsToLive;
     }
diff --git a/src/app/core/data/base/identifiable-data.service.spec.ts b/src/app/core/data/base/identifiable-data.service.spec.ts
index 11af83ff9f..817779fae7 100644
--- a/src/app/core/data/base/identifiable-data.service.spec.ts
+++ b/src/app/core/data/base/identifiable-data.service.spec.ts
@@ -5,7 +5,6 @@
  *
  * http://www.dspace.org/license/
  */
-import { FindListOptions } from '../find-list-options.model';
 import { getMockRequestService } from '../../../shared/mocks/request.service.mock';
 import { HALEndpointServiceStub } from '../../../shared/testing/hal-endpoint-service.stub';
 import { getMockRemoteDataBuildService } from '../../../shared/mocks/remote-data-build.service.mock';
@@ -13,7 +12,7 @@ import { followLink } from '../../../shared/utils/follow-link-config.model';
 import { TestScheduler } from 'rxjs/testing';
 import { RemoteData } from '../remote-data';
 import { RequestEntryState } from '../request-entry-state.model';
-import { Observable, of as observableOf } from 'rxjs';
+import { of as observableOf } from 'rxjs';
 import { RequestService } from '../request.service';
 import { RemoteDataBuildService } from '../../cache/builders/remote-data-build.service';
 import { HALEndpointService } from '../../shared/hal-endpoint.service';
@@ -21,7 +20,8 @@ import { ObjectCacheService } from '../../cache/object-cache.service';
 import { IdentifiableDataService } from './identifiable-data.service';
 import { EMBED_SEPARATOR } from './base-data.service';
 
-const endpoint = 'https://rest.api/core';
+const base = 'https://rest.api/core';
+const endpoint = 'test';
 
 class TestService extends IdentifiableDataService<any> {
   constructor(
@@ -30,11 +30,7 @@ class TestService extends IdentifiableDataService<any> {
     protected objectCache: ObjectCacheService,
     protected halService: HALEndpointService,
   ) {
-    super(undefined, requestService, rdbService, objectCache, halService);
-  }
-
-  public getBrowseEndpoint(options: FindListOptions = {}, linkPath: string = this.linkPath): Observable<string> {
-    return observableOf(endpoint);
+    super(endpoint, requestService, rdbService, objectCache, halService);
   }
 }
 
@@ -51,7 +47,7 @@ describe('IdentifiableDataService', () => {
 
   function initTestService(): TestService {
     requestService = getMockRequestService();
-    halService = new HALEndpointServiceStub('url') as any;
+    halService = new HALEndpointServiceStub(base) as any;
     rdbService = getMockRemoteDataBuildService();
     objectCache = {
 
@@ -143,4 +139,12 @@ describe('IdentifiableDataService', () => {
       expect(result).toEqual(expected);
     });
   });
+
+  describe('invalidateById', () => {
+    it('should invalidate the correct resource by href', () => {
+      spyOn(service, 'invalidateByHref').and.returnValue(observableOf(true));
+      service.invalidateById('123');
+      expect(service.invalidateByHref).toHaveBeenCalledWith(`${base}/${endpoint}/123`);
+    });
+  });
 });
diff --git a/src/app/core/data/base/identifiable-data.service.ts b/src/app/core/data/base/identifiable-data.service.ts
index 904f925765..fae6fd88c1 100644
--- a/src/app/core/data/base/identifiable-data.service.ts
+++ b/src/app/core/data/base/identifiable-data.service.ts
@@ -8,7 +8,7 @@
 import { CacheableObject } from '../../cache/cacheable-object.model';
 import { FollowLinkConfig } from '../../../shared/utils/follow-link-config.model';
 import { Observable } from 'rxjs';
-import { map } from 'rxjs/operators';
+import { map, switchMap, take } from 'rxjs/operators';
 import { RemoteData } from '../remote-data';
 import { BaseDataService } from './base-data.service';
 import { RequestService } from '../request.service';
@@ -80,4 +80,19 @@ export class IdentifiableDataService<T extends CacheableObject> extends BaseData
     return this.getEndpoint().pipe(
       map((endpoint: string) => this.getIDHref(endpoint, resourceID, ...linksToFollow)));
   }
+
+  /**
+   * Invalidate a cached resource by its identifier
+   * @param resourceID  the identifier of the resource to invalidate
+   */
+  invalidateById(resourceID: string): Observable<boolean> {
+    const ok$ = this.getIDHrefObs(resourceID).pipe(
+      take(1),
+      switchMap((href) => this.invalidateByHref(href))
+    );
+
+    ok$.subscribe();
+
+    return ok$;
+  }
 }
diff --git a/src/app/core/data/bitstream-data.service.spec.ts b/src/app/core/data/bitstream-data.service.spec.ts
index 89178f8dd2..c7d1cf3741 100644
--- a/src/app/core/data/bitstream-data.service.spec.ts
+++ b/src/app/core/data/bitstream-data.service.spec.ts
@@ -21,6 +21,9 @@ import { NotificationsService } from '../../shared/notifications/notifications.s
 import objectContaining = jasmine.objectContaining;
 import { RemoteData } from './remote-data';
 import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
+import { RequestParam } from '../cache/models/request-param.model';
+import { RestResponse } from '../cache/response.models';
+import { RequestEntry } from './request-entry.model';
 
 describe('BitstreamDataService', () => {
   let service: BitstreamDataService;
@@ -30,6 +33,7 @@ describe('BitstreamDataService', () => {
   let bitstreamFormatService: BitstreamFormatDataService;
   let rdbService: RemoteDataBuildService;
   const bitstreamFormatHref = 'rest-api/bitstreamformats';
+  let responseCacheEntry: RequestEntry;
 
   const bitstream1 = Object.assign(new Bitstream(), {
     id: 'fake-bitstream1',
@@ -54,8 +58,13 @@ describe('BitstreamDataService', () => {
   const url = 'fake-bitstream-url';
 
   beforeEach(() => {
+    responseCacheEntry = new RequestEntry();
+    responseCacheEntry.request = { href: 'https://rest.api/' } as any;
+    responseCacheEntry.response = new RestResponse(true, 200, 'Success');
+
     objectCache = jasmine.createSpyObj('objectCache', {
-      remove: jasmine.createSpy('remove')
+      remove: jasmine.createSpy('remove'),
+      getByHref: observableOf(responseCacheEntry),
     });
     requestService = getMockRequestService();
     halService = Object.assign(new HALEndpointServiceStub(url));
@@ -132,4 +141,30 @@ describe('BitstreamDataService', () => {
       expect(service.invalidateByHref).toHaveBeenCalledWith('fake-bitstream2-self');
     });
   });
+
+  describe('findByItemHandle', () => {
+    it('should encode the filename correctly in the search parameters', () => {
+      const handle = '123456789/1234';
+      const sequenceId = '5';
+      const filename = 'file with spaces.pdf';
+      const searchParams = [
+        new RequestParam('handle', handle),
+        new RequestParam('sequenceId', sequenceId),
+        new RequestParam('filename', filename)
+      ];
+      const linksToFollow: FollowLinkConfig<Bitstream>[] = [];
+
+      spyOn(service as any, 'getSearchByHref').and.callThrough();
+
+      service.getSearchByHref('byItemHandle', { searchParams }, ...linksToFollow).subscribe((href) => {
+        expect(service.getSearchByHref).toHaveBeenCalledWith(
+          'byItemHandle',
+          { searchParams },
+          ...linksToFollow
+        );
+
+        expect(href).toBe(`${url}/bitstreams/search/byItemHandle?handle=123456789%2F1234&sequenceId=5&filename=file%20with%20spaces.pdf`);
+      });
+    });
+  });
 });
diff --git a/src/app/core/data/bitstream-data.service.ts b/src/app/core/data/bitstream-data.service.ts
index bb4ec28166..59e3d60ae3 100644
--- a/src/app/core/data/bitstream-data.service.ts
+++ b/src/app/core/data/bitstream-data.service.ts
@@ -1,13 +1,14 @@
 import { HttpHeaders } from '@angular/common/http';
 import { Injectable } from '@angular/core';
-import { combineLatest as observableCombineLatest, Observable } from 'rxjs';
+import { combineLatest as observableCombineLatest, Observable, EMPTY } from 'rxjs';
 import { find, map, switchMap, take } from 'rxjs/operators';
 import { hasValue } from '../../shared/empty.util';
-import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
+import { FollowLinkConfig, followLink } from '../../shared/utils/follow-link-config.model';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { ObjectCacheService } from '../cache/object-cache.service';
 import { Bitstream } from '../shared/bitstream.model';
 import { BITSTREAM } from '../shared/bitstream.resource-type';
+import { getFirstCompletedRemoteData } from '../shared/operators';
 import { Bundle } from '../shared/bundle.model';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
 import { Item } from '../shared/item.model';
@@ -136,12 +137,25 @@ export class BitstreamDataService extends IdentifiableDataService<Bitstream> imp
       sendRequest(this.requestService),
       take(1)
     ).subscribe(() => {
-      this.requestService.removeByHrefSubstring(bitstream.self + '/format');
+      this.deleteFormatCache(bitstream);
     });
-
     return this.rdbService.buildFromRequestUUID(requestId);
   }
 
+  private deleteFormatCache(bitstream: Bitstream) {
+    const bitsreamFormatUrl = bitstream.self + '/format';
+    this.requestService.setStaleByHrefSubstring(bitsreamFormatUrl);
+    // Delete also cache by uuid as the format could be cached also there
+    this.objectCache.getByHref(bitsreamFormatUrl).pipe(take(1)).subscribe((cachedRequest) => {
+      if (cachedRequest.requestUUIDs && cachedRequest.requestUUIDs.length > 0){
+        const requestUuid = cachedRequest.requestUUIDs[0];
+        if (this.requestService.hasByUUID(requestUuid)) {
+          this.requestService.setStaleByUUID(requestUuid);
+        }
+      }
+    });
+  }
+
   /**
    * Returns an observable of {@link RemoteData} of a {@link Bitstream}, based on a handle and an
    * optional sequenceId or filename, with a list of {@link FollowLinkConfig}, to automatically
@@ -201,6 +215,38 @@ export class BitstreamDataService extends IdentifiableDataService<Bitstream> imp
     return this.searchData.getSearchByHref(searchMethod, options, ...linksToFollow);
   }
 
+
+  /**
+   *
+   * Make a request to get primary bitstream
+   * in all current use cases, and having it simplifies this method
+   *
+   * @param item                        the {@link Item} the {@link Bundle} is a part of
+   * @param bundleName                  the name of the {@link Bundle} we want to find
+   *                                    {@link Bitstream}s for
+   * @param useCachedVersionIfAvailable If this is true, the request will only be sent if there's
+   *                                    no valid cached version. Defaults to true
+   * @param reRequestOnStale            Whether or not the request should automatically be re-
+   *                                    requested after the response becomes stale
+   * @param options                     the {@link FindListOptions} for the request
+   * @return {Observable<Bitstream | null>}
+   *    Return an observable that contains primary bitstream information or null
+   */
+  public findPrimaryBitstreamByItemAndName(item: Item, bundleName: string, useCachedVersionIfAvailable = true, reRequestOnStale = true, options?: FindListOptions): Observable<Bitstream | null> {
+    return this.bundleService.findByItemAndName(item, bundleName, useCachedVersionIfAvailable, reRequestOnStale, options, followLink('primaryBitstream')).pipe(
+      getFirstCompletedRemoteData(),
+      switchMap((rd: RemoteData<Bundle>) => {
+        if (!rd.hasSucceeded) {
+          return EMPTY;
+        }
+        return rd.payload.primaryBitstream.pipe(
+          getFirstCompletedRemoteData(),
+          map((rdb: RemoteData<Bitstream>) => rdb.hasSucceeded ? rdb.payload : null),
+        );
+      }),
+    );
+  }
+
   /**
    * Make a new FindListRequest with given search method
    *
diff --git a/src/app/core/data/bundle-data.service.ts b/src/app/core/data/bundle-data.service.ts
index 19f0e73706..78ae204fe7 100644
--- a/src/app/core/data/bundle-data.service.ts
+++ b/src/app/core/data/bundle-data.service.ts
@@ -75,10 +75,14 @@ export class BundleDataService extends IdentifiableDataService<Bundle> implement
    *                                    requested after the response becomes stale
    * @param linksToFollow               List of {@link FollowLinkConfig} that indicate which
    *                                    {@link HALLink}s should be automatically resolved
+   * @param options                     the {@link FindListOptions} for the request
    */
   // TODO should be implemented rest side
-  findByItemAndName(item: Item, bundleName: string, useCachedVersionIfAvailable = true, reRequestOnStale = true, ...linksToFollow: FollowLinkConfig<Bundle>[]): Observable<RemoteData<Bundle>> {
-    return this.findAllByItem(item, { elementsPerPage: 9999 }, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow).pipe(
+  findByItemAndName(item: Item, bundleName: string, useCachedVersionIfAvailable = true, reRequestOnStale = true, options?: FindListOptions, ...linksToFollow: FollowLinkConfig<Bundle>[]): Observable<RemoteData<Bundle>> {
+    //Since we filter by bundleName where the pagination options are not indicated we need to load all the possible bundles.
+    // This is a workaround, in substitution of the previously recursive call with expand
+    const paginationOptions = options ?? { elementsPerPage: 9999 };
+    return this.findAllByItem(item, paginationOptions, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow).pipe(
       map((rd: RemoteData<PaginatedList<Bundle>>) => {
         if (hasValue(rd.payload) && hasValue(rd.payload.page)) {
           const matchingBundle = rd.payload.page.find((bundle: Bundle) =>
diff --git a/src/app/core/data/configuration-data.service.ts b/src/app/core/data/configuration-data.service.ts
index de044e25e3..557e13f57b 100644
--- a/src/app/core/data/configuration-data.service.ts
+++ b/src/app/core/data/configuration-data.service.ts
@@ -1,4 +1,3 @@
-/* eslint-disable max-classes-per-file */
 import { Injectable } from '@angular/core';
 import { Observable } from 'rxjs';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
diff --git a/src/app/core/data/dso-redirect.service.spec.ts b/src/app/core/data/dso-redirect.service.spec.ts
index 2122dc663a..9271bd5f7f 100644
--- a/src/app/core/data/dso-redirect.service.spec.ts
+++ b/src/app/core/data/dso-redirect.service.spec.ts
@@ -11,6 +11,8 @@ import { createSuccessfulRemoteDataObject } from '../../shared/remote-data.utils
 import { Item } from '../shared/item.model';
 import { EMBED_SEPARATOR } from './base/base-data.service';
 import { HardRedirectService } from '../services/hard-redirect.service';
+import { environment } from '../../../environments/environment.test';
+import { AppConfig } from '../../../config/app-config.interface';
 
 describe('DsoRedirectService', () => {
   let scheduler: TestScheduler;
@@ -56,6 +58,7 @@ describe('DsoRedirectService', () => {
     });
 
     service = new DsoRedirectService(
+      environment as AppConfig,
       requestService,
       rdbService,
       objectCache,
@@ -107,7 +110,7 @@ describe('DsoRedirectService', () => {
       redir.subscribe();
       scheduler.schedule(() => redir);
       scheduler.flush();
-      expect(redirectService.redirect).toHaveBeenCalledWith('/items/' + remoteData.payload.uuid, 301);
+      expect(redirectService.redirect).toHaveBeenCalledWith(`${environment.ui.nameSpace}/items/${remoteData.payload.uuid}`, 301);
     });
     it('should navigate to entities route with the corresponding entity type', () => {
       remoteData.payload.type = 'item';
@@ -124,7 +127,7 @@ describe('DsoRedirectService', () => {
       redir.subscribe();
       scheduler.schedule(() => redir);
       scheduler.flush();
-      expect(redirectService.redirect).toHaveBeenCalledWith('/entities/publication/' + remoteData.payload.uuid, 301);
+      expect(redirectService.redirect).toHaveBeenCalledWith(`${environment.ui.nameSpace}/entities/publication/${remoteData.payload.uuid}`, 301);
     });
 
     it('should navigate to collections route', () => {
@@ -133,7 +136,7 @@ describe('DsoRedirectService', () => {
       redir.subscribe();
       scheduler.schedule(() => redir);
       scheduler.flush();
-      expect(redirectService.redirect).toHaveBeenCalledWith('/collections/' + remoteData.payload.uuid, 301);
+      expect(redirectService.redirect).toHaveBeenCalledWith(`${environment.ui.nameSpace}/collections/${remoteData.payload.uuid}`, 301);
     });
 
     it('should navigate to communities route', () => {
@@ -142,7 +145,7 @@ describe('DsoRedirectService', () => {
       redir.subscribe();
       scheduler.schedule(() => redir);
       scheduler.flush();
-      expect(redirectService.redirect).toHaveBeenCalledWith('/communities/' + remoteData.payload.uuid, 301);
+      expect(redirectService.redirect).toHaveBeenCalledWith(`${environment.ui.nameSpace}/communities/${remoteData.payload.uuid}`, 301);
     });
   });
 
diff --git a/src/app/core/data/dso-redirect.service.ts b/src/app/core/data/dso-redirect.service.ts
index a27d1fb11f..4585df5b4b 100644
--- a/src/app/core/data/dso-redirect.service.ts
+++ b/src/app/core/data/dso-redirect.service.ts
@@ -6,7 +6,7 @@
  * http://www.dspace.org/license/
  */
 /* eslint-disable max-classes-per-file */
-import { Injectable } from '@angular/core';
+import { Injectable, Inject } from '@angular/core';
 import { Observable } from 'rxjs';
 import { tap } from 'rxjs/operators';
 import { hasValue } from '../../shared/empty.util';
@@ -21,6 +21,7 @@ import { DSpaceObject } from '../shared/dspace-object.model';
 import { IdentifiableDataService } from './base/identifiable-data.service';
 import { getDSORoute } from '../../app-routing-paths';
 import { HardRedirectService } from '../services/hard-redirect.service';
+import { APP_CONFIG, AppConfig } from '../../../config/app-config.interface';
 
 const ID_ENDPOINT = 'pid';
 const UUID_ENDPOINT = 'dso';
@@ -70,6 +71,7 @@ export class DsoRedirectService {
   private dataService: DsoByIdOrUUIDDataService;
 
   constructor(
+    @Inject(APP_CONFIG) protected appConfig: AppConfig,
     protected requestService: RequestService,
     protected rdbService: RemoteDataBuildService,
     protected objectCache: ObjectCacheService,
@@ -98,7 +100,7 @@ export class DsoRedirectService {
             let newRoute = getDSORoute(dso);
             if (hasValue(newRoute)) {
               // Use a "301 Moved Permanently" redirect for SEO purposes
-              this.hardRedirectService.redirect(newRoute, 301);
+              this.hardRedirectService.redirect(this.appConfig.ui.nameSpace.replace(/\/$/, '') + newRoute, 301);
             }
           }
         }
diff --git a/src/app/core/data/dspace-rest-response-parsing.service.ts b/src/app/core/data/dspace-rest-response-parsing.service.ts
index 500afc4aff..c0e1c70cae 100644
--- a/src/app/core/data/dspace-rest-response-parsing.service.ts
+++ b/src/app/core/data/dspace-rest-response-parsing.service.ts
@@ -109,6 +109,13 @@ export class DspaceRestResponseParsingService implements ResponseParsingService
               if (hasValue(match)) {
                 embedAltUrl = new URLCombiner(embedAltUrl, `?size=${match.size}`).toString();
               }
+              if (data._embedded[property] == null) {
+                // Embedded object is null, meaning it exists (not undefined), but had an empty response (204) -> cache it as null
+                this.addToObjectCache(null, request, data, embedAltUrl);
+              } else if (!isCacheableObject(data._embedded[property])) {
+                // Embedded object exists, but doesn't contain a self link -> cache it using the alternative link instead
+                this.objectCache.add(data._embedded[property], hasValue(request.responseMsToLive) ? request.responseMsToLive : environment.cache.msToLive.default, request.uuid, embedAltUrl);
+              }
               this.process<ObjectDomain>(data._embedded[property], request, embedAltUrl);
             });
         }
@@ -226,7 +233,7 @@ export class DspaceRestResponseParsingService implements ResponseParsingService
    * @param alternativeURL  an alternative url that can be used to retrieve the object
    */
   addToObjectCache(co: CacheableObject, request: RestRequest, data: any, alternativeURL?: string): void {
-    if (!isCacheableObject(co)) {
+    if (hasValue(co) && !isCacheableObject(co)) {
       const type = hasValue(data) && hasValue(data.type) ? data.type : 'object';
       let dataJSON: string;
       if (hasValue(data._embedded)) {
@@ -240,7 +247,7 @@ export class DspaceRestResponseParsingService implements ResponseParsingService
       return;
     }
 
-    if (alternativeURL === co._links.self.href) {
+    if (hasValue(co) && alternativeURL === co._links.self.href) {
       alternativeURL = undefined;
     }
 
diff --git a/src/app/core/data/feature-authorization/authorization-data.service.spec.ts b/src/app/core/data/feature-authorization/authorization-data.service.spec.ts
index ae44d590a4..9e1e892be2 100644
--- a/src/app/core/data/feature-authorization/authorization-data.service.spec.ts
+++ b/src/app/core/data/feature-authorization/authorization-data.service.spec.ts
@@ -64,7 +64,7 @@ describe('AuthorizationDataService', () => {
     const ePersonUuid = 'fake-eperson-uuid';
 
     function createExpected(providedObjectUrl: string, providedEPersonUuid?: string, providedFeatureId?: FeatureID): FindListOptions {
-      const searchParams = [new RequestParam('uri', providedObjectUrl)];
+      const searchParams = [new RequestParam('uri', providedObjectUrl, false)];
       if (hasValue(providedFeatureId)) {
         searchParams.push(new RequestParam('feature', providedFeatureId));
       }
diff --git a/src/app/core/data/feature-authorization/authorization-data.service.ts b/src/app/core/data/feature-authorization/authorization-data.service.ts
index c43d335234..be1c1b0901 100644
--- a/src/app/core/data/feature-authorization/authorization-data.service.ts
+++ b/src/app/core/data/feature-authorization/authorization-data.service.ts
@@ -74,7 +74,7 @@ export class AuthorizationDataService extends BaseDataService<Authorization> imp
           return [];
         }
       }),
-      catchError(() => observableOf(false)),
+      catchError(() => observableOf([])),
       oneAuthorizationMatchesFeature(featureId)
     );
   }
@@ -132,7 +132,8 @@ export class AuthorizationDataService extends BaseDataService<Authorization> imp
     if (isNotEmpty(options.searchParams)) {
       params = [...options.searchParams];
     }
-    params.push(new RequestParam('uri', objectUrl));
+    // TODO fix encode the uri parameter in the self link in the backend and set encodeValue to true afterwards
+    params.push(new RequestParam('uri', objectUrl, false));
     if (hasValue(featureId)) {
       params.push(new RequestParam('feature', featureId));
     }
diff --git a/src/app/core/data/feature-authorization/authorization-utils.ts b/src/app/core/data/feature-authorization/authorization-utils.ts
index d1b65f6123..a4e5e4d997 100644
--- a/src/app/core/data/feature-authorization/authorization-utils.ts
+++ b/src/app/core/data/feature-authorization/authorization-utils.ts
@@ -68,13 +68,13 @@ export const oneAuthorizationMatchesFeature = (featureID: FeatureID) =>
     source.pipe(
       switchMap((authorizations: Authorization[]) => {
         if (isNotEmpty(authorizations)) {
-          return observableCombineLatest(
+          return observableCombineLatest([
             ...authorizations
               .filter((authorization: Authorization) => hasValue(authorization.feature))
               .map((authorization: Authorization) => authorization.feature.pipe(
                 getFirstSucceededRemoteDataPayload()
               ))
-          );
+          ]);
         } else {
           return observableOf([]);
         }
diff --git a/src/app/core/data/object-updates/object-updates.reducer.ts b/src/app/core/data/object-updates/object-updates.reducer.ts
index 14bacc52db..da18a28d3f 100644
--- a/src/app/core/data/object-updates/object-updates.reducer.ts
+++ b/src/app/core/data/object-updates/object-updates.reducer.ts
@@ -58,6 +58,8 @@ export interface VirtualMetadataSource {
 
 export interface RelationshipIdentifiable extends Identifiable {
   nameVariant?: string;
+  originalItem: Item;
+  originalIsLeft: boolean
   relatedItem: Item;
   relationship: Relationship;
   type: RelationshipType;
diff --git a/src/app/core/data/object-updates/object-updates.service.stub.ts b/src/app/core/data/object-updates/object-updates.service.stub.ts
new file mode 100644
index 0000000000..c41728a338
--- /dev/null
+++ b/src/app/core/data/object-updates/object-updates.service.stub.ts
@@ -0,0 +1,28 @@
+export class ObjectUpdatesServiceStub {
+
+  initialize = jasmine.createSpy('initialize');
+  saveFieldUpdate = jasmine.createSpy('saveFieldUpdate');
+  getObjectEntry = jasmine.createSpy('getObjectEntry');
+  getFieldState = jasmine.createSpy('getFieldState');
+  getFieldUpdates = jasmine.createSpy('getFieldUpdates');
+  getFieldUpdatesExclusive = jasmine.createSpy('getFieldUpdatesExclusive');
+  isValid = jasmine.createSpy('isValid');
+  isValidPage = jasmine.createSpy('isValidPage');
+  saveAddFieldUpdate = jasmine.createSpy('saveAddFieldUpdate');
+  saveRemoveFieldUpdate = jasmine.createSpy('saveRemoveFieldUpdate');
+  saveChangeFieldUpdate = jasmine.createSpy('saveChangeFieldUpdate');
+  isSelectedVirtualMetadata = jasmine.createSpy('isSelectedVirtualMetadata');
+  setSelectedVirtualMetadata = jasmine.createSpy('setSelectedVirtualMetadata');
+  setEditableFieldUpdate = jasmine.createSpy('setEditableFieldUpdate');
+  setValidFieldUpdate = jasmine.createSpy('setValidFieldUpdate');
+  discardFieldUpdates = jasmine.createSpy('discardFieldUpdates');
+  discardAllFieldUpdates = jasmine.createSpy('discardAllFieldUpdates');
+  reinstateFieldUpdates = jasmine.createSpy('reinstateFieldUpdates');
+  removeSingleFieldUpdate = jasmine.createSpy('removeSingleFieldUpdate');
+  getUpdateFields = jasmine.createSpy('getUpdateFields');
+  hasUpdates = jasmine.createSpy('hasUpdates');
+  isReinstatable = jasmine.createSpy('isReinstatable');
+  getLastModified = jasmine.createSpy('getLastModified');
+  createPatch = jasmine.createSpy('getPatch');
+
+}
diff --git a/src/app/core/data/object-updates/object-updates.service.ts b/src/app/core/data/object-updates/object-updates.service.ts
index 2fb6d47d31..c3746f0283 100644
--- a/src/app/core/data/object-updates/object-updates.service.ts
+++ b/src/app/core/data/object-updates/object-updates.service.ts
@@ -19,7 +19,7 @@ import {
   SetEditableFieldUpdateAction,
   SetValidFieldUpdateAction
 } from './object-updates.actions';
-import { distinctUntilChanged, filter, map, switchMap } from 'rxjs/operators';
+import { distinctUntilChanged, filter, map, switchMap, take } from 'rxjs/operators';
 import {
   hasNoValue,
   hasValue,
@@ -198,8 +198,14 @@ export class ObjectUpdatesService {
    * @param url The page's URL for which the changes are saved
    * @param field An updated field for the page's object
    */
-  saveAddFieldUpdate(url: string, field: Identifiable) {
+  saveAddFieldUpdate(url: string, field: Identifiable): Observable<boolean> {
+    const update$: Observable<boolean> = this.getFieldUpdatesExclusive(url, [field]).pipe(
+      filter((fieldUpdates: FieldUpdates) => fieldUpdates[field.uuid].changeType === FieldChangeType.ADD),
+      take(1),
+      map(() => true),
+    );
     this.saveFieldUpdate(url, field, FieldChangeType.ADD);
+    return update$;
   }
 
   /**
@@ -207,8 +213,14 @@ export class ObjectUpdatesService {
    * @param url The page's URL for which the changes are saved
    * @param field An updated field for the page's object
    */
-  saveRemoveFieldUpdate(url: string, field: Identifiable) {
+  saveRemoveFieldUpdate(url: string, field: Identifiable): Observable<boolean> {
+    const update$: Observable<boolean> = this.getFieldUpdatesExclusive(url, [field]).pipe(
+      filter((fieldUpdates: FieldUpdates) => fieldUpdates[field.uuid].changeType === FieldChangeType.REMOVE),
+      take(1),
+      map(() => true),
+    );
     this.saveFieldUpdate(url, field, FieldChangeType.REMOVE);
+    return update$;
   }
 
   /**
diff --git a/src/app/core/data/relationship-data.service.spec.ts b/src/app/core/data/relationship-data.service.spec.ts
index 4432d5213a..05ec752597 100644
--- a/src/app/core/data/relationship-data.service.spec.ts
+++ b/src/app/core/data/relationship-data.service.spec.ts
@@ -23,6 +23,7 @@ import { FindListOptions } from './find-list-options.model';
 import { testSearchDataImplementation } from './base/search-data.spec';
 import { MetadataValue } from '../shared/metadata.models';
 import { MetadataRepresentationType } from '../shared/metadata-representation/metadata-representation.model';
+import { environment } from '../../../environments/environment.test';
 
 describe('RelationshipDataService', () => {
   let service: RelationshipDataService;
@@ -125,7 +126,8 @@ describe('RelationshipDataService', () => {
 
   const itemService = jasmine.createSpyObj('itemService', {
     findById: (uuid) => createSuccessfulRemoteDataObject(relatedItems.find((relatedItem) => relatedItem.id === uuid)),
-    findByHref: createSuccessfulRemoteDataObject$(relatedItems[0])
+    findByHref: createSuccessfulRemoteDataObject$(relatedItems[0]),
+    getIDHrefObs: (uuid: string) => observableOf(`https://demo.dspace.org/server/api/core/items/${uuid}`),
   });
 
   function initTestService() {
@@ -137,6 +139,7 @@ describe('RelationshipDataService', () => {
       itemService,
       null,
       jasmine.createSpy('paginatedRelationsToItems').and.returnValue((v) => v),
+      environment,
     );
   }
 
@@ -152,7 +155,7 @@ describe('RelationshipDataService', () => {
   });
 
   describe('composition', () => {
-    const initService = () => new RelationshipDataService(null, null, null, null, null, null, null);
+    const initService = () => new RelationshipDataService(null, null, null, null, null, null, null, environment);
 
     testSearchDataImplementation(initService);
   });
@@ -240,6 +243,16 @@ describe('RelationshipDataService', () => {
     });
   });
 
+  describe('searchByItemsAndType', () => {
+    it('should call addDependency for each item to invalidate the request when one of the items is update', () => {
+      spyOn(service as any, 'addDependency');
+
+      service.searchByItemsAndType(relationshipType.id, item.id, relationshipType.leftwardType, ['item-id-1', 'item-id-2']);
+
+      expect((service as any).addDependency).toHaveBeenCalledTimes(2);
+    });
+  });
+
   describe('resolveMetadataRepresentation', () => {
     const parentItem: Item = Object.assign(new Item(), {
       id: 'parent-item',
diff --git a/src/app/core/data/relationship-data.service.ts b/src/app/core/data/relationship-data.service.ts
index 46a51a2d01..34683d054f 100644
--- a/src/app/core/data/relationship-data.service.ts
+++ b/src/app/core/data/relationship-data.service.ts
@@ -51,6 +51,7 @@ import { MetadataRepresentation } from '../shared/metadata-representation/metada
 import { MetadatumRepresentation } from '../shared/metadata-representation/metadatum/metadatum-representation.model';
 import { ItemMetadataRepresentation } from '../shared/metadata-representation/item/item-metadata-representation.model';
 import { DSpaceObject } from '../shared/dspace-object.model';
+import { APP_CONFIG, AppConfig } from '../../../config/app-config.interface';
 
 const relationshipListsStateSelector = (state: AppState) => state.relationshipLists;
 
@@ -92,6 +93,7 @@ export class RelationshipDataService extends IdentifiableDataService<Relationshi
     protected itemService: ItemDataService,
     protected appStore: Store<AppState>,
     @Inject(PAGINATED_RELATIONS_TO_ITEMS_OPERATOR) private paginatedRelationsToItems: (thisId: string) => (source: Observable<RemoteData<PaginatedList<Relationship>>>) => Observable<RemoteData<PaginatedList<Item>>>,
+    @Inject(APP_CONFIG) private appConfig: AppConfig,
   ) {
     super('relationships', requestService, rdbService, objectCache, halService, 15 * 60 * 1000);
 
@@ -114,8 +116,11 @@ export class RelationshipDataService extends IdentifiableDataService<Relationshi
    * @param id                    the ID of the relationship to delete
    * @param copyVirtualMetadata   whether to copy this relationship's virtual metadata to the related Items
    *                              accepted values: none, all, left, right, configured
+   * @param shouldRefresh         refresh the cache for the items in the relationship after creating
+   *                              it. Disable this if you want to add relationships in bulk, and
+   *                              want to refresh the cachemanually at the end
    */
-  deleteRelationship(id: string, copyVirtualMetadata: string): Observable<RemoteData<NoContent>> {
+  deleteRelationship(id: string, copyVirtualMetadata: string, shouldRefresh = true): Observable<RemoteData<NoContent>> {
     return this.getRelationshipEndpoint(id).pipe(
       isNotEmptyOperator(),
       take(1),
@@ -126,7 +131,11 @@ export class RelationshipDataService extends IdentifiableDataService<Relationshi
       sendRequest(this.requestService),
       switchMap((restRequest: RestRequest) => this.rdbService.buildFromRequestUUID(restRequest.uuid)),
       getFirstCompletedRemoteData(),
-      tap(() => this.refreshRelationshipItemsInCacheByRelationship(id)),
+      tap(() => {
+        if (shouldRefresh) {
+          this.refreshRelationshipItemsInCacheByRelationship(id);
+        }
+      }),
     );
   }
 
@@ -137,8 +146,11 @@ export class RelationshipDataService extends IdentifiableDataService<Relationshi
    * @param item2 The second item of the relationship
    * @param leftwardValue The leftward value of the relationship
    * @param rightwardValue The rightward value of the relationship
+   * @param shouldRefresh refresh the cache for the items in the relationship after creating it.
+   *                      Disable this if you want to add relationships in bulk, and want to refresh
+   *                      the cache manually at the end
    */
-  addRelationship(typeId: string, item1: Item, item2: Item, leftwardValue?: string, rightwardValue?: string): Observable<RemoteData<Relationship>> {
+  addRelationship(typeId: string, item1: Item, item2: Item, leftwardValue?: string, rightwardValue?: string, shouldRefresh = true): Observable<RemoteData<Relationship>> {
     const options: HttpOptions = Object.create({});
     let headers = new HttpHeaders();
     headers = headers.append('Content-Type', 'text/uri-list');
@@ -153,8 +165,12 @@ export class RelationshipDataService extends IdentifiableDataService<Relationshi
       sendRequest(this.requestService),
       switchMap((restRequest: RestRequest) => this.rdbService.buildFromRequestUUID(restRequest.uuid)),
       getFirstCompletedRemoteData(),
-      tap(() => this.refreshRelationshipItemsInCache(item1)),
-      tap(() => this.refreshRelationshipItemsInCache(item2)),
+      tap(() => {
+        if (shouldRefresh) {
+          this.refreshRelationshipItemsInCache(item1);
+          this.refreshRelationshipItemsInCache(item2);
+        }
+      }),
     ) as Observable<RemoteData<Relationship>>;
   }
 
@@ -182,7 +198,7 @@ export class RelationshipDataService extends IdentifiableDataService<Relationshi
    * Method to remove an item that's part of a relationship from the cache
    * @param item The item to remove from the cache
    */
-  public refreshRelationshipItemsInCache(item) {
+  public refreshRelationshipItemsInCache(item: Item): void {
     this.objectCache.remove(item._links.self.href);
     this.requestService.removeByHrefSubstring(item.uuid);
     observableCombineLatest([
@@ -264,7 +280,7 @@ export class RelationshipDataService extends IdentifiableDataService<Relationshi
    * @param options
    */
   getRelatedItemsByLabel(item: Item, label: string, options?: FindListOptions): Observable<RemoteData<PaginatedList<Item>>> {
-    let linksToFollow: FollowLinkConfig<Relationship>[] = itemLinksToFollow(options.fetchThumbnail);
+    let linksToFollow: FollowLinkConfig<Relationship>[] = itemLinksToFollow(options.fetchThumbnail, this.appConfig.item.showAccessStatuses);
     linksToFollow.push(followLink('relationshipType'));
 
     return this.getItemRelationshipsByLabel(item, label, options, true, true, ...linksToFollow).pipe(this.paginatedRelationsToItems(item.uuid));
@@ -295,7 +311,19 @@ export class RelationshipDataService extends IdentifiableDataService<Relationshi
     } else {
       findListOptions.searchParams = searchParams;
     }
-    return this.searchBy('byLabel', findListOptions, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
+
+    // always set reRequestOnStale to false here, so it doesn't happen automatically in BaseDataService
+    const result$ = this.searchBy('byLabel', findListOptions, useCachedVersionIfAvailable, false, ...linksToFollow);
+
+    // add this result as a dependency of the item, meaning that if the item is invalided, this
+    // result will be as well
+    this.addDependency(result$, item._links.self.href);
+
+    // do the reRequestOnStale call here, to ensure any re-requests also get added as dependencies
+    return result$.pipe(
+      this.reRequestStaleRemoteData(reRequestOnStale, () =>
+        this.getItemRelationshipsByLabel(item, label, options, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow)),
+    );
   }
 
   /**
@@ -492,50 +520,33 @@ export class RelationshipDataService extends IdentifiableDataService<Relationshi
    * @param arrayOfItemIds The uuid of the items to be found on the other side of returned relationships
    */
   searchByItemsAndType(typeId: string,itemUuid: string,relationshipLabel: string, arrayOfItemIds: string[] ): Observable<RemoteData<PaginatedList<Relationship>>> {
-
-    const searchParams = [
-          {
-            fieldName: 'typeId',
-            fieldValue: typeId
-          },
-          {
-            fieldName: 'focusItem',
-            fieldValue: itemUuid
-          },
-          {
-            fieldName: 'relationshipLabel',
-            fieldValue: relationshipLabel
-          },
-          {
-            fieldName: 'size',
-            fieldValue: arrayOfItemIds.length
-          },
-          {
-            fieldName: 'embed',
-            fieldValue: 'leftItem'
-          },
-          {
-            fieldName: 'embed',
-            fieldValue: 'rightItem'
-          },
-        ];
+    const searchParams: RequestParam[] = [
+      new RequestParam('typeId', typeId),
+      new RequestParam('focusItem', itemUuid),
+      new RequestParam('relationshipLabel', relationshipLabel),
+      new RequestParam('size', arrayOfItemIds.length),
+      new RequestParam('embed', 'leftItem'),
+      new RequestParam('embed', 'rightItem'),
+    ];
 
     arrayOfItemIds.forEach( (itemId) => {
       searchParams.push(
-        {
-          fieldName: 'relatedItem',
-          fieldValue: itemId,
-        }
+        new RequestParam('relatedItem', itemId),
       );
     });
 
-    return this.searchBy(
+    const searchRD$: Observable<RemoteData<PaginatedList<Relationship>>> = this.searchBy(
       'byItemsAndType',
       {
         searchParams: searchParams
       },
     ) as Observable<RemoteData<PaginatedList<Relationship>>>;
 
+    arrayOfItemIds.forEach((itemId: string) => {
+      this.addDependency(searchRD$, this.itemService.getIDHrefObs(encodeURIComponent(itemId)));
+    });
+
+    return searchRD$;
   }
 
   /**
diff --git a/src/app/core/data/relationship-type-data.service.ts b/src/app/core/data/relationship-type-data.service.ts
index 3020e52d47..263920a615 100644
--- a/src/app/core/data/relationship-type-data.service.ts
+++ b/src/app/core/data/relationship-type-data.service.ts
@@ -1,6 +1,6 @@
 import { Injectable } from '@angular/core';
-import { combineLatest as observableCombineLatest, Observable } from 'rxjs';
-import { map, mergeMap, switchMap, toArray } from 'rxjs/operators';
+import { combineLatest as observableCombineLatest, EMPTY, expand, from, Observable, reduce } from 'rxjs';
+import { map, mergeMap, toArray } from 'rxjs/operators';
 import { hasValue } from '../../shared/empty.util';
 import { followLink, FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
@@ -17,6 +17,7 @@ import { FindAllDataImpl } from './base/find-all-data';
 import { SearchDataImpl } from './base/search-data';
 import { ObjectCacheService } from '../cache/object-cache.service';
 import { dataService } from './base/data-service.decorator';
+import { RequestParam } from '../cache/models/request-param.model';
 
 /**
  * Check if one side of a RelationshipType is the ItemType with the given label
@@ -61,34 +62,49 @@ export class RelationshipTypeDataService extends BaseDataService<RelationshipTyp
    */
   getRelationshipTypeByLabelAndTypes(relationshipTypeLabel: string, firstItemType: string, secondItemType: string): Observable<RelationshipType> {
     // Retrieve all relationship types from the server in a single page
-    return this.findAllData.findAll({ currentPage: 1, elementsPerPage: 9999 }, true, true, followLink('leftType'), followLink('rightType'))
-               .pipe(
-                 getFirstSucceededRemoteData(),
-                 // Emit each type in the page array separately
-                 switchMap((typeListRD: RemoteData<PaginatedList<RelationshipType>>) => typeListRD.payload.page),
-                 // Check each type individually, to see if it matches the provided types
-                 mergeMap((relationshipType: RelationshipType) => {
-                   if (relationshipType.leftwardType === relationshipTypeLabel) {
-                     return this.checkType(relationshipType, firstItemType, secondItemType);
-                   } else if (relationshipType.rightwardType === relationshipTypeLabel) {
-                     return this.checkType(relationshipType, secondItemType, firstItemType);
-                   } else {
-                     return [null];
-                   }
-                 }),
-                 // Wait for all types to be checked and emit once, with the results combined back into an
-                 // array
-                 toArray(),
-                 // Look for a match in the array and emit it if found, or null if one isn't found
-                 map((types: RelationshipType[]) => {
-                   const match = types.find((type: RelationshipType) => hasValue(type));
-                   if (hasValue(match)) {
-                     return match;
-                   } else {
-                     return null;
-                   }
-                 }),
-               );
+    const initialPageInfo = { currentPage: 1, elementsPerPage: 20 };
+    return this.findAllData.findAll(initialPageInfo, true, true, followLink('leftType'), followLink('rightType'))
+      .pipe(
+        getFirstSucceededRemoteData(),
+        // Emit each type in the page array separately
+        expand((typeListRD: RemoteData<PaginatedList<RelationshipType>>) => {
+          const currentPage = typeListRD.payload.pageInfo.currentPage;
+          const totalPages = typeListRD.payload.pageInfo.totalPages;
+          if (currentPage < totalPages) {
+            const nextPageInfo = { currentPage: currentPage + 1, elementsPerPage: 20 };
+            return this.findAllData.findAll(nextPageInfo, true, true, followLink('leftType'), followLink('rightType')).pipe(
+              getFirstSucceededRemoteData()
+            );
+          } else {
+            return EMPTY;
+          }
+        }),
+        // Collect all pages into a single array
+        reduce((acc: RelationshipType[], typeListRD: RemoteData<PaginatedList<RelationshipType>>) => acc.concat(typeListRD.payload.page), []),
+        mergeMap((relationshipTypes: RelationshipType[]) => from(relationshipTypes)),
+        // Check each type individually, to see if it matches the provided types
+        mergeMap((relationshipType: RelationshipType) => {
+          if (relationshipType.leftwardType === relationshipTypeLabel) {
+            return this.checkType(relationshipType, firstItemType, secondItemType);
+          } else if (relationshipType.rightwardType === relationshipTypeLabel) {
+            return this.checkType(relationshipType, secondItemType, firstItemType);
+          } else {
+            return [null];
+          }
+        }),
+        // Wait for all types to be checked and emit once, with the results combined back into an
+        // array
+        toArray(),
+        // Look for a match in the array and emit it if found, or null if one isn't found
+        map((types: RelationshipType[]) => {
+          const match = types.find((type: RelationshipType) => hasValue(type));
+          if (hasValue(match)) {
+            return match;
+          } else {
+            return null;
+          }
+        }),
+      );
   }
 
   /**
@@ -130,14 +146,8 @@ export class RelationshipTypeDataService extends BaseDataService<RelationshipTyp
       'byEntityType',
       {
         searchParams: [
-          {
-            fieldName: 'type',
-            fieldValue: type,
-          },
-          {
-            fieldName: 'size',
-            fieldValue: 100,
-          },
+          new RequestParam('type', type),
+          new RequestParam('size', 100),
         ],
       }, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow,
     ).pipe(
diff --git a/src/app/core/data/request-entry-state.model.spec.ts b/src/app/core/data/request-entry-state.model.spec.ts
new file mode 100644
index 0000000000..7daa655566
--- /dev/null
+++ b/src/app/core/data/request-entry-state.model.spec.ts
@@ -0,0 +1,186 @@
+import {
+  isRequestPending,
+  isError,
+  isSuccess,
+  isErrorStale,
+  isSuccessStale,
+  isResponsePending,
+  isResponsePendingStale,
+  isLoading,
+  isStale,
+  hasFailed,
+  hasSucceeded,
+  hasCompleted,
+  RequestEntryState
+} from './request-entry-state.model';
+
+describe(`isRequestPending`, () => {
+  it(`should only return true if the given state is RequestPending`, () => {
+    expect(isRequestPending(RequestEntryState.RequestPending)).toBeTrue();
+
+    expect(isRequestPending(RequestEntryState.ResponsePending)).toBeFalse();
+    expect(isRequestPending(RequestEntryState.Error)).toBeFalse();
+    expect(isRequestPending(RequestEntryState.Success)).toBeFalse();
+    expect(isRequestPending(RequestEntryState.ResponsePendingStale)).toBeFalse();
+    expect(isRequestPending(RequestEntryState.ErrorStale)).toBeFalse();
+    expect(isRequestPending(RequestEntryState.SuccessStale)).toBeFalse();
+  });
+});
+
+describe(`isError`, () => {
+  it(`should only return true if the given state is Error`, () => {
+    expect(isError(RequestEntryState.Error)).toBeTrue();
+
+    expect(isError(RequestEntryState.RequestPending)).toBeFalse();
+    expect(isError(RequestEntryState.ResponsePending)).toBeFalse();
+    expect(isError(RequestEntryState.Success)).toBeFalse();
+    expect(isError(RequestEntryState.ResponsePendingStale)).toBeFalse();
+    expect(isError(RequestEntryState.ErrorStale)).toBeFalse();
+    expect(isError(RequestEntryState.SuccessStale)).toBeFalse();
+  });
+});
+
+describe(`isSuccess`, () => {
+  it(`should only return true if the given state is Success`, () => {
+    expect(isSuccess(RequestEntryState.Success)).toBeTrue();
+
+    expect(isSuccess(RequestEntryState.RequestPending)).toBeFalse();
+    expect(isSuccess(RequestEntryState.ResponsePending)).toBeFalse();
+    expect(isSuccess(RequestEntryState.Error)).toBeFalse();
+    expect(isSuccess(RequestEntryState.ResponsePendingStale)).toBeFalse();
+    expect(isSuccess(RequestEntryState.ErrorStale)).toBeFalse();
+    expect(isSuccess(RequestEntryState.SuccessStale)).toBeFalse();
+  });
+});
+
+describe(`isErrorStale`, () => {
+  it(`should only return true if the given state is ErrorStale`, () => {
+    expect(isErrorStale(RequestEntryState.ErrorStale)).toBeTrue();
+
+    expect(isErrorStale(RequestEntryState.RequestPending)).toBeFalse();
+    expect(isErrorStale(RequestEntryState.ResponsePending)).toBeFalse();
+    expect(isErrorStale(RequestEntryState.Error)).toBeFalse();
+    expect(isErrorStale(RequestEntryState.Success)).toBeFalse();
+    expect(isErrorStale(RequestEntryState.ResponsePendingStale)).toBeFalse();
+    expect(isErrorStale(RequestEntryState.SuccessStale)).toBeFalse();
+  });
+});
+
+describe(`isSuccessStale`, () => {
+  it(`should only return true if the given state is SuccessStale`, () => {
+    expect(isSuccessStale(RequestEntryState.SuccessStale)).toBeTrue();
+
+    expect(isSuccessStale(RequestEntryState.RequestPending)).toBeFalse();
+    expect(isSuccessStale(RequestEntryState.ResponsePending)).toBeFalse();
+    expect(isSuccessStale(RequestEntryState.Error)).toBeFalse();
+    expect(isSuccessStale(RequestEntryState.Success)).toBeFalse();
+    expect(isSuccessStale(RequestEntryState.ResponsePendingStale)).toBeFalse();
+    expect(isSuccessStale(RequestEntryState.ErrorStale)).toBeFalse();
+  });
+});
+
+describe(`isResponsePending`, () => {
+  it(`should only return true if the given state is ResponsePending`, () => {
+    expect(isResponsePending(RequestEntryState.ResponsePending)).toBeTrue();
+
+    expect(isResponsePending(RequestEntryState.RequestPending)).toBeFalse();
+    expect(isResponsePending(RequestEntryState.Error)).toBeFalse();
+    expect(isResponsePending(RequestEntryState.Success)).toBeFalse();
+    expect(isResponsePending(RequestEntryState.ResponsePendingStale)).toBeFalse();
+    expect(isResponsePending(RequestEntryState.ErrorStale)).toBeFalse();
+    expect(isResponsePending(RequestEntryState.SuccessStale)).toBeFalse();
+  });
+});
+
+describe(`isResponsePendingStale`, () => {
+  it(`should only return true if the given state is requestPending`, () => {
+    expect(isResponsePendingStale(RequestEntryState.ResponsePendingStale)).toBeTrue();
+
+    expect(isResponsePendingStale(RequestEntryState.RequestPending)).toBeFalse();
+    expect(isResponsePendingStale(RequestEntryState.ResponsePending)).toBeFalse();
+    expect(isResponsePendingStale(RequestEntryState.Error)).toBeFalse();
+    expect(isResponsePendingStale(RequestEntryState.Success)).toBeFalse();
+    expect(isResponsePendingStale(RequestEntryState.ErrorStale)).toBeFalse();
+    expect(isResponsePendingStale(RequestEntryState.SuccessStale)).toBeFalse();
+  });
+});
+
+describe(`isLoading`, () => {
+  it(`should only return true if the given state is RequestPending, ResponsePending or ResponsePendingStale`, () => {
+    expect(isLoading(RequestEntryState.RequestPending)).toBeTrue();
+    expect(isLoading(RequestEntryState.ResponsePending)).toBeTrue();
+    expect(isLoading(RequestEntryState.ResponsePendingStale)).toBeTrue();
+
+    expect(isLoading(RequestEntryState.Error)).toBeFalse();
+    expect(isLoading(RequestEntryState.Success)).toBeFalse();
+    expect(isLoading(RequestEntryState.ErrorStale)).toBeFalse();
+    expect(isLoading(RequestEntryState.SuccessStale)).toBeFalse();
+  });
+});
+
+describe(`hasFailed`, () => {
+  describe(`when the state is loading`, () => {
+    it(`should return undefined`, () => {
+      expect(hasFailed(RequestEntryState.RequestPending)).toBeUndefined();
+      expect(hasFailed(RequestEntryState.ResponsePending)).toBeUndefined();
+      expect(hasFailed(RequestEntryState.ResponsePendingStale)).toBeUndefined();
+    });
+  });
+
+  describe(`when the state has completed`, () => {
+    it(`should only return true if the given state is Error or ErrorStale`, () => {
+      expect(hasFailed(RequestEntryState.Error)).toBeTrue();
+      expect(hasFailed(RequestEntryState.ErrorStale)).toBeTrue();
+
+      expect(hasFailed(RequestEntryState.Success)).toBeFalse();
+      expect(hasFailed(RequestEntryState.SuccessStale)).toBeFalse();
+    });
+  });
+});
+
+describe(`hasSucceeded`, () => {
+  describe(`when the state is loading`, () => {
+    it(`should return undefined`, () => {
+      expect(hasSucceeded(RequestEntryState.RequestPending)).toBeUndefined();
+      expect(hasSucceeded(RequestEntryState.ResponsePending)).toBeUndefined();
+      expect(hasSucceeded(RequestEntryState.ResponsePendingStale)).toBeUndefined();
+    });
+  });
+
+  describe(`when the state has completed`, () => {
+    it(`should only return true if the given state is Error or ErrorStale`, () => {
+      expect(hasSucceeded(RequestEntryState.Success)).toBeTrue();
+      expect(hasSucceeded(RequestEntryState.SuccessStale)).toBeTrue();
+
+      expect(hasSucceeded(RequestEntryState.Error)).toBeFalse();
+      expect(hasSucceeded(RequestEntryState.ErrorStale)).toBeFalse();
+    });
+  });
+});
+
+
+describe(`hasCompleted`, () => {
+  it(`should only return true if the given state is Error, Success, ErrorStale or SuccessStale`, () => {
+    expect(hasCompleted(RequestEntryState.Error)).toBeTrue();
+    expect(hasCompleted(RequestEntryState.Success)).toBeTrue();
+    expect(hasCompleted(RequestEntryState.ErrorStale)).toBeTrue();
+    expect(hasCompleted(RequestEntryState.SuccessStale)).toBeTrue();
+
+    expect(hasCompleted(RequestEntryState.RequestPending)).toBeFalse();
+    expect(hasCompleted(RequestEntryState.ResponsePending)).toBeFalse();
+    expect(hasCompleted(RequestEntryState.ResponsePendingStale)).toBeFalse();
+  });
+});
+
+describe(`isStale`, () => {
+  it(`should only return true if the given state is ResponsePendingStale, SuccessStale or ErrorStale`, () => {
+    expect(isStale(RequestEntryState.ResponsePendingStale)).toBeTrue();
+    expect(isStale(RequestEntryState.SuccessStale)).toBeTrue();
+    expect(isStale(RequestEntryState.ErrorStale)).toBeTrue();
+
+    expect(isStale(RequestEntryState.RequestPending)).toBeFalse();
+    expect(isStale(RequestEntryState.ResponsePending)).toBeFalse();
+    expect(isStale(RequestEntryState.Error)).toBeFalse();
+    expect(isStale(RequestEntryState.Success)).toBeFalse();
+  });
+});
diff --git a/src/app/core/data/request-entry-state.model.ts b/src/app/core/data/request-entry-state.model.ts
index a813b6e743..3aeace39d2 100644
--- a/src/app/core/data/request-entry-state.model.ts
+++ b/src/app/core/data/request-entry-state.model.ts
@@ -3,8 +3,9 @@ export enum RequestEntryState {
   ResponsePending = 'ResponsePending',
   Error = 'Error',
   Success = 'Success',
+  ResponsePendingStale = 'ResponsePendingStale',
   ErrorStale = 'ErrorStale',
-  SuccessStale = 'SuccessStale'
+  SuccessStale = 'SuccessStale',
 }
 
 /**
@@ -42,12 +43,21 @@ export const isSuccessStale = (state: RequestEntryState) =>
  */
 export const isResponsePending = (state: RequestEntryState) =>
   state === RequestEntryState.ResponsePending;
+
 /**
- * Returns true if the given state is RequestPending or ResponsePending,
- * false otherwise
+ * Returns true if the given state is ResponsePendingStale, false otherwise
+ */
+export const isResponsePendingStale = (state: RequestEntryState) =>
+  state === RequestEntryState.ResponsePendingStale;
+
+/**
+ * Returns true if the given state is RequestPending, RequestPendingStale, ResponsePending, or
+ * ResponsePendingStale, false otherwise
  */
 export const isLoading = (state: RequestEntryState) =>
-  isRequestPending(state) || isResponsePending(state);
+  isRequestPending(state) ||
+  isResponsePending(state) ||
+  isResponsePendingStale(state);
 
 /**
  * If isLoading is true for the given state, this method returns undefined, we can't know yet.
@@ -82,7 +92,10 @@ export const hasCompleted = (state: RequestEntryState) =>
   !isLoading(state);
 
 /**
- * Returns true if the given state is SuccessStale or ErrorStale, false otherwise
+ * Returns true if the given state is isRequestPendingStale, isResponsePendingStale, SuccessStale or
+ * ErrorStale, false otherwise
  */
 export const isStale = (state: RequestEntryState) =>
-  isSuccessStale(state) || isErrorStale(state);
+  isResponsePendingStale(state) ||
+  isSuccessStale(state) ||
+  isErrorStale(state);
diff --git a/src/app/core/data/request.effects.ts b/src/app/core/data/request.effects.ts
index 889d909bfa..d79dd9a283 100644
--- a/src/app/core/data/request.effects.ts
+++ b/src/app/core/data/request.effects.ts
@@ -1,7 +1,7 @@
 import { Injectable, Injector } from '@angular/core';
 
 import { Actions, createEffect, ofType } from '@ngrx/effects';
-import { catchError, filter, map, mergeMap, take } from 'rxjs/operators';
+import { catchError, filter, map, mergeMap, take, withLatestFrom } from 'rxjs/operators';
 
 import { hasValue, isNotEmpty } from '../../shared/empty.util';
 import { StoreActionTypes } from '../../store.actions';
@@ -9,6 +9,7 @@ import { getClassForType } from '../cache/builders/build-decorators';
 import { RawRestResponse } from '../dspace-rest/raw-rest-response.model';
 import { DspaceRestService } from '../dspace-rest/dspace-rest.service';
 import { DSpaceSerializer } from '../dspace-rest/dspace.serializer';
+import { XSRFService } from '../xsrf/xsrf.service';
 import {
   RequestActionTypes,
   RequestErrorAction,
@@ -19,6 +20,7 @@ import {
 import { RequestService } from './request.service';
 import { ParsedResponse } from '../cache/response.models';
 import { RequestError } from './request-error.model';
+import { RestRequestMethod } from './rest-request-method';
 import { RestRequestWithResponseParser } from './rest-request-with-response-parser.model';
 import { RequestEntry } from './request-entry.model';
 
@@ -33,7 +35,11 @@ export class RequestEffects {
       );
     }),
     filter((entry: RequestEntry) => hasValue(entry)),
-    map((entry: RequestEntry) => entry.request),
+    withLatestFrom(this.xsrfService.tokenInitialized$),
+    // If it's a GET request, or we have an XSRF token, dispatch it immediately
+    // Otherwise wait for the XSRF token first
+    filter(([entry, tokenInitialized]: [RequestEntry, boolean]) => entry.request.method === RestRequestMethod.GET || tokenInitialized === true),
+    map(([entry, tokenInitialized]: [RequestEntry, boolean]) => entry.request),
     mergeMap((request: RestRequestWithResponseParser) => {
       let body = request.body;
       if (isNotEmpty(request.body) && !request.isMultipart) {
@@ -73,7 +79,8 @@ export class RequestEffects {
     private actions$: Actions,
     private restApi: DspaceRestService,
     private injector: Injector,
-    protected requestService: RequestService
+    protected requestService: RequestService,
+    protected xsrfService: XSRFService,
   ) { }
 
 }
diff --git a/src/app/core/data/request.reducer.spec.ts b/src/app/core/data/request.reducer.spec.ts
index 05f074a96a..86b9c4cd5d 100644
--- a/src/app/core/data/request.reducer.spec.ts
+++ b/src/app/core/data/request.reducer.spec.ts
@@ -48,9 +48,16 @@ describe('requestReducer', () => {
       lastUpdated: 0
     }
   };
+  const testResponsePendingState = {
+    [id1]: {
+      state: RequestEntryState.ResponsePending,
+      lastUpdated: 0
+    }
+  };
   deepFreeze(testInitState);
   deepFreeze(testSuccessState);
   deepFreeze(testErrorState);
+  deepFreeze(testResponsePendingState);
 
   it('should return the current state when no valid actions have been made', () => {
     const action = new NullAction();
@@ -91,29 +98,94 @@ describe('requestReducer', () => {
     expect(newState[id1].response).toEqual(undefined);
   });
 
-  it('should set state to Success for the given RestRequest in the state, in response to a SUCCESS action', () => {
-    const state = testInitState;
+  describe(`in response to a SUCCESS action`, () => {
+    let startState;
+    describe(`when the entry isn't stale`, () => {
+      beforeEach(() => {
+        startState = Object.assign({}, testInitState, {
+          [id1]: Object.assign({}, testInitState[id1], {
+            state: RequestEntryState.ResponsePending
+          })
+        });
+        deepFreeze(startState);
+      });
+      it('should set state to Success for the given RestRequest in the state', () => {
+        const action = new RequestSuccessAction(id1, 200);
+        const newState = requestReducer(startState, action);
 
-    const action = new RequestSuccessAction(id1, 200);
-    const newState = requestReducer(state, action);
+        expect(newState[id1].request.uuid).toEqual(id1);
+        expect(newState[id1].request.href).toEqual(link1);
+        expect(newState[id1].state).toEqual(RequestEntryState.Success);
+        expect(newState[id1].response.statusCode).toEqual(200);
+      });
+    });
+
+    describe(`when the entry is stale`, () => {
+      beforeEach(() => {
+        startState = Object.assign({}, testInitState, {
+          [id1]: Object.assign({}, testInitState[id1], {
+            state: RequestEntryState.ResponsePendingStale
+          })
+        });
+        deepFreeze(startState);
+      });
+      it('should set state to SuccessStale for the given RestRequest in the state', () => {
+        const action = new RequestSuccessAction(id1, 200);
+        const newState = requestReducer(startState, action);
+
+        expect(newState[id1].request.uuid).toEqual(id1);
+        expect(newState[id1].request.href).toEqual(link1);
+        expect(newState[id1].state).toEqual(RequestEntryState.SuccessStale);
+        expect(newState[id1].response.statusCode).toEqual(200);
+      });
+    });
 
-    expect(newState[id1].request.uuid).toEqual(id1);
-    expect(newState[id1].request.href).toEqual(link1);
-    expect(newState[id1].state).toEqual(RequestEntryState.Success);
-    expect(newState[id1].response.statusCode).toEqual(200);
   });
 
-  it('should set state to Error for the given RestRequest in the state, in response to an ERROR action', () => {
-    const state = testInitState;
+  describe(`in response to an ERROR action`, () => {
+    let startState;
+    describe(`when the entry isn't stale`, () => {
+      beforeEach(() => {
+        startState = Object.assign({}, testInitState, {
+          [id1]: Object.assign({}, testInitState[id1], {
+            state: RequestEntryState.ResponsePending
+          })
+        });
+        deepFreeze(startState);
+      });
+      it('should set state to Error for the given RestRequest in the state', () => {
+        const action = new RequestErrorAction(id1, 404, 'Not Found');
+        const newState = requestReducer(startState, action);
 
-    const action = new RequestErrorAction(id1, 404, 'Not Found');
-    const newState = requestReducer(state, action);
+        expect(newState[id1].request.uuid).toEqual(id1);
+        expect(newState[id1].request.href).toEqual(link1);
+        expect(newState[id1].state).toEqual(RequestEntryState.Error);
+        expect(newState[id1].response.statusCode).toEqual(404);
+        expect(newState[id1].response.errorMessage).toEqual('Not Found');
+      });
+    });
 
-    expect(newState[id1].request.uuid).toEqual(id1);
-    expect(newState[id1].request.href).toEqual(link1);
-    expect(newState[id1].state).toEqual(RequestEntryState.Error);
-    expect(newState[id1].response.statusCode).toEqual(404);
-    expect(newState[id1].response.errorMessage).toEqual('Not Found');
+    describe(`when the entry is stale`, () => {
+      beforeEach(() => {
+        startState = Object.assign({}, testInitState, {
+          [id1]: Object.assign({}, testInitState[id1], {
+            state: RequestEntryState.ResponsePendingStale
+          })
+        });
+        deepFreeze(startState);
+      });
+      it('should set state to ErrorStale for the given RestRequest in the state', () => {
+        const action = new RequestErrorAction(id1, 404, 'Not Found');
+        const newState = requestReducer(startState, action);
+
+        expect(newState[id1].request.uuid).toEqual(id1);
+        expect(newState[id1].request.href).toEqual(link1);
+        expect(newState[id1].state).toEqual(RequestEntryState.ErrorStale);
+        expect(newState[id1].response.statusCode).toEqual(404);
+        expect(newState[id1].response.errorMessage).toEqual('Not Found');
+      });
+
+    });
   });
 
   it('should update the response\'s timeCompleted for the given RestRequest in the state, in response to a RESET_TIMESTAMPS action', () => {
@@ -145,28 +217,112 @@ describe('requestReducer', () => {
     expect(newState[id1]).toBeNull();
   });
 
-  describe(`for an entry with state: Success`, () => {
-    it(`should set the state to SuccessStale, in response to a STALE action`, () => {
-      const state = testSuccessState;
+  describe(`in response to a STALE action`, () => {
+    describe(`when the entry has been removed`, () => {
+      it(`shouldn't do anything`, () => {
+        const startState = {
+          [id1]: null
+        };
+        deepFreeze(startState);
 
-      const action = new RequestStaleAction(id1);
-      const newState = requestReducer(state, action);
+        const action = new RequestStaleAction(id1);
+        const newState = requestReducer(startState, action);
 
-      expect(newState[id1].state).toEqual(RequestEntryState.SuccessStale);
-      expect(newState[id1].lastUpdated).toBe(action.lastUpdated);
+        expect(newState[id1]).toBeNull();
+      });
+    });
+
+    describe(`for stale entries`, () => {
+      it(`shouldn't do anything`, () => {
+        const rpsStartState = Object.assign({}, testInitState, {
+          [id1]: Object.assign({}, testInitState[id1], {
+            state: RequestEntryState.ResponsePendingStale
+          })
+        });
+        deepFreeze(rpsStartState);
+
+        const action = new RequestStaleAction(id1);
+        let newState = requestReducer(rpsStartState, action);
+
+        expect(newState[id1].state).toEqual(rpsStartState[id1].state);
+        expect(newState[id1].lastUpdated).toBe(rpsStartState[id1].lastUpdated);
+
+        const ssStartState = Object.assign({}, testInitState, {
+          [id1]: Object.assign({}, testInitState[id1], {
+            state: RequestEntryState.SuccessStale
+          })
+        });
+
+        newState = requestReducer(ssStartState, action);
+
+        expect(newState[id1].state).toEqual(ssStartState[id1].state);
+        expect(newState[id1].lastUpdated).toBe(ssStartState[id1].lastUpdated);
+
+        const esStartState = Object.assign({}, testInitState, {
+          [id1]: Object.assign({}, testInitState[id1], {
+            state: RequestEntryState.ErrorStale
+          })
+        });
+
+        newState = requestReducer(esStartState, action);
+
+        expect(newState[id1].state).toEqual(esStartState[id1].state);
+        expect(newState[id1].lastUpdated).toBe(esStartState[id1].lastUpdated);
+
+      });
+    });
+
+    describe(`for and entry with state: RequestPending`, () => {
+      it(`shouldn't do anything`, () => {
+        const startState = Object.assign({}, testInitState, {
+          [id1]: Object.assign({}, testInitState[id1], {
+            state: RequestEntryState.RequestPending
+          })
+        });
+
+        const action = new RequestStaleAction(id1);
+        const newState = requestReducer(startState, action);
+
+        expect(newState[id1].state).toEqual(startState[id1].state);
+        expect(newState[id1].lastUpdated).toBe(startState[id1].lastUpdated);
+
+      });
+    });
+
+    describe(`for an entry with state: ResponsePending`, () => {
+      it(`should set the state to ResponsePendingStale`, () => {
+        const state = testResponsePendingState;
+
+        const action = new RequestStaleAction(id1);
+        const newState = requestReducer(state, action);
+
+        expect(newState[id1].state).toEqual(RequestEntryState.ResponsePendingStale);
+        expect(newState[id1].lastUpdated).toBe(action.lastUpdated);
+      });
+    });
+
+    describe(`for an entry with state: Success`, () => {
+      it(`should set the state to SuccessStale`, () => {
+        const state = testSuccessState;
+
+        const action = new RequestStaleAction(id1);
+        const newState = requestReducer(state, action);
+
+        expect(newState[id1].state).toEqual(RequestEntryState.SuccessStale);
+        expect(newState[id1].lastUpdated).toBe(action.lastUpdated);
+      });
+    });
+
+    describe(`for an entry with state: Error`, () => {
+      it(`should set the state to ErrorStale`, () => {
+        const state = testErrorState;
+
+        const action = new RequestStaleAction(id1);
+        const newState = requestReducer(state, action);
+
+        expect(newState[id1].state).toEqual(RequestEntryState.ErrorStale);
+        expect(newState[id1].lastUpdated).toBe(action.lastUpdated);
+      });
     });
   });
-
-  describe(`for an entry with state: Error`, () => {
-    it(`should set the state to ErrorStale, in response to a STALE action`, () => {
-      const state = testErrorState;
-
-      const action = new RequestStaleAction(id1);
-      const newState = requestReducer(state, action);
-
-      expect(newState[id1].state).toEqual(RequestEntryState.ErrorStale);
-      expect(newState[id1].lastUpdated).toBe(action.lastUpdated);
-    });
-  });
-
 });
diff --git a/src/app/core/data/request.reducer.ts b/src/app/core/data/request.reducer.ts
index 9bf17faf8d..9cf4fee0e2 100644
--- a/src/app/core/data/request.reducer.ts
+++ b/src/app/core/data/request.reducer.ts
@@ -11,7 +11,13 @@ import {
   ResetResponseTimestampsAction
 } from './request.actions';
 import { isNull } from '../../shared/empty.util';
-import { hasSucceeded, isStale, RequestEntryState } from './request-entry-state.model';
+import {
+  hasSucceeded,
+  isStale,
+  RequestEntryState,
+  isRequestPending,
+  isResponsePending
+} from './request-entry-state.model';
 import { RequestState } from './request-state.model';
 
 // Object.create(null) ensures the object has no default js properties (e.g. `__proto__`)
@@ -91,14 +97,17 @@ function executeRequest(storeState: RequestState, action: RequestExecuteAction):
  *    the new storeState, with the response added to the request
  */
 function completeSuccessRequest(storeState: RequestState, action: RequestSuccessAction): RequestState {
-  if (isNull(storeState[action.payload.uuid])) {
+  const prevEntry = storeState[action.payload.uuid];
+  if (isNull(prevEntry)) {
     // after a request has been removed it's possible pending changes still come in.
     // Don't store them
     return storeState;
   } else {
     return Object.assign({}, storeState, {
-      [action.payload.uuid]: Object.assign({}, storeState[action.payload.uuid], {
-        state: RequestEntryState.Success,
+      [action.payload.uuid]: Object.assign({}, prevEntry, {
+        // If a response comes in for a request that's already stale, still store it otherwise
+        // components that are waiting for it might freeze
+        state: isStale(prevEntry.state) ? RequestEntryState.SuccessStale : RequestEntryState.Success,
         response: {
           timeCompleted: action.payload.timeCompleted,
           lastUpdated: action.payload.timeCompleted,
@@ -124,14 +133,17 @@ function completeSuccessRequest(storeState: RequestState, action: RequestSuccess
  *    the new storeState, with the response added to the request
  */
 function completeFailedRequest(storeState: RequestState, action: RequestErrorAction): RequestState {
-  if (isNull(storeState[action.payload.uuid])) {
+  const prevEntry = storeState[action.payload.uuid];
+  if (isNull(prevEntry)) {
     // after a request has been removed it's possible pending changes still come in.
     // Don't store them
     return storeState;
   } else {
     return Object.assign({}, storeState, {
-      [action.payload.uuid]: Object.assign({}, storeState[action.payload.uuid], {
-        state: RequestEntryState.Error,
+      [action.payload.uuid]: Object.assign({}, prevEntry, {
+        // If a response comes in for a request that's already stale, still store it otherwise
+        // components that are waiting for it might freeze
+        state: isStale(prevEntry.state) ? RequestEntryState.ErrorStale : RequestEntryState.Error,
         response: {
           timeCompleted: action.payload.timeCompleted,
           lastUpdated: action.payload.timeCompleted,
@@ -155,22 +167,27 @@ function completeFailedRequest(storeState: RequestState, action: RequestErrorAct
  *    the new storeState, set to stale
  */
 function expireRequest(storeState: RequestState, action: RequestStaleAction): RequestState {
-  if (isNull(storeState[action.payload.uuid])) {
-    // after a request has been removed it's possible pending changes still come in.
-    // Don't store them
+  const prevEntry = storeState[action.payload.uuid];
+  if (isNull(prevEntry) || isStale(prevEntry.state) || isRequestPending(prevEntry.state)) {
+    // No need to do anything if the entry doesn't exist, is already stale, or if the request is
+    // still pending, because that means it still needs to be sent to the server. Any response
+    // is guaranteed to have been generated after the request was set to stale.
     return storeState;
   } else {
-    const prevEntry = storeState[action.payload.uuid];
-    if (isStale(prevEntry.state)) {
-      return storeState;
+    let nextRequestEntryState: RequestEntryState;
+    if (isResponsePending(prevEntry.state)) {
+      nextRequestEntryState = RequestEntryState.ResponsePendingStale;
+    } else if (hasSucceeded(prevEntry.state)) {
+      nextRequestEntryState = RequestEntryState.SuccessStale;
     } else {
-      return Object.assign({}, storeState, {
-        [action.payload.uuid]: Object.assign({}, prevEntry, {
-          state: hasSucceeded(prevEntry.state) ? RequestEntryState.SuccessStale : RequestEntryState.ErrorStale,
-          lastUpdated: action.lastUpdated
-        })
-      });
+      nextRequestEntryState = RequestEntryState.ErrorStale;
     }
+    return Object.assign({}, storeState, {
+      [action.payload.uuid]: Object.assign({}, prevEntry, {
+        state: nextRequestEntryState,
+        lastUpdated: action.lastUpdated
+      })
+    });
   }
 }
 
diff --git a/src/app/core/data/request.service.spec.ts b/src/app/core/data/request.service.spec.ts
index 108a588881..ae07a1c3d5 100644
--- a/src/app/core/data/request.service.spec.ts
+++ b/src/app/core/data/request.service.spec.ts
@@ -1,6 +1,6 @@
 import { Store, StoreModule } from '@ngrx/store';
 import { cold, getTestScheduler } from 'jasmine-marbles';
-import { EMPTY, of as observableOf } from 'rxjs';
+import { EMPTY, Observable, of as observableOf } from 'rxjs';
 import { TestScheduler } from 'rxjs/testing';
 
 import { getMockObjectCacheService } from '../../shared/mocks/object-cache.service.mock';
@@ -80,11 +80,11 @@ describe('RequestService', () => {
     store = TestBed.inject(Store);
     mockStore = store as MockStore<CoreState>;
     mockStore.setState(initialState);
+
     service = new RequestService(
       objectCache,
       uuidService,
       store,
-      undefined
     );
     serviceAsAny = service as any;
   });
@@ -638,4 +638,87 @@ describe('RequestService', () => {
       expect(done$).toBeObservable(cold('-----(t|)', { t: true }));
     }));
   });
+
+  describe('setStaleByHref', () => {
+    const uuid = 'c574a42c-4818-47ac-bbe1-6c3cd622c81f';
+    const href = 'https://rest.api/some/object';
+    const freshRE: any = {
+      request: { uuid, href },
+      state: RequestEntryState.Success
+    };
+    const staleRE: any = {
+      request: { uuid, href },
+      state: RequestEntryState.SuccessStale
+    };
+
+    it(`should call getByHref to retrieve the RequestEntry matching the href`, () => {
+      spyOn(service, 'getByHref').and.returnValue(observableOf(staleRE));
+      service.setStaleByHref(href);
+      expect(service.getByHref).toHaveBeenCalledWith(href);
+    });
+
+    it(`should dispatch a RequestStaleAction for the RequestEntry returned by getByHref`, (done: DoneFn) => {
+      spyOn(service, 'getByHref').and.returnValue(observableOf(staleRE));
+      spyOn(store, 'dispatch');
+      service.setStaleByHref(href).subscribe(() => {
+        const requestStaleAction = new RequestStaleAction(uuid);
+        requestStaleAction.lastUpdated = jasmine.any(Number) as any;
+        expect(store.dispatch).toHaveBeenCalledWith(requestStaleAction);
+        done();
+      });
+    });
+
+   it(`should emit true when the request in the store is stale`, () => {
+     spyOn(service, 'getByHref').and.returnValue(cold('a-b', {
+       a: freshRE,
+       b: staleRE
+     }));
+     const result$ = service.setStaleByHref(href);
+     expect(result$).toBeObservable(cold('--(c|)', { c: true }));
+   });
+  });
+
+  describe('setStaleByHrefSubstring', () => {
+    let dispatchSpy: jasmine.Spy;
+    let getByUUIDSpy: jasmine.Spy;
+
+    beforeEach(() => {
+      dispatchSpy = spyOn(store, 'dispatch');
+      getByUUIDSpy = spyOn(service, 'getByUUID').and.callThrough();
+    });
+
+    describe('with an empty/no matching requests in the state', () => {
+      it('should return true', () => {
+        const done$: Observable<boolean> = service.setStaleByHrefSubstring('https://rest.api/endpoint/selfLink');
+        expect(done$).toBeObservable(cold('(a|)', { a: true }));
+      });
+    });
+
+    describe('with a matching request in the state', () => {
+      beforeEach(() => {
+        const state = Object.assign({}, initialState, {
+          core: Object.assign({}, initialState.core, {
+            'index': {
+              'get-request/href-to-uuid': {
+                'https://rest.api/endpoint/selfLink': '5f2a0d2a-effa-4d54-bd54-5663b960f9eb'
+              }
+            }
+          })
+        });
+        mockStore.setState(state);
+      });
+
+      it('should return an Observable that emits true as soon as the request is stale', () => {
+        dispatchSpy.and.callFake(() => { /* empty */ });   // don't actually set as stale
+        getByUUIDSpy.and.returnValue(cold('a-b--c--d-', {  // but fake the state in the cache
+          a: { state: RequestEntryState.ResponsePending },
+          b: { state: RequestEntryState.Success },
+          c: { state: RequestEntryState.SuccessStale },
+          d: { state: RequestEntryState.Error },
+        }));
+        const done$: Observable<boolean> = service.setStaleByHrefSubstring('https://rest.api/endpoint/selfLink');
+        expect(done$).toBeObservable(cold('-----(a|)', { a: true }));
+      });
+    });
+  });
 });
diff --git a/src/app/core/data/request.service.ts b/src/app/core/data/request.service.ts
index 1f6680203e..063b19f801 100644
--- a/src/app/core/data/request.service.ts
+++ b/src/app/core/data/request.service.ts
@@ -2,13 +2,13 @@ import { Injectable } from '@angular/core';
 import { HttpHeaders } from '@angular/common/http';
 
 import { createSelector, MemoizedSelector, select, Store } from '@ngrx/store';
-import { Observable } from 'rxjs';
-import { filter, map, take, tap } from 'rxjs/operators';
+import { Observable, from as observableFrom } from 'rxjs';
+import { filter, find, map, mergeMap, switchMap, take, tap, toArray } from 'rxjs/operators';
 import cloneDeep from 'lodash/cloneDeep';
 import { hasValue, isEmpty, isNotEmpty, hasNoValue } from '../../shared/empty.util';
 import { ObjectCacheEntry } from '../cache/object-cache.reducer';
 import { ObjectCacheService } from '../cache/object-cache.service';
-import { IndexState, MetaIndexState } from '../index/index.reducer';
+import { IndexState } from '../index/index.reducer';
 import { requestIndexSelector, getUrlWithoutEmbedParams } from '../index/index.selectors';
 import { UUIDService } from '../shared/uuid.service';
 import {
@@ -16,7 +16,7 @@ import {
   RequestExecuteAction,
   RequestStaleAction
 } from './request.actions';
-import { GetRequest} from './request.models';
+import { GetRequest } from './request.models';
 import { CommitSSBAction } from '../cache/server-sync-buffer.actions';
 import { RestRequestMethod } from './rest-request-method';
 import { coreSelector } from '../core.selectors';
@@ -136,8 +136,7 @@ export class RequestService {
 
   constructor(private objectCache: ObjectCacheService,
               private uuidService: UUIDService,
-              private store: Store<CoreState>,
-              private indexStore: Store<MetaIndexState>) {
+              private store: Store<CoreState>) {
   }
 
   generateRequestId(): string {
@@ -164,7 +163,7 @@ export class RequestService {
     this.getByHref(request.href).pipe(
       take(1))
       .subscribe((re: RequestEntry) => {
-        isPending = (hasValue(re) && isLoading(re.state));
+        isPending = (hasValue(re) && isLoading(re.state) && !isStale(re.state));
       });
     return isPending;
   }
@@ -300,22 +299,42 @@ export class RequestService {
    * Set all requests that match (part of) the href to stale
    *
    * @param href    A substring of the request(s) href
-   * @return        Returns an observable emitting whether or not the cache is removed
+   * @return        Returns an observable emitting when those requests are all stale
    */
   setStaleByHrefSubstring(href: string): Observable<boolean> {
-    this.store.pipe(
+    const requestUUIDs$ = this.store.pipe(
       select(uuidsFromHrefSubstringSelector(requestIndexSelector, href)),
       take(1)
-    ).subscribe((uuids: string[]) => {
+    );
+    requestUUIDs$.subscribe((uuids: string[]) => {
       for (const uuid of uuids) {
         this.store.dispatch(new RequestStaleAction(uuid));
       }
     });
     this.requestsOnTheirWayToTheStore = this.requestsOnTheirWayToTheStore.filter((reqHref: string) => reqHref.indexOf(href) < 0);
 
-    return this.store.pipe(
-      select(uuidsFromHrefSubstringSelector(requestIndexSelector, href)),
-      map((uuids) => isEmpty(uuids))
+    // emit true after all requests are stale
+    return requestUUIDs$.pipe(
+      switchMap((uuids: string[]) => {
+        if (isEmpty(uuids)) {
+          // if there were no matching requests, emit true immediately
+          return [true];
+        } else {
+          // otherwise emit all request uuids in order
+          return observableFrom(uuids).pipe(
+            // retrieve the RequestEntry for each uuid
+            mergeMap((uuid: string) => this.getByUUID(uuid)),
+            // check whether it is undefined or stale
+            map((request: RequestEntry) => hasNoValue(request) || isStale(request.state)),
+            // if it is, complete
+            find((stale: boolean) => stale === true),
+            // after all observables above are completed, emit them as a single array
+            toArray(),
+            // when the array comes in, emit true
+            map(() => true)
+          );
+        }
+      })
     );
   }
 
@@ -331,7 +350,29 @@ export class RequestService {
       map((request: RequestEntry) => isStale(request.state)),
       filter((stale: boolean) => stale),
       take(1),
-      );
+    );
+  }
+
+  /**
+   * Mark a request as stale
+   * @param href  the href of the request
+   * @return      an Observable that will emit true once the Request becomes stale
+   */
+  setStaleByHref(href: string): Observable<boolean> {
+    const requestEntry$ = this.getByHref(href);
+
+    requestEntry$.pipe(
+      map((re: RequestEntry) => re.request.uuid),
+      take(1),
+    ).subscribe((uuid: string) => {
+      this.store.dispatch(new RequestStaleAction(uuid));
+    });
+
+    return requestEntry$.pipe(
+      map((request: RequestEntry) => isStale(request.state)),
+      filter((stale: boolean) => stale),
+      take(1)
+    );
   }
 
   /**
@@ -344,10 +385,10 @@ export class RequestService {
     // if it's not a GET request
     if (request.method !== RestRequestMethod.GET) {
       return true;
-    // if it is a GET request, check it isn't pending
+      // if it is a GET request, check it isn't pending
     } else if (this.isPending(request)) {
       return false;
-    // if it is pending, check if we're allowed to use a cached version
+      // if it is pending, check if we're allowed to use a cached version
     } else if (!useCachedVersionIfAvailable) {
       return true;
     } else {
diff --git a/src/app/core/data/root-data.service.spec.ts b/src/app/core/data/root-data.service.spec.ts
index b65449d007..c34ad37531 100644
--- a/src/app/core/data/root-data.service.spec.ts
+++ b/src/app/core/data/root-data.service.spec.ts
@@ -1,16 +1,18 @@
 import { RootDataService } from './root-data.service';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
-import { Observable, of } from 'rxjs';
+import {
+  createSuccessfulRemoteDataObject$,
+  createFailedRemoteDataObject$
+} from '../../shared/remote-data.utils';
+import { Observable } from 'rxjs';
 import { RemoteData } from './remote-data';
 import { Root } from './root.model';
-import { RawRestResponse } from '../dspace-rest/raw-rest-response.model';
 import { cold } from 'jasmine-marbles';
 
 describe('RootDataService', () => {
   let service: RootDataService;
   let halService: HALEndpointService;
-  let restService;
+  let requestService;
   let rootEndpoint;
   let findByHrefSpy;
 
@@ -19,10 +21,10 @@ describe('RootDataService', () => {
     halService = jasmine.createSpyObj('halService', {
       getRootHref: rootEndpoint,
     });
-    restService = jasmine.createSpyObj('halService', {
-      get: jasmine.createSpy('get'),
-    });
-    service = new RootDataService(null, null, null, halService, restService);
+    requestService = jasmine.createSpyObj('requestService', [
+      'setStaleByHref',
+    ]);
+    service = new RootDataService(requestService, null, null, halService);
 
     findByHrefSpy = spyOn(service as any, 'findByHref');
     findByHrefSpy.and.returnValue(createSuccessfulRemoteDataObject$({}));
@@ -47,12 +49,8 @@ describe('RootDataService', () => {
     let result$: Observable<boolean>;
 
     it('should return observable of true when root endpoint is available', () => {
-      const mockResponse = {
-        statusCode: 200,
-        statusText: 'OK'
-      } as RawRestResponse;
+      spyOn(service, 'findRoot').and.returnValue(createSuccessfulRemoteDataObject$<Root>({} as any));
 
-      restService.get.and.returnValue(of(mockResponse));
       result$ = service.checkServerAvailability();
 
       expect(result$).toBeObservable(cold('(a|)', {
@@ -61,12 +59,8 @@ describe('RootDataService', () => {
     });
 
     it('should return observable of false when root endpoint is not available', () => {
-      const mockResponse = {
-        statusCode: 500,
-        statusText: 'Internal Server Error'
-      } as RawRestResponse;
+      spyOn(service, 'findRoot').and.returnValue(createFailedRemoteDataObject$<Root>('500'));
 
-      restService.get.and.returnValue(of(mockResponse));
       result$ = service.checkServerAvailability();
 
       expect(result$).toBeObservable(cold('(a|)', {
@@ -75,4 +69,12 @@ describe('RootDataService', () => {
     });
 
   });
+
+  describe(`invalidateRootCache`, () => {
+    it(`should set the cached root request to stale`, () => {
+      service.invalidateRootCache();
+      expect(halService.getRootHref).toHaveBeenCalled();
+      expect(requestService.setStaleByHref).toHaveBeenCalledWith(rootEndpoint);
+    });
+  });
 });
diff --git a/src/app/core/data/root-data.service.ts b/src/app/core/data/root-data.service.ts
index 54fe614d3e..5431a2d1fb 100644
--- a/src/app/core/data/root-data.service.ts
+++ b/src/app/core/data/root-data.service.ts
@@ -7,12 +7,11 @@ import { HALEndpointService } from '../shared/hal-endpoint.service';
 import { Observable, of as observableOf } from 'rxjs';
 import { RemoteData } from './remote-data';
 import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
-import { DspaceRestService } from '../dspace-rest/dspace-rest.service';
-import { RawRestResponse } from '../dspace-rest/raw-rest-response.model';
 import { catchError, map } from 'rxjs/operators';
 import { BaseDataService } from './base/base-data.service';
 import { ObjectCacheService } from '../cache/object-cache.service';
 import { dataService } from './base/data-service.decorator';
+import { getFirstCompletedRemoteData } from '../shared/operators';
 
 /**
  * A service to retrieve the {@link Root} object from the REST API.
@@ -25,7 +24,6 @@ export class RootDataService extends BaseDataService<Root> {
     protected rdbService: RemoteDataBuildService,
     protected objectCache: ObjectCacheService,
     protected halService: HALEndpointService,
-    protected restService: DspaceRestService,
   ) {
     super('', requestService, rdbService, objectCache, halService, 6 * 60 * 60 * 1000);
   }
@@ -34,12 +32,13 @@ export class RootDataService extends BaseDataService<Root> {
    * Check if root endpoint is available
    */
   checkServerAvailability(): Observable<boolean> {
-    return this.restService.get(this.halService.getRootHref()).pipe(
+    return this.findRoot().pipe(
       catchError((err ) => {
         console.error(err);
         return observableOf(false);
       }),
-      map((res: RawRestResponse) => res.statusCode === 200)
+      getFirstCompletedRemoteData(),
+      map((rootRd: RemoteData<Root>) => rootRd.statusCode === 200)
     );
   }
 
@@ -60,6 +59,6 @@ export class RootDataService extends BaseDataService<Root> {
    * Set to sale the root endpoint cache hit
    */
   invalidateRootCache() {
-    this.requestService.setStaleByHrefSubstring(this.halService.getRootHref());
+    this.requestService.setStaleByHref(this.halService.getRootHref());
   }
 }
diff --git a/src/app/core/data/version-history-data.service.spec.ts b/src/app/core/data/version-history-data.service.spec.ts
index 03bf6c8bcb..1d55b4b2f1 100644
--- a/src/app/core/data/version-history-data.service.spec.ts
+++ b/src/app/core/data/version-history-data.service.spec.ts
@@ -65,6 +65,10 @@ describe('VersionHistoryDataService', () => {
       },
     },
   });
+  const version1WithDraft = Object.assign(new Version(), {
+    ...version1,
+    versionhistory: createSuccessfulRemoteDataObject$(versionHistoryDraft),
+  });
   const versions = [version1, version2];
   versionHistory.versions = createSuccessfulRemoteDataObject$(createPaginatedList(versions));
   const item1 = Object.assign(new Item(), {
@@ -186,21 +190,18 @@ describe('VersionHistoryDataService', () => {
   });
 
   describe('hasDraftVersion$', () => {
-    beforeEach(waitForAsync(() => {
-      versionService.findByHref.and.returnValue(createSuccessfulRemoteDataObject$<Version>(version1));
-    }));
     it('should return false if draftVersion is false', fakeAsync(() => {
-      versionService.getHistoryFromVersion.and.returnValue(of(versionHistory));
+      versionService.findByHref.and.returnValue(createSuccessfulRemoteDataObject$<Version>(version1));
       service.hasDraftVersion$('href').subscribe((res) => {
         expect(res).toBeFalse();
       });
     }));
+
     it('should return true if draftVersion is true', fakeAsync(() => {
-      versionService.getHistoryFromVersion.and.returnValue(of(versionHistoryDraft));
+      versionService.findByHref.and.returnValue(createSuccessfulRemoteDataObject$<Version>(version1WithDraft));
       service.hasDraftVersion$('href').subscribe((res) => {
         expect(res).toBeTrue();
       });
     }));
   });
-
 });
diff --git a/src/app/core/data/version-history-data.service.ts b/src/app/core/data/version-history-data.service.ts
index b331c4f2e4..8ecfde0686 100644
--- a/src/app/core/data/version-history-data.service.ts
+++ b/src/app/core/data/version-history-data.service.ts
@@ -6,23 +6,21 @@ import { ObjectCacheService } from '../cache/object-cache.service';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
 import { HttpHeaders } from '@angular/common/http';
 import { PostRequest } from './request.models';
-import { Observable, of } from 'rxjs';
+import { combineLatest, Observable, of as observableOf } from 'rxjs';
 import { PaginatedSearchOptions } from '../../shared/search/models/paginated-search-options.model';
 import { RemoteData } from './remote-data';
 import { PaginatedList } from './paginated-list.model';
 import { Version } from '../shared/version.model';
-import { filter, map, switchMap, take } from 'rxjs/operators';
+import { filter, find, map, switchMap, take } from 'rxjs/operators';
 import { VERSION_HISTORY } from '../shared/version-history.resource-type';
 import { followLink, FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
 import { VersionDataService } from './version-data.service';
 import { HttpOptions } from '../dspace-rest/dspace-rest.service';
 import { getAllSucceededRemoteData, getFirstCompletedRemoteData, getFirstSucceededRemoteDataPayload, getRemoteDataPayload } from '../shared/operators';
 import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
-import { hasValueOperator } from '../../shared/empty.util';
+import { hasValue, hasValueOperator } from '../../shared/empty.util';
 import { Item } from '../shared/item.model';
 import { FindListOptions } from './find-list-options.model';
-import { sendRequest } from '../shared/request.operators';
-import { RestRequest } from './rest-request.model';
 import { IdentifiableDataService } from './base/identifiable-data.service';
 import { dataService } from './base/data-service.decorator';
 
@@ -86,19 +84,31 @@ export class VersionHistoryDataService extends IdentifiableDataService<VersionHi
    * @param summary the summary of the new version
    */
   createVersion(itemHref: string, summary: string): Observable<RemoteData<Version>> {
+    const requestId = this.requestService.generateRequestId();
     const requestOptions: HttpOptions = Object.create({});
     let requestHeaders = new HttpHeaders();
     requestHeaders = requestHeaders.append('Content-Type', 'text/uri-list');
     requestOptions.headers = requestHeaders;
 
-    return this.halService.getEndpoint(this.versionsEndpoint).pipe(
+    this.halService.getEndpoint(this.versionsEndpoint).pipe(
       take(1),
       map((endpointUrl: string) => (summary?.length > 0) ? `${endpointUrl}?summary=${summary}` : `${endpointUrl}`),
-      map((endpointURL: string) => new PostRequest(this.requestService.generateRequestId(), endpointURL, itemHref, requestOptions)),
-      sendRequest(this.requestService),
-      switchMap((restRequest: RestRequest) => this.rdbService.buildFromRequestUUID(restRequest.uuid)),
-      getFirstCompletedRemoteData()
-    ) as Observable<RemoteData<Version>>;
+      find((href: string) => hasValue(href)),
+    ).subscribe((href) => {
+      const request = new PostRequest(requestId, href, itemHref, requestOptions);
+      if (hasValue(this.responseMsToLive)) {
+        request.responseMsToLive = this.responseMsToLive;
+      }
+
+      this.requestService.send(request);
+    });
+
+    return this.rdbService.buildFromRequestUUIDAndAwait<Version>(requestId, (versionRD) => combineLatest([
+      this.requestService.setStaleByHrefSubstring(versionRD.payload._links.self.href),
+      this.requestService.setStaleByHrefSubstring(versionRD.payload._links.versionhistory.href),
+    ])).pipe(
+      getFirstCompletedRemoteData(),
+    );
   }
 
   /**
@@ -137,7 +147,7 @@ export class VersionHistoryDataService extends IdentifiableDataService<VersionHi
       switchMap((res) => res.versionhistory),
       getFirstSucceededRemoteDataPayload(),
       switchMap((versionHistoryRD) => this.getLatestVersionFromHistory$(versionHistoryRD)),
-    ) : of(null);
+    ) : observableOf(null);
   }
 
   /**
@@ -148,8 +158,8 @@ export class VersionHistoryDataService extends IdentifiableDataService<VersionHi
   isLatest$(version: Version): Observable<boolean> {
     return version ? this.getLatestVersion$(version).pipe(
       take(1),
-      switchMap((latestVersion) => of(version.version === latestVersion.version))
-    ) : of(null);
+      switchMap((latestVersion) => observableOf(version.version === latestVersion.version))
+    ) : observableOf(null);
   }
 
   /**
@@ -158,17 +168,22 @@ export class VersionHistoryDataService extends IdentifiableDataService<VersionHi
    * @returns `true` if a workspace item exists, `false` otherwise, or `null` if a version history does not exist
    */
   hasDraftVersion$(versionHref: string): Observable<boolean> {
-    return this.versionDataService.findByHref(versionHref, true, true, followLink('versionhistory')).pipe(
+    return this.versionDataService.findByHref(versionHref, false, true, followLink('versionhistory')).pipe(
       getFirstCompletedRemoteData(),
-      switchMap((res) => {
-        if (res.hasSucceeded && !res.hasNoContent) {
-          return of(res).pipe(
-            getFirstSucceededRemoteDataPayload(),
-            switchMap((version) => this.versionDataService.getHistoryFromVersion(version)),
-            map((versionHistory) => versionHistory ? versionHistory.draftVersion : false),
+      switchMap((versionRD: RemoteData<Version>) => {
+        if (versionRD.hasSucceeded && !versionRD.hasNoContent && hasValue(versionRD.payload)) {
+          return versionRD.payload.versionhistory.pipe(
+            getFirstCompletedRemoteData(),
+            map((versionHistoryRD: RemoteData<VersionHistory>) => {
+              if (versionHistoryRD.hasSucceeded && !versionHistoryRD.hasNoContent) {
+                return versionHistoryRD.payload.draftVersion;
+              } else {
+                return false;
+              }
+            }),
           );
         } else {
-          return of(false);
+          return observableOf(false);
         }
       }),
     );
diff --git a/src/app/core/dspace-rest/dspace-rest.interceptor.spec.ts b/src/app/core/dspace-rest/dspace-rest.interceptor.spec.ts
new file mode 100644
index 0000000000..4a47ffe9fd
--- /dev/null
+++ b/src/app/core/dspace-rest/dspace-rest.interceptor.spec.ts
@@ -0,0 +1,194 @@
+import {
+  HTTP_INTERCEPTORS,
+  HttpClient,
+} from '@angular/common/http';
+import {
+  HttpClientTestingModule,
+  HttpTestingController,
+} from '@angular/common/http/testing';
+import { PLATFORM_ID } from '@angular/core';
+import { TestBed } from '@angular/core/testing';
+
+import {
+  APP_CONFIG,
+  AppConfig,
+} from '../../../config/app-config.interface';
+import { DspaceRestInterceptor } from './dspace-rest.interceptor';
+import { DspaceRestService } from './dspace-rest.service';
+
+describe('DspaceRestInterceptor', () => {
+  let httpMock: HttpTestingController;
+  let httpClient: HttpClient;
+  const appConfig: Partial<AppConfig> = {
+    rest: {
+      ssl: false,
+      host: 'localhost',
+      port: 8080,
+      nameSpace: '/server',
+      baseUrl: 'http://api.example.com/server',
+    },
+  };
+  const appConfigWithSSR: Partial<AppConfig> = {
+    rest: {
+      ssl: false,
+      host: 'localhost',
+      port: 8080,
+      nameSpace: '/server',
+      baseUrl: 'http://api.example.com/server',
+      ssrBaseUrl: 'http://ssr.example.com/server',
+    },
+  };
+
+  describe('When SSR base URL is not set ', () => {
+    describe('and it\'s in the browser', () => {
+      beforeEach(() => {
+        TestBed.configureTestingModule({
+          imports: [HttpClientTestingModule],
+          providers: [
+            DspaceRestService,
+            {
+              provide: HTTP_INTERCEPTORS,
+              useClass: DspaceRestInterceptor,
+              multi: true,
+            },
+            { provide: APP_CONFIG, useValue: appConfig },
+            { provide: PLATFORM_ID, useValue: 'browser' },
+          ],
+        });
+
+        httpMock = TestBed.inject(HttpTestingController);
+        httpClient = TestBed.inject(HttpClient);
+      });
+
+      it('should not modify the request', () => {
+        const url = 'http://api.example.com/server/items';
+        httpClient.get(url).subscribe((response) => {
+          expect(response).toBeTruthy();
+        });
+
+        const req = httpMock.expectOne(url);
+        expect(req.request.url).toBe(url);
+        req.flush({});
+        httpMock.verify();
+      });
+    });
+
+    describe('and it\'s in SSR mode', () => {
+      beforeEach(() => {
+        TestBed.configureTestingModule({
+          imports: [HttpClientTestingModule],
+          providers: [
+            DspaceRestService,
+            {
+              provide: HTTP_INTERCEPTORS,
+              useClass: DspaceRestInterceptor,
+              multi: true,
+            },
+            { provide: APP_CONFIG, useValue: appConfig },
+            { provide: PLATFORM_ID, useValue: 'server' },
+          ],
+        });
+
+        httpMock = TestBed.inject(HttpTestingController);
+        httpClient = TestBed.inject(HttpClient);
+      });
+
+      it('should not replace the base URL', () => {
+        const url = 'http://api.example.com/server/items';
+
+        httpClient.get(url).subscribe((response) => {
+          expect(response).toBeTruthy();
+        });
+
+        const req = httpMock.expectOne(url);
+        expect(req.request.url).toBe(url);
+        req.flush({});
+        httpMock.verify();
+      });
+    });
+  });
+
+  describe('When SSR base URL is set ', () => {
+    describe('and it\'s in the browser', () => {
+      beforeEach(() => {
+        TestBed.configureTestingModule({
+          imports: [HttpClientTestingModule],
+          providers: [
+            DspaceRestService,
+            {
+              provide: HTTP_INTERCEPTORS,
+              useClass: DspaceRestInterceptor,
+              multi: true,
+            },
+            { provide: APP_CONFIG, useValue: appConfigWithSSR },
+            { provide: PLATFORM_ID, useValue: 'browser' },
+          ],
+        });
+
+        httpMock = TestBed.inject(HttpTestingController);
+        httpClient = TestBed.inject(HttpClient);
+      });
+
+      it('should not modify the request', () => {
+        const url = 'http://api.example.com/server/items';
+        httpClient.get(url).subscribe((response) => {
+          expect(response).toBeTruthy();
+        });
+
+        const req = httpMock.expectOne(url);
+        expect(req.request.url).toBe(url);
+        req.flush({});
+        httpMock.verify();
+      });
+    });
+
+    describe('and it\'s in SSR mode', () => {
+      beforeEach(() => {
+        TestBed.configureTestingModule({
+          imports: [HttpClientTestingModule],
+          providers: [
+            DspaceRestService,
+            {
+              provide: HTTP_INTERCEPTORS,
+              useClass: DspaceRestInterceptor,
+              multi: true,
+            },
+            { provide: APP_CONFIG, useValue: appConfigWithSSR },
+            { provide: PLATFORM_ID, useValue: 'server' },
+          ],
+        });
+
+        httpMock = TestBed.inject(HttpTestingController);
+        httpClient = TestBed.inject(HttpClient);
+      });
+
+      it('should replace the base URL', () => {
+        const url = 'http://api.example.com/server/items';
+        const ssrBaseUrl = appConfigWithSSR.rest.ssrBaseUrl;
+
+        httpClient.get(url).subscribe((response) => {
+          expect(response).toBeTruthy();
+        });
+
+        const req = httpMock.expectOne(ssrBaseUrl + '/items');
+        expect(req.request.url).toBe(ssrBaseUrl + '/items');
+        req.flush({});
+        httpMock.verify();
+      });
+
+      it('should not replace any query param containing the base URL', () => {
+        const url = 'http://api.example.com/server/items?url=http://api.example.com/server/item/1';
+        const ssrBaseUrl = appConfigWithSSR.rest.ssrBaseUrl;
+
+        httpClient.get(url).subscribe((response) => {
+          expect(response).toBeTruthy();
+        });
+
+        const req = httpMock.expectOne(ssrBaseUrl + '/items?url=http://api.example.com/server/item/1');
+        expect(req.request.url).toBe(ssrBaseUrl + '/items?url=http://api.example.com/server/item/1');
+        req.flush({});
+        httpMock.verify();
+      });
+    });
+  });
+});
diff --git a/src/app/core/dspace-rest/dspace-rest.interceptor.ts b/src/app/core/dspace-rest/dspace-rest.interceptor.ts
new file mode 100644
index 0000000000..efd2c12b5d
--- /dev/null
+++ b/src/app/core/dspace-rest/dspace-rest.interceptor.ts
@@ -0,0 +1,52 @@
+import { isPlatformBrowser } from '@angular/common';
+import {
+  HttpEvent,
+  HttpHandler,
+  HttpInterceptor,
+  HttpRequest,
+} from '@angular/common/http';
+import {
+  Inject,
+  Injectable,
+  PLATFORM_ID,
+} from '@angular/core';
+import { Observable } from 'rxjs';
+
+import {
+  APP_CONFIG,
+  AppConfig,
+} from '../../../config/app-config.interface';
+import { isEmpty } from '../../shared/empty.util';
+
+@Injectable()
+/**
+ * This Interceptor is used to use the configured base URL for the request made during SSR execution
+ */
+export class DspaceRestInterceptor implements HttpInterceptor {
+
+  /**
+   * Contains the configured application base URL
+   * @protected
+   */
+  protected baseUrl: string;
+  protected ssrBaseUrl: string;
+
+  constructor(
+    @Inject(APP_CONFIG) protected appConfig: AppConfig,
+    @Inject(PLATFORM_ID) private platformId: string,
+  ) {
+    this.baseUrl = this.appConfig.rest.baseUrl;
+    this.ssrBaseUrl = this.appConfig.rest.ssrBaseUrl;
+  }
+
+  intercept(request: HttpRequest<unknown>, next: HttpHandler): Observable<HttpEvent<unknown>> {
+    if (isPlatformBrowser(this.platformId) || isEmpty(this.ssrBaseUrl) || this.baseUrl === this.ssrBaseUrl) {
+      return next.handle(request);
+    }
+
+    // Different SSR Base URL specified so replace it in the current request url
+    const url = request.url.replace(this.baseUrl, this.ssrBaseUrl);
+    const newRequest: HttpRequest<any> = request.clone({ url });
+    return next.handle(newRequest);
+  }
+}
diff --git a/src/app/core/eperson/eperson-data.service.spec.ts b/src/app/core/eperson/eperson-data.service.spec.ts
index b4b939eebf..ba7bab6887 100644
--- a/src/app/core/eperson/eperson-data.service.spec.ts
+++ b/src/app/core/eperson/eperson-data.service.spec.ts
@@ -11,6 +11,7 @@ import {
   EPeopleRegistryCancelEPersonAction,
   EPeopleRegistryEditEPersonAction
 } from '../../access-control/epeople-registry/epeople-registry.actions';
+import { GroupMock } from '../../shared/testing/group-mock';
 import { RequestParam } from '../cache/models/request-param.model';
 import { ChangeAnalyzer } from '../data/change-analyzer';
 import { PatchRequest, PostRequest } from '../data/request.models';
@@ -19,7 +20,7 @@ import { HALEndpointService } from '../shared/hal-endpoint.service';
 import { Item } from '../shared/item.model';
 import { EPersonDataService } from './eperson-data.service';
 import { EPerson } from './models/eperson.model';
-import { EPersonMock, EPersonMock2 } from '../../shared/testing/eperson.mock';
+import { EPersonMock, EPersonMock2, EPersonMockWithNoName } from '../../shared/testing/eperson.mock';
 import { HALEndpointServiceStub } from '../../shared/testing/hal-endpoint-service.stub';
 import { createNoContentRemoteDataObject$, createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
 import { getMockRemoteDataBuildServiceHrefMap } from '../../shared/mocks/remote-data-build.service.mock';
@@ -96,7 +97,7 @@ describe('EPersonDataService', () => {
     it('search by default scope (byMetadata) and no query', () => {
       service.searchByScope(null, '');
       const options = Object.assign(new FindListOptions(), {
-        searchParams: [Object.assign(new RequestParam('query', encodeURIComponent('')))]
+        searchParams: [Object.assign(new RequestParam('query', ''))],
       });
       expect(service.searchBy).toHaveBeenCalledWith('byMetadata', options, true, true);
     });
@@ -104,7 +105,7 @@ describe('EPersonDataService', () => {
     it('search metadata scope and no query', () => {
       service.searchByScope('metadata', '');
       const options = Object.assign(new FindListOptions(), {
-        searchParams: [Object.assign(new RequestParam('query', encodeURIComponent('')))]
+        searchParams: [Object.assign(new RequestParam('query', ''))],
       });
       expect(service.searchBy).toHaveBeenCalledWith('byMetadata', options, true, true);
     });
@@ -112,7 +113,7 @@ describe('EPersonDataService', () => {
     it('search metadata scope and with query', () => {
       service.searchByScope('metadata', 'test');
       const options = Object.assign(new FindListOptions(), {
-        searchParams: [Object.assign(new RequestParam('query', encodeURIComponent('test')))]
+        searchParams: [Object.assign(new RequestParam('query', 'test'))],
       });
       expect(service.searchBy).toHaveBeenCalledWith('byMetadata', options, true, true);
     });
@@ -122,7 +123,7 @@ describe('EPersonDataService', () => {
       spyOn(service, 'findByHref').and.returnValue(createSuccessfulRemoteDataObject$(null));
       service.searchByScope('email', '');
       const options = Object.assign(new FindListOptions(), {
-        searchParams: [Object.assign(new RequestParam('email', encodeURIComponent('')))]
+        searchParams: [Object.assign(new RequestParam('email', ''))],
       });
       expect((service as any).searchData.getSearchByHref).toHaveBeenCalledWith('byEmail', options);
       expect(service.findByHref).toHaveBeenCalledWith(epersonsEndpoint, true, true);
@@ -133,13 +134,37 @@ describe('EPersonDataService', () => {
       spyOn(service, 'findByHref').and.returnValue(createSuccessfulRemoteDataObject$(EPersonMock));
       service.searchByScope('email', EPersonMock.email);
       const options = Object.assign(new FindListOptions(), {
-        searchParams: [Object.assign(new RequestParam('email', encodeURIComponent(EPersonMock.email)))]
+        searchParams: [Object.assign(new RequestParam('email', EPersonMock.email))],
       });
       expect((service as any).searchData.getSearchByHref).toHaveBeenCalledWith('byEmail', options);
       expect(service.findByHref).toHaveBeenCalledWith(epersonsEndpoint, true, true);
     });
   });
 
+  describe('searchNonMembers', () => {
+    beforeEach(() => {
+      spyOn(service, 'searchBy');
+    });
+
+    it('search with empty query and a group ID', () => {
+      service.searchNonMembers('', GroupMock.id);
+      const options = Object.assign(new FindListOptions(), {
+        searchParams: [Object.assign(new RequestParam('query', '')),
+                       Object.assign(new RequestParam('group', GroupMock.id))]
+      });
+      expect(service.searchBy).toHaveBeenCalledWith('isNotMemberOf', options, true, true);
+    });
+
+    it('search with query and a group ID', () => {
+      service.searchNonMembers('test', GroupMock.id);
+      const options = Object.assign(new FindListOptions(), {
+        searchParams: [Object.assign(new RequestParam('query', 'test')),
+                       Object.assign(new RequestParam('group', GroupMock.id))]
+      });
+      expect(service.searchBy).toHaveBeenCalledWith('isNotMemberOf', options, true, true);
+    });
+  });
+
   describe('updateEPerson', () => {
     beforeEach(() => {
       spyOn(service, 'findByHref').and.returnValue(createSuccessfulRemoteDataObject$(EPersonMock));
@@ -254,6 +279,37 @@ describe('EPersonDataService', () => {
     });
   });
 
+  describe('updateEPerson with non existing metadata', () => {
+    beforeEach(() => {
+      spyOn(service, 'findByHref').and.returnValue(createSuccessfulRemoteDataObject$(EPersonMockWithNoName));
+    });
+    describe('add name that was not previously set', () => {
+      beforeEach(() => {
+        const changedEPerson = Object.assign(new EPerson(), {
+          id: EPersonMock.id,
+          metadata: Object.assign(EPersonMock.metadata, {
+            'eperson.firstname': [
+              {
+                language: null,
+                value: 'User',
+              },
+            ],
+          }),
+          email: EPersonMock.email,
+          canLogIn: EPersonMock.canLogIn,
+          requireCertificate: EPersonMock.requireCertificate,
+          _links: EPersonMock._links,
+        });
+        service.updateEPerson(changedEPerson).subscribe();
+      });
+      it('should send PatchRequest with add email operation', () => {
+        const operations = [{ op: 'add', path: '/eperson.firstname', value: [{ language: null, value: 'User' }] }];
+        const expected = new PatchRequest(requestService.generateRequestId(), epersonsEndpoint + '/' + EPersonMock.uuid, operations);
+        expect(requestService.send).toHaveBeenCalledWith(expected);
+      });
+    });
+  });
+
   describe('getActiveEPerson', () => {
     it('should retrieve the ePerson currently getting edited, if any', () => {
       service.editEPerson(EPersonMock);
diff --git a/src/app/core/eperson/eperson-data.service.ts b/src/app/core/eperson/eperson-data.service.ts
index d30030365c..9d9ac4a0b8 100644
--- a/src/app/core/eperson/eperson-data.service.ts
+++ b/src/app/core/eperson/eperson-data.service.ts
@@ -34,6 +34,7 @@ import { PatchData, PatchDataImpl } from '../data/base/patch-data';
 import { DeleteData, DeleteDataImpl } from '../data/base/delete-data';
 import { RestRequestMethod } from '../data/rest-request-method';
 import { dataService } from '../data/base/data-service.decorator';
+import { getEPersonEditRoute } from '../../access-control/access-control-routing-paths';
 
 const ePeopleRegistryStateSelector = (state: AppState) => state.epeopleRegistry;
 const editEPersonSelector = createSelector(ePeopleRegistryStateSelector, (ePeopleRegistryState: EPeopleRegistryState) => ePeopleRegistryState.editEPerson);
@@ -130,7 +131,7 @@ export class EPersonDataService extends IdentifiableDataService<EPerson> impleme
    */
   public getEPersonByEmail(query: string, useCachedVersionIfAvailable = true, reRequestOnStale = true, ...linksToFollow: FollowLinkConfig<EPerson>[]): Observable<RemoteData<EPerson | NoContent>> {
     const findListOptions = new FindListOptions();
-    findListOptions.searchParams = [new RequestParam('email', encodeURIComponent(query))];
+    findListOptions.searchParams = [new RequestParam('email', query)];
     const href$ = this.searchData.getSearchByHref(this.searchByEmailPath, findListOptions, ...linksToFollow);
     return this.findByHref(href$, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
   }
@@ -147,7 +148,7 @@ export class EPersonDataService extends IdentifiableDataService<EPerson> impleme
    *                                    {@link HALLink}s should be automatically resolved
    */
   private getEpeopleByMetadata(query: string, options?: FindListOptions, useCachedVersionIfAvailable = true, reRequestOnStale = true, ...linksToFollow: FollowLinkConfig<EPerson>[]): Observable<RemoteData<PaginatedList<EPerson>>> {
-    const searchParams = [new RequestParam('query', encodeURIComponent(query))];
+    const searchParams = [new RequestParam('query', query)];
     return this.getEPeopleBy(searchParams, this.searchByMetadataPath, options, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
   }
 
@@ -176,6 +177,34 @@ export class EPersonDataService extends IdentifiableDataService<EPerson> impleme
     return this.searchBy(searchMethod, findListOptions, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
   }
 
+  /**
+   * Searches for all EPerons which are *not* a member of a given group, via a passed in query
+   * (searches all EPerson metadata and by exact UUID).
+   * Endpoint used: /eperson/epesons/search/isNotMemberOf?query=<:string>&group=<:uuid>
+   * @param query                       search query param
+   * @param group                       UUID of group to exclude results from. Members of this group will never be returned.
+   * @param options
+   * @param useCachedVersionIfAvailable If this is true, the request will only be sent if there's
+   *                                    no valid cached version. Defaults to true
+   * @param reRequestOnStale            Whether or not the request should automatically be re-
+   *                                    requested after the response becomes stale
+   * @param linksToFollow               List of {@link FollowLinkConfig} that indicate which
+   *                                    {@link HALLink}s should be automatically resolved
+   */
+  public searchNonMembers(query: string, group: string, options?: FindListOptions, useCachedVersionIfAvailable = true, reRequestOnStale = true, ...linksToFollow: FollowLinkConfig<EPerson>[]): Observable<RemoteData<PaginatedList<EPerson>>> {
+    const searchParams = [new RequestParam('query', query), new RequestParam('group', group)];
+    let findListOptions = new FindListOptions();
+    if (options) {
+      findListOptions = Object.assign(new FindListOptions(), options);
+    }
+    if (findListOptions.searchParams) {
+      findListOptions.searchParams = [...findListOptions.searchParams, ...searchParams];
+    } else {
+      findListOptions.searchParams = searchParams;
+    }
+    return this.searchBy('isNotMemberOf', findListOptions, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
+  }
+
   /**
    * Add a new patch to the object cache
    * The patch is derived from the differences between the given object and its version in the object cache
@@ -204,7 +233,8 @@ export class EPersonDataService extends IdentifiableDataService<EPerson> impleme
    * @param newEPerson
    */
   private generateOperations(oldEPerson: EPerson, newEPerson: EPerson): Operation[] {
-    let operations = this.comparator.diff(oldEPerson, newEPerson).filter((operation: Operation) => operation.op === 'replace');
+    let operations = this.comparator.diff(oldEPerson, newEPerson)
+      .filter((operation: Operation) => ['replace', 'add'].includes(operation.op));
     if (hasValue(oldEPerson.email) && oldEPerson.email !== newEPerson.email) {
       operations = [...operations, {
         op: 'replace', path: '/email', value: newEPerson.email
@@ -281,15 +311,7 @@ export class EPersonDataService extends IdentifiableDataService<EPerson> impleme
         this.editEPerson(ePerson);
       }
     });
-    return '/access-control/epeople';
-  }
-
-  /**
-   * Get EPeople admin page
-   * @param ePerson New EPerson to edit
-   */
-  public getEPeoplePageRouterLink(): string {
-    return '/access-control/epeople';
+    return getEPersonEditRoute(ePerson.id);
   }
 
   /**
diff --git a/src/app/core/eperson/group-data.service.spec.ts b/src/app/core/eperson/group-data.service.spec.ts
index b424aed1aa..6eecfd7fa1 100644
--- a/src/app/core/eperson/group-data.service.spec.ts
+++ b/src/app/core/eperson/group-data.service.spec.ts
@@ -43,11 +43,11 @@ describe('GroupDataService', () => {
   let rdbService;
   let objectCache;
   function init() {
-    restEndpointURL = 'https://dspace.4science.it/dspace-spring-rest/api/eperson';
+    restEndpointURL = 'https://rest.api/server/api/eperson';
     groupsEndpoint = `${restEndpointURL}/groups`;
     groups = [GroupMock, GroupMock2];
     groups$ = createSuccessfulRemoteDataObject$(createPaginatedList(groups));
-    rdbService = getMockRemoteDataBuildServiceHrefMap(undefined, { 'https://dspace.4science.it/dspace-spring-rest/api/eperson/groups': groups$ });
+    rdbService = getMockRemoteDataBuildServiceHrefMap(undefined, { 'https://rest.api/server/api/eperson/groups': groups$ });
     halService = new HALEndpointServiceStub(restEndpointURL);
     objectCache = getMockObjectCacheService();
     TestBed.configureTestingModule({
@@ -111,6 +111,30 @@ describe('GroupDataService', () => {
     });
   });
 
+  describe('searchNonMemberGroups', () => {
+    beforeEach(() => {
+      spyOn(service, 'searchBy');
+    });
+
+    it('search with empty query and a group ID', () => {
+      service.searchNonMemberGroups('', GroupMock.id);
+      const options = Object.assign(new FindListOptions(), {
+        searchParams: [Object.assign(new RequestParam('query', '')),
+                       Object.assign(new RequestParam('group', GroupMock.id))]
+      });
+      expect(service.searchBy).toHaveBeenCalledWith('isNotMemberOf', options, true, true);
+    });
+
+    it('search with query and a group ID', () => {
+      service.searchNonMemberGroups('test', GroupMock.id);
+      const options = Object.assign(new FindListOptions(), {
+        searchParams: [Object.assign(new RequestParam('query', 'test')),
+                       Object.assign(new RequestParam('group', GroupMock.id))]
+      });
+      expect(service.searchBy).toHaveBeenCalledWith('isNotMemberOf', options, true, true);
+    });
+  });
+
   describe('addSubGroupToGroup', () => {
     beforeEach(() => {
       objectCache.getByHref.and.returnValue(observableOf({
diff --git a/src/app/core/eperson/group-data.service.ts b/src/app/core/eperson/group-data.service.ts
index bb38e46758..683d026bb6 100644
--- a/src/app/core/eperson/group-data.service.ts
+++ b/src/app/core/eperson/group-data.service.ts
@@ -3,7 +3,7 @@ import { Injectable } from '@angular/core';
 
 import { createSelector, select, Store } from '@ngrx/store';
 import { Observable, zip as observableZip } from 'rxjs';
-import { filter, map, take } from 'rxjs/operators';
+import { take } from 'rxjs/operators';
 import {
   GroupRegistryCancelGroupAction,
   GroupRegistryEditGroupAction
@@ -40,6 +40,7 @@ import { DeleteData, DeleteDataImpl } from '../data/base/delete-data';
 import { Operation } from 'fast-json-patch';
 import { RestRequestMethod } from '../data/rest-request-method';
 import { dataService } from '../data/base/data-service.decorator';
+import { getGroupEditRoute } from '../../access-control/access-control-routing-paths';
 
 const groupRegistryStateSelector = (state: AppState) => state.groupRegistry;
 const editGroupSelector = createSelector(groupRegistryStateSelector, (groupRegistryState: GroupRegistryState) => groupRegistryState.editGroup);
@@ -104,23 +105,31 @@ export class GroupDataService extends IdentifiableDataService<Group> implements
   }
 
   /**
-   * Check if the current user is member of to the indicated group
-   *
-   * @param groupName
-   *    the group name
-   * @return boolean
-   *    true if user is member of the indicated group, false otherwise
+   * Searches for all groups which are *not* a member of a given group, via a passed in query
+   * (searches in group name and by exact UUID).
+   * Endpoint used: /eperson/groups/search/isNotMemberOf?query=<:string>&group=<:uuid>
+   * @param query                       search query param
+   * @param group                       UUID of group to exclude results from. Members of this group will never be returned.
+   * @param options
+   * @param useCachedVersionIfAvailable If this is true, the request will only be sent if there's
+   *                                    no valid cached version. Defaults to true
+   * @param reRequestOnStale            Whether or not the request should automatically be re-
+   *                                    requested after the response becomes stale
+   * @param linksToFollow               List of {@link FollowLinkConfig} that indicate which
+   *                                    {@link HALLink}s should be automatically resolved
    */
-  isMemberOf(groupName: string): Observable<boolean> {
-    const searchHref = 'isMemberOf';
-    const options = new FindListOptions();
-    options.searchParams = [new RequestParam('groupName', groupName)];
-
-    return this.searchBy(searchHref, options).pipe(
-      filter((groups: RemoteData<PaginatedList<Group>>) => !groups.isResponsePending),
-      take(1),
-      map((groups: RemoteData<PaginatedList<Group>>) => groups.payload.totalElements > 0)
-    );
+  public searchNonMemberGroups(query: string, group: string, options?: FindListOptions, useCachedVersionIfAvailable = true, reRequestOnStale = true, ...linksToFollow: FollowLinkConfig<Group>[]): Observable<RemoteData<PaginatedList<Group>>> {
+    const searchParams = [new RequestParam('query', query), new RequestParam('group', group)];
+    let findListOptions = new FindListOptions();
+    if (options) {
+      findListOptions = Object.assign(new FindListOptions(), options);
+    }
+    if (findListOptions.searchParams) {
+      findListOptions.searchParams = [...findListOptions.searchParams, ...searchParams];
+    } else {
+      findListOptions.searchParams = searchParams;
+    }
+    return this.searchBy('isNotMemberOf', findListOptions, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
   }
 
   /**
@@ -264,15 +273,15 @@ export class GroupDataService extends IdentifiableDataService<Group> implements
    * @param group Group we want edit page for
    */
   public getGroupEditPageRouterLink(group: Group): string {
-    return this.getGroupEditPageRouterLinkWithID(group.id);
+    return getGroupEditRoute(group.id);
   }
 
   /**
    * Get Edit page of group
    * @param groupID Group ID we want edit page for
    */
-  public getGroupEditPageRouterLinkWithID(groupId: string): string {
-    return '/access-control/groups/' + groupId;
+  public getGroupEditPageRouterLinkWithID(groupID: string): string {
+    return getGroupEditRoute(groupID);
   }
 
   /**
diff --git a/src/app/core/eperson/models/eperson-dto.model.ts b/src/app/core/eperson/models/eperson-dto.model.ts
index 0e79902196..5fa6c7ed68 100644
--- a/src/app/core/eperson/models/eperson-dto.model.ts
+++ b/src/app/core/eperson/models/eperson-dto.model.ts
@@ -13,9 +13,4 @@ export class EpersonDtoModel {
      * Whether or not the linked EPerson is able to be deleted
      */
     public ableToDelete: boolean;
-    /**
-     * Whether or not this EPerson is member of group on page it is being used on
-     */
-    public memberOfGroup: boolean;
-
 }
diff --git a/src/app/core/eperson/models/eperson.model.ts b/src/app/core/eperson/models/eperson.model.ts
index 08b36dd78d..c985812411 100644
--- a/src/app/core/eperson/models/eperson.model.ts
+++ b/src/app/core/eperson/models/eperson.model.ts
@@ -85,7 +85,7 @@ export class EPerson extends DSpaceObject {
   public groups?: Observable<RemoteData<PaginatedList<Group>>>;
 
   getRenderTypes(): (string | GenericConstructor<ListableObject>)[] {
-    return [this.constructor.name, ...super.getRenderTypes()];
+    return ['EPerson', this.constructor.name, ...super.getRenderTypes()];
   }
 
 }
diff --git a/src/app/core/forward-client-ip/forward-client-ip.interceptor.ts b/src/app/core/forward-client-ip/forward-client-ip.interceptor.ts
index 2e2e59fa6b..edca5cc509 100644
--- a/src/app/core/forward-client-ip/forward-client-ip.interceptor.ts
+++ b/src/app/core/forward-client-ip/forward-client-ip.interceptor.ts
@@ -18,6 +18,14 @@ export class ForwardClientIpInterceptor implements HttpInterceptor {
    */
   intercept(httpRequest: HttpRequest<any>, next: HttpHandler): Observable<HttpEvent<any>> {
     const clientIp = this.req.get('x-forwarded-for') || this.req.connection.remoteAddress;
-    return next.handle(httpRequest.clone({ setHeaders: { 'X-Forwarded-For': clientIp } }));
+    const headers = { 'X-Forwarded-For': clientIp };
+
+    // if the request has a user-agent retain it
+    const userAgent = this.req.get('user-agent');
+    if (userAgent) {
+      headers['User-Agent'] = userAgent;
+    }
+
+    return next.handle(httpRequest.clone({ setHeaders: headers }));
   }
 }
diff --git a/src/app/core/index/index.effects.ts b/src/app/core/index/index.effects.ts
index 18d639023f..65aa45e571 100644
--- a/src/app/core/index/index.effects.ts
+++ b/src/app/core/index/index.effects.ts
@@ -27,7 +27,7 @@ export class UUIDIndexEffects {
    addObject$ = createEffect(() => this.actions$
     .pipe(
       ofType(ObjectCacheActionTypes.ADD),
-      filter((action: AddToObjectCacheAction) => hasValue(action.payload.objectToCache.uuid)),
+      filter((action: AddToObjectCacheAction) => hasValue(action.payload.objectToCache) && hasValue(action.payload.objectToCache.uuid)),
       map((action: AddToObjectCacheAction) => {
         return new AddToIndexAction(
           IndexName.OBJECT,
@@ -46,7 +46,7 @@ export class UUIDIndexEffects {
       ofType(ObjectCacheActionTypes.ADD),
       map((action: AddToObjectCacheAction) => {
         const alternativeLink = action.payload.alternativeLink;
-        const selfLink = action.payload.objectToCache._links.self.href;
+        const selfLink = hasValue(action.payload.objectToCache?._links?.self) ? action.payload.objectToCache._links.self.href : alternativeLink;
         if (hasValue(alternativeLink) && alternativeLink !== selfLink) {
           return new AddToIndexAction(
             IndexName.ALTERNATIVE_OBJECT_LINK,
diff --git a/src/app/core/json-patch/json-patch-operations.reducer.spec.ts b/src/app/core/json-patch/json-patch-operations.reducer.spec.ts
index 34a68a8801..7af2f1377f 100644
--- a/src/app/core/json-patch/json-patch-operations.reducer.spec.ts
+++ b/src/app/core/json-patch/json-patch-operations.reducer.spec.ts
@@ -339,4 +339,384 @@ describe('jsonPatchOperationsReducer test suite', () => {
     });
   });
 
+  describe('dedupeOperationEntries', () => {
+    it('should not remove duplicated keys if operations are not sequential', () => {
+      initState = {
+        sections: {
+          children: {
+            publicationStep: {
+              body: [
+                {
+                  operation: {
+                    op: 'add',
+                    path: '/sections/publicationStep/dc.date.issued',
+                    value: [
+                      {
+                        value: '2024-06',
+                        language: null,
+                        authority: null,
+                        display: '2024-06',
+                        confidence: -1,
+                        place: 0,
+                        otherInformation: null,
+                      },
+                    ],
+                  },
+                  timeCompleted: timestampBeforeStart,
+                },
+                {
+                  operation: {
+                    op: 'replace',
+                    path: '/sections/publicationStep/dc.date.issued/0',
+                    value: {
+                      value: '2023-06-19',
+                      language: null,
+                      authority: null,
+                      display: '2023-06-19',
+                      confidence: -1,
+                      place: 0,
+                      otherInformation: null,
+                    },
+                  },
+                  timeCompleted: timestampBeforeStart,
+                },
+              ],
+            } as JsonPatchOperationsEntry,
+          },
+          transactionStartTime: null,
+          commitPending: false,
+        } as JsonPatchOperationsResourceEntry,
+      };
+
+      const value = [
+        {
+          value: '2024-06-19',
+          language: null,
+          authority: null,
+          display: '2024-06-19',
+          confidence: -1,
+          place: 0,
+          otherInformation: null,
+        },
+      ];
+      const action = new NewPatchAddOperationAction(
+        'sections',
+        'publicationStep',
+        '/sections/publicationStep/dc.date.issued',
+        value);
+      const newState = jsonPatchOperationsReducer(initState, action);
+
+      const expectedBody: any =  [
+        {
+          'operation': {
+            'op': 'add',
+            'path': '/sections/publicationStep/dc.date.issued',
+            'value': [
+              {
+                'value': '2024-06',
+                'language': null,
+                'authority': null,
+                'display': '2024-06',
+                'confidence': -1,
+                'place': 0,
+                'otherInformation': null,
+              },
+            ],
+          },
+          'timeCompleted': timestampBeforeStart,
+        },
+        {
+          'operation': {
+            'op': 'replace',
+            'path': '/sections/publicationStep/dc.date.issued/0',
+            'value': {
+              'value': '2023-06-19',
+              'language': null,
+              'authority': null,
+              'display': '2023-06-19',
+              'confidence': -1,
+              'place': 0,
+              'otherInformation': null,
+            },
+          },
+          'timeCompleted': timestampBeforeStart,
+        },
+        {
+          'operation': {
+            'op': 'add',
+            'path': '/sections/publicationStep/dc.date.issued',
+            'value': [
+              {
+                'value': '2024-06-19',
+                'language': null,
+                'authority': null,
+                'display': '2024-06-19',
+                'confidence': -1,
+                'place': 0,
+                'otherInformation': null,
+              },
+            ],
+          },
+          'timeCompleted': timestampBeforeStart,
+        },
+      ];
+
+      expect(newState.sections.children.publicationStep.body).toEqual(expectedBody);
+
+    });
+
+    it('should remove duplicated keys if operations are sequential', () => {
+      initState = {
+        sections: {
+          children: {
+            publicationStep: {
+              body: [
+                {
+                  operation: {
+                    op: 'add',
+                    path: '/sections/publicationStep/dc.date.issued',
+                    value: [
+                      {
+                        value: '2024-06',
+                        language: null,
+                        authority: null,
+                        display: '2024-06',
+                        confidence: -1,
+                        place: 0,
+                        otherInformation: null,
+                      },
+                    ],
+                  },
+                  timeCompleted: timestampBeforeStart,
+                },
+                {
+                  operation: {
+                    op: 'replace',
+                    path: '/sections/publicationStep/dc.date.issued/0',
+                    value: {
+                      value: '2023-06-19',
+                      language: null,
+                      authority: null,
+                      display: '2023-06-19',
+                      confidence: -1,
+                      place: 0,
+                      otherInformation: null,
+                    },
+                  },
+                  timeCompleted: timestampBeforeStart,
+                },
+                {
+                  'operation': {
+                    'op': 'add',
+                    'path': '/sections/publicationStep/dc.date.issued',
+                    'value': [
+                      {
+                        'value': '2024-06-19',
+                        'language': null,
+                        'authority': null,
+                        'display': '2024-06-19',
+                        'confidence': -1,
+                        'place': 0,
+                        'otherInformation': null,
+                      },
+                    ],
+                  },
+                  'timeCompleted': timestampBeforeStart,
+                },
+              ],
+            } as JsonPatchOperationsEntry,
+          },
+          transactionStartTime: null,
+          commitPending: false,
+        } as JsonPatchOperationsResourceEntry,
+      };
+
+      const value = [
+        {
+          value: '2024-06-20',
+          language: null,
+          authority: null,
+          display: '2024-06-20',
+          confidence: -1,
+          place: 0,
+          otherInformation: null,
+        },
+      ];
+      const action = new NewPatchAddOperationAction(
+        'sections',
+        'publicationStep',
+        '/sections/publicationStep/dc.date.issued',
+        value);
+      const newState = jsonPatchOperationsReducer(initState, action);
+
+      const expectedBody: any =  [
+        {
+          'operation': {
+            'op': 'add',
+            'path': '/sections/publicationStep/dc.date.issued',
+            'value': [
+              {
+                'value': '2024-06',
+                'language': null,
+                'authority': null,
+                'display': '2024-06',
+                'confidence': -1,
+                'place': 0,
+                'otherInformation': null,
+              },
+            ],
+          },
+          'timeCompleted': timestampBeforeStart,
+        },
+        {
+          'operation': {
+            'op': 'replace',
+            'path': '/sections/publicationStep/dc.date.issued/0',
+            'value': {
+              'value': '2023-06-19',
+              'language': null,
+              'authority': null,
+              'display': '2023-06-19',
+              'confidence': -1,
+              'place': 0,
+              'otherInformation': null,
+            },
+          },
+          'timeCompleted': timestampBeforeStart,
+        },
+        {
+          'operation': {
+            'op': 'add',
+            'path': '/sections/publicationStep/dc.date.issued',
+            'value': [
+              {
+                'value': '2024-06-20',
+                'language': null,
+                'authority': null,
+                'display': '2024-06-20',
+                'confidence': -1,
+                'place': 0,
+                'otherInformation': null,
+              },
+            ],
+          },
+          'timeCompleted': timestampBeforeStart,
+        },
+      ];
+
+      expect(newState.sections.children.publicationStep.body).toEqual(expectedBody);
+
+    });
+
+    it('should remove duplicated keys if all operations have same key', () => {
+      initState = {
+        sections: {
+          children: {
+            publicationStep: {
+              body: [
+                {
+                  operation: {
+                    op: 'add',
+                    path: '/sections/publicationStep/dc.date.issued',
+                    value: [
+                      {
+                        value: '2024',
+                        language: null,
+                        authority: null,
+                        display: '2024-06',
+                        confidence: -1,
+                        place: 0,
+                        otherInformation: null,
+                      },
+                    ],
+                  },
+                  timeCompleted: timestampBeforeStart,
+                },
+                {
+                  'operation': {
+                    'op': 'add',
+                    'path': '/sections/publicationStep/dc.date.issued',
+                    'value': [
+                      {
+                        'value': '2024-06',
+                        'language': null,
+                        'authority': null,
+                        'display': '2024-06',
+                        'confidence': -1,
+                        'place': 0,
+                        'otherInformation': null,
+                      },
+                    ],
+                  },
+                  'timeCompleted': timestampBeforeStart,
+                },
+                {
+                  'operation': {
+                    'op': 'add',
+                    'path': '/sections/publicationStep/dc.date.issued',
+                    'value': [
+                      {
+                        'value': '2024-06-19',
+                        'language': null,
+                        'authority': null,
+                        'display': '2024-06-19',
+                        'confidence': -1,
+                        'place': 0,
+                        'otherInformation': null,
+                      },
+                    ],
+                  },
+                  'timeCompleted': timestampBeforeStart,
+                },
+              ],
+            } as JsonPatchOperationsEntry,
+          },
+          transactionStartTime: null,
+          commitPending: false,
+        } as JsonPatchOperationsResourceEntry,
+      };
+
+      const value = [
+        {
+          value: '2024-06-20',
+          language: null,
+          authority: null,
+          display: '2024-06-20',
+          confidence: -1,
+          place: 0,
+          otherInformation: null,
+        },
+      ];
+      const action = new NewPatchAddOperationAction(
+        'sections',
+        'publicationStep',
+        '/sections/publicationStep/dc.date.issued',
+        value);
+      const newState = jsonPatchOperationsReducer(initState, action);
+
+      const expectedBody: any =  [
+        {
+          'operation': {
+            'op': 'add',
+            'path': '/sections/publicationStep/dc.date.issued',
+            'value': [
+              {
+                'value': '2024-06-20',
+                'language': null,
+                'authority': null,
+                'display': '2024-06-20',
+                'confidence': -1,
+                'place': 0,
+                'otherInformation': null,
+              },
+            ],
+          },
+          'timeCompleted': timestampBeforeStart,
+        },
+      ];
+
+      expect(newState.sections.children.publicationStep.body).toEqual(expectedBody);
+
+    });
+  });
 });
diff --git a/src/app/core/json-patch/json-patch-operations.reducer.ts b/src/app/core/json-patch/json-patch-operations.reducer.ts
index 5e00027edb..9687bdf21d 100644
--- a/src/app/core/json-patch/json-patch-operations.reducer.ts
+++ b/src/app/core/json-patch/json-patch-operations.reducer.ts
@@ -351,7 +351,32 @@ function addOperationToList(body: JsonPatchOperationObject[], actionType, target
       newBody.push(makeOperationEntry({ op: JsonPatchOperationType.move, from: fromPath, path: targetPath }));
       break;
   }
-  return newBody;
+  return dedupeOperationEntries(newBody);
+}
+
+/**
+ * Dedupe operation entries by op and path. This prevents processing unnecessary patches in a single PATCH request.
+ *
+ * @param body JSON patch operation object entries
+ * @returns deduped JSON patch operation object entries
+ */
+function dedupeOperationEntries(body: JsonPatchOperationObject[]): JsonPatchOperationObject[] {
+  const ops = new Map<string, number>();
+  for (let i = body.length - 1; i >= 0; i--) {
+    const patch = body[i].operation;
+    const key = `${patch.op}-${patch.path}`;
+    if (!ops.has(key)) {
+      ops.set(key, i);
+    } else {
+      const entry = ops.get(key);
+      if (entry - 1 === i) {
+        body.splice(i, 1);
+        ops.set(key, i);
+      }
+    }
+  }
+
+  return body;
 }
 
 function makeOperationEntry(operation) {
diff --git a/src/app/core/metadata/metadata.service.ts b/src/app/core/metadata/metadata.service.ts
index 204c925e6b..dff566bf7b 100644
--- a/src/app/core/metadata/metadata.service.ts
+++ b/src/app/core/metadata/metadata.service.ts
@@ -45,6 +45,7 @@ import { CoreState } from '../core-state.model';
 import { AuthorizationDataService } from '../data/feature-authorization/authorization-data.service';
 import { getDownloadableBitstream } from '../shared/bitstream.operators';
 import { APP_CONFIG, AppConfig } from '../../../config/app-config.interface';
+import { FindListOptions } from '../data/find-list-options.model';
 
 /**
  * The base selector function to select the metaTag section in the store
@@ -160,6 +161,7 @@ export class MetadataService {
     this.setCitationKeywordsTag();
 
     this.setCitationAbstractUrlTag();
+    this.setCitationDoiTag();
     this.setCitationPdfUrlTag();
     this.setCitationPublisherTag();
 
@@ -172,7 +174,6 @@ export class MetadataService {
     // this.setCitationIssueTag();
     // this.setCitationFirstPageTag();
     // this.setCitationLastPageTag();
-    // this.setCitationDOITag();
     // this.setCitationPMIDTag();
 
     // this.setCitationFullTextTag();
@@ -293,6 +294,18 @@ export class MetadataService {
     }
   }
 
+  /**
+   * Add <meta name="citation_doi" ... >  to the <head>
+   */
+  private setCitationDoiTag(): void {
+    if (this.currentObject.value instanceof Item) {
+      let doi = this.getMetaTagValue('dc.identifier.doi');
+      if (hasValue(doi)) {
+        this.addMetaTag('citation_doi', doi);
+      }
+    }
+  }
+
   /**
    * Add <meta name="citation_pdf_url" ... >  to the <head>
    */
@@ -306,6 +319,7 @@ export class MetadataService {
         'ORIGINAL',
         true,
         true,
+        new FindListOptions(),
         followLink('primaryBitstream'),
         followLink('bitstreams', {
             findListOptions: {
diff --git a/src/app/core/server-check/server-check.guard.spec.ts b/src/app/core/server-check/server-check.guard.spec.ts
index 1f126be5e5..f65a7deca7 100644
--- a/src/app/core/server-check/server-check.guard.spec.ts
+++ b/src/app/core/server-check/server-check.guard.spec.ts
@@ -1,68 +1,88 @@
 import { ServerCheckGuard } from './server-check.guard';
-import { Router } from '@angular/router';
+import { Router, NavigationStart, UrlTree, NavigationEnd, RouterEvent } from '@angular/router';
 
-import { of } from 'rxjs';
-import { take } from 'rxjs/operators';
-
-import { getPageInternalServerErrorRoute } from '../../app-routing-paths';
+import { of, ReplaySubject } from 'rxjs';
 import { RootDataService } from '../data/root-data.service';
+import { TestScheduler } from 'rxjs/testing';
 import SpyObj = jasmine.SpyObj;
 
 describe('ServerCheckGuard', () => {
   let guard: ServerCheckGuard;
-  let router: SpyObj<Router>;
+  let router: Router;
+  let eventSubject: ReplaySubject<RouterEvent>;
   let rootDataServiceStub: SpyObj<RootDataService>;
-
-  rootDataServiceStub = jasmine.createSpyObj('RootDataService', {
-    checkServerAvailability: jasmine.createSpy('checkServerAvailability'),
-    invalidateRootCache: jasmine.createSpy('invalidateRootCache')
-  });
-  router = jasmine.createSpyObj('Router', {
-    navigateByUrl: jasmine.createSpy('navigateByUrl')
-  });
+  let testScheduler: TestScheduler;
+  let redirectUrlTree: UrlTree;
 
   beforeEach(() => {
+    testScheduler = new TestScheduler((actual, expected) => {
+      expect(actual).toEqual(expected);
+    });
+    rootDataServiceStub = jasmine.createSpyObj('RootDataService', {
+      checkServerAvailability: jasmine.createSpy('checkServerAvailability'),
+      invalidateRootCache: jasmine.createSpy('invalidateRootCache'),
+      findRoot: jasmine.createSpy('findRoot')
+    });
+    redirectUrlTree = new UrlTree();
+    eventSubject = new ReplaySubject<RouterEvent>(1);
+    router = {
+      events: eventSubject.asObservable(),
+      navigateByUrl: jasmine.createSpy('navigateByUrl'),
+      parseUrl: jasmine.createSpy('parseUrl').and.returnValue(redirectUrlTree)
+    } as any;
     guard = new ServerCheckGuard(router, rootDataServiceStub);
   });
 
-  afterEach(() => {
-    router.navigateByUrl.calls.reset();
-    rootDataServiceStub.invalidateRootCache.calls.reset();
-  });
-
   it('should be created', () => {
     expect(guard).toBeTruthy();
   });
 
-  describe('when root endpoint has succeeded', () => {
+  describe('when root endpoint request has succeeded', () => {
     beforeEach(() => {
       rootDataServiceStub.checkServerAvailability.and.returnValue(of(true));
     });
 
-    it('should not redirect to error page', () => {
-      guard.canActivateChild({} as any, {} as any).pipe(
-        take(1)
-      ).subscribe((canActivate: boolean) => {
-        expect(canActivate).toEqual(true);
-        expect(rootDataServiceStub.invalidateRootCache).not.toHaveBeenCalled();
-        expect(router.navigateByUrl).not.toHaveBeenCalled();
+    it('should return true', () => {
+      testScheduler.run(({ expectObservable }) => {
+        const result$ = guard.canActivateChild({} as any, {} as any);
+        expectObservable(result$).toBe('(a|)', { a: true });
       });
     });
   });
 
-  describe('when root endpoint has not succeeded', () => {
+  describe('when root endpoint request has not succeeded', () => {
     beforeEach(() => {
       rootDataServiceStub.checkServerAvailability.and.returnValue(of(false));
     });
 
-    it('should redirect to error page', () => {
-      guard.canActivateChild({} as any, {} as any).pipe(
-        take(1)
-      ).subscribe((canActivate: boolean) => {
-        expect(canActivate).toEqual(false);
-        expect(rootDataServiceStub.invalidateRootCache).toHaveBeenCalled();
-        expect(router.navigateByUrl).toHaveBeenCalledWith(getPageInternalServerErrorRoute());
+    it('should return a UrlTree with the route to the 500 error page', () => {
+      testScheduler.run(({ expectObservable }) => {
+        const result$ = guard.canActivateChild({} as any, {} as any);
+        expectObservable(result$).toBe('(b|)', { b: redirectUrlTree });
       });
+      expect(router.parseUrl).toHaveBeenCalledWith('/500');
+    });
+  });
+
+  describe(`listenForRouteChanges`, () => {
+    it(`should invalidate the root cache, when the method is first called`, () => {
+        testScheduler.run(() => {
+          guard.listenForRouteChanges();
+          expect(rootDataServiceStub.invalidateRootCache).toHaveBeenCalledTimes(1);
+        });
+    });
+
+    it(`should invalidate the root cache on every NavigationStart event`, () => {
+        testScheduler.run(() => {
+          guard.listenForRouteChanges();
+          eventSubject.next(new NavigationStart(1,''));
+          eventSubject.next(new NavigationEnd(1,'', ''));
+          eventSubject.next(new NavigationStart(2,''));
+          eventSubject.next(new NavigationEnd(2,'', ''));
+          eventSubject.next(new NavigationStart(3,''));
+        });
+        // once when the method is first called, and then 3 times for NavigationStart events
+        expect(rootDataServiceStub.invalidateRootCache).toHaveBeenCalledTimes(1 + 3);
     });
   });
 });
diff --git a/src/app/core/server-check/server-check.guard.ts b/src/app/core/server-check/server-check.guard.ts
index 8a0e26c01d..79c34c3659 100644
--- a/src/app/core/server-check/server-check.guard.ts
+++ b/src/app/core/server-check/server-check.guard.ts
@@ -1,8 +1,15 @@
 import { Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot, CanActivateChild, Router, RouterStateSnapshot } from '@angular/router';
+import {
+  ActivatedRouteSnapshot,
+  CanActivateChild,
+  Router,
+  RouterStateSnapshot,
+  UrlTree,
+  NavigationStart
+} from '@angular/router';
 
 import { Observable } from 'rxjs';
-import { take, tap } from 'rxjs/operators';
+import { take, map, filter } from 'rxjs/operators';
 
 import { RootDataService } from '../data/root-data.service';
 import { getPageInternalServerErrorRoute } from '../../app-routing-paths';
@@ -23,17 +30,36 @@ export class ServerCheckGuard implements CanActivateChild {
    */
   canActivateChild(
     route: ActivatedRouteSnapshot,
-    state: RouterStateSnapshot): Observable<boolean> {
+    state: RouterStateSnapshot
+  ): Observable<boolean | UrlTree> {
 
     return this.rootDataService.checkServerAvailability().pipe(
       take(1),
-      tap((isAvailable: boolean) => {
+      map((isAvailable: boolean) => {
         if (!isAvailable) {
-          this.rootDataService.invalidateRootCache();
-          this.router.navigateByUrl(getPageInternalServerErrorRoute());
+          return this.router.parseUrl(getPageInternalServerErrorRoute());
+        } else {
+          return true;
         }
       })
     );
+  }
 
+  /**
+   * Listen to all router events. Every time a new navigation starts, invalidate the cache
+   * for the root endpoint. That way we retrieve it once per routing operation to ensure the
+   * backend is not down. But if the guard is called multiple times during the same routing
+   * operation, the cached version is used.
+   */
+  listenForRouteChanges(): void {
+    // we'll always be too late for the first NavigationStart event with the router subscribe below,
+    // so this statement is for the very first route operation.
+    this.rootDataService.invalidateRootCache();
+
+    this.router.events.pipe(
+      filter(event => event instanceof NavigationStart),
+    ).subscribe(() => {
+      this.rootDataService.invalidateRootCache();
+    });
   }
 }
diff --git a/src/app/core/services/browser-hard-redirect.service.ts b/src/app/core/services/browser-hard-redirect.service.ts
index 4ef9548899..827e83f0b7 100644
--- a/src/app/core/services/browser-hard-redirect.service.ts
+++ b/src/app/core/services/browser-hard-redirect.service.ts
@@ -38,8 +38,8 @@ export class BrowserHardRedirectService extends HardRedirectService {
   /**
    * Get the origin of the current URL
    * i.e. <scheme> "://" <hostname> [ ":" <port> ]
-   * e.g. if the URL is https://demo7.dspace.org/search?query=test,
-   * the origin would be https://demo7.dspace.org
+   * e.g. if the URL is https://demo.dspace.org/search?query=test,
+   * the origin would be https://demo.dspace.org
    */
   getCurrentOrigin(): string {
     return this.location.origin;
diff --git a/src/app/core/services/cookie.service.ts b/src/app/core/services/cookie.service.ts
index 0098e3ace4..939e19f317 100644
--- a/src/app/core/services/cookie.service.ts
+++ b/src/app/core/services/cookie.service.ts
@@ -1,7 +1,4 @@
-import { Inject, Injectable } from '@angular/core';
-
-import { REQUEST } from '@nguniversal/express-engine/tokens';
-
+import { Injectable } from '@angular/core';
 import { Subject ,  Observable } from 'rxjs';
 import { CookieAttributes } from 'js-cookie';
 
@@ -22,9 +19,6 @@ export abstract class CookieService implements ICookieService {
   protected readonly cookieSource = new Subject<{ readonly [key: string]: any }>();
   public readonly cookies$ = this.cookieSource.asObservable();
 
-  constructor(@Inject(REQUEST) protected req: any) {
-  }
-
   public abstract set(name: string, value: any, options?: CookieAttributes): void;
 
   public abstract remove(name: string, options?: CookieAttributes): void;
diff --git a/src/app/core/services/hard-redirect.service.ts b/src/app/core/services/hard-redirect.service.ts
index 826c7e4fa9..e6104cefb9 100644
--- a/src/app/core/services/hard-redirect.service.ts
+++ b/src/app/core/services/hard-redirect.service.ts
@@ -25,8 +25,8 @@ export abstract class HardRedirectService {
   /**
    * Get the origin of the current URL
    * i.e. <scheme> "://" <hostname> [ ":" <port> ]
-   * e.g. if the URL is https://demo7.dspace.org/search?query=test,
-   * the origin would be https://demo7.dspace.org
+   * e.g. if the URL is https://demo.dspace.org/search?query=test,
+   * the origin would be https://demo.dspace.org
    */
   abstract getCurrentOrigin(): string;
 }
diff --git a/src/app/core/services/server-cookie.service.ts b/src/app/core/services/server-cookie.service.ts
index 6ae3525c74..1cc7d4414f 100644
--- a/src/app/core/services/server-cookie.service.ts
+++ b/src/app/core/services/server-cookie.service.ts
@@ -1,10 +1,15 @@
-import { Injectable } from '@angular/core';
+import { Injectable, Inject } from '@angular/core';
 import { CookieAttributes } from 'js-cookie';
 import { CookieService, ICookieService } from './cookie.service';
+import { REQUEST } from '@nguniversal/express-engine/tokens';
 
 @Injectable()
 export class ServerCookieService extends CookieService implements ICookieService {
 
+  constructor(@Inject(REQUEST) protected req: any) {
+    super();
+  }
+
   public set(name: string, value: any, options?: CookieAttributes): void {
     return;
   }
diff --git a/src/app/core/services/server-hard-redirect.service.spec.ts b/src/app/core/services/server-hard-redirect.service.spec.ts
index 6bd5828921..a904a8e66c 100644
--- a/src/app/core/services/server-hard-redirect.service.spec.ts
+++ b/src/app/core/services/server-hard-redirect.service.spec.ts
@@ -1,4 +1,6 @@
 import { TestBed } from '@angular/core/testing';
+
+import { environment } from '../../../environments/environment.test';
 import { ServerHardRedirectService } from './server-hard-redirect.service';
 
 describe('ServerHardRedirectService', () => {
@@ -6,7 +8,7 @@ describe('ServerHardRedirectService', () => {
   const mockRequest = jasmine.createSpyObj(['get']);
   const mockResponse = jasmine.createSpyObj(['redirect', 'end']);
 
-  const service: ServerHardRedirectService = new ServerHardRedirectService(mockRequest, mockResponse);
+  let service: ServerHardRedirectService = new ServerHardRedirectService(environment, mockRequest, mockResponse);
   const origin = 'https://test-host.com:4000';
 
   beforeEach(() => {
@@ -67,4 +69,23 @@ describe('ServerHardRedirectService', () => {
     });
   });
 
+  describe('when SSR base url is set', () => {
+    const redirect = 'https://private-url:4000/server/api/bitstreams/uuid';
+    const replacedUrl = 'https://public-url/server/api/bitstreams/uuid';
+    const environmentWithSSRUrl: any = { ...environment, ...{ ...environment.rest, rest: {
+      ssrBaseUrl: 'https://private-url:4000/server',
+      baseUrl: 'https://public-url/server',
+    } } };
+    service = new ServerHardRedirectService(environmentWithSSRUrl, mockRequest, mockResponse);
+
+    beforeEach(() => {
+      service.redirect(redirect);
+    });
+
+    it('should perform a 302 redirect', () => {
+      expect(mockResponse.redirect).toHaveBeenCalledWith(302, replacedUrl);
+      expect(mockResponse.end).toHaveBeenCalled();
+    });
+  });
+
 });
diff --git a/src/app/core/services/server-hard-redirect.service.ts b/src/app/core/services/server-hard-redirect.service.ts
index 8c45cc864b..280dbd22cb 100644
--- a/src/app/core/services/server-hard-redirect.service.ts
+++ b/src/app/core/services/server-hard-redirect.service.ts
@@ -2,6 +2,8 @@ import { Inject, Injectable } from '@angular/core';
 import { Request, Response } from 'express';
 import { REQUEST, RESPONSE } from '@nguniversal/express-engine/tokens';
 import { HardRedirectService } from './hard-redirect.service';
+import { APP_CONFIG, AppConfig } from '../../../config/app-config.interface';
+import { isNotEmpty } from '../../shared/empty.util';
 
 /**
  * Service for performing hard redirects within the server app module
@@ -10,6 +12,7 @@ import { HardRedirectService } from './hard-redirect.service';
 export class ServerHardRedirectService extends HardRedirectService {
 
   constructor(
+    @Inject(APP_CONFIG) protected appConfig: AppConfig,
     @Inject(REQUEST) protected req: Request,
     @Inject(RESPONSE) protected res: Response,
   ) {
@@ -25,17 +28,22 @@ export class ServerHardRedirectService extends HardRedirectService {
    *    optional HTTP status code to use for redirect (default = 302, which is a temporary redirect)
    */
   redirect(url: string, statusCode?: number) {
-
     if (url === this.req.url) {
       return;
     }
 
+    let redirectUrl = url;
+    // If redirect url contains SSR base url then replace with public base url
+    if (isNotEmpty(this.appConfig.rest.ssrBaseUrl) && this.appConfig.rest.baseUrl !== this.appConfig.rest.ssrBaseUrl) {
+      redirectUrl = url.replace(this.appConfig.rest.ssrBaseUrl, this.appConfig.rest.baseUrl);
+    }
+
     if (this.res.finished) {
       const req: any = this.req;
       req._r_count = (req._r_count || 0) + 1;
 
       console.warn('Attempted to redirect on a finished response. From',
-        this.req.url, 'to', url);
+        this.req.url, 'to', redirectUrl);
 
       if (req._r_count > 10) {
         console.error('Detected a redirection loop. killing the nodejs process');
@@ -49,9 +57,9 @@ export class ServerHardRedirectService extends HardRedirectService {
         status = 302;
       }
 
-      console.log(`Redirecting from ${this.req.url} to ${url} with ${status}`);
+      console.info(`Redirecting from ${this.req.url} to ${redirectUrl} with ${status}`);
 
-      this.res.redirect(status, url);
+      this.res.redirect(status, redirectUrl);
       this.res.end();
       // I haven't found a way to correctly stop Angular rendering.
       // So we just let it end its work, though we have already closed
@@ -69,8 +77,8 @@ export class ServerHardRedirectService extends HardRedirectService {
   /**
    * Get the origin of the current URL
    * i.e. <scheme> "://" <hostname> [ ":" <port> ]
-   * e.g. if the URL is https://demo7.dspace.org/search?query=test,
-   * the origin would be https://demo7.dspace.org
+   * e.g. if the URL is https://demo.dspace.org/search?query=test,
+   * the origin would be https://demo.dspace.org
    */
   getCurrentOrigin(): string {
     return this.req.protocol + '://' + this.req.headers.host;
diff --git a/src/app/core/shared/browse-definition.model.ts b/src/app/core/shared/browse-definition.model.ts
index a5bed53c9f..bd7e4862ce 100644
--- a/src/app/core/shared/browse-definition.model.ts
+++ b/src/app/core/shared/browse-definition.model.ts
@@ -1,4 +1,7 @@
-import { autoserialize } from 'cerialize';
+import {
+  autoserialize,
+  autoserializeAs,
+} from 'cerialize';
 import { CacheableObject } from '../cache/cacheable-object.model';
 
 /**
@@ -9,6 +12,9 @@ export abstract class BrowseDefinition extends CacheableObject {
   @autoserialize
   id: string;
 
+  @autoserializeAs('metadata')
+  metadataKeys: string[];
+
   /**
    * Get the render type of the BrowseDefinition model
    */
diff --git a/src/app/core/shared/hal-endpoint.service.spec.ts b/src/app/core/shared/hal-endpoint.service.spec.ts
index 56e890b318..b81d0806df 100644
--- a/src/app/core/shared/hal-endpoint.service.spec.ts
+++ b/src/app/core/shared/hal-endpoint.service.spec.ts
@@ -1,4 +1,3 @@
-import { cold, hot } from 'jasmine-marbles';
 import { getMockRequestService } from '../../shared/mocks/request.service.mock';
 import { RequestService } from '../data/request.service';
 import { HALEndpointService } from './hal-endpoint.service';
@@ -7,12 +6,17 @@ import { combineLatest as observableCombineLatest, of as observableOf } from 'rx
 import { environment } from '../../../environments/environment';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
+import { TestScheduler } from 'rxjs/testing';
+import { RemoteData } from '../data/remote-data';
+import { RequestEntryState } from '../data/request-entry-state.model';
 
 describe('HALEndpointService', () => {
   let service: HALEndpointService;
   let requestService: RequestService;
   let rdbService: RemoteDataBuildService;
   let envConfig;
+  let testScheduler;
+  let remoteDataMocks;
   const endpointMap = {
     test: {
       href: 'https://rest.api/test'
@@ -68,7 +72,30 @@ describe('HALEndpointService', () => {
   };
   const linkPath = 'test';
 
+  const timeStamp = new Date().getTime();
+  const msToLive = 15 * 60 * 1000;
+  const payload = {
+    _links: endpointMaps[one]
+  };
+  const statusCodeSuccess = 200;
+  const statusCodeError = 404;
+  const errorMessage = 'not found';
+  remoteDataMocks = {
+    RequestPending: new RemoteData(undefined, msToLive, timeStamp, RequestEntryState.RequestPending, undefined, undefined, undefined),
+    ResponsePending: new RemoteData(undefined, msToLive, timeStamp, RequestEntryState.ResponsePending, undefined, undefined, undefined),
+    ResponsePendingStale: new RemoteData(undefined, msToLive, timeStamp, RequestEntryState.ResponsePendingStale, undefined, undefined, undefined),
+    Success: new RemoteData(timeStamp, msToLive, timeStamp, RequestEntryState.Success, undefined, payload, statusCodeSuccess),
+    SuccessStale: new RemoteData(timeStamp, msToLive, timeStamp, RequestEntryState.SuccessStale, undefined, payload, statusCodeSuccess),
+    Error: new RemoteData(timeStamp, msToLive, timeStamp, RequestEntryState.Error, errorMessage, undefined, statusCodeError),
+    ErrorStale: new RemoteData(timeStamp, msToLive, timeStamp, RequestEntryState.ErrorStale, errorMessage, undefined, statusCodeError),
+  };
+
   beforeEach(() => {
+    testScheduler = new TestScheduler((actual, expected) => {
+      // asserting the two objects are equal
+      // e.g. using chai.
+      expect(actual).toEqual(expected);
+    });
     requestService = getMockRequestService();
     rdbService = jasmine.createSpyObj('rdbService', {
       buildFromHref: createSuccessfulRemoteDataObject$({
@@ -111,20 +138,28 @@ describe('HALEndpointService', () => {
     });
 
     it(`should return the endpoint URL for the service's linkPath`, () => {
-      spyOn(service as any, 'getEndpointAt').and
-        .returnValue(hot('a-', { a: 'https://rest.api/test' }));
-      const result = service.getEndpoint(linkPath);
+      testScheduler.run(({ cold, expectObservable }) => {
+        spyOn(service as any, 'getEndpointAt').and
+          .returnValue(cold('a-', { a: 'https://rest.api/test' }));
+        const result = service.getEndpoint(linkPath);
 
-      const expected = cold('(b|)', { b: endpointMap.test.href });
-      expect(result).toBeObservable(expected);
+        const expected = '(b|)';
+        const values = {
+          b: endpointMap.test.href
+        };
+        expectObservable(result).toBe(expected, values);
+      });
     });
 
     it('should return undefined for a linkPath that isn\'t in the endpoint map', () => {
-      spyOn(service as any, 'getEndpointAt').and
-        .returnValue(hot('a-', { a: undefined }));
-      const result = service.getEndpoint('unknown');
-      const expected = cold('(b|)', { b: undefined });
-      expect(result).toBeObservable(expected);
+      testScheduler.run(({ cold, expectObservable }) => {
+        spyOn(service as any, 'getEndpointAt').and
+          .returnValue(cold('a-', { a: undefined }));
+        const result = service.getEndpoint('unknown');
+        const expected = '(b|)';
+        const values = { b: undefined };
+        expectObservable(result).toBe(expected, values);
+      });
     });
   });
 
@@ -183,29 +218,118 @@ describe('HALEndpointService', () => {
     });
 
     it('should return undefined as long as getRootEndpointMap hasn\'t fired', () => {
-      spyOn(service as any, 'getRootEndpointMap').and
-        .returnValue(hot('----'));
+      testScheduler.run(({ cold, expectObservable }) => {
+        spyOn(service as any, 'getRootEndpointMap').and
+          .returnValue(cold('----'));
 
-      const result = service.isEnabledOnRestApi(linkPath);
-      const expected = cold('b---', { b: undefined });
-      expect(result).toBeObservable(expected);
+        const result = service.isEnabledOnRestApi(linkPath);
+        const expected = 'b---';
+        const values = { b: undefined };
+        expectObservable(result).toBe(expected, values);
+      });
     });
 
     it('should return true if the service\'s linkPath is in the endpoint map', () => {
-      spyOn(service as any, 'getRootEndpointMap').and
-        .returnValue(hot('--a-', { a: endpointMap }));
-      const result = service.isEnabledOnRestApi(linkPath);
-      const expected = cold('b-c-', { b: undefined, c: true });
-      expect(result).toBeObservable(expected);
+      testScheduler.run(({ cold, expectObservable }) => {
+        spyOn(service as any, 'getRootEndpointMap').and
+          .returnValue(cold('--a-', { a: endpointMap }));
+        const result = service.isEnabledOnRestApi(linkPath);
+        const expected = 'b-c-';
+        const values = { b: undefined, c: true };
+        expectObservable(result).toBe(expected, values);
+      });
     });
 
     it('should return false if the service\'s linkPath isn\'t in the endpoint map', () => {
-      spyOn(service as any, 'getRootEndpointMap').and
-        .returnValue(hot('--a-', { a: endpointMap }));
+      testScheduler.run(({ cold, expectObservable }) => {
+        spyOn(service as any, 'getRootEndpointMap').and
+          .returnValue(cold('--a-',  { a: endpointMap }));
 
-      const result = service.isEnabledOnRestApi('unknown');
-      const expected = cold('b-c-', { b: undefined, c: false });
-      expect(result).toBeObservable(expected);
+        const result = service.isEnabledOnRestApi('unknown');
+        const expected = 'b-c-';
+        const values = { b: undefined, c: false };
+        expectObservable(result).toBe(expected, values);
+      });
+    });
+
+  });
+
+  describe(`getEndpointMapAt`, () => {
+    const href = 'https://rest.api/some/sub/path';
+
+    it(`should call requestService.send with a new EndpointMapRequest for the given href. useCachedVersionIfAvailable should be true`, () => {
+      testScheduler.run(() => {
+        (service as any).getEndpointMapAt(href);
+      });
+      const expected = new EndpointMapRequest(requestService.generateRequestId(), href);
+      expect(requestService.send).toHaveBeenCalledWith(expected, true);
+    });
+
+    it(`should call rdbService.buildFromHref with the given href`, () => {
+      testScheduler.run(() => {
+        (service as any).getEndpointMapAt(href);
+      });
+      expect(rdbService.buildFromHref).toHaveBeenCalledWith(href);
+    });
+
+    describe(`when the RemoteData returned from rdbService is stale`, () => {
+      it(`should re-request it`, () => {
+        spyOn(service as any, 'getEndpointMapAt').and.callThrough();
+          testScheduler.run(({ cold }) => {
+            (rdbService.buildFromHref as jasmine.Spy).and.returnValue(cold('a', { a: remoteDataMocks.ResponsePendingStale }));
+            // we need to subscribe to the result, to ensure the "tap" that does the re-request can fire
+            (service as any).getEndpointMapAt(href).subscribe();
+          });
+          expect((service as any).getEndpointMapAt).toHaveBeenCalledTimes(2);
+      });
+    });
+
+    describe(`when the RemoteData returned from rdbService isn't stale`, () => {
+      it(`should not re-request it`, () => {
+        spyOn(service as any, 'getEndpointMapAt').and.callThrough();
+          testScheduler.run(({ cold }) => {
+            (rdbService.buildFromHref as jasmine.Spy).and.returnValue(cold('a', { a: remoteDataMocks.ResponsePending }));
+            // we need to subscribe to the result, to ensure the "tap" that does the re-request can fire
+            (service as any).getEndpointMapAt(href).subscribe();
+          });
+          expect((service as any).getEndpointMapAt).toHaveBeenCalledTimes(1);
+      });
+    });
+
+    it(`should emit exactly once, returning the endpoint map in the response, when the RemoteData completes`, () => {
+      testScheduler.run(({ cold, expectObservable }) => {
+        (rdbService.buildFromHref as jasmine.Spy).and.returnValue(cold('a-b-c-d-e-f-g-h-i-j-k-l', {
+          a: remoteDataMocks.RequestPending,
+          b: remoteDataMocks.ResponsePending,
+          c: remoteDataMocks.ResponsePendingStale,
+          d: remoteDataMocks.SuccessStale,
+          e: remoteDataMocks.RequestPending,
+          f: remoteDataMocks.ResponsePending,
+          g: remoteDataMocks.Success,
+          h: remoteDataMocks.SuccessStale,
+          i: remoteDataMocks.RequestPending,
+          k: remoteDataMocks.ResponsePending,
+          l: remoteDataMocks.Error,
+        }));
+        const expected = '------------(g|)';
+        const values = {
+          g: endpointMaps[one]
+        };
+        expectObservable((service as any).getEndpointMapAt(one)).toBe(expected, values);
+      });
+    });
+
+    it(`should emit undefined when the response doesn't have a payload`, () => {
+      testScheduler.run(({ cold, expectObservable }) => {
+        (rdbService.buildFromHref as jasmine.Spy).and.returnValue(cold('a', {
+          a: remoteDataMocks.Error,
+        }));
+        const expected = '(a|)';
+        const values = {
+          g: undefined
+        };
+        expectObservable((service as any).getEndpointMapAt(href)).toBe(expected, values);
+      });
     });
 
   });
diff --git a/src/app/core/shared/hal-endpoint.service.ts b/src/app/core/shared/hal-endpoint.service.ts
index 8b6316a6ce..07754616c7 100644
--- a/src/app/core/shared/hal-endpoint.service.ts
+++ b/src/app/core/shared/hal-endpoint.service.ts
@@ -1,5 +1,12 @@
 import { Observable } from 'rxjs';
-import { distinctUntilChanged, map, startWith, switchMap, take } from 'rxjs/operators';
+import {
+  distinctUntilChanged,
+  map,
+  startWith,
+  switchMap,
+  take,
+  tap, filter
+} from 'rxjs/operators';
 import { RequestService } from '../data/request.service';
 import { EndpointMapRequest } from '../data/request.models';
 import { hasValue, isEmpty, isNotEmpty } from '../../shared/empty.util';
@@ -9,7 +16,7 @@ import { EndpointMap } from '../cache/response.models';
 import { getFirstCompletedRemoteData } from './operators';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { RemoteData } from '../data/remote-data';
-import { UnCacheableObject } from './uncacheable-object.model';
+import { CacheableObject } from '../cache/cacheable-object.model';
 
 @Injectable()
 export class HALEndpointService {
@@ -33,9 +40,18 @@ export class HALEndpointService {
 
     this.requestService.send(request, true);
 
-    return this.rdbService.buildFromHref<UnCacheableObject>(href).pipe(
+    return this.rdbService.buildFromHref<CacheableObject>(href).pipe(
+      // Re-request stale responses
+      tap((rd: RemoteData<CacheableObject>) => {
+        if (hasValue(rd) && rd.isStale) {
+          this.getEndpointMapAt(href);
+        }
+      }),
+      // Filter out all stale responses. We're only interested in a single, non-stale,
+      // completed RemoteData
+      filter((rd: RemoteData<CacheableObject>) => !rd.isStale),
       getFirstCompletedRemoteData(),
-      map((response: RemoteData<UnCacheableObject>) => {
+      map((response: RemoteData<CacheableObject>) => {
         if (hasValue(response.payload)) {
           return response.payload._links;
         } else {
diff --git a/src/app/core/shared/hierarchical-browse-definition.model.ts b/src/app/core/shared/hierarchical-browse-definition.model.ts
index d561fff643..b64ecabdf2 100644
--- a/src/app/core/shared/hierarchical-browse-definition.model.ts
+++ b/src/app/core/shared/hierarchical-browse-definition.model.ts
@@ -1,4 +1,4 @@
-import { autoserialize, autoserializeAs, deserialize, inheritSerialization } from 'cerialize';
+import { autoserialize, deserialize, inheritSerialization } from 'cerialize';
 import { typedObject } from '../cache/builders/build-decorators';
 import { excludeFromEquals } from '../utilities/equals.decorators';
 import { HIERARCHICAL_BROWSE_DEFINITION } from './hierarchical-browse-definition.resource-type';
@@ -26,9 +26,6 @@ export class HierarchicalBrowseDefinition extends BrowseDefinition {
   @autoserialize
   vocabulary: string;
 
-  @autoserializeAs('metadata')
-  metadataKeys: string[];
-
   get self(): string {
     return this._links.self.href;
   }
diff --git a/src/app/core/shared/metadata.utils.ts b/src/app/core/shared/metadata.utils.ts
index 87a90b53a3..e48b2b0c44 100644
--- a/src/app/core/shared/metadata.utils.ts
+++ b/src/app/core/shared/metadata.utils.ts
@@ -157,7 +157,7 @@ export class Metadata {
     const outputKeys: string[] = [];
     for (const inputKey of inputKeys) {
       if (inputKey.includes('*')) {
-        const inputKeyRegex = new RegExp('^' + inputKey.replace(/\./g, '\\.').replace(/\*/g, '.*') + '$');
+        const inputKeyRegex = new RegExp('^' + inputKey.replace(/\\/g, '\\\\').replace(/\./g, '\\.').replace(/\*/g, '.*') + '$');
         for (const mapKey of Object.keys(mdMap)) {
           if (!outputKeys.includes(mapKey) && inputKeyRegex.test(mapKey)) {
             outputKeys.push(mapKey);
diff --git a/src/app/core/shared/non-hierarchical-browse-definition.ts b/src/app/core/shared/non-hierarchical-browse-definition.ts
index d5481fcc8d..cba6f3ecd6 100644
--- a/src/app/core/shared/non-hierarchical-browse-definition.ts
+++ b/src/app/core/shared/non-hierarchical-browse-definition.ts
@@ -16,9 +16,6 @@ export abstract class NonHierarchicalBrowseDefinition extends BrowseDefinition {
   @autoserializeAs('order')
   defaultSortOrder: string;
 
-  @autoserializeAs('metadata')
-  metadataKeys: string[];
-
   @autoserialize
   dataType: BrowseByDataType;
 }
diff --git a/src/app/core/shared/search/search-filter.service.ts b/src/app/core/shared/search/search-filter.service.ts
index 80ba200d38..bf232cb141 100644
--- a/src/app/core/shared/search/search-filter.service.ts
+++ b/src/app/core/shared/search/search-filter.service.ts
@@ -27,6 +27,7 @@ const filterStateSelector = (state: SearchFiltersState) => state.searchFilter;
 export const FILTER_CONFIG: InjectionToken<SearchFilterConfig> = new InjectionToken<SearchFilterConfig>('filterConfig');
 export const IN_PLACE_SEARCH: InjectionToken<boolean> = new InjectionToken<boolean>('inPlaceSearch');
 export const REFRESH_FILTER: InjectionToken<BehaviorSubject<any>> = new InjectionToken<boolean>('refreshFilters');
+export const SCOPE: InjectionToken<string> = new InjectionToken<string>('scope');
 
 /**
  * Service that performs all actions that have to do with search filters and facets
diff --git a/src/app/core/statistics/usage-report-data.service.ts b/src/app/core/statistics/usage-report-data.service.ts
index fde8298488..5ce186f4ca 100644
--- a/src/app/core/statistics/usage-report-data.service.ts
+++ b/src/app/core/statistics/usage-report-data.service.ts
@@ -15,6 +15,7 @@ import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
 import { RemoteData } from '../data/remote-data';
 import { PaginatedList } from '../data/paginated-list.model';
 import { dataService } from '../data/base/data-service.decorator';
+import { RequestParam } from '../cache/models/request-param.model';
 
 /**
  * A service to retrieve {@link UsageReport}s from the REST API
@@ -45,10 +46,7 @@ export class UsageReportDataService extends IdentifiableDataService<UsageReport>
   searchStatistics(uri: string, page: number, size: number): Observable<UsageReport[]> {
     return this.searchBy('object', {
       searchParams: [
-        {
-          fieldName: `uri`,
-          fieldValue: uri,
-        },
+        new RequestParam('uri', uri),
       ],
       currentPage: page,
       elementsPerPage: size,
diff --git a/src/app/core/submission/models/workspaceitem-section-upload-file.model.ts b/src/app/core/submission/models/workspaceitem-section-upload-file.model.ts
index 177473b7d5..725e646d76 100644
--- a/src/app/core/submission/models/workspaceitem-section-upload-file.model.ts
+++ b/src/app/core/submission/models/workspaceitem-section-upload-file.model.ts
@@ -29,6 +29,18 @@ export class WorkspaceitemSectionUploadFileObject {
     value: string;
   };
 
+  /**
+   * The file format information
+   */
+  format: {
+    shortDescription: string,
+    description: string,
+    mimetype: string,
+    supportLevel: string,
+    internal: boolean,
+    type: string
+  };
+
   /**
    * The file url
    */
diff --git a/src/app/core/submission/resolver/submission-links-to-follow.ts b/src/app/core/submission/resolver/submission-links-to-follow.ts
new file mode 100644
index 0000000000..b4aa3586eb
--- /dev/null
+++ b/src/app/core/submission/resolver/submission-links-to-follow.ts
@@ -0,0 +1,14 @@
+import { followLink, FollowLinkConfig } from '../../../shared/utils/follow-link-config.model';
+import { WorkflowItem } from '../models/workflowitem.model';
+import { WorkspaceItem } from '../models/workspaceitem.model';
+
+/**
+ * The self links defined in this list are expected to be requested somewhere in the near future
+ * Requesting them as embeds will limit the number of requests
+ *
+ * Needs to be in a separate file to prevent circular dependencies in webpack.
+ */
+export const SUBMISSION_LINKS_TO_FOLLOW: FollowLinkConfig<WorkflowItem | WorkspaceItem>[] = [
+  followLink('item'),
+  followLink('collection'),
+];
diff --git a/src/app/core/submission/resolver/submission-object.resolver.ts b/src/app/core/submission/resolver/submission-object.resolver.ts
index 09561fbafa..b059b69e4d 100644
--- a/src/app/core/submission/resolver/submission-object.resolver.ts
+++ b/src/app/core/submission/resolver/submission-object.resolver.ts
@@ -1,12 +1,11 @@
-import { followLink } from '../../../shared/utils/follow-link-config.model';
 import { Injectable } from '@angular/core';
 import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from '@angular/router';
 import { Observable } from 'rxjs';
-import { Store } from '@ngrx/store';
 import { switchMap } from 'rxjs/operators';
 import { RemoteData } from '../../data/remote-data';
 import { getFirstCompletedRemoteData } from '../../shared/operators';
 import { IdentifiableDataService } from '../../data/base/identifiable-data.service';
+import { SUBMISSION_LINKS_TO_FOLLOW } from './submission-links-to-follow';
 
 /**
  * This class represents a resolver that requests a specific item before the route is activated
@@ -15,7 +14,6 @@ import { IdentifiableDataService } from '../../data/base/identifiable-data.servi
 export class SubmissionObjectResolver<T> implements Resolve<RemoteData<T>> {
     constructor(
       protected dataService: IdentifiableDataService<any>,
-      protected store: Store<any>,
     ) {
     }
 
@@ -30,7 +28,7 @@ export class SubmissionObjectResolver<T> implements Resolve<RemoteData<T>> {
         const itemRD$ = this.dataService.findById(route.params.id,
             true,
             false,
-            followLink('item'),
+            ...SUBMISSION_LINKS_TO_FOLLOW,
         ).pipe(
             getFirstCompletedRemoteData(),
             switchMap((wfiRD: RemoteData<any>) => wfiRD.payload.item as Observable<RemoteData<T>>),
diff --git a/src/app/core/submission/resolver/submission-parent-breadcrumb.resolver.ts b/src/app/core/submission/resolver/submission-parent-breadcrumb.resolver.ts
new file mode 100644
index 0000000000..554437ed94
--- /dev/null
+++ b/src/app/core/submission/resolver/submission-parent-breadcrumb.resolver.ts
@@ -0,0 +1,43 @@
+import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from '@angular/router';
+import { Observable } from 'rxjs';
+import { map } from 'rxjs/operators';
+import { getFirstCompletedRemoteData, getRemoteDataPayload } from '../../shared/operators';
+import { IdentifiableDataService } from '../../data/base/identifiable-data.service';
+import { BreadcrumbConfig } from '../../../breadcrumbs/breadcrumb/breadcrumb-config.model';
+import { SubmissionParentBreadcrumbsService } from '../submission-parent-breadcrumb.service';
+import { SUBMISSION_LINKS_TO_FOLLOW } from './submission-links-to-follow';
+import { SubmissionObject } from '../models/submission-object.model';
+
+/**
+ * This class represents a resolver that requests a specific item before the route is activated
+ */
+export abstract class SubmissionParentBreadcrumbResolver implements Resolve<BreadcrumbConfig<SubmissionObject>> {
+
+  protected constructor(
+    protected dataService: IdentifiableDataService<any>,
+    protected breadcrumbService: SubmissionParentBreadcrumbsService,
+  ) {
+  }
+
+  /**
+   * Method for resolving an item based on the parameters in the current route
+   * @param {ActivatedRouteSnapshot} route The current ActivatedRouteSnapshot
+   * @param {RouterStateSnapshot} state The current RouterStateSnapshot
+   * @returns Observable<<RemoteData<Item>> Emits the found item based on the parameters in the current route,
+   * or an error if something went wrong
+   */
+  resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<BreadcrumbConfig<SubmissionObject>> {
+    return this.dataService.findById(route.params.id,
+      true,
+      false,
+      ...SUBMISSION_LINKS_TO_FOLLOW,
+    ).pipe(
+      getFirstCompletedRemoteData(),
+      getRemoteDataPayload(),
+      map((submissionObject: SubmissionObject) => ({
+        provider: this.breadcrumbService,
+        key: submissionObject,
+      } as BreadcrumbConfig<SubmissionObject>)),
+    );
+  }
+}
diff --git a/src/app/core/submission/submission-cc-license-url-data.service.ts b/src/app/core/submission/submission-cc-license-url-data.service.ts
index 3d5dedb505..5ccaf9bc4d 100644
--- a/src/app/core/submission/submission-cc-license-url-data.service.ts
+++ b/src/app/core/submission/submission-cc-license-url-data.service.ts
@@ -16,6 +16,7 @@ import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
 import { RemoteData } from '../data/remote-data';
 import { PaginatedList } from '../data/paginated-list.model';
 import { dataService } from '../data/base/data-service.decorator';
+import { RequestParam } from '../cache/models/request-param.model';
 
 @Injectable()
 @dataService(SUBMISSION_CC_LICENSE_URL)
@@ -43,17 +44,8 @@ export class SubmissionCcLicenseUrlDataService extends BaseDataService<Submissio
     return this.searchData.getSearchByHref(
       'rightsByQuestions',{
         searchParams: [
-          {
-            fieldName: 'license',
-            fieldValue: ccLicense.id
-          },
-          ...ccLicense.fields.map(
-            (field) => {
-              return {
-                fieldName: `answer_${field.id}`,
-                fieldValue: options.get(field).id,
-              };
-            }),
+          new RequestParam('license', ccLicense.id),
+          ...ccLicense.fields.map((field: Field) => new RequestParam(`answer_${field.id}`, options.get(field).id)),
         ]
       }
     ).pipe(
diff --git a/src/app/core/submission/submission-json-patch-operations.service.spec.ts b/src/app/core/submission/submission-json-patch-operations.service.spec.ts
index 5472e86856..b186c27c33 100644
--- a/src/app/core/submission/submission-json-patch-operations.service.spec.ts
+++ b/src/app/core/submission/submission-json-patch-operations.service.spec.ts
@@ -18,6 +18,9 @@ describe('SubmissionJsonPatchOperationsService', () => {
   const rdbService = {} as RemoteDataBuildService;
   const halEndpointService = {} as HALEndpointService;
 
+  const uuid = '91ecbeda-99fe-42ac-9430-b9b75af56f78';
+  const href = 'https://rest.api/some/self/link?with=maybe&a=few&other=parameters';
+
   function initTestService() {
     return new SubmissionJsonPatchOperationsService(
       requestService,
@@ -37,4 +40,16 @@ describe('SubmissionJsonPatchOperationsService', () => {
     expect((service as any).patchRequestConstructor).toEqual(SubmissionPatchRequest);
   });
 
+  describe(`getRequestInstance`, () => {
+    it(`should add a parameter to embed the item to the request URL`, () => {
+      const result = (service as any).getRequestInstance(uuid, href);
+      const resultURL = new URL(result.href);
+      expect(resultURL.searchParams.get('embed')).toEqual('item');
+
+      // if we delete the embed item param, it should be identical to the original url
+      resultURL.searchParams.delete('embed');
+      expect(href).toEqual(resultURL.toString());
+    });
+  });
+
 });
diff --git a/src/app/core/submission/submission-json-patch-operations.service.ts b/src/app/core/submission/submission-json-patch-operations.service.ts
index 5771c85b57..117056008a 100644
--- a/src/app/core/submission/submission-json-patch-operations.service.ts
+++ b/src/app/core/submission/submission-json-patch-operations.service.ts
@@ -9,6 +9,7 @@ import { SubmitDataResponseDefinitionObject } from '../shared/submit-data-respon
 import { SubmissionPatchRequest } from '../data/request.models';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { CoreState } from '../core-state.model';
+import { URLCombiner } from '../url-combiner/url-combiner';
 
 /**
  * A service that provides methods to make JSON Patch requests.
@@ -27,4 +28,20 @@ export class SubmissionJsonPatchOperationsService extends JsonPatchOperationsSer
     super();
   }
 
+  /**
+   * Return an instance for RestRequest class
+   *
+   * @param uuid
+   *    The request uuid
+   * @param href
+   *    The request href
+   * @param body
+   *    The request body
+   * @return Object<PatchRequestDefinition>
+   *    instance of PatchRequestDefinition
+   */
+  protected getRequestInstance(uuid: string, href: string, body?: any): SubmissionPatchRequest {
+    return new this.patchRequestConstructor(uuid, new URLCombiner(href, '?embed=item').toString(), body);
+  }
+
 }
diff --git a/src/app/core/submission/submission-parent-breadcrumb.service.ts b/src/app/core/submission/submission-parent-breadcrumb.service.ts
new file mode 100644
index 0000000000..421226f80b
--- /dev/null
+++ b/src/app/core/submission/submission-parent-breadcrumb.service.ts
@@ -0,0 +1,66 @@
+import { BreadcrumbsProviderService } from '../breadcrumbs/breadcrumbsProviderService';
+import { Injectable } from '@angular/core';
+import { Observable, switchMap, combineLatest, of as observableOf } from 'rxjs';
+import { Breadcrumb } from '../../breadcrumbs/breadcrumb/breadcrumb.model';
+import { getFirstCompletedRemoteData, getRemoteDataPayload } from '../shared/operators';
+import { Collection } from '../shared/collection.model';
+import { DSONameService } from '../breadcrumbs/dso-name.service';
+import { SubmissionObject } from './models/submission-object.model';
+import { RemoteData } from '../data/remote-data';
+import { DSOBreadcrumbsService } from '../breadcrumbs/dso-breadcrumbs.service';
+import { getDSORoute } from '../../app-routing-paths';
+import { SubmissionService } from '../../submission/submission.service';
+import { CollectionDataService } from '../data/collection-data.service';
+import {
+  hasValue,
+  isEmpty,
+} from '../../shared/empty.util';
+
+/**
+ * Service to calculate the parent {@link DSpaceObject} breadcrumbs for a {@link SubmissionObject}
+ */
+@Injectable()
+export class SubmissionParentBreadcrumbsService implements BreadcrumbsProviderService<SubmissionObject> {
+
+  constructor(
+    protected dsoNameService: DSONameService,
+    protected dsoBreadcrumbsService: DSOBreadcrumbsService,
+    protected submissionService: SubmissionService,
+    protected collectionService: CollectionDataService,
+  ) {
+  }
+
+  /**
+   * Creates the parent breadcrumb structure for {@link SubmissionObject}s. It also automatically recreates the
+   * parent breadcrumb structure when you change a {@link SubmissionObject}'s by dispatching a
+   * {@link ChangeSubmissionCollectionAction}.
+   *
+   * @param submissionObject The {@link SubmissionObject} for which the parent breadcrumb structure needs to be created
+   */
+  getBreadcrumbs(submissionObject: SubmissionObject): Observable<Breadcrumb[]> {
+    if (isEmpty(submissionObject)) {
+      return observableOf([]);
+    }
+
+    return combineLatest([
+      (submissionObject.collection as Observable<RemoteData<Collection>>).pipe(
+        getFirstCompletedRemoteData(),
+        getRemoteDataPayload(),
+      ),
+      this.submissionService.getSubmissionCollectionId(submissionObject.id),
+    ]).pipe(
+      switchMap(([collection, latestCollectionId]: [Collection, string]) => {
+        if (hasValue(latestCollectionId)) {
+          return this.collectionService.findById(latestCollectionId).pipe(
+            getFirstCompletedRemoteData(),
+            getRemoteDataPayload(),
+          );
+        } else {
+          return observableOf(collection);
+        }
+      }),
+      switchMap((collection: Collection) => this.dsoBreadcrumbsService.getBreadcrumbs(collection, getDSORoute(collection))),
+    );
+  }
+
+}
diff --git a/src/app/core/submission/submission-rest.service.spec.ts b/src/app/core/submission/submission-rest.service.spec.ts
index fdfc7da0af..01cb886fa2 100644
--- a/src/app/core/submission/submission-rest.service.spec.ts
+++ b/src/app/core/submission/submission-rest.service.spec.ts
@@ -28,7 +28,7 @@ describe('SubmissionRestService test suite', () => {
   const resourceEndpoint = 'workspaceitems';
   const resourceScope = '260';
   const body = { test: new FormFieldMetadataValueObject('test') };
-  const resourceHref = resourceEndpointURL + '/' + resourceEndpoint + '/' + resourceScope + '?projection=full';
+  const resourceHref = resourceEndpointURL + '/' + resourceEndpoint + '/' + resourceScope + '?embed=item,sections,collection';
   const timestampResponse = 1545994811992;
 
   function initTestService() {
diff --git a/src/app/core/submission/submission-rest.service.ts b/src/app/core/submission/submission-rest.service.ts
index 1daf4fcae9..dfdc8449e0 100644
--- a/src/app/core/submission/submission-rest.service.ts
+++ b/src/app/core/submission/submission-rest.service.ts
@@ -78,7 +78,7 @@ export class SubmissionRestService {
    */
   protected getEndpointByIDHref(endpoint, resourceID, collectionId?: string): string {
     let url = isNotEmpty(resourceID) ? `${endpoint}/${resourceID}` : `${endpoint}`;
-    url = new URLCombiner(url, '?projection=full').toString();
+    url = new URLCombiner(url, '?embed=item,sections,collection').toString();
     if (collectionId) {
       url = new URLCombiner(url, `&owningCollection=${collectionId}`).toString();
     }
diff --git a/src/app/core/submission/workflowitem-data.service.ts b/src/app/core/submission/workflowitem-data.service.ts
index 47d18470d3..5381627c19 100644
--- a/src/app/core/submission/workflowitem-data.service.ts
+++ b/src/app/core/submission/workflowitem-data.service.ts
@@ -13,7 +13,6 @@ import { RemoteData } from '../data/remote-data';
 import { NoContent } from '../shared/NoContent.model';
 import { getFirstCompletedRemoteData } from '../shared/operators';
 import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
-import { WorkspaceItem } from './models/workspaceitem.model';
 import { RequestParam } from '../cache/models/request-param.model';
 import { FindListOptions } from '../data/find-list-options.model';
 import { IdentifiableDataService } from '../data/base/identifiable-data.service';
@@ -28,7 +27,6 @@ import { dataService } from '../data/base/data-service.decorator';
 @Injectable()
 @dataService(WorkflowItem.type)
 export class WorkflowItemDataService extends IdentifiableDataService<WorkflowItem> implements SearchData<WorkflowItem>, DeleteData<WorkflowItem> {
-  protected linkPath = 'workflowitems';
   protected searchByItemLinkPath = 'item';
   protected responseMsToLive = 10 * 1000;
 
@@ -42,7 +40,7 @@ export class WorkflowItemDataService extends IdentifiableDataService<WorkflowIte
     protected halService: HALEndpointService,
     protected notificationsService: NotificationsService,
   ) {
-    super('workspaceitems', requestService, rdbService, objectCache, halService);
+    super('workflowitems', requestService, rdbService, objectCache, halService);
 
     this.searchData = new SearchDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
     this.deleteData = new DeleteDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, notificationsService, this.responseMsToLive, this.constructIdEndpoint);
@@ -105,9 +103,9 @@ export class WorkflowItemDataService extends IdentifiableDataService<WorkflowIte
    * @param options        The {@link FindListOptions} object
    * @param linksToFollow  List of {@link FollowLinkConfig} that indicate which {@link HALLink}s should be automatically resolved
    */
-  public findByItem(uuid: string, useCachedVersionIfAvailable = false, reRequestOnStale = true, options: FindListOptions = {}, ...linksToFollow: FollowLinkConfig<WorkspaceItem>[]): Observable<RemoteData<WorkspaceItem>> {
+  public findByItem(uuid: string, useCachedVersionIfAvailable = false, reRequestOnStale = true, options: FindListOptions = {}, ...linksToFollow: FollowLinkConfig<WorkflowItem>[]): Observable<RemoteData<WorkflowItem>> {
     const findListOptions = new FindListOptions();
-    findListOptions.searchParams = [new RequestParam('uuid', encodeURIComponent(uuid))];
+    findListOptions.searchParams = [new RequestParam('uuid', uuid)];
     const href$ = this.searchData.getSearchByHref(this.searchByItemLinkPath, findListOptions, ...linksToFollow);
     return this.findByHref(href$, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
   }
@@ -126,7 +124,7 @@ export class WorkflowItemDataService extends IdentifiableDataService<WorkflowIte
    * @return {Observable<RemoteData<PaginatedList<T>>}
    *    Return an observable that emits response from the server
    */
-  public searchBy(searchMethod: string, options?: FindListOptions, useCachedVersionIfAvailable?: boolean, reRequestOnStale?: boolean, ...linksToFollow: FollowLinkConfig<WorkspaceItem>[]): Observable<RemoteData<PaginatedList<WorkspaceItem>>> {
+  public searchBy(searchMethod: string, options?: FindListOptions, useCachedVersionIfAvailable?: boolean, reRequestOnStale?: boolean, ...linksToFollow: FollowLinkConfig<WorkflowItem>[]): Observable<RemoteData<PaginatedList<WorkflowItem>>> {
     return this.searchData.searchBy(searchMethod, options, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
   }
 
diff --git a/src/app/core/submission/workspaceitem-data.service.ts b/src/app/core/submission/workspaceitem-data.service.ts
index f285fb6eca..d219de0ddc 100644
--- a/src/app/core/submission/workspaceitem-data.service.ts
+++ b/src/app/core/submission/workspaceitem-data.service.ts
@@ -54,7 +54,7 @@ export class WorkspaceitemDataService extends IdentifiableDataService<WorkspaceI
    */
   public findByItem(uuid: string, useCachedVersionIfAvailable = false, reRequestOnStale = true, options: FindListOptions = {}, ...linksToFollow: FollowLinkConfig<WorkspaceItem>[]): Observable<RemoteData<WorkspaceItem>> {
     const findListOptions = new FindListOptions();
-    findListOptions.searchParams = [new RequestParam('uuid', encodeURIComponent(uuid))];
+    findListOptions.searchParams = [new RequestParam('uuid', uuid)];
     const href$ = this.getSearchByHref(this.searchByItemLinkPath, findListOptions, ...linksToFollow);
     return this.findByHref(href$, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
   }
diff --git a/src/app/core/xsrf/browser-xsrf.service.spec.ts b/src/app/core/xsrf/browser-xsrf.service.spec.ts
new file mode 100644
index 0000000000..aba3edd330
--- /dev/null
+++ b/src/app/core/xsrf/browser-xsrf.service.spec.ts
@@ -0,0 +1,58 @@
+import { HttpClient } from '@angular/common/http';
+import {
+  HttpClientTestingModule,
+  HttpTestingController,
+} from '@angular/common/http/testing';
+import { TestBed } from '@angular/core/testing';
+
+import { RESTURLCombiner } from '../url-combiner/rest-url-combiner';
+import { BrowserXSRFService } from './browser-xsrf.service';
+
+describe(`BrowserXSRFService`, () => {
+  let service: BrowserXSRFService;
+  let httpClient: HttpClient;
+  let httpTestingController: HttpTestingController;
+
+  const endpointURL = new RESTURLCombiner('/security/csrf').toString();
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      imports: [ HttpClientTestingModule ],
+      providers: [ BrowserXSRFService ],
+    });
+    httpClient = TestBed.inject(HttpClient);
+    httpTestingController = TestBed.inject(HttpTestingController);
+    service = TestBed.inject(BrowserXSRFService);
+  });
+
+  describe(`initXSRFToken`, () => {
+    it(`should perform a GET to the csrf endpoint`, (done: DoneFn) => {
+      service.initXSRFToken(httpClient)();
+
+      const req = httpTestingController.expectOne({
+        url: endpointURL,
+        method: 'GET',
+      });
+
+      req.flush({});
+      httpTestingController.verify();
+      expect().nothing();
+      done();
+    });
+
+    describe(`when the GET succeeds`, () => {
+      it(`should set tokenInitialized$ to true`, (done: DoneFn) => {
+        service.initXSRFToken(httpClient)();
+
+        const req = httpTestingController.expectOne(endpointURL);
+
+        req.flush({});
+        httpTestingController.verify();
+
+        expect(service.tokenInitialized$.getValue()).toBeTrue();
+        done();
+      });
+    });
+
+  });
+});
diff --git a/src/app/core/xsrf/browser-xsrf.service.ts b/src/app/core/xsrf/browser-xsrf.service.ts
new file mode 100644
index 0000000000..121defc061
--- /dev/null
+++ b/src/app/core/xsrf/browser-xsrf.service.ts
@@ -0,0 +1,30 @@
+import { HttpClient } from '@angular/common/http';
+import { Injectable } from '@angular/core';
+import { take } from 'rxjs/operators';
+
+import { RESTURLCombiner } from '../url-combiner/rest-url-combiner';
+import { XSRFService } from './xsrf.service';
+
+/**
+ * Browser (CSR) Service to obtain a new CSRF/XSRF token when needed by our RequestService
+ * to perform a modify request (e.g. POST/PUT/DELETE).
+ * NOTE: This is primarily necessary before the *first* modifying request, as the CSRF
+ * token may not yet be initialized.
+ */
+@Injectable()
+export class BrowserXSRFService extends XSRFService {
+  initXSRFToken(httpClient: HttpClient): () => Promise<any> {
+    return () => new Promise<void>((resolve) => {
+      // Force a new token to be created by calling the CSRF endpoint
+      httpClient.get(new RESTURLCombiner('/security/csrf').toString(), undefined).pipe(
+        take(1),
+      ).subscribe(() => {
+        // Once token is returned, set tokenInitialized to true.
+        this.tokenInitialized$.next(true);
+      });
+
+      // return immediately, the rest of the app doesn't need to wait for this to finish
+      resolve();
+    });
+  }
+}
diff --git a/src/app/core/xsrf/server-xsrf.service.spec.ts b/src/app/core/xsrf/server-xsrf.service.spec.ts
new file mode 100644
index 0000000000..05728edb42
--- /dev/null
+++ b/src/app/core/xsrf/server-xsrf.service.spec.ts
@@ -0,0 +1,33 @@
+import { HttpClient } from '@angular/common/http';
+
+import { ServerXSRFService } from './server-xsrf.service';
+
+describe(`ServerXSRFService`, () => {
+  let service: ServerXSRFService;
+  let httpClient: HttpClient;
+
+  beforeEach(() => {
+    httpClient = jasmine.createSpyObj(['post', 'get', 'request']);
+    service = new ServerXSRFService();
+  });
+
+  describe(`initXSRFToken`, () => {
+    it(`shouldn't perform any requests`, (done: DoneFn) => {
+      service.initXSRFToken(httpClient)().then(() => {
+        for (const prop in httpClient) {
+          if (httpClient.hasOwnProperty(prop)) {
+            expect(httpClient[prop]).not.toHaveBeenCalled();
+          }
+        }
+        done();
+      });
+    });
+
+    it(`should leave tokenInitialized$ on false`, (done: DoneFn) => {
+      service.initXSRFToken(httpClient)().then(() => {
+        expect(service.tokenInitialized$.getValue()).toBeFalse();
+        done();
+      });
+    });
+  });
+});
diff --git a/src/app/core/xsrf/server-xsrf.service.ts b/src/app/core/xsrf/server-xsrf.service.ts
new file mode 100644
index 0000000000..f729aa49a7
--- /dev/null
+++ b/src/app/core/xsrf/server-xsrf.service.ts
@@ -0,0 +1,19 @@
+import { HttpClient } from '@angular/common/http';
+import { Injectable } from '@angular/core';
+
+import { XSRFService } from './xsrf.service';
+
+/**
+ * Server (SSR) Service to obtain a new CSRF/XSRF token. Because SSR only triggers GET
+ * requests a CSRF token is never needed.
+ */
+@Injectable()
+export class ServerXSRFService extends XSRFService {
+  initXSRFToken(httpClient: HttpClient): () => Promise<any> {
+    return () => new Promise<void>((resolve) => {
+      // return immediately, and keep tokenInitialized$ false. The server side can make only GET
+      // requests, since it can never get a valid XSRF cookie
+      resolve();
+    });
+  }
+}
diff --git a/src/app/core/xsrf/xsrf.service.spec.ts b/src/app/core/xsrf/xsrf.service.spec.ts
new file mode 100644
index 0000000000..56564a294c
--- /dev/null
+++ b/src/app/core/xsrf/xsrf.service.spec.ts
@@ -0,0 +1,21 @@
+import { HttpClient } from '@angular/common/http';
+
+import { XSRFService } from './xsrf.service';
+
+class XSRFServiceImpl extends XSRFService {
+  initXSRFToken(httpClient: HttpClient): () => Promise<any> {
+    return () => null;
+  }
+}
+
+describe(`XSRFService`, () => {
+  let service: XSRFService;
+
+  beforeEach(() => {
+    service = new XSRFServiceImpl();
+  });
+
+  it(`should start with tokenInitialized$.hasValue() === false`, () => {
+    expect(service.tokenInitialized$.getValue()).toBeFalse();
+  });
+});
diff --git a/src/app/core/xsrf/xsrf.service.ts b/src/app/core/xsrf/xsrf.service.ts
new file mode 100644
index 0000000000..99b27021b6
--- /dev/null
+++ b/src/app/core/xsrf/xsrf.service.ts
@@ -0,0 +1,15 @@
+import { HttpClient } from '@angular/common/http';
+import { Injectable } from '@angular/core';
+import { BehaviorSubject } from 'rxjs';
+
+/**
+ * Abstract CSRF/XSRF Service used to track whether a CSRF token has been received
+ * from the DSpace REST API. Once it is received, the "tokenInitialized$" flag will
+ * be set to "true".
+ */
+@Injectable()
+export abstract class XSRFService {
+  public tokenInitialized$: BehaviorSubject<boolean> = new BehaviorSubject(false);
+
+  abstract initXSRFToken(httpClient: HttpClient): () => Promise<any>;
+}
diff --git a/src/app/curation-form/curation-form.component.spec.ts b/src/app/curation-form/curation-form.component.spec.ts
index dc70b925e8..a0bdee21f4 100644
--- a/src/app/curation-form/curation-form.component.spec.ts
+++ b/src/app/curation-form/curation-form.component.spec.ts
@@ -1,4 +1,4 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { ComponentFixture, TestBed, waitForAsync, fakeAsync, flush } from '@angular/core/testing';
 import { TranslateModule } from '@ngx-translate/core';
 import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
 import { CurationFormComponent } from './curation-form.component';
@@ -16,6 +16,7 @@ import { ConfigurationDataService } from '../core/data/configuration-data.servic
 import { ConfigurationProperty } from '../core/shared/configuration-property.model';
 import { getProcessDetailRoute } from '../process-page/process-page-routing.paths';
 import { HandleService } from '../shared/handle.service';
+import { of as observableOf } from 'rxjs';
 
 describe('CurationFormComponent', () => {
   let comp: CurationFormComponent;
@@ -54,7 +55,7 @@ describe('CurationFormComponent', () => {
     });
 
     handleService = {
-      normalizeHandle: (a) => a
+      normalizeHandle: (a: string) => observableOf(a),
     } as any;
 
     notificationsService = new NotificationsServiceStub();
@@ -151,12 +152,13 @@ describe('CurationFormComponent', () => {
     ], []);
   });
 
-  it(`should show an error notification and return when an invalid dsoHandle is provided`, () => {
+  it(`should show an error notification and return when an invalid dsoHandle is provided`, fakeAsync(() => {
     comp.dsoHandle = 'test-handle';
-    spyOn(handleService, 'normalizeHandle').and.returnValue(null);
+    spyOn(handleService, 'normalizeHandle').and.returnValue(observableOf(null));
     comp.submit();
+    flush();
 
     expect(notificationsService.error).toHaveBeenCalled();
     expect(scriptDataService.invoke).not.toHaveBeenCalled();
-  });
+  }));
 });
diff --git a/src/app/curation-form/curation-form.component.ts b/src/app/curation-form/curation-form.component.ts
index 2c0e900a66..cc2c14f89f 100644
--- a/src/app/curation-form/curation-form.component.ts
+++ b/src/app/curation-form/curation-form.component.ts
@@ -1,22 +1,22 @@
-import { ChangeDetectorRef, Component, Input, OnInit } from '@angular/core';
+import { ChangeDetectorRef, Component, Input, OnDestroy, OnInit } from '@angular/core';
 import { ScriptDataService } from '../core/data/processes/script-data.service';
 import { UntypedFormControl, UntypedFormGroup } from '@angular/forms';
-import { getFirstCompletedRemoteData } from '../core/shared/operators';
-import { find, map } from 'rxjs/operators';
+import { getFirstCompletedRemoteData, getFirstSucceededRemoteDataPayload } from '../core/shared/operators';
+import { map } from 'rxjs/operators';
 import { NotificationsService } from '../shared/notifications/notifications.service';
 import { TranslateService } from '@ngx-translate/core';
 import { hasValue, isEmpty, isNotEmpty } from '../shared/empty.util';
 import { RemoteData } from '../core/data/remote-data';
 import { Router } from '@angular/router';
-import { ProcessDataService } from '../core/data/processes/process-data.service';
 import { Process } from '../process-page/processes/process.model';
 import { ConfigurationDataService } from '../core/data/configuration-data.service';
 import { ConfigurationProperty } from '../core/shared/configuration-property.model';
-import { Observable } from 'rxjs';
+import { Observable, Subscription } from 'rxjs';
 import { getProcessDetailRoute } from '../process-page/process-page-routing.paths';
 import { HandleService } from '../shared/handle.service';
 
 export const CURATION_CFG = 'plugin.named.org.dspace.curate.CurationTask';
+
 /**
  * Component responsible for rendering the Curation Task form
  */
@@ -24,7 +24,7 @@ export const CURATION_CFG = 'plugin.named.org.dspace.curate.CurationTask';
   selector: 'ds-curation-form',
   templateUrl: './curation-form.component.html'
 })
-export class CurationFormComponent implements OnInit {
+export class CurationFormComponent implements OnDestroy, OnInit {
 
   config: Observable<RemoteData<ConfigurationProperty>>;
   tasks: string[];
@@ -33,10 +33,11 @@ export class CurationFormComponent implements OnInit {
   @Input()
   dsoHandle: string;
 
+  subs: Subscription[] = [];
+
   constructor(
     private scriptDataService: ScriptDataService,
     private configurationDataService: ConfigurationDataService,
-    private processDataService: ProcessDataService,
     private notificationsService: NotificationsService,
     private translateService: TranslateService,
     private handleService: HandleService,
@@ -45,6 +46,10 @@ export class CurationFormComponent implements OnInit {
   ) {
   }
 
+  ngOnDestroy(): void {
+    this.subs.forEach((sub: Subscription) => sub.unsubscribe());
+  }
+
   ngOnInit(): void {
     this.form = new UntypedFormGroup({
       task: new UntypedFormControl(''),
@@ -52,16 +57,15 @@ export class CurationFormComponent implements OnInit {
     });
 
     this.config = this.configurationDataService.findByPropertyName(CURATION_CFG);
-    this.config.pipe(
-      find((rd: RemoteData<ConfigurationProperty>) => rd.hasSucceeded),
-      map((rd: RemoteData<ConfigurationProperty>) => rd.payload)
-    ).subscribe((configProperties) => {
+    this.subs.push(this.config.pipe(
+      getFirstSucceededRemoteDataPayload(),
+    ).subscribe((configProperties: ConfigurationProperty) => {
       this.tasks = configProperties.values
         .filter((value) => isNotEmpty(value) && value.includes('='))
         .map((value) => value.split('=')[1].trim());
       this.form.get('task').patchValue(this.tasks[0]);
       this.cdr.detectChanges();
-    });
+    }));
   }
 
   /**
@@ -77,33 +81,41 @@ export class CurationFormComponent implements OnInit {
    */
   submit() {
     const taskName = this.form.get('task').value;
-    let handle;
+    let handle$: Observable<string | null>;
     if (this.hasHandleValue()) {
-      handle = this.handleService.normalizeHandle(this.dsoHandle);
-      if (isEmpty(handle)) {
-        this.notificationsService.error(this.translateService.get('curation.form.submit.error.head'),
-          this.translateService.get('curation.form.submit.error.invalid-handle'));
-        return;
-      }
+      handle$ = this.handleService.normalizeHandle(this.dsoHandle).pipe(
+        map((handle: string | null) => {
+          if (isEmpty(handle)) {
+            this.notificationsService.error(this.translateService.get('curation.form.submit.error.head'),
+              this.translateService.get('curation.form.submit.error.invalid-handle'));
+          }
+          return handle;
+        }),
+      );
     } else {
-      handle = this.handleService.normalizeHandle(this.form.get('handle').value);
-      if (isEmpty(handle)) {
-        handle = 'all';
-      }
+      handle$ = this.handleService.normalizeHandle(this.form.get('handle').value).pipe(
+        map((handle: string | null) => isEmpty(handle) ? 'all' : handle),
+      );
     }
 
-    this.scriptDataService.invoke('curate', [
-      { name: '-t', value: taskName },
-      { name: '-i', value: handle },
-    ], []).pipe(getFirstCompletedRemoteData()).subscribe((rd: RemoteData<Process>) => {
-      if (rd.hasSucceeded) {
-        this.notificationsService.success(this.translateService.get('curation.form.submit.success.head'),
-          this.translateService.get('curation.form.submit.success.content'));
-        this.router.navigateByUrl(getProcessDetailRoute(rd.payload.processId));
-      } else {
-        this.notificationsService.error(this.translateService.get('curation.form.submit.error.head'),
-          this.translateService.get('curation.form.submit.error.content'));
+    this.subs.push(handle$.subscribe((handle: string) => {
+      if (hasValue(handle)) {
+        this.subs.push(this.scriptDataService.invoke('curate', [
+          { name: '-t', value: taskName },
+          { name: '-i', value: handle },
+        ], []).pipe(
+          getFirstCompletedRemoteData(),
+        ).subscribe((rd: RemoteData<Process>) => {
+          if (rd.hasSucceeded) {
+            this.notificationsService.success(this.translateService.get('curation.form.submit.success.head'),
+              this.translateService.get('curation.form.submit.success.content'));
+            void this.router.navigateByUrl(getProcessDetailRoute(rd.payload.processId));
+          } else {
+            this.notificationsService.error(this.translateService.get('curation.form.submit.error.head'),
+              this.translateService.get('curation.form.submit.error.content'));
+          }
+        }));
       }
-    });
+    }));
   }
 }
diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-shared/dso-edit-metadata-cells.scss b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-shared/dso-edit-metadata-cells.scss
index 20d479ac88..29b93f3150 100644
--- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-shared/dso-edit-metadata-cells.scss
+++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-shared/dso-edit-metadata-cells.scss
@@ -24,7 +24,7 @@
   }
 
   &.ds-warning {
-    background-color: var(--bs-warning-bg);
+    background-color: var(--ds-warning-bg);
 
     .ds-flex-cell {
       border: 1px solid var(--bs-warning);
@@ -32,7 +32,7 @@
   }
 
   &.ds-danger {
-    background-color: var(--bs-danger-bg);
+    background-color: var(--ds-danger-bg);
 
     .ds-flex-cell {
       border: 1px solid var(--bs-danger);
@@ -40,7 +40,7 @@
   }
 
   &.ds-success {
-    background-color: var(--bs-success-bg);
+    background-color: var(--ds-success-bg);
 
     .ds-flex-cell {
       border: 1px solid var(--bs-success);
diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.html b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.html
index 525b42610b..f96759a75e 100644
--- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.html
+++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.html
@@ -4,6 +4,7 @@
   <div class="flex-grow-1 ds-flex-cell ds-value-cell d-flex align-items-center" *ngVar="(mdRepresentation$ | async) as mdRepresentation" role="cell">
     <div class="dont-break-out preserve-line-breaks" *ngIf="!mdValue.editing && !mdRepresentation">{{ mdValue.newValue.value }}</div>
     <textarea class="form-control" rows="5" *ngIf="mdValue.editing && !mdRepresentation" [(ngModel)]="mdValue.newValue.value"
+              [attr.aria-label]="(dsoType + '.edit.metadata.edit.value') | translate"
               [dsDebounce]="300" (onDebounce)="confirm.emit(false)"></textarea>
     <div class="d-flex" *ngIf="mdRepresentation">
       <a class="mr-2" target="_blank" [routerLink]="mdRepresentationItemRoute$ | async">{{ mdRepresentationName$ | async }}</a>
@@ -13,40 +14,41 @@
   <div class="ds-flex-cell ds-lang-cell" role="cell">
     <div class="dont-break-out preserve-line-breaks" *ngIf="!mdValue.editing">{{ mdValue.newValue.language }}</div>
     <input class="form-control" type="text" *ngIf="mdValue.editing" [(ngModel)]="mdValue.newValue.language"
+           [attr.aria-label]="(dsoType + '.edit.metadata.edit.language') | translate"
            [dsDebounce]="300" (onDebounce)="confirm.emit(false)" />
   </div>
   <div class="text-center ds-flex-cell ds-edit-cell" role="cell">
     <div class="btn-group">
       <div class="edit-field">
         <div class="btn-group edit-buttons" [ngbTooltip]="isVirtual ? (dsoType + '.edit.metadata.edit.buttons.virtual' | translate) : null">
-          <button class="btn btn-outline-primary btn-sm ng-star-inserted" id="metadata-edit-btn" *ngIf="!mdValue.editing"
+          <button class="btn btn-outline-primary btn-sm ng-star-inserted" data-test="metadata-edit-btn" *ngIf="!mdValue.editing"
                   [title]="dsoType + '.edit.metadata.edit.buttons.edit' | translate"
                   ngbTooltip="{{ dsoType + '.edit.metadata.edit.buttons.edit' | translate }}"
-                  [disabled]="isVirtual || mdValue.change === DsoEditMetadataChangeTypeEnum.REMOVE || (saving$ | async)" (click)="edit.emit()">
+                  [dsBtnDisabled]="isVirtual || mdValue.change === DsoEditMetadataChangeTypeEnum.REMOVE || (saving$ | async)" (click)="edit.emit()">
             <i class="fas fa-edit fa-fw"></i>
           </button>
-          <button class="btn btn-outline-success btn-sm ng-star-inserted" id="metadata-confirm-btn" *ngIf="mdValue.editing"
+          <button class="btn btn-outline-success btn-sm ng-star-inserted" data-test="metadata-confirm-btn" *ngIf="mdValue.editing"
                   [title]="dsoType + '.edit.metadata.edit.buttons.confirm' | translate"
                   ngbTooltip="{{ dsoType + '.edit.metadata.edit.buttons.confirm' | translate }}"
-                  [disabled]="isVirtual || (saving$ | async)" (click)="confirm.emit(true)">
+                  [dsBtnDisabled]="isVirtual || (saving$ | async)" (click)="confirm.emit(true)">
             <i class="fas fa-check fa-fw"></i>
           </button>
-          <button class="btn btn-outline-danger btn-sm" id="metadata-remove-btn"
+          <button class="btn btn-outline-danger btn-sm" data-test="metadata-remove-btn"
                   [title]="dsoType + '.edit.metadata.edit.buttons.remove' | translate"
                   ngbTooltip="{{ dsoType + '.edit.metadata.edit.buttons.remove' | translate }}"
-                  [disabled]="isVirtual || (mdValue.change && mdValue.change !== DsoEditMetadataChangeTypeEnum.ADD) || mdValue.editing || (saving$ | async)" (click)="remove.emit()">
+                  [dsBtnDisabled]="isVirtual || (mdValue.change && mdValue.change !== DsoEditMetadataChangeTypeEnum.ADD) || mdValue.editing || (saving$ | async)" (click)="remove.emit()">
             <i class="fas fa-trash-alt fa-fw"></i>
           </button>
-          <button class="btn btn-outline-warning btn-sm" id="metadata-undo-btn"
+          <button class="btn btn-outline-warning btn-sm" data-test="metadata-undo-btn"
                   [title]="dsoType + '.edit.metadata.edit.buttons.undo' | translate"
                   ngbTooltip="{{ dsoType + '.edit.metadata.edit.buttons.undo' | translate }}"
-                  [disabled]="isVirtual || (!mdValue.change && mdValue.reordered) || (!mdValue.change && !mdValue.editing) || (saving$ | async)" (click)="undo.emit()">
+                  [dsBtnDisabled]="isVirtual || (!mdValue.change && mdValue.reordered) || (!mdValue.change && !mdValue.editing) || (saving$ | async)" (click)="undo.emit()">
             <i class="fas fa-undo-alt fa-fw"></i>
           </button>
         </div>
       </div>
-      <button class="btn btn-outline-secondary ds-drag-handle btn-sm" id="metadata-drag-btn" *ngVar="(isOnlyValue || (saving$ | async)) as disabled"
-              cdkDragHandle [cdkDragHandleDisabled]="disabled" [ngClass]="{'disabled': disabled}" [disabled]="disabled"
+      <button class="btn btn-outline-secondary ds-drag-handle btn-sm" data-test="metadata-drag-btn" *ngVar="(isOnlyValue || (saving$ | async)) as disabled"
+              cdkDragHandle [cdkDragHandleDisabled]="disabled" [ngClass]="{'disabled': disabled}" [dsBtnDisabled]="disabled"
               [title]="dsoType + '.edit.metadata.edit.buttons.drag' | translate"
               ngbTooltip="{{ dsoType + '.edit.metadata.edit.buttons.drag' | translate }}">
         <i class="fas fa-grip-vertical fa-fw"></i>
diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.scss b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.scss
index 4a207ee1a4..e555191300 100644
--- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.scss
+++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.scss
@@ -1,5 +1,5 @@
 .ds-success {
-  background-color: var(--bs-success-bg);
+  background-color: var(--ds-success-bg);
   border: 1px solid var(--bs-success);
 }
 
diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.spec.ts b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.spec.ts
index 67a6f98ac0..e90e7391f8 100644
--- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.spec.ts
+++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.spec.ts
@@ -11,6 +11,7 @@ import { ItemMetadataRepresentation } from '../../../core/shared/metadata-repres
 import { MetadataValue, VIRTUAL_METADATA_PREFIX } from '../../../core/shared/metadata.models';
 import { DsoEditMetadataChangeType, DsoEditMetadataValue } from '../dso-edit-metadata-form';
 import { By } from '@angular/platform-browser';
+import {BtnDisabledDirective} from '../../../shared/btn-disabled.directive';
 
 const EDIT_BTN = 'edit';
 const CONFIRM_BTN = 'confirm';
@@ -49,7 +50,7 @@ describe('DsoEditMetadataValueComponent', () => {
     initServices();
 
     TestBed.configureTestingModule({
-      declarations: [DsoEditMetadataValueComponent, VarDirective],
+      declarations: [DsoEditMetadataValueComponent, VarDirective, BtnDisabledDirective],
       imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([])],
       providers: [
         { provide: RelationshipDataService, useValue: relationshipService },
@@ -149,7 +150,7 @@ describe('DsoEditMetadataValueComponent', () => {
       let btn: DebugElement;
 
       beforeEach(() => {
-        btn = fixture.debugElement.query(By.css(`#metadata-${name}-btn`));
+        btn = fixture.debugElement.query(By.css(`button[data-test="metadata-${name}-btn"]`));
       });
 
       if (exists) {
@@ -158,7 +159,14 @@ describe('DsoEditMetadataValueComponent', () => {
         });
 
         it(`should${disabled ? ' ' : ' not '}be disabled`, () => {
-          expect(btn.nativeElement.disabled).toBe(disabled);
+          if (disabled) {
+            expect(btn.nativeElement.getAttribute('aria-disabled')).toBe('true');
+            expect(btn.nativeElement.classList.contains('disabled')).toBeTrue();
+          } else {
+            // Can be null or false, depending on if button was ever disabled so just check not true
+            expect(btn.nativeElement.getAttribute('aria-disabled')).not.toBe('true');
+            expect(btn.nativeElement.classList.contains('disabled')).toBeFalse();
+          }
         });
       } else {
         it('should not exist', () => {
diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html
index 24c3dc5cd7..1598558e51 100644
--- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html
+++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html
@@ -1,24 +1,28 @@
 <div class="item-metadata" *ngIf="form">
   <div class="button-row top d-flex my-2 space-children-mr ml-gap">
-    <button class="mr-auto btn btn-success" id="dso-add-btn" [disabled]="form.newValue || (saving$ | async)"
+    <button class="mr-auto btn btn-success" id="dso-add-btn" [dsBtnDisabled]="form.newValue || (saving$ | async)"
+            [attr.aria-label]="dsoType + '.edit.metadata.add-button' | translate"
             [title]="dsoType + '.edit.metadata.add-button' | translate"
-            (click)="add()"><i class="fas fa-plus"></i>
+            (click)="add()"><i class="fas fa-plus" aria-hidden="true"></i>
       <span class="d-none d-sm-inline">&nbsp;{{ dsoType + '.edit.metadata.add-button' | translate }}</span>
     </button>
-    <button class="btn btn-warning ml-1" id="dso-reinstate-btn" *ngIf="isReinstatable" [disabled]="(saving$ | async)"
+    <button class="btn btn-warning ml-1" id="dso-reinstate-btn" *ngIf="isReinstatable" [dsBtnDisabled]="(saving$ | async)"
+            [attr.aria-label]="dsoType + '.edit.metadata.reinstate-button' | translate"
             [title]="dsoType + '.edit.metadata.reinstate-button' | translate"
-            (click)="reinstate()"><i class="fas fa-undo-alt"></i>
+            (click)="reinstate()"><i class="fas fa-undo-alt" aria-hidden="true"></i>
       <span class="d-none d-sm-inline">&nbsp;{{ dsoType + '.edit.metadata.reinstate-button' | translate }}</span>
     </button>
-    <button class="btn btn-primary ml-1" id="dso-save-btn" [disabled]="!hasChanges || (saving$ | async)"
+    <button class="btn btn-primary ml-1" id="dso-save-btn" [dsBtnDisabled]="!hasChanges || (saving$ | async)"
+            [attr.aria-label]="dsoType + '.edit.metadata.save-button' | translate"
             [title]="dsoType + '.edit.metadata.save-button' | translate"
-            (click)="submit()"><i class="fas fa-save"></i>
+            (click)="submit()"><i class="fas fa-save" aria-hidden="true"></i>
       <span class="d-none d-sm-inline">&nbsp;{{ dsoType + '.edit.metadata.save-button' | translate }}</span>
     </button>
     <button class="btn btn-danger ml-1" id="dso-discard-btn" *ngIf="!isReinstatable"
+            [attr.aria-label]="dsoType + '.edit.metadata.discard-button' | translate"
             [title]="dsoType + '.edit.metadata.discard-button' | translate"
-            [disabled]="!hasChanges || (saving$ | async)"
-            (click)="discard()"><i class="fas fa-times"></i>
+            [dsBtnDisabled]="!hasChanges || (saving$ | async)"
+            (click)="discard()"><i class="fas fa-times" aria-hidden="true"></i>
       <span class="d-none d-sm-inline">&nbsp;{{ dsoType + '.edit.metadata.discard-button' | translate }}</span>
     </button>
   </div>
@@ -72,18 +76,24 @@
   </div>
   <div class="button-row bottom d-inline-block w-100">
     <div class="mt-2 float-right space-children-mr ml-gap">
-      <button class="btn btn-warning" *ngIf="isReinstatable" [disabled]="(saving$ | async)"
+      <button class="btn btn-warning" *ngIf="isReinstatable" [dsBtnDisabled]="(saving$ | async)"
+              [attr.aria-label]="dsoType + '.edit.metadata.reinstate-button' | translate"
               [title]="dsoType + '.edit.metadata.reinstate-button' | translate"
-              (click)="reinstate()"><i class="fas fa-undo-alt"></i> {{ dsoType + '.edit.metadata.reinstate-button' | translate }}
+              (click)="reinstate()">
+        <i class="fas fa-undo-alt" aria-hidden="true"></i> {{ dsoType + '.edit.metadata.reinstate-button' | translate }}
       </button>
-      <button class="btn btn-primary" [disabled]="!hasChanges || (saving$ | async)"
+      <button class="btn btn-primary" [dsBtnDisabled]="!hasChanges || (saving$ | async)"
+              [attr.aria-label]="dsoType + '.edit.metadata.save-button' | translate"
               [title]="dsoType + '.edit.metadata.save-button' | translate"
-              (click)="submit()"><i class="fas fa-save"></i> {{ dsoType + '.edit.metadata.save-button' | translate }}
+              (click)="submit()">
+        <i class="fas fa-save" aria-hidden="true"></i> {{ dsoType + '.edit.metadata.save-button' | translate }}
       </button>
       <button class="btn btn-danger" *ngIf="!isReinstatable"
+              [attr.aria-label]="dsoType + '.edit.metadata.discard-button' | translate"
               [title]="dsoType + '.edit.metadata.discard-button' | translate"
-              [disabled]="!hasChanges || (saving$ | async)"
-              (click)="discard()"><i class="fas fa-times"></i> {{ dsoType + '.edit.metadata.discard-button' | translate }}
+              [dsBtnDisabled]="!hasChanges || (saving$ | async)"
+              (click)="discard()">
+        <i class="fas fa-times" aria-hidden="true"></i> {{ dsoType + '.edit.metadata.discard-button' | translate }}
       </button>
     </div>
   </div>
diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.scss b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.scss
index 4e5e9ff1d4..3a181fd130 100644
--- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.scss
+++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.scss
@@ -7,7 +7,7 @@
   border: 1px solid var(--bs-gray-200);
 
   &.ds-success {
-    background-color: var(--bs-success-bg);
+    background-color: var(--ds-success-bg);
     border: 1px solid var(--bs-success);
   }
 }
diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.spec.ts b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.spec.ts
index 7067c44fbb..eef3e45fa9 100644
--- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.spec.ts
+++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.spec.ts
@@ -16,6 +16,7 @@ import { DATA_SERVICE_FACTORY } from '../../core/data/base/data-service.decorato
 import { Operation } from 'fast-json-patch';
 import { RemoteData } from '../../core/data/remote-data';
 import { Observable } from 'rxjs/internal/Observable';
+import {BtnDisabledDirective} from '../../shared/btn-disabled.directive';
 
 const ADD_BTN = 'add';
 const REINSTATE_BTN = 'reinstate';
@@ -71,7 +72,7 @@ describe('DsoEditMetadataComponent', () => {
     notificationsService = jasmine.createSpyObj('notificationsService', ['error', 'success']);
 
     TestBed.configureTestingModule({
-      declarations: [DsoEditMetadataComponent, VarDirective],
+      declarations: [DsoEditMetadataComponent, VarDirective, BtnDisabledDirective],
       imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([])],
       providers: [
         TestDataService,
@@ -180,7 +181,13 @@ describe('DsoEditMetadataComponent', () => {
         });
 
         it(`should${disabled ? ' ' : ' not '}be disabled`, () => {
-          expect(btn.nativeElement.disabled).toBe(disabled);
+          if (disabled) {
+            expect(btn.nativeElement.getAttribute('aria-disabled')).toBe('true');
+            expect(btn.nativeElement.classList.contains('disabled')).toBeTrue();
+          } else {
+            expect(btn.nativeElement.getAttribute('aria-disabled')).not.toBe('true');
+            expect(btn.nativeElement.classList.contains('disabled')).toBeFalse();
+          }
         });
       } else {
         it('should not exist', () => {
diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts
index d67a7ea738..d44817be84 100644
--- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts
+++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts
@@ -1,5 +1,5 @@
 import { Component, Inject, Injector, Input, OnDestroy, OnInit, ViewChild } from '@angular/core';
-import { AlertType } from '../../shared/alert/aletr-type';
+import { AlertType } from '../../shared/alert/alert-type';
 import { DSpaceObject } from '../../core/shared/dspace-object.model';
 import { DsoEditMetadataForm } from './dso-edit-metadata-form';
 import { map } from 'rxjs/operators';
diff --git a/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.html b/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.html
index 4c310bd81b..a82f31b953 100644
--- a/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.html
+++ b/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.html
@@ -1,18 +1,36 @@
 <div class="w-100 position-relative">
   <input type="text" #mdFieldInput
          class="form-control" [ngClass]="{ 'is-invalid': showInvalid }"
+         [attr.aria-label]="(dsoType + '.edit.metadata.metadatafield') | translate"
          [value]="mdField"
          [formControl]="input"
          (focusin)="query$.next(mdField)"
          (dsClickOutside)="query$.next(null)"
-         (click)="$event.stopPropagation();" />
+         (click)="$event.stopPropagation();"
+         (keyup)="this.selectedValueLoading = false"
+  />
   <div class="invalid-feedback show-feedback" *ngIf="showInvalid">{{ dsoType + '.edit.metadata.metadatafield.invalid' | translate }}</div>
-  <div class="autocomplete dropdown-menu" [ngClass]="{'show': (mdFieldOptions$ | async)?.length > 0}">
-    <div class="dropdown-list">
-      <div *ngFor="let mdFieldOption of (mdFieldOptions$ | async)">
-        <a href="javascript:void(0);" class="d-block dropdown-item" (click)="select(mdFieldOption)">
-          <span [innerHTML]="mdFieldOption"></span>
-        </a>
+  <div id="scrollable-metadata-field-selector" class="dropdown-menu scrollable-menu" [ngClass]="{'show': (mdFieldOptions$ | async)?.length > 0}">
+    <div  class="dropdown-list">
+      <div
+        infiniteScroll
+        [infiniteScrollDistance]="1"
+        [infiniteScrollThrottle]="0"
+        [infiniteScrollContainer]="'#scrollable-metadata-field-selector'"
+        [fromRoot]="true"
+        (scrolled)="onScrollDown()">
+        <ng-container *ngIf="mdFieldOptions$ | async">
+          <button *ngFor="let listEntry of (mdFieldOptions$ | async)"
+                  class="d-block dropdown-item"
+                  dsHoverClass="ds-hover"
+                  (click)="select(listEntry)" #listEntryElement>
+            <span [innerHTML]="listEntry"></span>
+          </button>
+        </ng-container>
+        <button *ngIf="loading"
+                class="list-group-item list-group-item-action border-0 list-entry">
+          <ds-loading [showMessage]="false"></ds-loading>
+        </button>
       </div>
     </div>
   </div>
diff --git a/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.scss b/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.scss
index e69de29bb2..e4c20f130d 100644
--- a/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.scss
+++ b/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.scss
@@ -0,0 +1,5 @@
+.scrollable-menu {
+  height: auto;
+  max-height: var(--ds-dso-selector-list-max-height);
+  overflow: scroll;
+}
diff --git a/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.spec.ts b/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.spec.ts
index de8736df94..999012a7fe 100644
--- a/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.spec.ts
+++ b/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.spec.ts
@@ -28,7 +28,8 @@ describe('MetadataFieldSelectorComponent', () => {
     metadataSchema = Object.assign(new MetadataSchema(), {
       id: 0,
       prefix: 'dc',
-      namespace: 'http://dublincore.org/documents/dcmi-terms/',
+      namespace: 'https://schema.org/CreativeWork',
+      field: '.',
     });
     metadataFields = [
       Object.assign(new MetadataField(), {
@@ -68,10 +69,10 @@ describe('MetadataFieldSelectorComponent', () => {
   });
 
   describe('when a query is entered', () => {
-    const query = 'test query';
+    const query = 'dc.d';
 
     beforeEach(() => {
-      component.showInvalid = true;
+      component.showInvalid = false;
       component.query$.next(query);
     });
 
@@ -80,7 +81,7 @@ describe('MetadataFieldSelectorComponent', () => {
     });
 
     it('should query the registry service for metadata fields and include the schema', () => {
-      expect(registryService.queryMetadataFields).toHaveBeenCalledWith(query, { elementsPerPage: 10, sort: new SortOptions('fieldName', SortDirection.ASC) }, true, false, followLink('schema'));
+      expect(registryService.queryMetadataFields).toHaveBeenCalledWith(query, { elementsPerPage: 20, sort: new SortOptions('fieldName', SortDirection.ASC), currentPage: 1 }, true, false, followLink('schema'));
     });
   });
 
diff --git a/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.ts b/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.ts
index fc0d57046d..ec9ebabcf9 100644
--- a/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.ts
+++ b/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.ts
@@ -9,20 +9,23 @@ import {
   Output,
   ViewChild
 } from '@angular/core';
-import { debounceTime, distinctUntilChanged, map, switchMap, take, tap } from 'rxjs/operators';
+import { debounceTime, map, startWith, switchMap, take, tap } from 'rxjs/operators';
 import { followLink } from '../../../shared/utils/follow-link-config.model';
 import {
   getAllSucceededRemoteData,
   getFirstCompletedRemoteData,
   metadataFieldsToString
 } from '../../../core/shared/operators';
-import { Observable } from 'rxjs/internal/Observable';
+import {
+  BehaviorSubject,
+  combineLatest as observableCombineLatest,
+  Observable,
+  of,
+  Subscription,
+} from 'rxjs';
 import { RegistryService } from '../../../core/registry/registry.service';
 import { UntypedFormControl } from '@angular/forms';
-import { BehaviorSubject } from 'rxjs/internal/BehaviorSubject';
 import { hasValue } from '../../../shared/empty.util';
-import { Subscription } from 'rxjs/internal/Subscription';
-import { of } from 'rxjs/internal/observable/of';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
 import { TranslateService } from '@ngx-translate/core';
 import { SortDirection, SortOptions } from '../../../core/cache/models/sort-options.model';
@@ -30,7 +33,7 @@ import { SortDirection, SortOptions } from '../../../core/cache/models/sort-opti
 @Component({
   selector: 'ds-metadata-field-selector',
   styleUrls: ['./metadata-field-selector.component.scss'],
-  templateUrl: './metadata-field-selector.component.html'
+  templateUrl: './metadata-field-selector.component.html',
 })
 /**
  * Component displaying a searchable input for metadata-fields
@@ -67,7 +70,7 @@ export class MetadataFieldSelectorComponent implements OnInit, OnDestroy, AfterV
    * List of available metadata field options to choose from, dependent on the current query the user entered
    * Shows up in a dropdown below the input
    */
-  mdFieldOptions$: Observable<string[]>;
+  mdFieldOptions$: BehaviorSubject<string[]> = new BehaviorSubject<string[]>([]);
 
   /**
    * FormControl for the input
@@ -102,6 +105,30 @@ export class MetadataFieldSelectorComponent implements OnInit, OnDestroy, AfterV
    */
   subs: Subscription[] = [];
 
+
+  /**
+   * The current page to load
+   * Dynamically goes up as the user scrolls down until it reaches the last page possible
+   */
+  currentPage$ = new BehaviorSubject(1);
+
+  /**
+   * Whether or not the list contains a next page to load
+   * This allows us to avoid next pages from trying to load when there are none
+   */
+  hasNextPage = false;
+
+  /**
+   * Whether or not new results are currently loading
+   */
+  loading = false;
+
+  /**
+   * Default page option for this feature
+   */
+  pageOptions = { elementsPerPage: 20, sort: new SortOptions('fieldName', SortDirection.ASC) };
+
+
   constructor(protected registryService: RegistryService,
               protected notificationsService: NotificationsService,
               protected translate: TranslateService) {
@@ -112,32 +139,33 @@ export class MetadataFieldSelectorComponent implements OnInit, OnDestroy, AfterV
    * Update the mdFieldOptions$ depending on the query$ fired by querying the server
    */
   ngOnInit(): void {
+    this.subs.push(this.input.valueChanges.pipe(
+      debounceTime(this.debounceTime),
+      startWith(''),
+    ).subscribe((valueChange) => {
+      this.currentPage$.next(1);
+      if (!this.selectedValueLoading) {
+        this.query$.next(valueChange);
+      }
+      this.mdField = valueChange;
+      this.mdFieldChange.emit(this.mdField);
+    }));
     this.subs.push(
-      this.input.valueChanges.pipe(
-        debounceTime(this.debounceTime),
-      ).subscribe((valueChange) => {
-        if (!this.selectedValueLoading) {
-          this.query$.next(valueChange);
-        }
-        this.selectedValueLoading = false;
-        this.mdField = valueChange;
-        this.mdFieldChange.emit(this.mdField);
-      }),
-    );
-    this.mdFieldOptions$ = this.query$.pipe(
-      distinctUntilChanged(),
-      switchMap((query: string) => {
-        this.showInvalid = false;
-        if (query !== null) {
-          return this.registryService.queryMetadataFields(query, { elementsPerPage: 10, sort: new SortOptions('fieldName', SortDirection.ASC) }, true, false, followLink('schema')).pipe(
-            getAllSucceededRemoteData(),
-            metadataFieldsToString(),
-          );
-        } else {
-          return [[]];
-        }
-      }),
-    );
+      observableCombineLatest(
+        this.query$,
+        this.currentPage$,
+      )
+        .pipe(
+          switchMap(([query, page]: [string, number]) => {
+            this.loading = true;
+            if (page === 1) {
+              this.mdFieldOptions$.next([]);
+            }
+            return this.search(query as string, page as number);
+          }),
+        ).subscribe((rd ) => {
+          if (!this.selectedValueLoading) {this.updateList(rd);}
+        }));
   }
 
   /**
@@ -181,6 +209,41 @@ export class MetadataFieldSelectorComponent implements OnInit, OnDestroy, AfterV
     this.input.setValue(mdFieldOption);
   }
 
+
+  /**
+   * When the user reaches the bottom of the page (or almost) and there's a next page available, increase the current page
+   */
+  onScrollDown() {
+    if (this.hasNextPage && !this.loading) {
+      this.currentPage$.next(this.currentPage$.value + 1);
+    }
+  }
+
+  /**
+   * @Description It update the mdFieldOptions$ according the query result page
+   * */
+  updateList(list: string[]) {
+    this.loading = false;
+    this.hasNextPage = list.length > 0;
+    const currentEntries = this.mdFieldOptions$.getValue();
+    this.mdFieldOptions$.next([...currentEntries, ...list]);
+    this.selectedValueLoading = false;
+  }
+  /**
+   * Perform a search for the current query and page
+   * @param query Query to search objects for
+   * @param page  Page to retrieve
+   * @param useCache Whether or not to use the cache
+   */
+  search(query: string, page: number, useCache: boolean = true)  {
+    return this.registryService.queryMetadataFields(query,{
+      elementsPerPage: this.pageOptions.elementsPerPage, sort: this.pageOptions.sort,
+      currentPage: page }, useCache, false, followLink('schema'))
+      .pipe(
+        getAllSucceededRemoteData(),
+        metadataFieldsToString(),
+      );
+  }
   /**
    * Unsubscribe from any open subscriptions
    */
diff --git a/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-issue/journal-issue-search-result-grid-element.component.html b/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-issue/journal-issue-search-result-grid-element.component.html
index 13c5286e71..ea04ef374f 100644
--- a/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-issue/journal-issue-search-result-grid-element.component.html
+++ b/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-issue/journal-issue-search-result-grid-element.component.html
@@ -6,7 +6,7 @@
     <a *ngIf="linkType != linkTypes.None"
        [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'"
        [attr.rel]="(linkType == linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="[itemPageRoute]"
-       class="card-img-top full-width" [attr.title]="'search.results.view-result' | translate">
+       class="card-img-top full-width" [attr.title]="'search.results.view-result' | translate" role="link" tabindex="0">
       <div>
         <ds-themed-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="false">
         </ds-themed-thumbnail>
@@ -37,7 +37,7 @@
       <div *ngIf="linkType != linkTypes.None" class="text-center">
         <a [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'"
            [attr.rel]="(linkType == linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="[itemPageRoute]"
-           class="lead btn btn-primary viewButton">{{ 'search.results.view-result' | translate}}</a>
+           class="lead btn btn-primary viewButton" role="link" tabindex="0">{{ 'search.results.view-result' | translate}}</a>
       </div>
     </div>
   </ds-truncatable>
diff --git a/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-volume/journal-volume-search-result-grid-element.component.html b/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-volume/journal-volume-search-result-grid-element.component.html
index c64da0b632..b5258ecf0b 100644
--- a/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-volume/journal-volume-search-result-grid-element.component.html
+++ b/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-volume/journal-volume-search-result-grid-element.component.html
@@ -6,7 +6,7 @@
     <a *ngIf="linkType != linkTypes.None"
        [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'"
        [attr.rel]="(linkType == linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="[itemPageRoute]"
-       class="card-img-top full-width" [attr.title]="'search.results.view-result' | translate">
+       class="card-img-top full-width" [attr.title]="'search.results.view-result' | translate" role="link" tabindex="0">
       <div>
         <ds-themed-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="false">
         </ds-themed-thumbnail>
@@ -37,7 +37,7 @@
       <div *ngIf="linkType != linkTypes.None" class="text-center">
         <a [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'"
            [attr.rel]="(linkType == linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="[itemPageRoute]"
-           class="lead btn btn-primary viewButton">{{ 'search.results.view-result' | translate}}</a>
+           class="lead btn btn-primary viewButton" role="link" tabindex="0">{{ 'search.results.view-result' | translate}}</a>
       </div>
     </div>
   </ds-truncatable>
diff --git a/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal/journal-search-result-grid-element.component.html b/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal/journal-search-result-grid-element.component.html
index 9037e364d8..e65024fa0a 100644
--- a/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal/journal-search-result-grid-element.component.html
+++ b/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal/journal-search-result-grid-element.component.html
@@ -6,7 +6,7 @@
     <a *ngIf="linkType != linkTypes.None"
        [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'"
        [attr.rel]="(linkType == linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="[itemPageRoute]"
-       class="card-img-top full-width" [attr.title]="'search.results.view-result' | translate">
+       class="card-img-top full-width" [attr.title]="'search.results.view-result' | translate" role="link" tabindex="0">
       <div>
         <ds-themed-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="false">
         </ds-themed-thumbnail>
@@ -41,7 +41,7 @@
       <div *ngIf="linkType != linkTypes.None" class="text-center">
         <a [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'"
            [attr.rel]="(linkType == linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="[itemPageRoute]"
-           class="lead btn btn-primary viewButton">{{ 'search.results.view-result' | translate}}</a>
+           class="lead btn btn-primary viewButton" role="link" tabindex="0">{{ 'search.results.view-result' | translate}}</a>
       </div>
     </div>
   </ds-truncatable>
diff --git a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.html b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.html
index e3293be3a0..39422cbfc8 100644
--- a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.html
+++ b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.html
@@ -2,7 +2,7 @@
   <div *ngIf="showThumbnails" class="col-3 col-md-2">
     <a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'"
        [attr.rel]="(linkType == linkTypes.ExternalLink) ? 'noopener noreferrer' : null"
-       [routerLink]="[itemPageRoute]" class="lead item-list-title dont-break-out">
+       [routerLink]="[itemPageRoute]" class="lead item-list-title dont-break-out" role="link" tabindex="0">
       <ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="true">
       </ds-thumbnail>
     </a>
@@ -17,26 +17,26 @@
       <a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'"
          [attr.rel]="(linkType == linkTypes.ExternalLink) ? 'noopener noreferrer' : null"
          [routerLink]="[itemPageRoute]" class="lead item-list-title dont-break-out"
-         [innerHTML]="dsoTitle"></a>
+         [innerHTML]="dsoTitle" role="link" tabindex="0"></a>
       <span *ngIf="linkType == linkTypes.None"
             class="lead item-list-title dont-break-out"
             [innerHTML]="dsoTitle"></span>
       <span class="text-muted">
-    <ds-truncatable-part [id]="dso.id" [minLines]="1">
-            <span *ngIf="dso.allMetadata(['publicationvolume.volumeNumber']).length > 0"
-                  class="item-list-journal-issues">
-                    <span *ngFor="let value of allMetadataValues(['publicationvolume.volumeNumber']); let last=last;">
-                        <span [innerHTML]="value"><span [innerHTML]="value"></span></span>
-                    </span>
-                <span *ngIf="dso.allMetadata(['publicationissue.issueNumber']).length > 0"
-                      class="item-list-journal-issue-numbers">
-                    <span *ngFor="let value of allMetadataValues(['publicationissue.issueNumber']); let last=last;">
-                        <span> - </span><span [innerHTML]="value"><span [innerHTML]="value"></span></span>
-                    </span>
-                </span>
+        <ds-truncatable-part [id]="dso.id" [minLines]="1">
+          <span *ngIf="dso.allMetadata(['publicationvolume.volumeNumber']).length > 0"
+                class="item-list-journal-issues">
+            <span *ngFor="let value of allMetadataValues(['publicationvolume.volumeNumber']); let last=last;">
+              <span [innerHTML]="value"></span><span *ngIf="!last">; </span>
             </span>
+            <span *ngIf="dso.allMetadata(['publicationissue.issueNumber']).length > 0"
+                  class="item-list-journal-issue-numbers">
+              <span *ngFor="let value of allMetadataValues(['publicationissue.issueNumber']); let first=first; let last=last;">
+                <span *ngIf="first"> - </span><span [innerHTML]="value"></span><span *ngIf="!last">; </span>
+              </span>
+            </span>
+          </span>
         </ds-truncatable-part>
-  </span>
+      </span>
     </ds-truncatable>
   </div>
 </div>
diff --git a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.html b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.html
index 8d7fbda4af..1cea5245b0 100644
--- a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.html
+++ b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.html
@@ -2,7 +2,7 @@
   <div *ngIf="showThumbnails" class="col-3 col-md-2">
     <a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'"
        [attr.rel]="(linkType == linkTypes.ExternalLink) ? 'noopener noreferrer' : null"
-       [routerLink]="[itemPageRoute]" class="lead item-list-title dont-break-out">
+       [routerLink]="[itemPageRoute]" class="lead item-list-title dont-break-out" role="link" tabindex="0">
       <ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="true">
       </ds-thumbnail>
     </a>
@@ -17,7 +17,7 @@
       <a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'"
          [attr.rel]="(linkType == linkTypes.ExternalLink) ? 'noopener noreferrer' : null"
          [routerLink]="[itemPageRoute]" class="lead item-list-title dont-break-out"
-         [innerHTML]="dsoTitle"></a>
+         [innerHTML]="dsoTitle" role="link" tabindex="0"></a>
       <span *ngIf="linkType == linkTypes.None"
             class="lead item-list-title dont-break-out"
             [innerHTML]="dsoTitle"></span>
@@ -26,13 +26,13 @@
             <span *ngIf="dso.allMetadata(['journal.title']).length > 0"
                   class="item-list-journal-volumes">
                     <span *ngFor="let value of allMetadataValues(['journal.title']); let last=last;">
-                        <span [innerHTML]="value"><span [innerHTML]="value"></span></span>
+                        <span [innerHTML]="value"></span><span *ngIf="!last">; </span>
                     </span>
             </span>
             <span *ngIf="dso.allMetadata(['publicationvolume.volumeNumber']).length > 0"
                   class="item-list-journal-volume-identifiers">
                     <span *ngFor="let value of allMetadataValues(['publicationvolume.volumeNumber']); let last=last;">
-                        <span> (</span><span [innerHTML]="value"><span [innerHTML]="value"></span></span><span>)</span>
+                        <span> (</span><span [innerHTML]="value"></span><span>)</span><span *ngIf="!last">;</span>
                     </span>
             </span>
         </ds-truncatable-part>
diff --git a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.html b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.html
index 6d7f9293ec..c656452cc3 100644
--- a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.html
+++ b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.html
@@ -1,7 +1,7 @@
 <div class="row">
   <div *ngIf="showThumbnails" class="col-3 col-md-2">
     <a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType == linkTypes.ExternalLink) ? 'noopener noreferrer' : null"
-       [routerLink]="[itemPageRoute]" class="lead item-list-title dont-break-out">
+       [routerLink]="[itemPageRoute]" class="lead item-list-title dont-break-out" role="link" tabindex="0">
       <ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="true">
       </ds-thumbnail>
     </a>
@@ -15,7 +15,7 @@
     <ds-truncatable [id]="dso.id">
       <a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType == linkTypes.ExternalLink) ? 'noopener noreferrer' : null"
          [routerLink]="[itemPageRoute]" class="lead item-list-title dont-break-out"
-         [innerHTML]="dsoTitle"></a>
+         [innerHTML]="dsoTitle" role="link" tabindex="0"></a>
       <span *ngIf="linkType == linkTypes.None"
             class="lead item-list-title dont-break-out"
             [innerHTML]="dsoTitle"></span>
@@ -24,7 +24,7 @@
             <span *ngIf="dso.allMetadata(['creativeworkseries.issn']).length > 0"
                   class="item-list-journals">
                     <span *ngFor="let value of allMetadataValues(['creativeworkseries.issn']); let last=last;">
-                        <span [innerHTML]="value"><span [innerHTML]="value"></span></span>
+                        <span [innerHTML]="value"></span><span *ngIf="!last">; </span>
                     </span>
             </span>
         </ds-truncatable-part>
diff --git a/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.html b/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.html
index 75f4587a3d..7445c816aa 100644
--- a/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.html
+++ b/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.html
@@ -51,7 +51,7 @@
       [label]="'journalissue.page.keyword'">
     </ds-generic-item-page-field>
     <div>
-      <a class="btn btn-outline-primary" [routerLink]="[itemPageRoute + '/full']">
+      <a class="btn btn-outline-primary" [routerLink]="[itemPageRoute + '/full']" role="button" tabindex="0">
         {{"item.page.link.full" | translate}}
       </a>
     </div>
diff --git a/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.html b/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.html
index 213581a519..e8a4555b0b 100644
--- a/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.html
+++ b/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.html
@@ -34,7 +34,7 @@
       [label]="'journalvolume.page.description'">
     </ds-generic-item-page-field>
     <div>
-      <a class="btn btn-outline-primary" [routerLink]="[itemPageRoute + '/full']">
+      <a class="btn btn-outline-primary" [routerLink]="[itemPageRoute + '/full']" role="button" tabindex="0">
         {{"item.page.link.full" | translate}}
       </a>
     </div>
diff --git a/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.html b/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.html
index 3b2cce061b..90a4ed20af 100644
--- a/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.html
+++ b/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.html
@@ -33,7 +33,7 @@
       [label]="'journal.page.description'">
     </ds-generic-item-page-field>
     <div>
-      <a class="btn btn-outline-primary" [routerLink]="[itemPageRoute + '/full']">
+      <a class="btn btn-outline-primary" [routerLink]="[itemPageRoute + '/full']" role="button" tabindex="0">
         {{"item.page.link.full" | translate}}
       </a>
     </div>
diff --git a/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.spec.ts b/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.spec.ts
index 6e2ded334b..ace7a69f9a 100644
--- a/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.spec.ts
+++ b/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.spec.ts
@@ -39,6 +39,8 @@ import {
   BrowseDefinitionDataServiceStub
 } from '../../../../shared/testing/browse-definition-data-service.stub';
 import { BrowseDefinitionDataService } from '../../../../core/browse/browse-definition-data.service';
+import { BrowseService } from '../../../../core/browse/browse.service';
+import { BrowseServiceStub } from '../../../../shared/testing/browse-service.stub';
 
 let comp: JournalComponent;
 let fixture: ComponentFixture<JournalComponent>;
@@ -105,7 +107,8 @@ describe('JournalComponent', () => {
         { provide: WorkspaceitemDataService, useValue: {} },
         { provide: SearchService, useValue: {} },
         { provide: RouteService, useValue: mockRouteService },
-        { provide: BrowseDefinitionDataService, useValue: BrowseDefinitionDataServiceStub }
+        { provide: BrowseDefinitionDataService, useValue: BrowseDefinitionDataServiceStub },
+        { provide: BrowseService, useValue: BrowseServiceStub },
       ],
 
       schemas: [NO_ERRORS_SCHEMA]
diff --git a/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/org-unit/org-unit-search-result-grid-element.component.html b/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/org-unit/org-unit-search-result-grid-element.component.html
index 502365e60a..1890bf7268 100644
--- a/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/org-unit/org-unit-search-result-grid-element.component.html
+++ b/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/org-unit/org-unit-search-result-grid-element.component.html
@@ -6,7 +6,7 @@
     <a *ngIf="linkType != linkTypes.None"
        [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'"
        [attr.rel]="(linkType == linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="[itemPageRoute]"
-       class="card-img-top full-width" [attr.title]="'search.results.view-result' | translate">
+       class="card-img-top full-width" [attr.title]="'search.results.view-result' | translate" role="link" tabindex="0">
       <div>
         <ds-themed-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="false">
         </ds-themed-thumbnail>
@@ -43,7 +43,7 @@
       <div *ngIf="linkType != linkTypes.None" class="text-center">
         <a [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'"
            [attr.rel]="(linkType == linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="[itemPageRoute]"
-           class="lead btn btn-primary viewButton">{{ 'search.results.view-result' | translate}}</a>
+           class="lead btn btn-primary viewButton" role="button" tabindex="0">{{ 'search.results.view-result' | translate}}</a>
       </div>
     </div>
   </ds-truncatable>
diff --git a/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/person/person-search-result-grid-element.component.html b/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/person/person-search-result-grid-element.component.html
index 0cbe19c1e0..c1398c1c85 100644
--- a/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/person/person-search-result-grid-element.component.html
+++ b/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/person/person-search-result-grid-element.component.html
@@ -6,7 +6,7 @@
     <a *ngIf="linkType != linkTypes.None"
        [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'"
        [attr.rel]="(linkType == linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="[itemPageRoute]"
-       class="card-img-top full-width" [attr.title]="'search.results.view-result' | translate">
+       class="card-img-top full-width" [attr.title]="'search.results.view-result' | translate" role="link" tabindex="0">
       <div>
         <ds-themed-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="false">
         </ds-themed-thumbnail>
@@ -36,7 +36,7 @@
       <div *ngIf="linkType != linkTypes.None" class="text-center">
         <a [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'"
            [attr.rel]="(linkType == linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="[itemPageRoute]"
-           class="lead btn btn-primary viewButton">{{ 'search.results.view-result' | translate}}</a>
+           class="lead btn btn-primary viewButton" role="button" tabindex="0">{{ 'search.results.view-result' | translate}}</a>
       </div>
     </div>
   </ds-truncatable>
diff --git a/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/project/project-search-result-grid-element.component.html b/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/project/project-search-result-grid-element.component.html
index 97d4016ec4..67b5e9a5ab 100644
--- a/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/project/project-search-result-grid-element.component.html
+++ b/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/project/project-search-result-grid-element.component.html
@@ -6,7 +6,7 @@
     <a *ngIf="linkType != linkTypes.None"
        [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'"
        [attr.rel]="(linkType == linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="[itemPageRoute]"
-       class="card-img-top full-width" [attr.title]="'search.results.view-result' | translate">
+       class="card-img-top full-width" [attr.title]="'search.results.view-result' | translate" role="link" tabindex="0">
       <div>
         <ds-themed-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="false">
         </ds-themed-thumbnail>
@@ -31,7 +31,7 @@
       <div *ngIf="linkType != linkTypes.None" class="text-center">
         <a [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'"
            [attr.rel]="(linkType == linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="[itemPageRoute]"
-           class="lead btn btn-primary viewButton">{{ 'search.results.view-result' | translate}}</a>
+           class="lead btn btn-primary viewButton" role="button" tabindex="0">{{ 'search.results.view-result' | translate}}</a>
       </div>
     </div>
   </ds-truncatable>
diff --git a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.html b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.html
index 07c7c5bb89..2f9b99fae6 100644
--- a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.html
+++ b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.html
@@ -2,7 +2,7 @@
     <div *ngIf="showThumbnails" class="col-3 col-md-2">
         <a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'"
            [attr.rel]="(linkType == linkTypes.ExternalLink) ? 'noopener noreferrer' : null"
-           [routerLink]="[itemPageRoute]" class="dont-break-out">
+           [routerLink]="[itemPageRoute]" class="dont-break-out" role="link" tabindex="0">
             <ds-thumbnail [thumbnail]="dso?.thumbnail | async"
                           [defaultImage]="'assets/images/orgunit-placeholder.svg'"
                           [alt]="'thumbnail.orgunit.alt'"
@@ -23,7 +23,7 @@
             <a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'"
                [attr.rel]="(linkType == linkTypes.ExternalLink) ? 'noopener noreferrer' : null"
                [routerLink]="[itemPageRoute]" class="lead"
-               [innerHTML]="dsoTitle || ('orgunit.listelement.no-title' | translate)"></a>
+               [innerHTML]="dsoTitle || ('orgunit.listelement.no-title' | translate)" role="link" tabindex="0"></a>
             <span *ngIf="linkType == linkTypes.None"
                   class="lead"
                   [innerHTML]="dsoTitle || ('orgunit.listelement.no-title' | translate)"></span>
diff --git a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.html b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.html
index f3f892bc98..f2d1f3b044 100644
--- a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.html
+++ b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.html
@@ -2,7 +2,7 @@
   <div *ngIf="showThumbnails" class="col-3 col-md-2">
     <a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'"
        [attr.rel]="(linkType == linkTypes.ExternalLink) ? 'noopener noreferrer' : null"
-       [routerLink]="[itemPageRoute]" class="dont-break-out">
+       [routerLink]="[itemPageRoute]" class="dont-break-out" role="link" tabindex="0">
       <ds-thumbnail [thumbnail]="dso?.thumbnail | async"
                     [defaultImage]="'assets/images/person-placeholder.svg'"
                     [alt]="'thumbnail.person.alt'"
@@ -23,7 +23,7 @@
       <a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'"
          [attr.rel]="(linkType == linkTypes.ExternalLink) ? 'noopener noreferrer' : null"
          [routerLink]="[itemPageRoute]" class="lead"
-         [innerHTML]="dsoTitle || ('person.listelement.no-title' | translate)"></a>
+         [innerHTML]="dsoTitle || ('person.listelement.no-title' | translate)" role="link" tabindex="0"></a>
       <span *ngIf="linkType == linkTypes.None"
             class="lead"
             [innerHTML]="dsoTitle || ('person.listelement.no-title' | translate)"></span>
diff --git a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.html b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.html
index 93289aa525..a218026f03 100644
--- a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.html
+++ b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.html
@@ -2,7 +2,7 @@
   <div *ngIf="showThumbnails" class="col-3 col-md-2">
     <a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'"
        [attr.rel]="(linkType == linkTypes.ExternalLink) ? 'noopener noreferrer' : null"
-       [routerLink]="[itemPageRoute]" class="dont-break-out">
+       [routerLink]="[itemPageRoute]" class="dont-break-out" role="link" tabindex="0">
       <ds-thumbnail [thumbnail]="dso?.thumbnail | async"
                     [defaultImage]="'assets/images/project-placeholder.svg'"
                     [alt]="'thumbnail.project.alt'"
@@ -23,7 +23,7 @@
       <a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'"
          [attr.rel]="(linkType == linkTypes.ExternalLink) ? 'noopener noreferrer' : null"
          [routerLink]="[itemPageRoute]" class="lead item-list-title dont-break-out"
-         [innerHTML]="dsoTitle"></a>
+         [innerHTML]="dsoTitle" role="link" tabindex="0"></a>
       <span *ngIf="linkType == linkTypes.None"
             class="lead item-list-title dont-break-out"
             [innerHTML]="dsoTitle"></span>
@@ -32,7 +32,7 @@
       <!--<span *ngIf="dso.allMetadata(['project.identifier.status']).length > 0"-->
       <!--class="item-list-status">-->
       <!--<span *ngFor="let value of allMetadataValues(['project.identifier.status']); let last=last;">-->
-      <!--<span [innerHTML]="value"><span [innerHTML]="value"></span></span>-->
+      <!--<span [innerHTML]="value"></span><span *ngIf="!last">; </span>-->
       <!--</span>-->
       <!--</span>-->
       <!--</ds-truncatable-part>-->
diff --git a/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.html b/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.html
index c79d19e267..985372ad18 100644
--- a/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.html
+++ b/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.html
@@ -42,7 +42,7 @@
       [label]="'orgunit.page.description'">
     </ds-generic-item-page-field>
     <div>
-      <a class="btn btn-outline-primary" [routerLink]="[itemPageRoute + '/full']">
+      <a class="btn btn-outline-primary" [routerLink]="[itemPageRoute + '/full']" role="button" tabindex="0">
         {{"item.page.link.full" | translate}}
       </a>
     </div>
diff --git a/src/app/entity-groups/research-entities/item-pages/person/person.component.html b/src/app/entity-groups/research-entities/item-pages/person/person.component.html
index 83a2e76dd8..fe7e608daf 100644
--- a/src/app/entity-groups/research-entities/item-pages/person/person.component.html
+++ b/src/app/entity-groups/research-entities/item-pages/person/person.component.html
@@ -50,7 +50,7 @@
       [label]="'person.page.name'">
     </ds-generic-item-page-field>
     <div>
-      <a class="btn btn-outline-primary" [routerLink]="[itemPageRoute + '/full']">
+      <a class="btn btn-outline-primary" [routerLink]="[itemPageRoute + '/full']" role="button" tabindex="0">
         {{"item.page.link.full" | translate}}
       </a>
     </div>
diff --git a/src/app/entity-groups/research-entities/item-pages/project/project.component.html b/src/app/entity-groups/research-entities/item-pages/project/project.component.html
index 0d9679ef1e..7a61203976 100644
--- a/src/app/entity-groups/research-entities/item-pages/project/project.component.html
+++ b/src/app/entity-groups/research-entities/item-pages/project/project.component.html
@@ -62,7 +62,7 @@
       [label]="'project.page.keyword'">
     </ds-generic-item-page-field>
     <div>
-      <a class="btn btn-outline-primary" [routerLink]="[itemPageRoute + '/full']">
+      <a class="btn btn-outline-primary" [routerLink]="[itemPageRoute + '/full']" role="button" tabindex="0">
         {{"item.page.link.full" | translate}}
       </a>
     </div>
diff --git a/src/app/entity-groups/research-entities/metadata-representations/person/person-item-metadata-list-element.component.html b/src/app/entity-groups/research-entities/metadata-representations/person/person-item-metadata-list-element.component.html
index 6f56056781..cbc68ef7cf 100644
--- a/src/app/entity-groups/research-entities/metadata-representations/person/person-item-metadata-list-element.component.html
+++ b/src/app/entity-groups/research-entities/metadata-representations/person/person-item-metadata-list-element.component.html
@@ -3,7 +3,7 @@
       <span *ngIf="mdRepresentation.allMetadata(['person.jobTitle']).length > 0"
             class="item-list-job-title">
               <span *ngFor="let value of mdRepresentation.allMetadataValues(['person.jobTitle']); let last=last;">
-                  <span [innerHTML]="value"><span [innerHTML]="value"></span></span>
+                  <span [innerHTML]="value"></span><span *ngIf="!last">; </span>
               </span>
       </span>
   </span>
@@ -12,4 +12,9 @@
   <a [routerLink]="[itemPageRoute]"
      [innerHTML]="mdRepresentation.getValue()"
      [ngbTooltip]="mdRepresentation.allMetadata(['person.jobTitle']).length > 0 ? descTemplate : null"></a>
+  <ds-orcid-badge-and-tooltip class="ml-1"
+                              *ngIf="mdRepresentation.firstMetadata('person.identifier.orcid')"
+                              [orcid]="mdRepresentation.firstMetadata('person.identifier.orcid')"
+                              [authenticatedTimestamp]="mdRepresentation.firstMetadata('dspace.orcid.authenticated')">
+  </ds-orcid-badge-and-tooltip>
 </ds-truncatable>
diff --git a/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-search-result-list-submission-element.component.html b/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-search-result-list-submission-element.component.html
index e264958738..1f020d127f 100644
--- a/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-search-result-list-submission-element.component.html
+++ b/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-search-result-list-submission-element.component.html
@@ -11,11 +11,11 @@
         <span class="text-muted">
         <span *ngIf="dso.allMetadata('organization.address.addressLocality').length > 0"
               class="item-list-address-locality">
-                    <span [innerHTML]="firstMetadataValue(['organization.address.addressLocality'])"><span [innerHTML]="firstMetadataValue(['organization.address.addressLocality'])"></span></span><span *ngIf="dso.allMetadata('organization.address.addressCountry').length > 0">, </span>
+                    <span [innerHTML]="firstMetadataValue(['organization.address.addressLocality'])"></span><span *ngIf="dso.allMetadata('organization.address.addressCountry').length > 0">, </span>
         </span>
         <span *ngIf="dso.allMetadata('organization.address.addressCountry').length > 0"
               class="item-list-address-country">
-                    <span [innerHTML]="firstMetadataValue(['organization.address.addressCountry'])"><span [innerHTML]="firstMetadataValue(['organization.address.addressCountry'])"></span></span>
+                    <span [innerHTML]="firstMetadataValue(['organization.address.addressCountry'])"></span>
         </span>
         </span>
     </div>
diff --git a/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-search-result-list-submission-element.component.ts b/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-search-result-list-submission-element.component.ts
index ef58007bae..76a5618292 100644
--- a/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-search-result-list-submission-element.component.ts
+++ b/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-search-result-list-submission-element.component.ts
@@ -22,7 +22,7 @@ import { APP_CONFIG, AppConfig } from '../../../../../../config/app-config.inter
 @listableObjectComponent('OrgUnitSearchResult', ViewMode.ListElement, Context.EntitySearchModal)
 @listableObjectComponent('OrgUnitSearchResult', ViewMode.ListElement, Context.EntitySearchModalWithNameVariants)
 @Component({
-  selector: 'ds-person-search-result-list-submission-element',
+  selector: 'ds-org-unit-search-result-list-submission-element',
   styleUrls: ['./org-unit-search-result-list-submission-element.component.scss'],
   templateUrl: './org-unit-search-result-list-submission-element.component.html'
 })
diff --git a/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-suggestions/org-unit-input-suggestions.component.html b/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-suggestions/org-unit-input-suggestions.component.html
index c4e31d3d81..58f39b8d0b 100644
--- a/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-suggestions/org-unit-input-suggestions.component.html
+++ b/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-suggestions/org-unit-input-suggestions.component.html
@@ -11,7 +11,9 @@
            [dsDebounce]="debounceTime" (onDebounce)="find($event)"
            [placeholder]="placeholder"
            [ngModelOptions]="{standalone: true}" autocomplete="off"/>
-    <input type="submit" class="d-none"/>
+    <button class="sr-only" type="submit">
+        {{'search.filters.search.submit' | translate}}
+    </button>
     <div class="autocomplete dropdown-menu" [ngClass]="{'show': (show | async) && isNotEmpty(suggestions)}">
         <div class="dropdown-list">
             <div *ngFor="let suggestionOption of suggestions">
diff --git a/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-suggestions/org-unit-input-suggestions.component.scss b/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-suggestions/org-unit-input-suggestions.component.scss
index 20b48c805b..26b765b704 100644
--- a/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-suggestions/org-unit-input-suggestions.component.scss
+++ b/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-suggestions/org-unit-input-suggestions.component.scss
@@ -3,10 +3,9 @@ form {
     &:before {
         pointer-events: none; // prevent the icon from ‘catching‘ the click
         position: absolute;
-        font-weight: 900;
-        font-family: "Font Awesome 5 Free";
+        font: var(--fa-font-solid);
         content: "\f0d7";
-        top: 7px;
+        top: 10px;
         right: 0;
         height: 20px;
         width: 20px;
diff --git a/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-suggestions/org-unit-input-suggestions.component.spec.ts b/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-suggestions/org-unit-input-suggestions.component.spec.ts
index 0981d895ec..a13af0067a 100644
--- a/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-suggestions/org-unit-input-suggestions.component.spec.ts
+++ b/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-suggestions/org-unit-input-suggestions.component.spec.ts
@@ -2,6 +2,7 @@ import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
 import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
 import { OrgUnitInputSuggestionsComponent } from './org-unit-input-suggestions.component';
 import { FormsModule } from '@angular/forms';
+import { TranslateModule } from '@ngx-translate/core';
 
 let component: OrgUnitInputSuggestionsComponent;
 let fixture: ComponentFixture<OrgUnitInputSuggestionsComponent>;
@@ -21,6 +22,7 @@ describe('OrgUnitInputSuggestionsComponent', () => {
       declarations: [OrgUnitInputSuggestionsComponent],
       imports: [
         FormsModule,
+        TranslateModule.forRoot(),
       ],
       providers: [
       ],
diff --git a/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.html b/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.html
index dd2589c726..0de1c93d9e 100644
--- a/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.html
+++ b/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.html
@@ -23,13 +23,13 @@
                                      (clickSuggestion)="select($event)"
                                      (submitSuggestion)="selectCustom($event)"></ds-person-input-suggestions>
         <span class="text-muted">
-        <span *ngIf="dso.allMetadata(['person.jobTitle']).length > 0"
-              class="item-list-job-title">
-                <span *ngFor="let value of allMetadataValues(['person.jobTitle']); let last=last;">
-                    <span [innerHTML]="value"><span [innerHTML]="value"></span></span>
-                </span>
+          <span *ngIf="dso.allMetadata(['person.jobTitle']).length > 0"
+                class="item-list-job-title">
+                  <span *ngFor="let value of allMetadataValues(['person.jobTitle']); let last=last;">
+                      <span [innerHTML]="value"></span><span *ngIf="!last">; </span>
+                  </span>
+          </span>
         </span>
-    </span>
       </div>
     </div>
   </div>
diff --git a/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.spec.ts b/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.spec.ts
index 9e4d347150..ba11253922 100644
--- a/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.spec.ts
+++ b/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.spec.ts
@@ -20,6 +20,7 @@ import { Bitstream } from '../../../../../core/shared/bitstream.model';
 import { HALEndpointService } from '../../../../../core/shared/hal-endpoint.service';
 import { Item } from '../../../../../core/shared/item.model';
 import { UUIDService } from '../../../../../core/shared/uuid.service';
+import { XSRFService } from '../../../../../core/xsrf/xsrf.service';
 import { NotificationsService } from '../../../../../shared/notifications/notifications.service';
 import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
 import { SelectableListService } from '../../../../../shared/object-list/selectable-list/selectable-list.service';
@@ -115,6 +116,7 @@ describe('PersonSearchResultListElementSubmissionComponent', () => {
         { provide: Store, useValue: {}},
         { provide: ObjectCacheService, useValue: {} },
         { provide: UUIDService, useValue: {} },
+        { provide: XSRFService, useValue: {} },
         { provide: RemoteDataBuildService, useValue: {} },
         { provide: CommunityDataService, useValue: {} },
         { provide: HALEndpointService, useValue: {} },
diff --git a/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-suggestions/person-input-suggestions.component.html b/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-suggestions/person-input-suggestions.component.html
index b1621dbd2c..53260ceaa3 100644
--- a/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-suggestions/person-input-suggestions.component.html
+++ b/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-suggestions/person-input-suggestions.component.html
@@ -12,7 +12,9 @@
            [dsDebounce]="debounceTime" (onDebounce)="find($event)"
            [placeholder]="placeholder"
            [ngModelOptions]="{standalone: true}" autocomplete="off"/>
-    <input type="submit" class="d-none"/>
+    <button class="sr-only" type="submit">
+        {{'search.filters.search.submit' | translate}}
+    </button>
     <div class="autocomplete dropdown-menu" [ngClass]="{'show': (show | async) && isNotEmpty(suggestions)}">
         <div class="dropdown-list">
             <div *ngFor="let suggestionOption of suggestions">
diff --git a/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-suggestions/person-input-suggestions.component.scss b/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-suggestions/person-input-suggestions.component.scss
index 86233c473a..d9a9544bfb 100644
--- a/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-suggestions/person-input-suggestions.component.scss
+++ b/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-suggestions/person-input-suggestions.component.scss
@@ -2,10 +2,9 @@ form {
     &:before {
         pointer-events: none; // prevent the icon from ‘catching‘ the click
         position: absolute;
-        font-weight: 900;
-        font-family: "Font Awesome 5 Free";
+        font: var(--fa-font-solid);
         content: "\f0d7";
-        top: 7px;
+        top: 10px;
         right: 0;
         height: 20px;
         width: 20px;
diff --git a/src/app/footer/footer.component.html b/src/app/footer/footer.component.html
index 13d84e6e2e..1ec797e73e 100644
--- a/src/app/footer/footer.component.html
+++ b/src/app/footer/footer.component.html
@@ -11,13 +11,13 @@
 
           <ul class="list-unstyled mb-0">
             <li>
-              <a routerLink="./" class="">Lorem ipsum</a>
+              <a routerLink="./" class="" role="link" tabindex="0">Lorem ipsum</a>
             </li>
             <li>
-              <a routerLink="./" class="">Ut facilisis</a>
+              <a routerLink="./" class="" role="link" tabindex="0">Ut facilisis</a>
             </li>
             <li>
-              <a routerLink="./" class="">Aenean sit</a>
+              <a routerLink="./" class="" role="link" tabindex="0">Aenean sit</a>
             </li>
           </ul>
         </div>
@@ -29,7 +29,7 @@
 
           <ul class="list-unstyled mb-0">
             <li>
-              <a routerLink="./" class="">Suspendisse potenti</a>
+              <a routerLink="./" class="" role="link" tabindex="0">Suspendisse potenti</a>
             </li>
           </ul>
         </div>
@@ -57,27 +57,28 @@
     <div class="content-container">
       <p class="m-0">
         <a class="text-white"
-           href="http://www.dspace.org/">{{ 'footer.link.dspace' | translate}}</a>
+           href="http://www.dspace.org/" role="link" tabindex="0">{{ 'footer.link.dspace' | translate}}</a>
         {{ 'footer.copyright' | translate:{year: dateObj | date:'y'} }}
         <a class="text-white"
-           href="https://www.lyrasis.org/">{{ 'footer.link.lyrasis' | translate}}</a>
+           href="https://www.lyrasis.org/" role="link" tabindex="0">{{ 'footer.link.lyrasis' | translate}}</a>
       </p>
-      <ul class="footer-info list-unstyled small d-flex justify-content-center mb-0">
+      <ul class="footer-info list-unstyled d-flex justify-content-center mb-0">
         <li>
-            <a class="text-white" href="javascript:void(0);"
-             (click)="showCookieSettings()">{{ 'footer.link.cookies' | translate}}</a>
+          <button class="btn btn-link text-white" type="button" (click)="showCookieSettings()" role="button" tabindex="0">
+            {{ 'footer.link.cookies' | translate}}
+          </button>
         </li>
         <li *ngIf="showPrivacyPolicy">
-          <a class="text-white"
-             routerLink="info/privacy">{{ 'footer.link.privacy-policy' | translate}}</a>
+          <a class="btn text-white"
+             routerLink="info/privacy" role="link" tabindex="0">{{ 'footer.link.privacy-policy' | translate}}</a>
         </li>
         <li *ngIf="showEndUserAgreement">
-          <a class="text-white"
-             routerLink="info/end-user-agreement">{{ 'footer.link.end-user-agreement' | translate}}</a>
+          <a class="btn text-white"
+             routerLink="info/end-user-agreement" role="link" tabindex="0">{{ 'footer.link.end-user-agreement' | translate}}</a>
         </li>
         <li *ngIf="showSendFeedback$ | async">
-          <a class="text-white"
-             routerLink="info/feedback">{{ 'footer.link.feedback' | translate}}</a>
+          <a class="btn text-white"
+             routerLink="info/feedback" role="link" tabindex="0">{{ 'footer.link.feedback' | translate}}</a>
         </li>
       </ul>
     </div>
diff --git a/src/app/footer/footer.component.scss b/src/app/footer/footer.component.scss
index 350295b870..f1a872c099 100644
--- a/src/app/footer/footer.component.scss
+++ b/src/app/footer/footer.component.scss
@@ -26,9 +26,19 @@
         li {
           display: inline-flex;
 
-          a {
+          a, .btn-link {
             padding: 0 calc(var(--bs-spacer) / 2);
-            color: inherit
+            color: inherit;
+            font-size: .875em;
+
+            &:focus {
+              box-shadow: none;
+              text-decoration: underline;
+            }
+
+            &:focus-visible {
+              box-shadow: 0 0 0 0.2rem rgba(255, 255, 255, 0.5);
+            }
           }
 
           &:not(:last-child) {
diff --git a/src/app/forgot-password/forgot-password-email/forgot-email.component.html b/src/app/forgot-password/forgot-password-email/forgot-email.component.html
index 995108cdbc..aaa0c27b46 100644
--- a/src/app/forgot-password/forgot-password-email/forgot-email.component.html
+++ b/src/app/forgot-password/forgot-password-email/forgot-email.component.html
@@ -1,3 +1,3 @@
-<ds-register-email-form
+<ds-themed-register-email-form
     [MESSAGE_PREFIX]="'forgot-email.form'" [typeRequest]="typeRequest">
-</ds-register-email-form>
+</ds-themed-register-email-form>
diff --git a/src/app/forgot-password/forgot-password-form/forgot-password-form.component.html b/src/app/forgot-password/forgot-password-form/forgot-password-form.component.html
index 5fb0006279..6cff2903b9 100644
--- a/src/app/forgot-password/forgot-password-form/forgot-password-form.component.html
+++ b/src/app/forgot-password/forgot-password-form/forgot-password-form.component.html
@@ -1,13 +1,13 @@
 <div class="container" *ngIf="(registration$ |async)">
-    <h3 class="mb-4">{{'forgot-password.form.head' | translate}}</h3>
+    <h1 class="mb-4">{{'forgot-password.form.head' | translate}}</h1>
     <div class="card mb-4">
         <div class="card-header">{{'forgot-password.form.identification.header' | translate}}</div>
         <div class="card-body">
             <div class="row">
                 <div class="col-12">
-                    <label class="font-weight-bold"
-                           for="email">{{'forgot-password.form.identification.email' | translate}}</label>
-                    <span id="email">{{(registration$ |async).email}}</span></div>
+                    <span class="font-weight-bold">{{'forgot-password.form.identification.email' | translate}} </span>
+                    <span [attr.data-test]="'email' | dsBrowserOnly">{{(registration$ |async).email}}</span>
+                </div>
             </div>
         </div>
     </div>
@@ -28,7 +28,7 @@
     <div class="row">
         <div class="col-12">
             <button
-                    [disabled]="isInValid"
+                    [dsBtnDisabled]="isInValid"
                     class="btn btn-default btn-primary"
                     (click)="submit()">{{'forgot-password.form.submit' | translate}}</button>
         </div>
diff --git a/src/app/forgot-password/forgot-password-form/forgot-password-form.component.spec.ts b/src/app/forgot-password/forgot-password-form/forgot-password-form.component.spec.ts
index 92d72d83df..05f5df72f1 100644
--- a/src/app/forgot-password/forgot-password-form/forgot-password-form.component.spec.ts
+++ b/src/app/forgot-password/forgot-password-form/forgot-password-form.component.spec.ts
@@ -21,6 +21,7 @@ import {
   createSuccessfulRemoteDataObject$
 } from '../../shared/remote-data.utils';
 import { CoreState } from '../../core/core-state.model';
+import { BrowserOnlyPipe } from '../../shared/utils/browser-only.pipe';
 
 describe('ForgotPasswordFormComponent', () => {
   let comp: ForgotPasswordFormComponent;
@@ -54,7 +55,10 @@ describe('ForgotPasswordFormComponent', () => {
 
     TestBed.configureTestingModule({
       imports: [CommonModule, RouterTestingModule.withRoutes([]), TranslateModule.forRoot(), ReactiveFormsModule],
-      declarations: [ForgotPasswordFormComponent],
+      declarations: [
+        BrowserOnlyPipe,
+        ForgotPasswordFormComponent,
+      ],
       providers: [
         {provide: Router, useValue: router},
         {provide: ActivatedRoute, useValue: route},
@@ -75,7 +79,7 @@ describe('ForgotPasswordFormComponent', () => {
 
   describe('init', () => {
     it('should initialise mail address', () => {
-      const elem = fixture.debugElement.queryAll(By.css('span#email'))[0].nativeElement;
+      const elem = fixture.debugElement.queryAll(By.css('span[data-test="email"]'))[0].nativeElement;
       expect(elem.innerHTML).toContain('test@email.org');
     });
   });
diff --git a/src/app/header-nav-wrapper/header-navbar-wrapper.component.html b/src/app/header-nav-wrapper/header-navbar-wrapper.component.html
index f99070b738..47e31ea733 100644
--- a/src/app/header-nav-wrapper/header-navbar-wrapper.component.html
+++ b/src/app/header-nav-wrapper/header-navbar-wrapper.component.html
@@ -1,4 +1,4 @@
-<div [ngClass]="{'open': !(isNavBarCollapsed | async)}">
+<div [ngClass]="{'open': !(isNavBarCollapsed$ | async)}" id="header-navbar-wrapper">
     <ds-themed-header></ds-themed-header>
     <ds-themed-navbar></ds-themed-navbar>
 </div>
diff --git a/src/app/header-nav-wrapper/header-navbar-wrapper.component.scss b/src/app/header-nav-wrapper/header-navbar-wrapper.component.scss
index b02b3c378c..c1bc9c7e90 100644
--- a/src/app/header-nav-wrapper/header-navbar-wrapper.component.scss
+++ b/src/app/header-nav-wrapper/header-navbar-wrapper.component.scss
@@ -1,4 +1,6 @@
 :host {
   position: relative;
-  z-index: var(--ds-nav-z-index);
+  div#header-navbar-wrapper {
+    border-bottom: 1px var(--ds-header-navbar-border-bottom-color) solid;
+  }
 }
diff --git a/src/app/header-nav-wrapper/header-navbar-wrapper.component.ts b/src/app/header-nav-wrapper/header-navbar-wrapper.component.ts
index a610b2cb02..0a32b3a70e 100644
--- a/src/app/header-nav-wrapper/header-navbar-wrapper.component.ts
+++ b/src/app/header-nav-wrapper/header-navbar-wrapper.component.ts
@@ -1,10 +1,8 @@
-import { Component, HostBinding, OnDestroy, OnInit } from '@angular/core';
-import { Store } from '@ngrx/store';
-import { AppState } from '../app.reducer';
-import { hasValue } from '../shared/empty.util';
-import { Observable, Subscription } from 'rxjs';
+import { Component, OnInit } from '@angular/core';
+import { Observable } from 'rxjs';
 import { MenuService } from '../shared/menu/menu.service';
 import { MenuID } from '../shared/menu/menu-id.model';
+import { HostWindowService, WidthCategory } from '../shared/host-window.service';
 
 /**
  * This component represents a wrapper for the horizontal navbar and the header
@@ -14,26 +12,22 @@ import { MenuID } from '../shared/menu/menu-id.model';
   styleUrls: ['header-navbar-wrapper.component.scss'],
   templateUrl: 'header-navbar-wrapper.component.html',
 })
-export class HeaderNavbarWrapperComponent implements OnInit, OnDestroy {
-  @HostBinding('class.open') isOpen = false;
-  private sub: Subscription;
-  public isNavBarCollapsed: Observable<boolean>;
+export class HeaderNavbarWrapperComponent implements OnInit {
+  public isNavBarCollapsed$: Observable<boolean>;
+  public isMobile$: Observable<boolean>;
+
   menuID = MenuID.PUBLIC;
+  maxMobileWidth = WidthCategory.SM;
 
   constructor(
-    private store: Store<AppState>,
-    private menuService: MenuService
+    private menuService: MenuService,
+    protected windowService: HostWindowService,
   ) {
   }
 
   ngOnInit(): void {
-    this.isNavBarCollapsed = this.menuService.isMenuCollapsed(this.menuID);
-    this.sub = this.isNavBarCollapsed.subscribe((isCollapsed) => this.isOpen = !isCollapsed);
+    this.isMobile$ = this.windowService.isUpTo(this.maxMobileWidth);
+    this.isNavBarCollapsed$ = this.menuService.isMenuCollapsed(this.menuID);
   }
 
-  ngOnDestroy() {
-    if (hasValue(this.sub)) {
-      this.sub.unsubscribe();
-    }
-  }
 }
diff --git a/src/app/header/context-help-toggle/context-help-toggle.component.html b/src/app/header/context-help-toggle/context-help-toggle.component.html
index 1ec2050497..6f04326d56 100644
--- a/src/app/header/context-help-toggle/context-help-toggle.component.html
+++ b/src/app/header/context-help-toggle/context-help-toggle.component.html
@@ -1,6 +1,6 @@
 <div *ngIf="buttonVisible$ | async">
   <a href="javascript:void(0);"
-     role="button"
+     role="menuitem"
      (click)="onClick()"
      [attr.aria-label]="'nav.context-help-toggle' | translate"
      [title]="'nav.context-help-toggle' | translate"
diff --git a/src/app/header/context-help-toggle/context-help-toggle.component.ts b/src/app/header/context-help-toggle/context-help-toggle.component.ts
index 6685df7106..de7c994faa 100644
--- a/src/app/header/context-help-toggle/context-help-toggle.component.ts
+++ b/src/app/header/context-help-toggle/context-help-toggle.component.ts
@@ -1,6 +1,6 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit, ElementRef } from '@angular/core';
 import { ContextHelpService } from '../../shared/context-help.service';
-import { Observable } from 'rxjs';
+import { Observable, Subscription } from 'rxjs';
 import { map } from 'rxjs/operators';
 
 /**
@@ -15,12 +15,23 @@ import { map } from 'rxjs/operators';
 export class ContextHelpToggleComponent implements OnInit {
   buttonVisible$: Observable<boolean>;
 
+  subscriptions: Subscription[] = [];
+
   constructor(
-    private contextHelpService: ContextHelpService,
-  ) { }
+    protected elRef: ElementRef,
+    protected contextHelpService: ContextHelpService,
+  ) {
+  }
 
   ngOnInit(): void {
     this.buttonVisible$ = this.contextHelpService.tooltipCount$().pipe(map(x => x > 0));
+    this.subscriptions.push(this.buttonVisible$.subscribe((showContextHelpToggle: boolean) => {
+      if (showContextHelpToggle) {
+        this.elRef.nativeElement.classList.remove('d-none');
+      } else {
+        this.elRef.nativeElement.classList.add('d-none');
+      }
+    }));
   }
 
   onClick() {
diff --git a/src/app/header/header.component.html b/src/app/header/header.component.html
index 4d87983523..9fc398c64e 100644
--- a/src/app/header/header.component.html
+++ b/src/app/header/header.component.html
@@ -1,21 +1,21 @@
 <header>
   <div class="container">
     <div class="d-flex flex-row justify-content-between">
-      <a class="navbar-brand my-2" routerLink="/home">
+      <a class="navbar-brand my-2" routerLink="/home" role="button" tabindex="0">
         <img src="assets/images/dspace-logo.svg" [attr.alt]="'menu.header.image.logo' | translate"/>
       </a>
 
       <nav role="navigation" [attr.aria-label]="'nav.user.description' | translate" class="navbar navbar-light navbar-expand-md flex-shrink-0 px-0">
         <ds-themed-search-navbar></ds-themed-search-navbar>
-        <ds-lang-switch></ds-lang-switch>
+        <ds-themed-lang-switch></ds-themed-lang-switch>
         <ds-context-help-toggle></ds-context-help-toggle>
         <ds-themed-auth-nav-menu></ds-themed-auth-nav-menu>
         <ds-impersonate-navbar></ds-impersonate-navbar>
-        <div class="pl-2">
-          <button class="navbar-toggler" type="button" (click)="toggleNavbar()"
+        <div *ngIf="isMobile$ | async" class="pl-2">
+          <button class="navbar-toggler px-0" type="button" (click)="toggleNavbar()"
                   aria-controls="collapsingNav"
                   aria-expanded="false" [attr.aria-label]="'nav.toggle' | translate">
-            <span class="navbar-toggler-icon fas fa-bars fa-fw" aria-hidden="true"></span>
+            <span class="fas fa-bars fa-fw toggler-icon" aria-hidden="true"></span>
           </button>
         </div>
       </nav>
diff --git a/src/app/header/header.component.scss b/src/app/header/header.component.scss
index cca3ed2abb..e002e0c347 100644
--- a/src/app/header/header.component.scss
+++ b/src/app/header/header.component.scss
@@ -1,22 +1,31 @@
-.navbar-brand img {
-  max-height: var(--ds-header-logo-height);
-  max-width: 100%;
-  @media screen and (max-width: map-get($grid-breakpoints, sm)) {
-    max-height: var(--ds-header-logo-height-xs);
+:host {
+  header {
+    background-color: var(--ds-header-bg);
+  }
+
+  .navbar-brand img {
+    max-height: var(--ds-header-logo-height);
+    max-width: 100%;
+  }
+
+  .navbar-toggler {
+    border: none;
+    color: var(--ds-header-icon-color);
+
+    &:hover, &:focus {
+      color: var(--ds-header-icon-color-hover);
+    }
+
+    .toggler-icon {
+      width: 1.5em;
+      height: 1.5em;
+      line-height: 1.5;
+    }
+  }
+
+  .navbar {
+    display: flex;
+    gap: calc(var(--bs-spacer) / 3);
+    align-items: center;
   }
 }
-
-.navbar-toggler .navbar-toggler-icon {
-  background-image: none !important;
-  line-height: 1.5;
-}
-
-.navbar-toggler {
-  border: none;
-  color: var(--ds-header-icon-color);
-
-  &:hover, &:focus {
-    color: var(--ds-header-icon-color-hover);
-  }
-}
-
diff --git a/src/app/header/header.component.spec.ts b/src/app/header/header.component.spec.ts
index 9bc952cee3..ccf8b19621 100644
--- a/src/app/header/header.component.spec.ts
+++ b/src/app/header/header.component.spec.ts
@@ -10,6 +10,8 @@ import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
 import { MenuService } from '../shared/menu/menu.service';
 import { MenuServiceStub } from '../shared/testing/menu-service.stub';
+import { HostWindowService } from '../shared/host-window.service';
+import { HostWindowServiceStub } from '../shared/testing/host-window-service.stub';
 
 let comp: HeaderComponent;
 let fixture: ComponentFixture<HeaderComponent>;
@@ -26,6 +28,7 @@ describe('HeaderComponent', () => {
         ReactiveFormsModule],
       declarations: [HeaderComponent],
       providers: [
+        { provide: HostWindowService, useValue: new HostWindowServiceStub(0) },
         { provide: MenuService, useValue: menuService }
       ],
       schemas: [NO_ERRORS_SCHEMA]
@@ -40,7 +43,7 @@ describe('HeaderComponent', () => {
     fixture = TestBed.createComponent(HeaderComponent);
 
     comp = fixture.componentInstance;
-
+    fixture.detectChanges();
   });
 
   describe('when the toggle button is clicked', () => {
diff --git a/src/app/header/header.component.ts b/src/app/header/header.component.ts
index 366b4f5e7a..83694ad9b8 100644
--- a/src/app/header/header.component.ts
+++ b/src/app/header/header.component.ts
@@ -1,7 +1,8 @@
-import { Component } from '@angular/core';
+import { Component, OnInit } from '@angular/core';
 import { Observable } from 'rxjs';
 import { MenuService } from '../shared/menu/menu.service';
 import { MenuID } from '../shared/menu/menu-id.model';
+import { HostWindowService, WidthCategory } from '../shared/host-window.service';
 
 /**
  * Represents the header with the logo and simple navigation
@@ -11,20 +12,27 @@ import { MenuID } from '../shared/menu/menu-id.model';
   styleUrls: ['header.component.scss'],
   templateUrl: 'header.component.html',
 })
-export class HeaderComponent {
+export class HeaderComponent implements OnInit {
   /**
    * Whether user is authenticated.
    * @type {Observable<string>}
    */
   public isAuthenticated: Observable<boolean>;
-  public showAuth = false;
+  public isMobile$: Observable<boolean>;
+
   menuID = MenuID.PUBLIC;
+  maxMobileWidth = WidthCategory.SM;
 
   constructor(
-    private menuService: MenuService
+    protected menuService: MenuService,
+    protected windowService: HostWindowService,
   ) {
   }
 
+  ngOnInit(): void {
+    this.isMobile$ = this.windowService.isUpTo(this.maxMobileWidth);
+  }
+
   public toggleNavbar(): void {
     this.menuService.toggleMenu(this.menuID);
   }
diff --git a/src/app/health-page/health-info/health-info-component/health-info-component.component.html b/src/app/health-page/health-info/health-info-component/health-info-component.component.html
index dbaaa7a6b6..84cba4d92f 100644
--- a/src/app/health-page/health-info/health-info-component/health-info-component.component.html
+++ b/src/app/health-page/health-info/health-info-component/health-info-component.component.html
@@ -1,16 +1,16 @@
 <div *ngFor="let entry of healthInfoComponent | dsObjNgFor" data-test="collapse">
   <div *ngIf="entry && !isPlainProperty(entry.value)" class="mb-3 border-bottom">
-    <div class="w-100 d-flex justify-content-between collapse-toggle" (click)="collapse.toggle()">
+    <div class="w-100 d-flex gap-3 justify-content-between collapse-toggle" (click)="collapse.toggle()">
       <button type="button" class="btn btn-link p-0" (click)="$event.preventDefault()" [attr.aria-expanded]="!collapse.collapsed"
-              aria-controls="collapseExample">
+              [attr.aria-controls]="'health-info-component-' + entry.key + '-content'">
         {{ entry.key | titlecase }}
       </button>
-      <div class="d-inline-block">
+      <div class="d-flex my-auto">
         <span *ngIf="collapse.collapsed" class="fas fa-chevron-down"></span>
         <span *ngIf="!collapse.collapsed" class="fas fa-chevron-up"></span>
       </div>
     </div>
-    <div #collapse="ngbCollapse" [ngbCollapse]="isCollapsed">
+    <div #collapse="ngbCollapse" [id]="'health-info-component-' + entry.key + '-content'" [ngbCollapse]="isCollapsed">
       <div class="card border-0">
         <div class="card-body">
           <ds-health-info-component [healthInfoComponent]="entry.value"
diff --git a/src/app/health-page/health-info/health-info.component.html b/src/app/health-page/health-info/health-info.component.html
index 4bafcaa2d8..b590695b0b 100644
--- a/src/app/health-page/health-info/health-info.component.html
+++ b/src/app/health-page/health-info/health-info.component.html
@@ -2,14 +2,14 @@
   <ngb-accordion #acc="ngbAccordion" [activeIds]="activeId">
     <ngb-panel [id]="entry.key" *ngFor="let entry of healthInfoResponse | dsObjNgFor">
       <ng-template ngbPanelHeader>
-        <div class="w-100 d-flex justify-content-between collapse-toggle" ngbPanelToggle (click)="acc.toggle(entry.key)" data-test="info-component">
-          <button type="button" class="btn btn-link p-0" (click)="$event.preventDefault()" [attr.aria-expanded]="!acc.isExpanded(entry.key)"
-                  aria-controls="collapsePanels">
+        <div class="w-100 d-flex gap-3 justify-content-between collapse-toggle" ngbPanelToggle (click)="acc.toggle(entry.key)" data-test="info-component">
+          <button type="button" class="btn btn-link p-0" (click)="$event.preventDefault()" [attr.aria-expanded]="acc.isExpanded(entry.key)"
+                  [attr.aria-controls]="'health-info-' + entry.key + '-content'">
             {{ getPanelLabel(entry.key) | titlecase }}
           </button>
-          <div class="text-right d-flex">
+          <div class="text-right d-flex gap-2">
             <ds-health-status [status]="entry.value?.status"></ds-health-status>
-            <div class="ml-3 d-inline-block">
+            <div class="d-flex my-auto">
               <span *ngIf="acc.isExpanded(entry.key)" class="fas fa-chevron-up fa-fw"></span>
               <span *ngIf="!acc.isExpanded(entry.key)" class="fas fa-chevron-down fa-fw"></span>
             </div>
@@ -17,8 +17,9 @@
         </div>
       </ng-template>
       <ng-template ngbPanelContent>
-        <ds-health-info-component [healthInfoComponentName]="entry.key"
-                                  [healthInfoComponent]="entry.value"></ds-health-info-component>
+        <ds-health-info-component [healthInfoComponentName]="entry.key" [healthInfoComponent]="entry.value"
+                                  [id]="'health-info-' + entry.key + '-content'">
+        </ds-health-info-component>
       </ng-template>
     </ngb-panel>
   </ngb-accordion>
diff --git a/src/app/health-page/health-page.component.html b/src/app/health-page/health-page.component.html
index 8083389e1b..209fd230ae 100644
--- a/src/app/health-page/health-page.component.html
+++ b/src/app/health-page/health-page.component.html
@@ -1,17 +1,17 @@
 <div class="container" *ngIf="(healthResponseInitialised | async) && (healthInfoResponseInitialised | async)">
-  <h2>{{'health-page.heading' | translate}}</h2>
+  <h1>{{'health-page.heading' | translate}}</h1>
   <div *ngIf="(healthResponse | async) && (healthInfoResponse | async)">
     <ul ngbNav #nav="ngbNav" [activeId]="'status'" class="nav-tabs">
-      <li [ngbNavItem]="'status'">
-        <a ngbNavLink>{{'health-page.status-tab' | translate}}</a>
+      <li [ngbNavItem]="'status'" role="presentation">
+        <a data-test="health-page.status-tab" ngbNavLink>{{'health-page.status-tab' | translate}}</a>
         <ng-template ngbNavContent>
           <div id="status">
             <ds-health-panel [healthResponse]="(healthResponse | async)"></ds-health-panel>
           </div>
         </ng-template>
       </li>
-      <li [ngbNavItem]="'info'">
-        <a ngbNavLink>{{'health-page.info-tab' | translate}}</a>
+      <li [ngbNavItem]="'info'" role="presentation">
+        <a data-test="health-page.info-tab" ngbNavLink>{{'health-page.info-tab' | translate}}</a>
         <ng-template ngbNavContent>
           <div id="info">
             <ds-health-info [healthInfoResponse]="(healthInfoResponse | async)"></ds-health-info>
@@ -21,7 +21,7 @@
     </ul>
     <div [ngbNavOutlet]="nav" class="mt-2"></div>
   </div>
-  <ds-alert *ngIf="!(healthResponse | async) || !(healthInfoResponse | async)" [type]="'alert-danger'" [content]="'health-page.error.msg'"></ds-alert>
+  <ds-alert *ngIf="!(healthResponse | async) || !(healthInfoResponse | async)" [type]="AlertType.Error" [content]="'health-page.error.msg'"></ds-alert>
 </div>
 
 
diff --git a/src/app/health-page/health-page.component.ts b/src/app/health-page/health-page.component.ts
index aa7bd7cba4..5c3c7ed70e 100644
--- a/src/app/health-page/health-page.component.ts
+++ b/src/app/health-page/health-page.component.ts
@@ -5,6 +5,7 @@ import { take } from 'rxjs/operators';
 
 import { HealthService } from './health.service';
 import { HealthInfoResponse, HealthResponse } from './models/health-component.model';
+import { AlertType } from '../shared/alert/alert-type';
 
 @Component({
   selector: 'ds-health-page',
@@ -33,6 +34,8 @@ export class HealthPageComponent implements OnInit {
    */
   healthInfoResponseInitialised: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(false);
 
+  readonly AlertType = AlertType;
+
   constructor(private healthDataService: HealthService) {
   }
 
diff --git a/src/app/health-page/health-panel/health-component/health-component.component.html b/src/app/health-page/health-panel/health-component/health-component.component.html
index 1f29c8c9fc..f962e66052 100644
--- a/src/app/health-page/health-panel/health-component/health-component.component.html
+++ b/src/app/health-page/health-panel/health-component/health-component.component.html
@@ -1,16 +1,16 @@
 <ng-container *ngIf="healthComponent?.components">
   <div *ngFor="let entry of healthComponent?.components | dsObjNgFor" class="mb-3 border-bottom" data-test="collapse">
-    <div class="w-100 d-flex justify-content-between collapse-toggle" (click)="collapse.toggle()">
+    <div class="w-100 d-flex gap-3 justify-content-between collapse-toggle" (click)="collapse.toggle()">
       <button type="button" class="btn btn-link p-0" (click)="$event.preventDefault()" [attr.aria-expanded]="!collapse.collapsed"
-              aria-controls="collapseExample">
+              [attr.aria-controls]="'health-component-' + entry.key + 'content'">
         {{ entry.key | titlecase }}
       </button>
-      <div class="d-inline-block">
+      <div class="d-flex my-auto">
         <span *ngIf="collapse.collapsed" class="fas fa-chevron-down"></span>
         <span *ngIf="!collapse.collapsed" class="fas fa-chevron-up"></span>
       </div>
     </div>
-    <div #collapse="ngbCollapse" [ngbCollapse]="isCollapsed">
+    <div #collapse="ngbCollapse" [id]="'health-component-' + entry.key + 'content'" [ngbCollapse]="isCollapsed">
       <div class="card border-0">
         <div class="card-body">
           <ds-health-component [healthComponent]="entry.value"
diff --git a/src/app/health-page/health-panel/health-component/health-component.component.ts b/src/app/health-page/health-panel/health-component/health-component.component.ts
index e212a07289..f2391c9c4c 100644
--- a/src/app/health-page/health-panel/health-component/health-component.component.ts
+++ b/src/app/health-page/health-panel/health-component/health-component.component.ts
@@ -3,7 +3,7 @@ import { Component, Input } from '@angular/core';
 import { TranslateService } from '@ngx-translate/core';
 
 import { HealthComponent } from '../../models/health-component.model';
-import { AlertType } from '../../../shared/alert/aletr-type';
+import { AlertType } from '../../../shared/alert/alert-type';
 
 /**
  * A component to render a "health component" object.
diff --git a/src/app/health-page/health-panel/health-panel.component.html b/src/app/health-page/health-panel/health-panel.component.html
index 2d67fa537b..ec2a27ce40 100644
--- a/src/app/health-page/health-panel/health-panel.component.html
+++ b/src/app/health-page/health-panel/health-panel.component.html
@@ -1,15 +1,18 @@
-<p class="h4">{{'health-page.status' | translate}} : <ds-health-status [status]="healthResponse.status"></ds-health-status></p>
+<p class="h4">
+  {{'health-page.status' | translate}}:
+  <ds-health-status [status]="healthResponse.status" class="d-inline-flex"></ds-health-status>
+</p>
 <ngb-accordion #acc="ngbAccordion" [activeIds]="activeId">
   <ngb-panel [id]="entry.key" *ngFor="let entry of healthResponse.components | dsObjNgFor">
     <ng-template ngbPanelHeader>
-      <div class="w-100 d-flex justify-content-between collapse-toggle" ngbPanelToggle (click)="acc.toggle(entry.key)" data-test="component">
-        <button type="button" class="btn btn-link p-0" (click)="$event.preventDefault()" [attr.aria-expanded]="!acc.isExpanded(entry.key)"
-                aria-controls="collapsePanels">
+      <div class="w-100 d-flex gap-3 justify-content-between collapse-toggle" ngbPanelToggle (click)="acc.toggle(entry.key)" data-test="component">
+        <button type="button" class="btn btn-link p-0" (click)="$event.preventDefault()" [attr.aria-expanded]="acc.isExpanded(entry.key)"
+                [attr.aria-controls]="'health-panel-' + entry.key + '-content'">
           {{ getPanelLabel(entry.key) | titlecase }}
         </button>
-        <div class="text-right d-flex">
+        <div class="text-right d-flex gap-2">
           <ds-health-status [status]="entry.value?.status"></ds-health-status>
-          <div class="ml-3 d-inline-block">
+          <div class="d-flex my-auto">
             <span *ngIf="acc.isExpanded(entry.key)" class="fas fa-chevron-up fa-fw"></span>
             <span *ngIf="!acc.isExpanded(entry.key)" class="fas fa-chevron-down fa-fw"></span>
           </div>
@@ -17,9 +20,9 @@
       </div>
     </ng-template>
     <ng-template ngbPanelContent>
-      <ds-health-component [healthComponent]="entry.value" [healthComponentName]="entry.key"></ds-health-component>
+      <ds-health-component [healthComponent]="entry.value" [healthComponentName]="entry.key"
+                           [id]="'health-panel-' + entry.key + '-content'" role="presentation">
+      </ds-health-component>
     </ng-template>
   </ngb-panel>
 </ngb-accordion>
-
-
diff --git a/src/app/health-page/health-panel/health-status/health-status.component.html b/src/app/health-page/health-panel/health-status/health-status.component.html
index 38a6f72601..e8710a0760 100644
--- a/src/app/health-page/health-panel/health-status/health-status.component.html
+++ b/src/app/health-page/health-panel/health-status/health-status.component.html
@@ -1,12 +1,12 @@
 <ng-container [ngSwitch]="status">
   <i *ngSwitchCase="HealthStatus.UP"
-     class="fa fa-check-circle text-success ml-2 mt-1"
+     class="fa fa-check-circle text-success my-auto"
      ngbTooltip="{{'health-page.status.ok.info' | translate}}" container="body" ></i>
   <i *ngSwitchCase="HealthStatus.UP_WITH_ISSUES"
-     class="fa fa-exclamation-triangle text-warning ml-2 mt-1"
+     class="fa fa-exclamation-triangle text-warning my-auto"
      ngbTooltip="{{'health-page.status.warning.info' | translate}}" container="body"></i>
   <i *ngSwitchCase="HealthStatus.DOWN"
-     class="fa fa-times-circle text-danger ml-2 mt-1"
+     class="fa fa-times-circle text-danger my-auto"
      ngbTooltip="{{'health-page.status.error.info' | translate}}" container="body"></i>
 
 </ng-container>
diff --git a/src/app/health-page/health-panel/health-status/health-status.component.scss b/src/app/health-page/health-panel/health-status/health-status.component.scss
index e69de29bb2..79ff2d5269 100644
--- a/src/app/health-page/health-panel/health-status/health-status.component.scss
+++ b/src/app/health-page/health-panel/health-status/health-status.component.scss
@@ -0,0 +1,3 @@
+:host {
+  display: flex;
+}
diff --git a/src/app/home-page/home-news/home-news.component.html b/src/app/home-page/home-news/home-news.component.html
index 6bee3cd76f..c4dbd191b2 100644
--- a/src/app/home-page/home-news/home-news.component.html
+++ b/src/app/home-page/home-news/home-news.component.html
@@ -1,4 +1,4 @@
-<div class="jumbotron jumbotron-fluid">
+<div class="jumbotron jumbotron-fluid mt-ncs">
   <div class="container">
     <div class="d-flex flex-wrap">
       <div>
@@ -14,7 +14,7 @@
       <li>issue permanent urls and trustworthy identifiers, including optional integrations with handle.net and DataCite DOI</li>
     </ul>
     <p>Join an international community of <a href="https://wiki.lyrasis.org/display/DSPACE/DSpace+Positioning"
-        target="_blank">leading institutions using DSpace</a>.
+        target="_blank" role="link" tabindex="0">leading institutions using DSpace</a>.
     </p>
   </div>
 </div>
diff --git a/src/app/home-page/home-news/home-news.component.scss b/src/app/home-page/home-news/home-news.component.scss
index 9ab24daa25..911a2fafc5 100644
--- a/src/app/home-page/home-news/home-news.component.scss
+++ b/src/app/home-page/home-news/home-news.component.scss
@@ -1,7 +1,5 @@
 :host {
     display: block;
-    margin-top: calc(-1 * var(--ds-content-spacing));
-    margin-bottom: calc(-1 * var(--ds-content-spacing));
 }
 
 .display-3 {
diff --git a/src/app/home-page/home-page-routing.module.ts b/src/app/home-page/home-page-routing.module.ts
index 196a290552..b95a258613 100644
--- a/src/app/home-page/home-page-routing.module.ts
+++ b/src/app/home-page/home-page-routing.module.ts
@@ -1,7 +1,6 @@
 import { NgModule } from '@angular/core';
 import { RouterModule } from '@angular/router';
 
-import { HomePageResolver } from './home-page.resolver';
 import { LinkMenuItemModel } from '../shared/menu/menu-item/models/link.model';
 import { ThemedHomePageComponent } from './themed-home-page.component';
 import { MenuItemType } from '../shared/menu/menu-item-type.model';
@@ -28,15 +27,9 @@ import { MenuItemType } from '../shared/menu/menu-item-type.model';
               } as LinkMenuItemModel,
             }],
           },
-        },
-        resolve: {
-          site: HomePageResolver
         }
       }
     ])
-  ],
-  providers: [
-    HomePageResolver
   ]
 })
 export class HomePageRoutingModule {
diff --git a/src/app/home-page/home-page.component.html b/src/app/home-page/home-page.component.html
index caa86ac290..e217e41a37 100644
--- a/src/app/home-page/home-page.component.html
+++ b/src/app/home-page/home-page.component.html
@@ -1,8 +1,5 @@
 <ds-themed-home-news></ds-themed-home-news>
 <div class="container">
-  <ng-container *ngIf="(site$ | async) as site">
-    <ds-view-tracker [object]="site"></ds-view-tracker>
-  </ng-container>
   <ds-themed-search-form [inPlaceSearch]="false" [searchPlaceholder]="'home.search-form.placeholder' | translate"></ds-themed-search-form>
   <ds-themed-top-level-community-list></ds-themed-top-level-community-list>
   <ds-recent-item-list *ngIf="recentSubmissionspageSize>0"></ds-recent-item-list>
diff --git a/src/app/home-page/recent-item-list/recent-item-list.component.html b/src/app/home-page/recent-item-list/recent-item-list.component.html
index cd14891b3f..c70971c8d8 100644
--- a/src/app/home-page/recent-item-list/recent-item-list.component.html
+++ b/src/app/home-page/recent-item-list/recent-item-list.component.html
@@ -1,12 +1,12 @@
 <ng-container *ngVar="(itemRD$ | async) as itemRD">
         <div class="mt-4" [ngClass]="placeholderFontClass" *ngIf="itemRD?.hasSucceeded && itemRD?.payload?.page.length > 0" @fadeIn>
-                <div class="d-flex flex-row border-bottom mb-4 pb-4 ng-tns-c416-2"></div>
+                <div class="d-flex flex-row border-bottom mb-4 pb-4"></div>
                 <h2> {{'home.recent-submissions.head' | translate}}</h2>
                 <div class="my-4" *ngFor="let item of itemRD?.payload?.page">
                         <ds-listable-object-component-loader [object]="item" [viewMode]="viewMode" class="pb-4">
                         </ds-listable-object-component-loader>
                 </div>
-                <button (click)="onLoadMore()" class="btn btn-primary search-button mt-4 float-left ng-tns-c290-40"> {{'vocabulary-treeview.load-more' | translate }} ...</button>
+                <button (click)="onLoadMore()" class="btn btn-primary search-button mt-4" role="button" tabindex="0"> {{'vocabulary-treeview.load-more' | translate }} ...</button>
         </div>
         <ds-error *ngIf="itemRD?.hasFailed" message="{{'error.recent-submissions' | translate}}"></ds-error>
         <ds-loading *ngIf="!itemRD || itemRD.isLoading" message="{{'loading.recent-submissions' | translate}}">
diff --git a/src/app/home-page/recent-item-list/recent-item-list.component.ts b/src/app/home-page/recent-item-list/recent-item-list.component.ts
index 9a8535d970..da7d8141e3 100644
--- a/src/app/home-page/recent-item-list/recent-item-list.component.ts
+++ b/src/app/home-page/recent-item-list/recent-item-list.component.ts
@@ -64,6 +64,9 @@ export class RecentItemListComponent implements OnInit {
     if (this.appConfig.browseBy.showThumbnails) {
       linksToFollow.push(followLink('thumbnail'));
     }
+    if (this.appConfig.item.showAccessStatuses) {
+      linksToFollow.push(followLink('accessStatus'));
+    }
 
     this.itemRD$ = this.searchService.search(
       new PaginatedSearchOptions({
diff --git a/src/app/home-page/top-level-community-list/top-level-community-list.component.html b/src/app/home-page/top-level-community-list/top-level-community-list.component.html
index b8dd7f8f76..a70baa3c54 100644
--- a/src/app/home-page/top-level-community-list/top-level-community-list.component.html
+++ b/src/app/home-page/top-level-community-list/top-level-community-list.component.html
@@ -11,5 +11,5 @@
     [hideGear]="true">
   </ds-viewable-collection>
 </div>
-<ds-error *ngIf="communitiesRD?.hasFailed " message="{{'error.top-level-communites' | translate}}"></ds-error>
+<ds-error *ngIf="communitiesRD?.hasFailed " message="{{'error.top-level-communities' | translate}}"></ds-error>
 <ds-themed-loading *ngIf="communitiesRD?.isLoading " message="{{'loading.top-level-communities' | translate}}"></ds-themed-loading></ng-container>
diff --git a/src/app/info/end-user-agreement/end-user-agreement-content/end-user-agreement-content.component.html b/src/app/info/end-user-agreement/end-user-agreement-content/end-user-agreement-content.component.html
index d5e6de85d4..79edebd35a 100644
--- a/src/app/info/end-user-agreement/end-user-agreement-content/end-user-agreement-content.component.html
+++ b/src/app/info/end-user-agreement/end-user-agreement-content/end-user-agreement-content.component.html
@@ -63,7 +63,7 @@
 <p>We reserve the right, but not the obligation, to: (1) monitor the Site for violations of these Terms of Use; (2) take appropriate legal action against anyone who, in our sole discretion, violates the law or these Terms of Use, including without limitation, reporting such user to law enforcement authorities; (3) in our sole discretion and without limitation, refuse, restrict access to, limit the availability of, or disable (to the extent technologically feasible) any of your Contributions or any portion thereof; (4) in our sole discretion and without limitation, notice, or liability, to remove from the Site or otherwise disable all files and content that are excessive in size or are in any way burdensome to our systems; and (5) otherwise manage the Site in a manner designed to protect our rights and property and to facilitate the proper functioning of the Site.</p>
 
 <h2>Privacy policy</h2>
-<p>We care about data privacy and security. Please review our <a [routerLink]="['/info/privacy']" target="_blank" rel="noopener noreferrer">Privacy Policy</a>. By using the Site, you agree to be bound by our Privacy Policy, which is incorporated into these Terms of Use.</p>
+<p>We care about data privacy and security. Please review our <a class="link-contrast" [routerLink]="['/info/privacy']" target="_blank" rel="noopener noreferrer">Privacy Policy</a>. By using the Site, you agree to be bound by our Privacy Policy, which is incorporated into these Terms of Use.</p>
 <p>Please be advised the Site is hosted in {{ 'info.end-user-agreement.hosting-country' | translate }}. If you access the Site from any other region of the world with laws or other requirements governing personal data collection, use, or disclosure that differ from applicable laws in {{ 'info.end-user-agreement.hosting-country' | translate }}, then through your continued use of the Site, you are transferring your data to {{ 'info.end-user-agreement.hosting-country' | translate }}, and you agree to have your data transferred to and processed in {{ 'info.end-user-agreement.hosting-country' | translate }}.</p>
 
 <h2>Term and termination</h2>
@@ -92,4 +92,4 @@
 <h2>Miscellaneous</h2>
 <p>These Terms of Use and any policies or operating rules posted by us on the Site or in respect to the Site constitute the entire agreement and understanding between you and us. Our failure to exercise or enforce any right or provision of these Terms of Use shall not operate as a waiver of such right or provision. These Terms of Use operate to the fullest extent permissible by law. We may assign any or all of our rights and obligations to others at any time. We shall not be responsible or liable for any loss, damage, delay, or failure to act caused by any cause beyond our reasonable control. If any provision or part of a provision of these Terms of Use is determined to be unlawful, void, or unenforceable, that provision or part of the provision is deemed severable from these Terms of Use and does not affect the validity and enforceability of any remaining provisions. There is no joint venture, partnership, employment or agency relationship created between you and us as a result of these Terms of Use or use of the Site. You agree that these Terms of Use will not be construed against us by virtue of having drafted them. You hereby waive any and all defenses you may have based on the electronic form of these Terms of Use and the lack of signing by the parties hereto to execute these Terms of Use.</p>
 
-<p><a [routerLink]="'.'" fragment="ref-a" id="comment-a">[a]</a>&nbsp;The DSpace software used to run this site is open source. Options for reuse and reproduction of the DSpace software is governed by its open source license: <a href="https://github.com/DSpace/DSpace/blob/main/LICENSE" target="_blank" rel="noopener noreferrer">https://github.com/DSpace/DSpace/blob/main/LICENSE</a></p>
\ No newline at end of file
+<p><a class="link-contrast" [routerLink]="'.'" fragment="ref-a" id="comment-a">[a]</a>&nbsp;The DSpace software used to run this site is open source. Options for reuse and reproduction of the DSpace software is governed by its open source license: <a class="link-contrast" href="https://github.com/DSpace/DSpace/blob/main/LICENSE" target="_blank" rel="noopener noreferrer">https://github.com/DSpace/DSpace/blob/main/LICENSE</a></p>
diff --git a/src/app/info/end-user-agreement/end-user-agreement.component.html b/src/app/info/end-user-agreement/end-user-agreement.component.html
index 2ab0005c69..ceb2ad23a4 100644
--- a/src/app/info/end-user-agreement/end-user-agreement.component.html
+++ b/src/app/info/end-user-agreement/end-user-agreement.component.html
@@ -7,7 +7,7 @@
 
     <div class="d-flex mt-4">
       <button id="button-cancel" type="button" (click)="cancel()" class="btn btn-outline-secondary mr-auto">{{ 'info.end-user-agreement.buttons.cancel' | translate }}</button>
-      <button id="button-save" type="submit" class="btn btn-primary" [disabled]="!accepted">{{ 'info.end-user-agreement.buttons.save' | translate }}</button>
+      <button id="button-save" type="submit" class="btn btn-primary" [dsBtnDisabled]="!accepted">{{ 'info.end-user-agreement.buttons.save' | translate }}</button>
     </div>
   </form>
 </div>
diff --git a/src/app/info/end-user-agreement/end-user-agreement.component.spec.ts b/src/app/info/end-user-agreement/end-user-agreement.component.spec.ts
index dc4f4cf412..c7735f0579 100644
--- a/src/app/info/end-user-agreement/end-user-agreement.component.spec.ts
+++ b/src/app/info/end-user-agreement/end-user-agreement.component.spec.ts
@@ -11,6 +11,7 @@ import { Store } from '@ngrx/store';
 import { By } from '@angular/platform-browser';
 import { LogOutAction } from '../../core/auth/auth.actions';
 import { ActivatedRouteStub } from '../../shared/testing/active-router.stub';
+import {BtnDisabledDirective} from '../../shared/btn-disabled.directive';
 
 describe('EndUserAgreementComponent', () => {
   let component: EndUserAgreementComponent;
@@ -49,7 +50,7 @@ describe('EndUserAgreementComponent', () => {
     init();
     TestBed.configureTestingModule({
       imports: [TranslateModule.forRoot()],
-      declarations: [EndUserAgreementComponent],
+      declarations: [EndUserAgreementComponent, BtnDisabledDirective],
       providers: [
         { provide: EndUserAgreementService, useValue: endUserAgreementService },
         { provide: NotificationsService, useValue: notificationsService },
@@ -81,7 +82,8 @@ describe('EndUserAgreementComponent', () => {
 
     it('should disable the save button', () => {
       const button = fixture.debugElement.query(By.css('#button-save')).nativeElement;
-      expect(button.disabled).toBeTruthy();
+      expect(button.getAttribute('aria-disabled')).toBe('true');
+      expect(button.classList.contains('disabled')).toBeTrue();
     });
   });
 
diff --git a/src/app/info/feedback/feedback-form/feedback-form.component.html b/src/app/info/feedback/feedback-form/feedback-form.component.html
index 02745f2580..c5c4b460a2 100644
--- a/src/app/info/feedback/feedback-form/feedback-form.component.html
+++ b/src/app/info/feedback/feedback-form/feedback-form.component.html
@@ -1,45 +1,49 @@
 <div class="row row-offcanvas row-offcanvas-right">
-  <div class="col-xs-12 col-sm-12 col-md-9 main-content">
-    <form class="primary" [formGroup]="feedbackForm" (ngSubmit)="createFeedback()">
-      <h2>{{ 'info.feedback.head' | translate }}</h2>
-      <p>{{ 'info.feedback.info' | translate }}</p>
-      <fieldset class="col p-0">
-        <div class="row">
-          <div class="control-group col-sm-12">
-            <label class="control-label" for="email">{{ 'info.feedback.email-label' | translate }}&nbsp;</label>
-            <input id="email" class="form-control" name="email" type="text" value="" formControlName="email" autofocus="autofocus" title="{{ 'info.feedback.email_help' | translate }}">
-            <small class="text-muted">{{ 'info.feedback.email_help' | translate }}</small>
-          </div>
+  <div class="col-xs-12 col-sm-12 col-md-9">
+    <h1>{{ 'info.feedback.head' | translate }}</h1>
+    <p>{{ 'info.feedback.info' | translate }}</p>
+    <form [formGroup]="feedbackForm" (ngSubmit)="createFeedback()" class="col p-0">
+      <div class="row mt-3">
+        <div class="control-group col-sm-12">
+          <label class="control-label" for="email">{{ 'info.feedback.email-label' | translate }}&nbsp;</label>
+          <input id="email" class="form-control" name="email" type="text" value="" formControlName="email" autofocus="autofocus" title="{{ 'info.feedback.email_help' | translate }}">
+          <small class="text-muted">{{ 'info.feedback.email_help' | translate }}</small>
         </div>
+      </div>
 
-        <ng-container *ngIf="feedbackForm.controls.email.invalid && (feedbackForm.controls.email.dirty || feedbackForm.controls.email.touched)"
-          class="alert">
+      <div *ngIf="feedbackForm.controls.email.invalid && (feedbackForm.controls.email.dirty || feedbackForm.controls.email.touched)" class="row">
+        <div class="col-sm-12 alert">
           <ds-error *ngIf="feedbackForm.controls.email.errors?.required" message="{{'info.feedback.error.email.required' | translate}}"></ds-error>
           <ds-error *ngIf="feedbackForm.controls.email.errors?.pattern" message="{{'info.feedback.error.email.required' | translate}}"></ds-error>
-        </ng-container>
-        <div class="row">
-          <div class="control-group col-sm-12">
-            <label class="control-label" for="comments">{{ 'info.feedback.comments' | translate }}:&nbsp;</label>
-            <textarea id="comments" formControlName="message" class="form-control" name="message" cols="20" rows="5"> </textarea>
-          </div>
         </div>
-        <ng-container *ngIf="feedbackForm.controls.message.invalid && (feedbackForm.controls.message.dirty || feedbackForm.controls.message.touched)"
-          class="alert">
+      </div>
+
+      <div class="row mt-3">
+        <div class="control-group col-sm-12">
+          <label class="control-label" for="comments">{{ 'info.feedback.comments' | translate }}:&nbsp;</label>
+          <textarea id="comments" formControlName="message" class="form-control" name="message" cols="20" rows="5"> </textarea>
+        </div>
+      </div>
+
+      <div *ngIf="feedbackForm.controls.message.invalid && (feedbackForm.controls.message.dirty || feedbackForm.controls.message.touched)" class="row">
+        <div class="col-sm-12 alert">
           <ds-error *ngIf="feedbackForm.controls.message.errors?.required" message="{{'info.feedback.error.message.required' | translate}}"></ds-error>
-        </ng-container>
-        <div class="row">
-          <div class="control-group col-sm-12">
-            <label class="control-label" for="page">{{ 'info.feedback.page-label' | translate }}&nbsp;</label>
-            <input id="page" readonly class="form-control" name="page" type="text" value="" formControlName="page" autofocus="autofocus" title="{{ 'info.feedback.page_help' | translate }}">
-            <small class="text-muted">{{ 'info.feedback.page_help' | translate }}</small>
-          </div>
         </div>
-        <div class="row py-2">
-          <div class="control-group col-sm-12 text-right">
-            <button [disabled]="!feedbackForm.valid" class="btn btn-primary" name="submit" type="submit">{{ 'info.feedback.send' | translate }}</button>
-          </div>
+      </div>
+
+      <div class="row mt-3">
+        <div class="control-group col-sm-12">
+          <label class="control-label" for="page">{{ 'info.feedback.page-label' | translate }}&nbsp;</label>
+          <input id="page" readonly class="form-control" name="page" type="text" value="" formControlName="page" autofocus="autofocus" title="{{ 'info.feedback.page_help' | translate }}">
+          <small class="text-muted">{{ 'info.feedback.page_help' | translate }}</small>
         </div>
-      </fieldset>
+      </div>
+
+      <div class="row mt-3">
+        <div class="control-group col-sm-12 text-right">
+          <button [dsBtnDisabled]="!feedbackForm.valid" class="btn btn-primary" name="submit" type="submit">{{ 'info.feedback.send' | translate }}</button>
+        </div>
+      </div>
     </form>
   </div>
 </div>
diff --git a/src/app/info/feedback/feedback-form/feedback-form.component.spec.ts b/src/app/info/feedback/feedback-form/feedback-form.component.spec.ts
index c3d38a2876..7b7c6e28b6 100644
--- a/src/app/info/feedback/feedback-form/feedback-form.component.spec.ts
+++ b/src/app/info/feedback/feedback-form/feedback-form.component.spec.ts
@@ -18,6 +18,7 @@ import { Router } from '@angular/router';
 import { RouterMock } from '../../../shared/mocks/router.mock';
 import { NativeWindowService } from '../../../core/services/window.service';
 import { NativeWindowMockFactory } from '../../../shared/mocks/mock-native-window-ref';
+import {BtnDisabledDirective} from '../../../shared/btn-disabled.directive';
 
 
 describe('FeedbackFormComponent', () => {
@@ -38,7 +39,7 @@ describe('FeedbackFormComponent', () => {
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
       imports: [TranslateModule.forRoot()],
-      declarations: [FeedbackFormComponent],
+      declarations: [FeedbackFormComponent, BtnDisabledDirective],
       providers: [
         { provide: RouteService, useValue: routeServiceStub },
         { provide: UntypedFormBuilder, useValue: new UntypedFormBuilder() },
@@ -72,7 +73,8 @@ describe('FeedbackFormComponent', () => {
   });
 
   it('should have disabled button', () => {
-    expect(de.query(By.css('button')).nativeElement.disabled).toBeTrue();
+    expect(de.query(By.css('button')).nativeElement.getAttribute('aria-disabled')).toBe('true');
+    expect(de.query(By.css('button')).nativeElement.classList.contains('disabled')).toBeTrue();
   });
 
   describe('when message is inserted', () => {
@@ -83,7 +85,8 @@ describe('FeedbackFormComponent', () => {
     });
 
     it('should not have disabled button', () => {
-      expect(de.query(By.css('button')).nativeElement.disabled).toBeFalse();
+      expect(de.query(By.css('button')).nativeElement.getAttribute('aria-disabled')).toBe('false');
+      expect(de.query(By.css('button')).nativeElement.classList.contains('disabled')).toBeFalse();
     });
 
     it('on submit should call createFeedback of feedbackDataServiceStub service', () => {
diff --git a/src/app/info/privacy/privacy-content/privacy-content.component.html b/src/app/info/privacy/privacy-content/privacy-content.component.html
index f29a786e8b..58ce7efb02 100644
--- a/src/app/info/privacy/privacy-content/privacy-content.component.html
+++ b/src/app/info/privacy/privacy-content/privacy-content.component.html
@@ -22,7 +22,7 @@
 <h2>Information we collect about you and how we collect it</h2>
 <p>We collect several types of information from and about users of our Website, including information:</p>
 <ul>
-  <li>by which you may be personally identified, such as name, e-mail address, telephone number, or any other identifier by which you may be contacted online or offline ("personal information"); and/or</li>
+  <li>by which you may be personally identified, such as name, email address, telephone number, or any other identifier by which you may be contacted online or offline ("personal information"); and/or</li>
   <li>about your internet connection, the equipment you use to access our Website and usage details.</li>
 </ul>
 <p>We collect this information:</p>
@@ -83,9 +83,9 @@
 <p>We may also disclose your personal information:</p>
 <ul>
   <li>To comply with any court order, law, or legal process, including to respond to any government or regulatory request.</li>
-  <li>To enforce or apply our <a [routerLink]="['/info/end-user-agreement']" target="_blank" rel="noopener noreferrer">End User Agreement</a> and other agreements, including for billing and collection purposes.</li>
+  <li>To enforce or apply our <a class="link-contrast" [routerLink]="['/info/end-user-agreement']" target="_blank" rel="noopener noreferrer">End User Agreement</a> and other agreements, including for billing and collection purposes.</li>
   <li>If we believe disclosure is necessary or appropriate to protect the rights, property, or safety of the Company, our customers, or others.</li>
 </ul>
 
 <h2>Changes to our privacy policy</h2>
-<p>It is our policy to post any changes we make to our privacy policy on this page. The date the privacy policy was last revised is identified at the top of the page. You are responsible for periodically visiting our Website and this privacy policy to check for any changes.</p>
\ No newline at end of file
+<p>It is our policy to post any changes we make to our privacy policy on this page. The date the privacy policy was last revised is identified at the top of the page. You are responsible for periodically visiting our Website and this privacy policy to check for any changes.</p>
diff --git a/src/app/item-page/alerts/item-alerts.component.html b/src/app/item-page/alerts/item-alerts.component.html
index cd71d23a91..b9b30f283b 100644
--- a/src/app/item-page/alerts/item-alerts.component.html
+++ b/src/app/item-page/alerts/item-alerts.component.html
@@ -6,7 +6,7 @@
         <ds-alert [type]="AlertTypeEnum.Warning">
             <div class="d-flex justify-content-between flex-wrap">
                 <span class="align-self-center">{{'item.alerts.withdrawn' | translate}}</span>
-                <a routerLink="/home" class="btn btn-primary btn-sm">{{"404.link.home-page" | translate}}</a>
+                <a routerLink="/home" class="btn btn-primary btn-sm" role="link" tabindex="0">{{"404.link.home-page" | translate}}</a>
             </div>
         </ds-alert>
     </div>
diff --git a/src/app/item-page/alerts/item-alerts.component.ts b/src/app/item-page/alerts/item-alerts.component.ts
index d7a84db015..2b1df58c9f 100644
--- a/src/app/item-page/alerts/item-alerts.component.ts
+++ b/src/app/item-page/alerts/item-alerts.component.ts
@@ -1,6 +1,6 @@
 import { Component, Input } from '@angular/core';
 import { Item } from '../../core/shared/item.model';
-import { AlertType } from '../../shared/alert/aletr-type';
+import { AlertType } from '../../shared/alert/alert-type';
 
 @Component({
   selector: 'ds-item-alerts',
diff --git a/src/app/item-page/bitstreams/request-a-copy/bitstream-request-a-copy-page.component.html b/src/app/item-page/bitstreams/request-a-copy/bitstream-request-a-copy-page.component.html
index 1fae737fdb..5b4b1bda52 100644
--- a/src/app/item-page/bitstreams/request-a-copy/bitstream-request-a-copy-page.component.html
+++ b/src/app/item-page/bitstreams/request-a-copy/bitstream-request-a-copy-page.component.html
@@ -1,5 +1,5 @@
 <div class="container">
-    <h3 class="mb-4">{{'bitstream-request-a-copy.header' | translate}}</h3>
+    <h1 class="mb-4">{{'bitstream-request-a-copy.header' | translate}}</h1>
     <div *ngIf="canDownload$|async" class="alert alert-success">
         <span>{{'bitstream-request-a-copy.alert.canDownload1' | translate}}</span>
         <a [routerLink]="getBitstreamLink()">{{'bitstream-request-a-copy.alert.canDownload2'| translate}}</a>
@@ -79,7 +79,7 @@
             </a>
 
             <button
-                    [disabled]="requestCopyForm.invalid"
+                    [dsBtnDisabled]="requestCopyForm.invalid"
                     class="btn btn-default btn-primary"
                     (click)="onSubmit()">{{'bitstream-request-a-copy.submit' | translate}}</button>
         </div>
diff --git a/src/app/item-page/bitstreams/upload/upload-bitstream.component.html b/src/app/item-page/bitstreams/upload/upload-bitstream.component.html
index 1732da1235..530471135c 100644
--- a/src/app/item-page/bitstreams/upload/upload-bitstream.component.html
+++ b/src/app/item-page/bitstreams/upload/upload-bitstream.component.html
@@ -2,7 +2,7 @@
   <ng-container *ngIf="bundles">
     <div class="row">
       <div class="col-12 mb-2">
-        <h2>{{'item.bitstreams.upload.title' | translate}}</h2>
+        <h1>{{'item.bitstreams.upload.title' | translate}}</h1>
         <ng-container *ngVar="(itemRD$ | async)?.payload as item">
           <div *ngIf="item">
             <span class="font-weight-bold">{{'item.bitstreams.upload.item' | translate}}</span>
diff --git a/src/app/item-page/edit-item-page/abstract-item-update/abstract-item-update.component.ts b/src/app/item-page/edit-item-page/abstract-item-update/abstract-item-update.component.ts
index 80002f614b..d62c380b6b 100644
--- a/src/app/item-page/edit-item-page/abstract-item-update/abstract-item-update.component.ts
+++ b/src/app/item-page/edit-item-page/abstract-item-update/abstract-item-update.component.ts
@@ -6,14 +6,14 @@ import { ObjectUpdatesService } from '../../../core/data/object-updates/object-u
 import { ActivatedRoute, Router, Data } from '@angular/router';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
 import { TranslateService } from '@ngx-translate/core';
-import { first, map, switchMap, tap } from 'rxjs/operators';
+import { take, map, switchMap, tap } from 'rxjs/operators';
 import { RemoteData } from '../../../core/data/remote-data';
 import { AbstractTrackableComponent } from '../../../shared/trackable/abstract-trackable.component';
 import { environment } from '../../../../environments/environment';
 import { getItemPageRoute } from '../../item-page-routing-paths';
 import { getAllSucceededRemoteData } from '../../../core/shared/operators';
 import { hasValue } from '../../../shared/empty.util';
-import { ITEM_PAGE_LINKS_TO_FOLLOW } from '../../item.resolver';
+import { getItemPageLinksToFollow } from '../../item.resolver';
 import { FieldUpdate } from '../../../core/data/object-updates/field-update.model';
 import { FieldUpdates } from '../../../core/data/object-updates/field-updates.model';
 
@@ -54,7 +54,7 @@ export class AbstractItemUpdateComponent extends AbstractTrackableComponent impl
     public translateService: TranslateService,
     public route: ActivatedRoute
   ) {
-    super(objectUpdatesService, notificationsService, translateService);
+    super(objectUpdatesService, notificationsService, translateService, router);
   }
 
   /**
@@ -72,20 +72,17 @@ export class AbstractItemUpdateComponent extends AbstractTrackableComponent impl
           this.item = rd.payload;
         }),
         switchMap((rd: RemoteData<Item>) => {
-          return this.itemService.findByHref(rd.payload._links.self.href, true, true, ...ITEM_PAGE_LINKS_TO_FOLLOW);
+          return this.itemService.findByHref(rd.payload._links.self.href, true, true, ...getItemPageLinksToFollow());
         }),
         getAllSucceededRemoteData()
       ).subscribe((rd: RemoteData<Item>) => {
         this.setItem(rd.payload);
       });
     }
+    super.ngOnInit();
 
     this.discardTimeOut = environment.item.edit.undoTimeout;
-    this.url = this.router.url;
-    if (this.url.indexOf('?') > 0) {
-      this.url = this.url.substr(0, this.url.indexOf('?'));
-    }
-    this.hasChanges().pipe(first()).subscribe((hasChanges) => {
+    this.hasChanges().pipe(take(1)).subscribe((hasChanges) => {
       if (!hasChanges) {
         this.initializeOriginalFields();
       } else {
@@ -170,7 +167,7 @@ export class AbstractItemUpdateComponent extends AbstractTrackableComponent impl
    */
   private checkLastModified() {
     const currentVersion = this.item.lastModified;
-    this.objectUpdatesService.getLastModified(this.url).pipe(first()).subscribe(
+    this.objectUpdatesService.getLastModified(this.url).pipe(take(1)).subscribe(
       (updateVersion: Date) => {
         if (updateVersion.getDate() !== currentVersion.getDate()) {
           this.notificationsService.warning(this.getNotificationTitle('outdated'), this.getNotificationContent('outdated'));
diff --git a/src/app/item-page/edit-item-page/edit-item-page.component.html b/src/app/item-page/edit-item-page/edit-item-page.component.html
index c370fe4f20..63dadef3b1 100644
--- a/src/app/item-page/edit-item-page/edit-item-page.component.html
+++ b/src/app/item-page/edit-item-page/edit-item-page.component.html
@@ -1,14 +1,17 @@
 <div class="container">
     <div class="row">
         <div class="col-12">
-            <h2 class="border-bottom">{{'item.edit.head' | translate}}</h2>
+            <h1 class="border-bottom">{{'item.edit.head' | translate}}</h1>
             <div class="pt-2">
                 <ul class="nav nav-tabs justify-content-start" role="tablist">
-                    <li *ngFor="let page of pages" class="nav-item" [attr.aria-selected]="page.page === currentPage" role="tab">
+                    <li *ngFor="let page of pages" class="nav-item" role="presentation">
                         <a *ngIf="(page.enabled | async)"
+                           [attr.aria-selected]="page.page === currentPage"
                            class="nav-link"
                            [ngClass]="{'active' : page.page === currentPage}"
-                           [routerLink]="['./' + page.page]">
+                           [routerLink]="['./' + page.page]"
+                           [attr.data-test]="page.page"
+                           role="tab">
                             {{'item.edit.tabs.' + page.page + '.head' | translate}}
                         </a>
                         <span [ngbTooltip]="'item.edit.tabs.disabled.tooltip' | translate">
diff --git a/src/app/item-page/edit-item-page/edit-item-page.module.ts b/src/app/item-page/edit-item-page/edit-item-page.module.ts
index 0a75394ddd..06e5799adf 100644
--- a/src/app/item-page/edit-item-page/edit-item-page.module.ts
+++ b/src/app/item-page/edit-item-page/edit-item-page.module.ts
@@ -15,7 +15,6 @@ import { ItemPrivateComponent } from './item-private/item-private.component';
 import { ItemPublicComponent } from './item-public/item-public.component';
 import { ItemDeleteComponent } from './item-delete/item-delete.component';
 import { ItemBitstreamsComponent } from './item-bitstreams/item-bitstreams.component';
-import { ItemEditBitstreamComponent } from './item-bitstreams/item-edit-bitstream/item-edit-bitstream.component';
 import { SearchPageModule } from '../../search-page/search-page.module';
 import { ItemCollectionMapperComponent } from './item-collection-mapper/item-collection-mapper.component';
 import { ItemRelationshipsComponent } from './item-relationships/item-relationships.component';
@@ -26,8 +25,6 @@ import { ItemMoveComponent } from './item-move/item-move.component';
 import { ItemEditBitstreamBundleComponent } from './item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component';
 import { BundleDataService } from '../../core/data/bundle-data.service';
 import { DragDropModule } from '@angular/cdk/drag-drop';
-import { ItemEditBitstreamDragHandleComponent } from './item-bitstreams/item-edit-bitstream-drag-handle/item-edit-bitstream-drag-handle.component';
-import { PaginatedDragAndDropBitstreamListComponent } from './item-bitstreams/item-edit-bitstream-bundle/paginated-drag-and-drop-bitstream-list/paginated-drag-and-drop-bitstream-list.component';
 import { VirtualMetadataComponent } from './virtual-metadata/virtual-metadata.component';
 import { ItemVersionHistoryComponent } from './item-version-history/item-version-history.component';
 import { ItemAuthorizationsComponent } from './item-authorizations/item-authorizations.component';
@@ -46,6 +43,9 @@ import { ResultsBackButtonModule } from '../../shared/results-back-button/result
 import {
   AccessControlFormModule
 } from '../../shared/access-control-form-container/access-control-form.module';
+import {
+  EditRelationshipListWrapperComponent
+} from './item-relationships/edit-relationship-list-wrapper/edit-relationship-list-wrapper.component';
 
 /**
  * Module that contains all components related to the Edit Item page administrator functionality
@@ -80,20 +80,18 @@ import {
     ItemRelationshipsComponent,
     ItemBitstreamsComponent,
     ItemVersionHistoryComponent,
-    ItemEditBitstreamComponent,
     ItemEditBitstreamBundleComponent,
-    PaginatedDragAndDropBitstreamListComponent,
     EditRelationshipComponent,
     EditRelationshipListComponent,
     ItemCollectionMapperComponent,
     ItemMoveComponent,
-    ItemEditBitstreamDragHandleComponent,
     VirtualMetadataComponent,
     ItemAuthorizationsComponent,
     IdentifierDataComponent,
     ItemRegisterDoiComponent,
     ItemCurateComponent,
     ItemAccessControlComponent,
+    EditRelationshipListWrapperComponent,
   ],
   providers: [
     BundleDataService,
diff --git a/src/app/item-page/edit-item-page/edit-item-page.routing.module.ts b/src/app/item-page/edit-item-page/edit-item-page.routing.module.ts
index f22027916f..5266b1b926 100644
--- a/src/app/item-page/edit-item-page/edit-item-page.routing.module.ts
+++ b/src/app/item-page/edit-item-page/edit-item-page.routing.module.ts
@@ -38,6 +38,8 @@ import { ItemPageBitstreamsGuard } from './item-page-bitstreams.guard';
 import { ItemPageRelationshipsGuard } from './item-page-relationships.guard';
 import { ItemPageVersionHistoryGuard } from './item-page-version-history.guard';
 import { ItemPageCollectionMapperGuard } from './item-page-collection-mapper.guard';
+import { ItemPageCurateGuard } from './item-page-curate.guard';
+import { ItemPageAccessControlGuard } from './item-page-access-control.guard';
 import { ThemedDsoEditMetadataComponent } from '../../dso-shared/dso-edit-metadata/themed-dso-edit-metadata.component';
 import { ItemPageRegisterDoiGuard } from './item-page-register-doi.guard';
 import { ItemCurateComponent } from './item-curate/item-curate.component';
@@ -87,7 +89,8 @@ import { ItemAccessControlComponent } from './item-access-control/item-access-co
               {
                 path: 'curate',
                 component: ItemCurateComponent,
-                data: { title: 'item.edit.tabs.curate.title', showBreadcrumbs: true }
+                data: { title: 'item.edit.tabs.curate.title', showBreadcrumbs: true },
+                canActivate: [ItemPageCurateGuard]
               },
               {
                 path: 'relationships',
@@ -116,7 +119,8 @@ import { ItemAccessControlComponent } from './item-access-control/item-access-co
               {
                 path: 'access-control',
                 component: ItemAccessControlComponent,
-                data: { title: 'item.edit.tabs.access-control.title', showBreadcrumbs: true }
+                data: { title: 'item.edit.tabs.access-control.title', showBreadcrumbs: true },
+                canActivate: [ItemPageAccessControlGuard]
               },
               {
                 path: 'mapper',
@@ -202,11 +206,13 @@ import { ItemAccessControlComponent } from './item-access-control/item-access-co
     ItemPageWithdrawGuard,
     ItemPageAdministratorGuard,
     ItemPageMetadataGuard,
+    ItemPageCurateGuard,
     ItemPageStatusGuard,
     ItemPageBitstreamsGuard,
     ItemPageRelationshipsGuard,
     ItemPageVersionHistoryGuard,
     ItemPageCollectionMapperGuard,
+    ItemPageAccessControlGuard,
     ItemPageRegisterDoiGuard,
   ]
 })
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.html b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.html
index 4cb9577fcb..9447e2560a 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.html
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.html
@@ -1,44 +1,47 @@
 <div class="item-bitstreams" *ngVar="(bundles$ | async) as bundles">
+  <div class="mt-2" id="reorder-description">
+    <ds-alert [content]="'item.edit.bitstreams.info-alert'" [type]="AlertType.Info"></ds-alert>
+  </div>
+
   <div class="button-row top d-flex mt-2 space-children-mr">
     <button class="mr-auto btn btn-success"
+            [attr.aria-label]="'item.edit.bitstreams.upload-button' | translate"
             [routerLink]="[itemPageRoute, 'bitstreams', 'new']"><i
             class="fas fa-upload"></i>
       <span class="d-none d-sm-inline">&nbsp;{{"item.edit.bitstreams.upload-button" | translate}}</span>
     </button>
-    <button class="btn btn-warning" *ngIf="isReinstatable() | async"
+    <button class="btn btn-warning" *ngIf="isReinstatable$ | async"
+            [attr.aria-label]="'item.edit.bitstreams.reinstate-button' | translate"
             (click)="reinstate()"><i
             class="fas fa-undo-alt"></i>
       <span class="d-none d-sm-inline">&nbsp;{{"item.edit.bitstreams.reinstate-button" | translate}}</span>
     </button>
-    <button class="btn btn-primary" [disabled]="!(hasChanges() | async) || submitting"
+    <button class="btn btn-primary" [dsBtnDisabled]="(hasChanges$ | async) !== true || submitting"
+            [attr.aria-label]="'item.edit.bitstreams.save-button' | translate"
             (click)="submit()"><i
             class="fas fa-save"></i>
       <span class="d-none d-sm-inline">&nbsp;{{"item.edit.bitstreams.save-button" | translate}}</span>
     </button>
-    <button class="btn btn-danger" *ngIf="!(isReinstatable() | async)"
-            [disabled]="!(hasChanges() | async) || submitting"
+    <button class="btn btn-danger" *ngIf="(isReinstatable$ | async) !== true"
+            [attr.aria-label]="'item.edit.bitstreams.discard-button' | translate"
+            [dsBtnDisabled]="(hasChanges$ | async) !== true || submitting"
             (click)="discard()"><i
             class="fas fa-times"></i>
       <span class="d-none d-sm-inline">&nbsp;{{"item.edit.bitstreams.discard-button" | translate}}</span>
     </button>
   </div>
 
-  <div *ngIf="item && bundles?.length > 0" class="container table-bordered mt-4">
-    <div class="row header-row font-weight-bold">
-      <div class="{{columnSizes.columns[0].buildClasses()}} row-element">
-        <ds-item-edit-bitstream-drag-handle></ds-item-edit-bitstream-drag-handle>
-        {{'item.edit.bitstreams.headers.name' | translate}}
-      </div>
-      <div class="{{columnSizes.columns[1].buildClasses()}} row-element">{{'item.edit.bitstreams.headers.description' | translate}}</div>
-      <div class="{{columnSizes.columns[2].buildClasses()}} text-center row-element">{{'item.edit.bitstreams.headers.format' | translate}}</div>
-      <div class="{{columnSizes.columns[3].buildClasses()}} text-center row-element">{{'item.edit.bitstreams.headers.actions' | translate}}</div>
-    </div>
-    <ds-item-edit-bitstream-bundle *ngFor="let bundle of bundles"
+  <div *ngIf="item && bundles?.length > 0" class="mt-4 table-border scrollable-table" [ngClass]="{'disabled-overlay': (isProcessingMoveRequest | async)}">
+    <ds-item-edit-bitstream-bundle *ngFor="let bundle of bundles; first as isFirst"
                                    [bundle]="bundle"
                                    [item]="item"
                                    [columnSizes]="columnSizes"
-                                   (dropObject)="dropBitstream(bundle, $event)">
+                                   [isFirstTable]="isFirst"
+                                   aria-describedby="reorder-description">
     </ds-item-edit-bitstream-bundle>
+    <div class="d-flex justify-content-center" *ngIf="showLoadMoreLink$ | async">
+      <button class="btn btn-link my-3" (click)="loadBundles()"> {{'item.edit.bitstreams.load-more.link' | translate}}</button>
+    </div>
   </div>
   <div *ngIf="bundles?.length === 0"
        class="alert alert-info w-100 d-inline-block mt-4" role="alert">
@@ -48,18 +51,21 @@
 
   <div class="button-row bottom">
     <div class="mt-4 float-right space-children-mr ml-gap">
-      <button class="btn btn-warning" *ngIf="isReinstatable() | async"
+      <button class="btn btn-warning" *ngIf="isReinstatable$ | async"
+              [attr.aria-label]="'item.edit.bitstreams.reinstate-button' | translate"
               (click)="reinstate()"><i
         class="fas fa-undo-alt"></i>
         <span class="d-none d-sm-inline">&nbsp;{{"item.edit.bitstreams.reinstate-button" | translate}}</span>
       </button>
-      <button class="btn btn-primary" [disabled]="!(hasChanges() | async) || submitting"
+      <button class="btn btn-primary" [dsBtnDisabled]="(hasChanges$ | async) !== true || submitting"
+              [attr.aria-label]="'item.edit.bitstreams.save-button' | translate"
               (click)="submit()"><i
         class="fas fa-save"></i>
         <span class="d-none d-sm-inline">&nbsp;{{"item.edit.bitstreams.save-button" | translate}}</span>
       </button>
-      <button class="btn btn-danger" *ngIf="!(isReinstatable() | async)"
-              [disabled]="!(hasChanges() | async) || submitting"
+      <button class="btn btn-danger" *ngIf="(isReinstatable$ | async) !== true"
+              [attr.aria-label]="'item.edit.bitstreams.discard-button' | translate"
+              [dsBtnDisabled]="(hasChanges$ | async) !== true || submitting"
               (click)="discard()"><i
         class="fas fa-times"></i>
         <span class="d-none d-sm-inline">&nbsp;{{"item.edit.bitstreams.discard-button" | translate}}</span>
@@ -67,3 +73,5 @@
     </div>
   </div>
 </div>
+
+<ds-themed-loading *ngIf="isProcessingMoveRequest | async" class="loading-overlay"></ds-themed-loading>
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.scss b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.scss
index 7de575b785..7fd1f4b31e 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.scss
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.scss
@@ -1,23 +1,4 @@
-.header-row {
-  color: var(--bs-table-dark-color);
-  background-color: var(--bs-table-dark-bg);
-  border-color: var(--bs-table-dark-border-color);
-}
-
-.bundle-row {
-  color: var(--bs-table-head-color);
-  background-color: var(--bs-table-head-bg);
-  border-color: var(--bs-table-border-color);
-}
-
-.row-element {
-  padding: 12px;
-  padding: 0.75em;
-  border-bottom: var(--bs-table-border-width) solid var(--bs-table-border-color);
-}
-
 .drag-handle {
-  visibility: hidden;
   &:hover {
     cursor: move;
   }
@@ -27,10 +8,6 @@
   cursor: move;
 }
 
-:host ::ng-deep .bitstream-row:hover .drag-handle, :host ::ng-deep .bitstream-row-drag-handle:focus .drag-handle {
-  visibility: visible !important;
-}
-
 .cdk-drag-preview {
   margin-left: 0;
   box-sizing: border-box;
@@ -54,3 +31,25 @@
 :host ::ng-deep .larger-tooltip .tooltip-inner {
   max-width: 500px;
 }
+
+.table-border {
+  border: 1px solid #dee2e6;
+}
+
+:host ::ng-deep .pagination {
+  padding-top: 0.5rem;
+}
+
+.scrollable-table {
+  overflow-x: auto;
+}
+
+.disabled-overlay {
+  opacity: 0.6;
+}
+
+.loading-overlay {
+  position: fixed;
+  top: 50%;
+  left: 50%;
+}
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.spec.ts b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.spec.ts
index 10e1812131..d26f815316 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.spec.ts
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.spec.ts
@@ -18,7 +18,6 @@ import { ObjectValuesPipe } from '../../../shared/utils/object-values-pipe';
 import { VarDirective } from '../../../shared/utils/var.directive';
 import { BundleDataService } from '../../../core/data/bundle-data.service';
 import { Bundle } from '../../../core/shared/bundle.model';
-import { RestResponse } from '../../../core/cache/response.models';
 import { SearchConfigurationService } from '../../../core/shared/search/search-configuration.service';
 import { RouterStub } from '../../../shared/testing/router.stub';
 import { getMockRequestService } from '../../../shared/mocks/request.service.mock';
@@ -26,6 +25,8 @@ import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } f
 import { createPaginatedList } from '../../../shared/testing/utils.test';
 import { FieldChangeType } from '../../../core/data/object-updates/field-change-type.model';
 import { BitstreamDataServiceStub } from '../../../shared/testing/bitstream-data-service.stub';
+import { ItemBitstreamsService } from './item-bitstreams.service';
+import { getItemBitstreamsServiceStub, ItemBitstreamsServiceStub } from './item-bitstreams.service.stub';
 
 let comp: ItemBitstreamsComponent;
 let fixture: ComponentFixture<ItemBitstreamsComponent>;
@@ -77,6 +78,7 @@ let objectCache: ObjectCacheService;
 let requestService: RequestService;
 let searchConfig: SearchConfigurationService;
 let bundleService: BundleDataService;
+let itemBitstreamsService: ItemBitstreamsServiceStub;
 
 describe('ItemBitstreamsComponent', () => {
   beforeEach(waitForAsync(() => {
@@ -145,9 +147,11 @@ describe('ItemBitstreamsComponent', () => {
       url: url
     });
     bundleService = jasmine.createSpyObj('bundleService', {
-      patch: observableOf(new RestResponse(true, 200, 'OK'))
+      patch: createSuccessfulRemoteDataObject$({}),
     });
 
+    itemBitstreamsService = getItemBitstreamsServiceStub();
+
     TestBed.configureTestingModule({
       imports: [TranslateModule.forRoot()],
       declarations: [ItemBitstreamsComponent, ObjectValuesPipe, VarDirective],
@@ -162,6 +166,7 @@ describe('ItemBitstreamsComponent', () => {
         { provide: RequestService, useValue: requestService },
         { provide: SearchConfigurationService, useValue: searchConfig },
         { provide: BundleDataService, useValue: bundleService },
+        { provide: ItemBitstreamsService, useValue: itemBitstreamsService },
         ChangeDetectorRef
       ], schemas: [
         NO_ERRORS_SCHEMA
@@ -182,42 +187,8 @@ describe('ItemBitstreamsComponent', () => {
       comp.submit();
     });
 
-    it('should call removeMultiple on the bitstreamService for the marked field', () => {
-      expect(bitstreamService.removeMultiple).toHaveBeenCalledWith([bitstream2]);
-    });
-
-    it('should not call removeMultiple on the bitstreamService for the unmarked field', () => {
-      expect(bitstreamService.removeMultiple).not.toHaveBeenCalledWith([bitstream1]);
-    });
-  });
-
-  describe('when dropBitstream is called', () => {
-    const event = {
-      fromIndex: 0,
-      toIndex: 50,
-      // eslint-disable-next-line no-empty,@typescript-eslint/no-empty-function
-      finish: () => {
-      }
-    };
-
-    beforeEach(() => {
-      comp.dropBitstream(bundle, event);
-    });
-  });
-
-  describe('when dropBitstream is called', () => {
-    beforeEach((done) => {
-      comp.dropBitstream(bundle, {
-        fromIndex: 0,
-        toIndex: 50,
-        finish: () => {
-          done();
-        }
-      });
-    });
-
-    it('should send out a patch for the move operation', () => {
-      expect(bundleService.patch).toHaveBeenCalled();
+    it('should call removeMarkedBitstreams on the itemBitstreamsService', () => {
+      expect(itemBitstreamsService.removeMarkedBitstreams).toHaveBeenCalled();
     });
   });
 
@@ -234,4 +205,114 @@ describe('ItemBitstreamsComponent', () => {
       expect(objectUpdatesService.reinstateFieldUpdates).toHaveBeenCalledWith(bundle.self);
     });
   });
+
+  describe('moveUp', () => {
+    it('should move the selected bitstream up', () => {
+      itemBitstreamsService.hasSelectedBitstream.and.returnValue(true);
+
+      const event = {
+        preventDefault: () => {/* Intentionally empty */},
+      } as KeyboardEvent;
+      comp.moveUp(event);
+
+      expect(itemBitstreamsService.moveSelectedBitstreamUp).toHaveBeenCalled();
+    });
+
+    it('should not do anything if no bitstream is selected', () => {
+      itemBitstreamsService.hasSelectedBitstream.and.returnValue(false);
+
+      const event = {
+        preventDefault: () => {/* Intentionally empty */},
+      } as KeyboardEvent;
+      comp.moveUp(event);
+
+      expect(itemBitstreamsService.moveSelectedBitstreamUp).not.toHaveBeenCalled();
+    });
+  });
+
+  describe('moveDown', () => {
+    it('should move the selected bitstream down', () => {
+      itemBitstreamsService.hasSelectedBitstream.and.returnValue(true);
+
+      const event = {
+        preventDefault: () => {/* Intentionally empty */},
+      } as KeyboardEvent;
+      comp.moveDown(event);
+
+      expect(itemBitstreamsService.moveSelectedBitstreamDown).toHaveBeenCalled();
+    });
+
+    it('should not do anything if no bitstream is selected', () => {
+      itemBitstreamsService.hasSelectedBitstream.and.returnValue(false);
+
+      const event = {
+        preventDefault: () => {/* Intentionally empty */},
+      } as KeyboardEvent;
+      comp.moveDown(event);
+
+      expect(itemBitstreamsService.moveSelectedBitstreamDown).not.toHaveBeenCalled();
+    });
+  });
+
+  describe('cancelSelection', () => {
+    it('should cancel the selection', () => {
+      itemBitstreamsService.hasSelectedBitstream.and.returnValue(true);
+
+      const event = {
+        preventDefault: () => {/* Intentionally empty */},
+      } as KeyboardEvent;
+      comp.cancelSelection(event);
+
+      expect(itemBitstreamsService.cancelSelection).toHaveBeenCalled();
+    });
+
+    it('should not do anything if no bitstream is selected', () => {
+      itemBitstreamsService.hasSelectedBitstream.and.returnValue(false);
+
+      const event = {
+        preventDefault: () => {/* Intentionally empty */},
+      } as KeyboardEvent;
+      comp.cancelSelection(event);
+
+      expect(itemBitstreamsService.cancelSelection).not.toHaveBeenCalled();
+    });
+  });
+
+  describe('clearSelection', () => {
+    it('should clear the selection', () => {
+      itemBitstreamsService.hasSelectedBitstream.and.returnValue(true);
+
+      const event = {
+        target: document.createElement('BODY'),
+        preventDefault: () => {/* Intentionally empty */},
+      } as unknown as KeyboardEvent;
+      comp.clearSelection(event);
+
+      expect(itemBitstreamsService.clearSelection).toHaveBeenCalled();
+    });
+
+    it('should not do anything if no bitstream is selected', () => {
+      itemBitstreamsService.hasSelectedBitstream.and.returnValue(false);
+
+      const event = {
+        target: document.createElement('BODY'),
+        preventDefault: () => {/* Intentionally empty */},
+      } as unknown as KeyboardEvent;
+      comp.clearSelection(event);
+
+      expect(itemBitstreamsService.clearSelection).not.toHaveBeenCalled();
+    });
+
+    it('should not do anything if the event target is not \'BODY\'', () => {
+      itemBitstreamsService.hasSelectedBitstream.and.returnValue(true);
+
+      const event = {
+        target: document.createElement('NOT-BODY'),
+        preventDefault: () => {/* Intentionally empty */},
+      } as unknown as KeyboardEvent;
+      comp.clearSelection(event);
+
+      expect(itemBitstreamsService.clearSelection).not.toHaveBeenCalled();
+    });
+  });
 });
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.ts b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.ts
index ee53bd919c..6d52ef5b4a 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.ts
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.ts
@@ -1,30 +1,29 @@
-import { ChangeDetectorRef, Component, NgZone, OnDestroy } from '@angular/core';
+import { ChangeDetectorRef, Component, NgZone, OnDestroy, HostListener } from '@angular/core';
 import { AbstractItemUpdateComponent } from '../abstract-item-update/abstract-item-update.component';
-import { filter, map, switchMap, take } from 'rxjs/operators';
-import { Observable, Subscription, zip as observableZip } from 'rxjs';
+import { map, switchMap, take } from 'rxjs/operators';
+import { Observable, Subscription, combineLatest, BehaviorSubject } from 'rxjs';
 import { ItemDataService } from '../../../core/data/item-data.service';
 import { ObjectUpdatesService } from '../../../core/data/object-updates/object-updates.service';
 import { ActivatedRoute, Router } from '@angular/router';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
 import { TranslateService } from '@ngx-translate/core';
 import { BitstreamDataService } from '../../../core/data/bitstream-data.service';
-import { hasValue, isNotEmpty } from '../../../shared/empty.util';
 import { ObjectCacheService } from '../../../core/cache/object-cache.service';
 import { RequestService } from '../../../core/data/request.service';
-import { getFirstSucceededRemoteData, getRemoteDataPayload } from '../../../core/shared/operators';
+import {
+  getFirstSucceededRemoteData,
+  getRemoteDataPayload,
+} from '../../../core/shared/operators';
 import { RemoteData } from '../../../core/data/remote-data';
 import { PaginatedList } from '../../../core/data/paginated-list.model';
 import { Bundle } from '../../../core/shared/bundle.model';
-import { Bitstream } from '../../../core/shared/bitstream.model';
 import { BundleDataService } from '../../../core/data/bundle-data.service';
 import { PaginatedSearchOptions } from '../../../shared/search/models/paginated-search-options.model';
-import { ResponsiveColumnSizes } from '../../../shared/responsive-table-sizes/responsive-column-sizes';
 import { ResponsiveTableSizes } from '../../../shared/responsive-table-sizes/responsive-table-sizes';
 import { NoContent } from '../../../core/shared/NoContent.model';
-import { Operation } from 'fast-json-patch';
-import { FieldUpdate } from '../../../core/data/object-updates/field-update.model';
-import { FieldUpdates } from '../../../core/data/object-updates/field-updates.model';
-import { FieldChangeType } from '../../../core/data/object-updates/field-change-type.model';
+import { ItemBitstreamsService } from './item-bitstreams.service';
+import { AlertType } from '../../../shared/alert/alert-type';
+import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
 
 @Component({
   selector: 'ds-item-bitstreams',
@@ -36,33 +35,27 @@ import { FieldChangeType } from '../../../core/data/object-updates/field-change-
  */
 export class ItemBitstreamsComponent extends AbstractItemUpdateComponent implements OnDestroy {
 
+  // Declared for use in template
+  protected readonly AlertType = AlertType;
+
   /**
    * The currently listed bundles
    */
-  bundles$: Observable<Bundle[]>;
+  private bundlesSubject = new BehaviorSubject<Bundle[]>([]);
 
   /**
    * The page options to use for fetching the bundles
    */
-  bundlesOptions = {
+  bundlesOptions: PaginationComponentOptions = Object.assign(new PaginationComponentOptions(), {
     id: 'bundles-pagination-options',
     currentPage: 1,
-    pageSize: 9999
-  } as any;
+    pageSize: 10,
+  });
 
   /**
    * The bootstrap sizes used for the columns within this table
    */
-  columnSizes = new ResponsiveTableSizes([
-    // Name column
-    new ResponsiveColumnSizes(2, 2, 3, 4, 4),
-    // Description column
-    new ResponsiveColumnSizes(2, 3, 3, 3, 3),
-    // Format column
-    new ResponsiveColumnSizes(2, 2, 2, 2, 2),
-    // Actions column
-    new ResponsiveColumnSizes(6, 5, 4, 3, 3)
-  ]);
+  columnSizes: ResponsiveTableSizes;
 
   /**
    * Are we currently submitting the changes?
@@ -76,6 +69,23 @@ export class ItemBitstreamsComponent extends AbstractItemUpdateComponent impleme
    */
   itemUpdateSubscription: Subscription;
 
+  /**
+   * An observable which emits a boolean which represents whether the service is currently handling a 'move' request
+   */
+  isProcessingMoveRequest: Observable<boolean>;
+
+  /**
+   * The flag indicating to show the load more link
+   */
+  showLoadMoreLink$: BehaviorSubject<boolean> = new BehaviorSubject(true);
+
+  /**
+   * The list of bundles for the current item as an observable
+   */
+  get bundles$(): Observable<Bundle[]> {
+    return this.bundlesSubject.asObservable();
+  }
+
   constructor(
     public itemService: ItemDataService,
     public objectUpdatesService: ObjectUpdatesService,
@@ -88,20 +98,75 @@ export class ItemBitstreamsComponent extends AbstractItemUpdateComponent impleme
     public requestService: RequestService,
     public cdRef: ChangeDetectorRef,
     public bundleService: BundleDataService,
-    public zone: NgZone
+    public zone: NgZone,
+    public itemBitstreamsService: ItemBitstreamsService,
   ) {
     super(itemService, objectUpdatesService, router, notificationsService, translateService, route);
+
+    this.columnSizes = this.itemBitstreamsService.getColumnSizes();
   }
 
   /**
    * Actions to perform after the item has been initialized
    */
   postItemInit(): void {
-    this.bundles$ = this.itemService.getBundles(this.item.id, new PaginatedSearchOptions({pagination: this.bundlesOptions})).pipe(
-      getFirstSucceededRemoteData(),
-      getRemoteDataPayload(),
-      map((bundlePage: PaginatedList<Bundle>) => bundlePage.page)
-    );
+    this.isProcessingMoveRequest = this.itemBitstreamsService.getPerformingMoveRequest$();
+    this.loadBundles(1);
+  }
+
+  /**
+   * Handles keyboard events that should move the currently selected bitstream up
+   */
+  @HostListener('document:keydown.arrowUp', ['$event'])
+  moveUp(event: KeyboardEvent) {
+    if (this.itemBitstreamsService.hasSelectedBitstream()) {
+      event.preventDefault();
+      this.itemBitstreamsService.moveSelectedBitstreamUp();
+    }
+  }
+
+  /**
+   * Handles keyboard events that should move the currently selected bitstream down
+   */
+  @HostListener('document:keydown.arrowDown', ['$event'])
+  moveDown(event: KeyboardEvent) {
+    if (this.itemBitstreamsService.hasSelectedBitstream()) {
+      event.preventDefault();
+      this.itemBitstreamsService.moveSelectedBitstreamDown();
+    }
+  }
+
+  /**
+   * Handles keyboard events that should cancel the currently selected bitstream.
+   * A cancel means that the selected bitstream is returned to its original position and is no longer selected.
+   * @param event
+   */
+  @HostListener('document:keyup.escape', ['$event'])
+  cancelSelection(event: KeyboardEvent) {
+    if (this.itemBitstreamsService.hasSelectedBitstream()) {
+      event.preventDefault();
+      this.itemBitstreamsService.cancelSelection();
+    }
+  }
+
+  /**
+   * Handles keyboard events that should clear the currently selected bitstream.
+   * A clear means that the selected bitstream remains in its current position but is no longer selected.
+   */
+  @HostListener('document:keydown.enter', ['$event'])
+  @HostListener('document:keydown.space', ['$event'])
+  clearSelection(event: KeyboardEvent) {
+    // Only when no specific element is in focus do we want to clear the currently selected bitstream
+    // Otherwise we might clear the selection when a different action was intended, e.g. clicking a button or selecting
+    // a different bitstream.
+    if (
+      this.itemBitstreamsService.hasSelectedBitstream() &&
+      event.target instanceof Element &&
+      event.target.tagName === 'BODY'
+    ) {
+      event.preventDefault();
+      this.itemBitstreamsService.clearSelection();
+    }
   }
 
   /**
@@ -111,6 +176,39 @@ export class ItemBitstreamsComponent extends AbstractItemUpdateComponent impleme
     this.notificationsPrefix = 'item.edit.bitstreams.notifications.';
   }
 
+  /**
+   * Load bundles for the current item
+   * @param currentPage The current page to load
+   */
+  loadBundles(currentPage?: number) {
+    this.bundlesOptions = Object.assign(new PaginationComponentOptions(), this.bundlesOptions, {
+      currentPage: currentPage || this.bundlesOptions.currentPage + 1,
+    });
+    this.itemService.getBundles(this.item.id, new PaginatedSearchOptions({pagination: this.bundlesOptions})).pipe(
+      getFirstSucceededRemoteData(),
+      getRemoteDataPayload(),
+    ).subscribe((bundles: PaginatedList<Bundle>) => {
+      this.updateBundles(bundles);
+    });
+  }
+
+  /**
+   * Update the subject containing the bundles with the provided bundles.
+   * Also updates the showLoadMoreLink observable so it does not show up when it is no longer necessary.
+   */
+  updateBundles(newBundlesPL: PaginatedList<Bundle>) {
+    const currentBundles = this.bundlesSubject.getValue();
+
+    // Only add bundles to the bundle subject if they are not present yet
+    const bundlesToAdd = newBundlesPL.page
+      .filter(bundleToAdd => !currentBundles.some(currentBundle => currentBundle.id === bundleToAdd.id));
+
+    const updatedBundles = [...currentBundles, ...bundlesToAdd];
+
+    this.showLoadMoreLink$.next(updatedBundles.length < newBundlesPL.totalElements);
+    this.bundlesSubject.next(updatedBundles);
+  }
+
 
   /**
    * Submit the current changes
@@ -119,84 +217,16 @@ export class ItemBitstreamsComponent extends AbstractItemUpdateComponent impleme
    */
   submit() {
     this.submitting = true;
-    const bundlesOnce$ = this.bundles$.pipe(take(1));
 
-    // Fetch all removed bitstreams from the object update service
-    const removedBitstreams$ = bundlesOnce$.pipe(
-      switchMap((bundles: Bundle[]) => observableZip(
-        ...bundles.map((bundle: Bundle) => this.objectUpdatesService.getFieldUpdates(bundle.self, [], true))
-      )),
-      map((fieldUpdates: FieldUpdates[]) => ([] as FieldUpdate[]).concat(
-        ...fieldUpdates.map((updates: FieldUpdates) => Object.values(updates).filter((fieldUpdate: FieldUpdate) => fieldUpdate.changeType === FieldChangeType.REMOVE))
-      )),
-      map((fieldUpdates: FieldUpdate[]) => fieldUpdates.map((fieldUpdate: FieldUpdate) => fieldUpdate.field))
-    );
-
-    // Send out delete requests for all deleted bitstreams
-    const removedResponses$: Observable<RemoteData<NoContent>> = removedBitstreams$.pipe(
-      take(1),
-      switchMap((removedBitstreams: Bitstream[]) => {
-        return this.bitstreamService.removeMultiple(removedBitstreams);
-      })
-    );
+    const removedResponses$ = this.itemBitstreamsService.removeMarkedBitstreams(this.bundles$);
 
     // Perform the setup actions from above in order and display notifications
     removedResponses$.subscribe((responses: RemoteData<NoContent>) => {
-      this.displayNotifications('item.edit.bitstreams.notifications.remove', [responses]);
+      this.itemBitstreamsService.displayNotifications('item.edit.bitstreams.notifications.remove', [responses]);
       this.submitting = false;
     });
   }
 
-  /**
-   * A bitstream was dropped in a new location. Send out a Move Patch request to the REST API, display notifications,
-   * refresh the bundle's cache (so the lists can properly reload) and call the event's callback function (which will
-   * navigate the user to the correct page)
-   * @param bundle  The bundle to send patch requests to
-   * @param event   The event containing the index the bitstream came from and was dropped to
-   */
-  dropBitstream(bundle: Bundle, event: any) {
-    this.zone.runOutsideAngular(() => {
-      if (hasValue(event) && hasValue(event.fromIndex) && hasValue(event.toIndex) && hasValue(event.finish)) {
-        const moveOperation = {
-          op: 'move',
-          from: `/_links/bitstreams/${event.fromIndex}/href`,
-          path: `/_links/bitstreams/${event.toIndex}/href`
-        } as Operation;
-        this.bundleService.patch(bundle, [moveOperation]).pipe(take(1)).subscribe((response: RemoteData<Bundle>) => {
-          this.zone.run(() => {
-            this.displayNotifications('item.edit.bitstreams.notifications.move', [response]);
-            // Remove all cached requests from this bundle and call the event's callback when the requests are cleared
-            this.requestService.removeByHrefSubstring(bundle.self).pipe(
-              filter((isCached) => isCached),
-              take(1)
-            ).subscribe(() => event.finish());
-          });
-        });
-      }
-    });
-  }
-
-  /**
-   * Display notifications
-   * - Error notification for each failed response with their message
-   * - Success notification in case there's at least one successful response
-   * @param key       The i18n key for the notification messages
-   * @param responses The returned responses to display notifications for
-   */
-  displayNotifications(key: string, responses: RemoteData<any>[]) {
-    if (isNotEmpty(responses)) {
-      const failedResponses = responses.filter((response: RemoteData<Bundle>) => hasValue(response) && response.hasFailed);
-      const successfulResponses = responses.filter((response: RemoteData<Bundle>) => hasValue(response) && response.hasSucceeded);
-
-      failedResponses.forEach((response: RemoteData<Bundle>) => {
-        this.notificationsService.error(this.translateService.instant(`${key}.failed.title`), response.errorMessage);
-      });
-      if (successfulResponses.length > 0) {
-        this.notificationsService.success(this.translateService.instant(`${key}.saved.title`), this.translateService.instant(`${key}.saved.content`));
-      }
-    }
-  }
-
   /**
    * Request the object updates service to discard all current changes to this item
    * Shows a notification to remind the user that they can undo this
@@ -222,7 +252,7 @@ export class ItemBitstreamsComponent extends AbstractItemUpdateComponent impleme
    */
   isReinstatable(): Observable<boolean> {
     return this.bundles$.pipe(
-      switchMap((bundles: Bundle[]) => observableZip(...bundles.map((bundle: Bundle) => this.objectUpdatesService.isReinstatable(bundle.self)))),
+      switchMap((bundles: Bundle[]) => combineLatest(bundles.map((bundle: Bundle) => this.objectUpdatesService.isReinstatable(bundle.self)))),
       map((reinstatable: boolean[]) => reinstatable.includes(true))
     );
   }
@@ -232,7 +262,7 @@ export class ItemBitstreamsComponent extends AbstractItemUpdateComponent impleme
    */
   hasChanges(): Observable<boolean> {
     return this.bundles$.pipe(
-      switchMap((bundles: Bundle[]) => observableZip(...bundles.map((bundle: Bundle) => this.objectUpdatesService.hasUpdates(bundle.self)))),
+      switchMap((bundles: Bundle[]) => combineLatest(bundles.map((bundle: Bundle) => this.objectUpdatesService.hasUpdates(bundle.self)))),
       map((hasChanges: boolean[]) => hasChanges.includes(true))
     );
   }
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.service.spec.ts b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.service.spec.ts
new file mode 100644
index 0000000000..a0277ef064
--- /dev/null
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.service.spec.ts
@@ -0,0 +1,705 @@
+import { ItemBitstreamsService, SelectedBitstreamTableEntry } from './item-bitstreams.service';
+import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
+import { getMockTranslateService } from '../../../shared/mocks/translate.service.mock';
+import { ObjectUpdatesServiceStub } from '../../../core/data/object-updates/object-updates.service.stub';
+import { BitstreamDataServiceStub } from '../../../shared/testing/bitstream-data-service.stub';
+import { DSONameServiceMock } from '../../../shared/mocks/dso-name.service.mock';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { ObjectUpdatesService } from '../../../core/data/object-updates/object-updates.service';
+import { TranslateService } from '@ngx-translate/core';
+import { BitstreamDataService } from '../../../core/data/bitstream-data.service';
+import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
+import { Bitstream } from '../../../core/shared/bitstream.model';
+import { BitstreamFormat } from '../../../core/shared/bitstream-format.model';
+import {
+  createSuccessfulRemoteDataObject$,
+  createFailedRemoteDataObject,
+  createSuccessfulRemoteDataObject
+} from '../../../shared/remote-data.utils';
+import { BundleDataService } from '../../../core/data/bundle-data.service';
+import { RequestService } from '../../../core/data/request.service';
+import { LiveRegionService } from '../../../shared/live-region/live-region.service';
+import { Bundle } from '../../../core/shared/bundle.model';
+import { of } from 'rxjs';
+import { getLiveRegionServiceStub } from '../../../shared/live-region/live-region.service.stub';
+import { fakeAsync, tick } from '@angular/core/testing';
+import createSpy = jasmine.createSpy;
+import { MoveOperation } from 'fast-json-patch';
+
+describe('ItemBitstreamsService', () => {
+  let service: ItemBitstreamsService;
+  let notificationsService: NotificationsService;
+  let translateService: TranslateService;
+  let objectUpdatesService: ObjectUpdatesService;
+  let bitstreamDataService: BitstreamDataService;
+  let bundleDataService: BundleDataService;
+  let dsoNameService: DSONameService;
+  let requestService: RequestService;
+  let liveRegionService: LiveRegionService;
+
+  beforeEach(() => {
+    notificationsService = new NotificationsServiceStub() as any;
+    translateService = getMockTranslateService();
+    objectUpdatesService = new ObjectUpdatesServiceStub() as any;
+    bitstreamDataService = new BitstreamDataServiceStub() as any;
+    bundleDataService = jasmine.createSpyObj('bundleDataService', {
+      patch: createSuccessfulRemoteDataObject$(new Bundle()),
+    });
+    dsoNameService = new DSONameServiceMock() as any;
+    requestService = jasmine.createSpyObj('requestService', {
+      setStaleByHrefSubstring: of(true),
+    });
+    liveRegionService = getLiveRegionServiceStub();
+
+    service = new ItemBitstreamsService(
+      notificationsService,
+      translateService,
+      objectUpdatesService,
+      bitstreamDataService,
+      bundleDataService,
+      dsoNameService,
+      requestService,
+      liveRegionService,
+    );
+  });
+
+  const defaultEntry: SelectedBitstreamTableEntry = {
+    bitstream: {
+      name: 'bitstream name',
+    } as any,
+    bundle: Object.assign(new Bundle(), {
+      _links: { self: { href: 'self_link' }},
+    }),
+    bundleSize: 10,
+    currentPosition: 0,
+    originalPosition: 0,
+  };
+
+  describe('selectBitstreamEntry', () => {
+    it('should correctly make getSelectedBitstream$ emit', fakeAsync(() => {
+      const emittedActions = [];
+
+      service.getSelectionAction$().subscribe(selected => emittedActions.push(selected));
+
+      expect(emittedActions.length).toBe(1);
+      expect(emittedActions[0]).toBeNull();
+
+      const entry = Object.assign({}, defaultEntry);
+
+      service.selectBitstreamEntry(entry);
+      tick();
+
+      expect(emittedActions.length).toBe(2);
+      expect(emittedActions[1]).toEqual({ action: 'Selected', selectedEntry: entry });
+    }));
+
+    it('should correctly make getSelectedBitstream return the bitstream', () => {
+      expect(service.getSelectedBitstream()).toBeNull();
+
+      const entry = Object.assign({}, defaultEntry);
+
+      service.selectBitstreamEntry(entry);
+      expect(service.getSelectedBitstream()).toEqual(entry);
+    });
+
+    it('should correctly make hasSelectedBitstream return', () => {
+      expect(service.hasSelectedBitstream()).toBeFalse();
+
+      const entry = Object.assign({}, defaultEntry);
+
+      service.selectBitstreamEntry(entry);
+      expect(service.hasSelectedBitstream()).toBeTrue();
+    });
+
+    it('should do nothing if no entry was provided', fakeAsync(() => {
+      const emittedActions = [];
+
+      service.getSelectionAction$().subscribe(selected => emittedActions.push(selected));
+
+      expect(emittedActions.length).toBe(1);
+      expect(emittedActions[0]).toBeNull();
+
+      const entry = Object.assign({}, defaultEntry);
+
+      service.selectBitstreamEntry(entry);
+      tick();
+
+      expect(emittedActions.length).toBe(2);
+      expect(emittedActions[1]).toEqual({ action: 'Selected', selectedEntry: entry });
+
+      service.selectBitstreamEntry(null);
+      tick();
+
+      expect(emittedActions.length).toBe(2);
+      expect(emittedActions[1]).toEqual({ action: 'Selected', selectedEntry: entry });
+    }));
+
+    it('should announce the selected bitstream', () => {
+      const entry = Object.assign({}, defaultEntry);
+
+      spyOn(service, 'announceSelect');
+
+      service.selectBitstreamEntry(entry);
+      expect(service.announceSelect).toHaveBeenCalledWith(entry.bitstream.name);
+    });
+  });
+
+  describe('clearSelection', () => {
+    it('should clear the selected bitstream', fakeAsync(() => {
+      const emittedActions = [];
+
+      service.getSelectionAction$().subscribe(selected => emittedActions.push(selected));
+
+      expect(emittedActions.length).toBe(1);
+      expect(emittedActions[0]).toBeNull();
+
+      const entry = Object.assign({}, defaultEntry);
+
+      service.selectBitstreamEntry(entry);
+      tick();
+
+      expect(emittedActions.length).toBe(2);
+      expect(emittedActions[1]).toEqual({ action: 'Selected', selectedEntry: entry });
+
+      service.clearSelection();
+      tick();
+
+      expect(emittedActions.length).toBe(3);
+      expect(emittedActions[2]).toEqual({ action: 'Cleared', selectedEntry: entry });
+    }));
+
+    it('should not do anything if there is no selected bitstream', fakeAsync(() => {
+      const emittedActions = [];
+
+      service.getSelectionAction$().subscribe(selected => emittedActions.push(selected));
+
+      expect(emittedActions.length).toBe(1);
+      expect(emittedActions[0]).toBeNull();
+
+      service.clearSelection();
+      tick();
+
+      expect(emittedActions.length).toBe(1);
+      expect(emittedActions[0]).toBeNull();
+    }));
+
+    it('should announce the cleared bitstream', () => {
+      const entry = Object.assign({}, defaultEntry);
+
+      spyOn(service, 'announceClear');
+      service.selectBitstreamEntry(entry);
+      service.clearSelection();
+
+      expect(service.announceClear).toHaveBeenCalledWith(entry.bitstream.name);
+    });
+
+    it('should display a notification if the selected bitstream was moved', () => {
+      const entry = Object.assign({}, defaultEntry,
+        {
+          originalPosition: 5,
+          currentPosition: 7,
+        }
+      );
+
+      spyOn(service, 'displaySuccessNotification');
+      service.selectBitstreamEntry(entry);
+      service.clearSelection();
+
+      expect(service.displaySuccessNotification).toHaveBeenCalled();
+    });
+
+    it('should not display a notification if the selected bitstream is in its original position', () => {
+      const entry = Object.assign({}, defaultEntry,
+        {
+          originalPosition: 7,
+          currentPosition: 7,
+        }
+      );
+
+      spyOn(service, 'displaySuccessNotification');
+      service.selectBitstreamEntry(entry);
+      service.clearSelection();
+
+      expect(service.displaySuccessNotification).not.toHaveBeenCalled();
+    });
+  });
+
+  describe('cancelSelection', () => {
+    it('should clear the selected bitstream if it has not moved', fakeAsync(() => {
+      const emittedActions = [];
+
+      service.getSelectionAction$().subscribe(selected => emittedActions.push(selected));
+
+      expect(emittedActions.length).toBe(1);
+      expect(emittedActions[0]).toBeNull();
+
+      const entry = Object.assign({}, defaultEntry);
+
+      service.selectBitstreamEntry(entry);
+      tick();
+
+      expect(emittedActions.length).toBe(2);
+      expect(emittedActions[1]).toEqual({ action: 'Selected', selectedEntry: entry });
+
+      service.cancelSelection();
+      tick();
+
+      expect(emittedActions.length).toBe(3);
+      expect(emittedActions[2]).toEqual({ action: 'Cleared', selectedEntry: entry });
+    }));
+
+    it('should cancel the selected bitstream if it has moved', fakeAsync(() => {
+      const emittedActions = [];
+
+      service.getSelectionAction$().subscribe(selected => emittedActions.push(selected));
+
+      expect(emittedActions.length).toBe(1);
+      expect(emittedActions[0]).toBeNull();
+
+      const entry = Object.assign({}, defaultEntry, {
+        originalPosition: 0,
+        currentPosition: 3,
+      });
+
+      service.selectBitstreamEntry(entry);
+      tick();
+
+      expect(emittedActions.length).toBe(2);
+      expect(emittedActions[1]).toEqual({ action: 'Selected', selectedEntry: entry });
+
+      service.cancelSelection();
+      tick();
+
+      expect(emittedActions.length).toBe(3);
+      expect(emittedActions[2]).toEqual({ action: 'Cancelled', selectedEntry: entry });
+    }));
+
+    it('should announce a clear if the bitstream has not moved', () => {
+      const entry = Object.assign({}, defaultEntry,
+        {
+          originalPosition: 7,
+          currentPosition: 7,
+        }
+      );
+
+      spyOn(service, 'announceClear');
+      spyOn(service, 'announceCancel');
+
+      service.selectBitstreamEntry(entry);
+      service.cancelSelection();
+
+      expect(service.announceClear).toHaveBeenCalledWith(entry.bitstream.name);
+      expect(service.announceCancel).not.toHaveBeenCalled();
+    });
+
+    it('should announce a cancel if the bitstream has moved', () => {
+      const entry = Object.assign({}, defaultEntry,
+        {
+          originalPosition: 5,
+          currentPosition: 7,
+        }
+      );
+
+      spyOn(service, 'announceClear');
+      spyOn(service, 'announceCancel');
+
+      service.selectBitstreamEntry(entry);
+      service.cancelSelection();
+
+      expect(service.announceClear).not.toHaveBeenCalled();
+      expect(service.announceCancel).toHaveBeenCalledWith(entry.bitstream.name, entry.originalPosition);
+    });
+
+    it('should return the bitstream to its original position if it has moved', () => {
+      const entry = Object.assign({}, defaultEntry,
+        {
+          originalPosition: 5,
+          currentPosition: 7,
+        }
+      );
+
+      spyOn(service, 'performBitstreamMoveRequest');
+
+      service.selectBitstreamEntry(entry);
+      service.cancelSelection();
+
+      expect(service.performBitstreamMoveRequest).toHaveBeenCalledWith(entry.bundle, entry.currentPosition, entry.originalPosition);
+    });
+
+    it('should not move the bitstream if it has not moved', () => {
+      const entry = Object.assign({}, defaultEntry,
+        {
+          originalPosition: 7,
+          currentPosition: 7,
+        }
+      );
+
+      spyOn(service, 'performBitstreamMoveRequest');
+
+      service.selectBitstreamEntry(entry);
+      service.cancelSelection();
+
+      expect(service.performBitstreamMoveRequest).not.toHaveBeenCalled();
+    });
+
+    it('should not do anything if there is no selected bitstream', () => {
+      spyOn(service, 'announceClear');
+      spyOn(service, 'announceCancel');
+      spyOn(service, 'performBitstreamMoveRequest');
+
+      service.cancelSelection();
+
+      expect(service.announceClear).not.toHaveBeenCalled();
+      expect(service.announceCancel).not.toHaveBeenCalled();
+      expect(service.performBitstreamMoveRequest).not.toHaveBeenCalled();
+    });
+  });
+
+  describe('moveSelectedBitstream', () => {
+    beforeEach(() => {
+      spyOn(service, 'performBitstreamMoveRequest').and.callThrough();
+    });
+
+    describe('up', () => {
+      it('should move the selected bitstream one position up', () => {
+        const startPosition = 7;
+        const endPosition = startPosition - 1;
+
+        const entry = Object.assign({}, defaultEntry,
+          {
+            originalPosition: 5,
+            currentPosition: startPosition,
+          }
+        );
+
+        const movedEntry = Object.assign({}, defaultEntry,
+          {
+            originalPosition: 5,
+            currentPosition: endPosition,
+          }
+        );
+
+        service.selectBitstreamEntry(entry);
+        service.moveSelectedBitstreamUp();
+        expect(service.performBitstreamMoveRequest).toHaveBeenCalledWith(entry.bundle, startPosition, endPosition, jasmine.any(Function));
+        expect(service.getSelectedBitstream()).toEqual(movedEntry);
+      });
+
+      it('should emit the move', fakeAsync(() => {
+        const emittedActions = [];
+
+        service.getSelectionAction$().subscribe(selected => emittedActions.push(selected));
+
+        expect(emittedActions.length).toBe(1);
+        expect(emittedActions[0]).toBeNull();
+
+        const startPosition = 7;
+        const endPosition = startPosition - 1;
+
+        const entry = Object.assign({}, defaultEntry,
+          {
+            originalPosition: 5,
+            currentPosition: startPosition,
+          }
+        );
+
+        const movedEntry = Object.assign({}, defaultEntry,
+          {
+            originalPosition: 5,
+            currentPosition: endPosition,
+          }
+        );
+
+        service.selectBitstreamEntry(entry);
+        tick();
+
+        expect(emittedActions.length).toBe(2);
+        expect(emittedActions[1]).toEqual({ action: 'Selected', selectedEntry: entry });
+
+        service.moveSelectedBitstreamUp();
+        tick();
+
+        expect(emittedActions.length).toBe(3);
+        expect(emittedActions[2]).toEqual({ action: 'Moved', selectedEntry: movedEntry });
+      }));
+
+      it('should announce the move', () => {
+        const startPosition = 7;
+        const endPosition = startPosition - 1;
+
+        spyOn(service, 'announceMove');
+
+        const entry = Object.assign({}, defaultEntry,
+          {
+            originalPosition: 5,
+            currentPosition: startPosition,
+          }
+        );
+
+        service.selectBitstreamEntry(entry);
+        service.moveSelectedBitstreamUp();
+
+        expect(service.announceMove).toHaveBeenCalledWith(entry.bitstream.name, endPosition);
+      });
+
+      it('should not do anything if the bitstream is already at the top', () => {
+        const entry = Object.assign({}, defaultEntry,
+          {
+            originalPosition: 5,
+            currentPosition: 0,
+          }
+        );
+
+        service.selectBitstreamEntry(entry);
+        service.moveSelectedBitstreamUp();
+
+        expect(service.performBitstreamMoveRequest).not.toHaveBeenCalled();
+      });
+
+      it('should not do anything if there is no selected bitstream', () => {
+        service.moveSelectedBitstreamUp();
+
+        expect(service.performBitstreamMoveRequest).not.toHaveBeenCalled();
+      });
+    });
+
+    describe('down', () => {
+      it('should move the selected bitstream one position down', () => {
+        const startPosition = 7;
+        const endPosition = startPosition + 1;
+
+        const entry = Object.assign({}, defaultEntry,
+          {
+            originalPosition: 5,
+            currentPosition: startPosition,
+          }
+        );
+
+        const movedEntry = Object.assign({}, defaultEntry,
+          {
+            originalPosition: 5,
+            currentPosition: endPosition,
+          }
+        );
+
+        service.selectBitstreamEntry(entry);
+        service.moveSelectedBitstreamDown();
+        expect(service.performBitstreamMoveRequest).toHaveBeenCalledWith(entry.bundle, startPosition, endPosition, jasmine.any(Function));
+        expect(service.getSelectedBitstream()).toEqual(movedEntry);
+      });
+
+      it('should emit the move', fakeAsync(() => {
+        const emittedActions = [];
+
+        service.getSelectionAction$().subscribe(selected => emittedActions.push(selected));
+
+        expect(emittedActions.length).toBe(1);
+        expect(emittedActions[0]).toBeNull();
+
+        const startPosition = 7;
+        const endPosition = startPosition + 1;
+
+        const entry = Object.assign({}, defaultEntry,
+          {
+            originalPosition: 5,
+            currentPosition: startPosition,
+          }
+        );
+
+        const movedEntry = Object.assign({}, defaultEntry,
+          {
+            originalPosition: 5,
+            currentPosition: endPosition,
+          }
+        );
+
+        service.selectBitstreamEntry(entry);
+        tick();
+
+        expect(emittedActions.length).toBe(2);
+        expect(emittedActions[1]).toEqual({ action: 'Selected', selectedEntry: entry });
+
+        service.moveSelectedBitstreamDown();
+        tick();
+
+        expect(emittedActions.length).toBe(3);
+        expect(emittedActions[2]).toEqual({ action: 'Moved', selectedEntry: movedEntry });
+      }));
+
+      it('should announce the move', () => {
+        const startPosition = 7;
+        const endPosition = startPosition + 1;
+
+        spyOn(service, 'announceMove');
+
+        const entry = Object.assign({}, defaultEntry,
+          {
+            originalPosition: 5,
+            currentPosition: startPosition,
+          }
+        );
+
+        service.selectBitstreamEntry(entry);
+        service.moveSelectedBitstreamDown();
+
+        expect(service.announceMove).toHaveBeenCalledWith(entry.bitstream.name, endPosition);
+      });
+
+      it('should not do anything if the bitstream is already at the bottom of the bundle', () => {
+        const entry = Object.assign({}, defaultEntry,
+          {
+            originalPosition: 5,
+            currentPosition: 9,
+          }
+        );
+
+        service.selectBitstreamEntry(entry);
+        service.moveSelectedBitstreamDown();
+
+        expect(service.performBitstreamMoveRequest).not.toHaveBeenCalled();
+      });
+
+      it('should not do anything if there is no selected bitstream', () => {
+        service.moveSelectedBitstreamDown();
+
+        expect(service.performBitstreamMoveRequest).not.toHaveBeenCalled();
+      });
+    });
+  });
+
+  describe('performBitstreamMoveRequest', () => {
+    const bundle: Bundle = defaultEntry.bundle;
+    const from = 5;
+    const to = 7;
+    const callback = createSpy('callbackFunction');
+
+    it('should correctly create the Move request', () => {
+      const expectedOperation: MoveOperation = {
+        op: 'move',
+        from: `/_links/bitstreams/${from}/href`,
+        path: `/_links/bitstreams/${to}/href`,
+      };
+
+      service.performBitstreamMoveRequest(bundle, from, to, callback);
+      expect(bundleDataService.patch).toHaveBeenCalledWith(bundle, [expectedOperation]);
+    });
+
+    it('should correctly make the bundle\'s self link stale', () => {
+      service.performBitstreamMoveRequest(bundle, from, to, callback);
+      expect(requestService.setStaleByHrefSubstring).toHaveBeenCalledWith(bundle._links.self.href);
+    });
+
+    it('should attempt to show a message should the request have failed', () => {
+      spyOn(service, 'displayFailedResponseNotifications');
+      service.performBitstreamMoveRequest(bundle, from, to, callback);
+      expect(service.displayFailedResponseNotifications).toHaveBeenCalled();
+    });
+
+    it('should correctly call the provided function once the request has finished', () => {
+      service.performBitstreamMoveRequest(bundle, from, to, callback);
+      expect(callback).toHaveBeenCalled();
+    });
+
+    it('should emit at the start and end of the request', fakeAsync(() => {
+      const emittedActions = [];
+
+      service.getPerformingMoveRequest$().subscribe(selected => emittedActions.push(selected));
+
+      expect(emittedActions.length).toBe(1);
+      expect(emittedActions[0]).toBeFalse();
+
+      service.performBitstreamMoveRequest(bundle, from, to, callback);
+      tick();
+
+      expect(emittedActions.length).toBe(3);
+      expect(emittedActions[1]).toBeTrue();
+      expect(emittedActions[2]).toBeFalse();
+    }));
+  });
+
+  describe('displayNotifications', () => {
+    it('should display an error notification if a response failed', () => {
+      const responses = [
+        createFailedRemoteDataObject(),
+      ];
+
+      const key = 'some.key';
+
+      service.displayNotifications(key, responses);
+
+      expect(notificationsService.success).not.toHaveBeenCalled();
+      expect(notificationsService.error).toHaveBeenCalled();
+      expect(translateService.instant).toHaveBeenCalledWith('some.key.failed.title');
+    });
+
+    it('should display a success notification if a response succeeded', () => {
+      const responses = [
+        createSuccessfulRemoteDataObject(undefined),
+      ];
+
+      const key = 'some.key';
+
+      service.displayNotifications(key, responses);
+
+      expect(notificationsService.success).toHaveBeenCalled();
+      expect(notificationsService.error).not.toHaveBeenCalled();
+      expect(translateService.instant).toHaveBeenCalledWith('some.key.saved.title');
+    });
+
+    it('should display both notifications if some failed and some succeeded', () => {
+      const responses = [
+        createFailedRemoteDataObject(),
+        createSuccessfulRemoteDataObject(undefined),
+      ];
+
+      const key = 'some.key';
+
+      service.displayNotifications(key, responses);
+
+      expect(notificationsService.success).toHaveBeenCalled();
+      expect(notificationsService.error).toHaveBeenCalled();
+      expect(translateService.instant).toHaveBeenCalledWith('some.key.saved.title');
+      expect(translateService.instant).toHaveBeenCalledWith('some.key.saved.title');
+    });
+  });
+
+  describe('mapBitstreamsToTableEntries', () => {
+    it('should correctly map a Bitstream to a BitstreamTableEntry', () => {
+      const format: BitstreamFormat = new BitstreamFormat();
+
+      const bitstream: Bitstream = Object.assign(new Bitstream(), {
+        uuid: 'testUUID',
+        format: createSuccessfulRemoteDataObject$(format),
+      });
+
+      spyOn(dsoNameService, 'getName').and.returnValue('Test Name');
+      spyOn(bitstream, 'firstMetadataValue').and.returnValue('description');
+
+      const tableEntry = service.mapBitstreamsToTableEntries([bitstream])[0];
+
+      expect(tableEntry.name).toEqual('Test Name');
+      expect(tableEntry.nameStripped).toEqual('TestName');
+      expect(tableEntry.bitstream).toBe(bitstream);
+      expect(tableEntry.id).toEqual('testUUID');
+      expect(tableEntry.description).toEqual('description');
+      expect(tableEntry.downloadUrl).toEqual('/bitstreams/testUUID/download');
+    });
+  });
+
+  describe('nameToHeader', () => {
+    it('should correctly transform a string to an appropriate header ID', () => {
+      const stringA = 'Test String';
+      const stringAResult = 'TestString';
+      expect(service.nameToHeader(stringA)).toEqual(stringAResult);
+
+      const stringB = 'Test String Two';
+      const stringBResult = 'TestStringTwo';
+      expect(service.nameToHeader(stringB)).toEqual(stringBResult);
+
+      const stringC = 'Test           String           Three';
+      const stringCResult = 'TestStringThree';
+      expect(service.nameToHeader(stringC)).toEqual(stringCResult);
+    });
+  });
+
+});
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.service.stub.ts b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.service.stub.ts
new file mode 100644
index 0000000000..f60693f726
--- /dev/null
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.service.stub.ts
@@ -0,0 +1,78 @@
+import { of } from 'rxjs';
+import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
+import { ResponsiveTableSizes } from '../../../shared/responsive-table-sizes/responsive-table-sizes';
+import { ResponsiveColumnSizes } from '../../../shared/responsive-table-sizes/responsive-column-sizes';
+import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
+
+export function getItemBitstreamsServiceStub(): ItemBitstreamsServiceStub {
+  return new ItemBitstreamsServiceStub();
+}
+
+export class ItemBitstreamsServiceStub {
+  getSelectionAction$ = jasmine.createSpy('getSelectedBitstream$').and
+    .returnValue(of(null));
+
+  getSelectedBitstream = jasmine.createSpy('getSelectedBitstream').and
+    .returnValue(null);
+
+  hasSelectedBitstream = jasmine.createSpy('hasSelectedBitstream').and
+    .returnValue(false);
+
+  selectBitstreamEntry = jasmine.createSpy('selectBitstreamEntry');
+
+  clearSelection = jasmine.createSpy('clearSelection');
+
+  cancelSelection = jasmine.createSpy('cancelSelection');
+
+  moveSelectedBitstreamUp = jasmine.createSpy('moveSelectedBitstreamUp');
+
+  moveSelectedBitstreamDown = jasmine.createSpy('moveSelectedBitstreamDown');
+
+  performBitstreamMoveRequest = jasmine.createSpy('performBitstreamMoveRequest');
+
+  getPerformingMoveRequest = jasmine.createSpy('getPerformingMoveRequest').and.returnValue(false);
+
+  getPerformingMoveRequest$ = jasmine.createSpy('getPerformingMoveRequest$').and.returnValue(of(false));
+
+  getInitialBundlesPaginationOptions = jasmine.createSpy('getInitialBundlesPaginationOptions').and
+    .returnValue(new PaginationComponentOptions());
+
+  getInitialBitstreamsPaginationOptions = jasmine.createSpy('getInitialBitstreamsPaginationOptions').and
+    .returnValue(new PaginationComponentOptions());
+
+  getColumnSizes = jasmine.createSpy('getColumnSizes').and
+    .returnValue(
+      new ResponsiveTableSizes([
+        new ResponsiveColumnSizes(2, 2, 3, 4, 4),
+        new ResponsiveColumnSizes(2, 3, 3, 3, 3),
+        new ResponsiveColumnSizes(2, 2, 2, 2, 2),
+        new ResponsiveColumnSizes(6, 5, 4, 3, 3)
+      ])
+    );
+
+  displayNotifications = jasmine.createSpy('displayNotifications');
+
+  displayFailedResponseNotifications = jasmine.createSpy('displayFailedResponseNotifications');
+
+  displayErrorNotification = jasmine.createSpy('displayErrorNotification');
+
+  displaySuccessFulResponseNotifications = jasmine.createSpy('displaySuccessFulResponseNotifications');
+
+  displaySuccessNotification = jasmine.createSpy('displaySuccessNotification');
+
+  removeMarkedBitstreams = jasmine.createSpy('removeMarkedBitstreams').and
+    .returnValue(createSuccessfulRemoteDataObject$({}));
+
+  mapBitstreamsToTableEntries = jasmine.createSpy('mapBitstreamsToTableEntries').and
+    .returnValue([]);
+
+  nameToHeader = jasmine.createSpy('nameToHeader').and.returnValue('header');
+
+  stripWhiteSpace = jasmine.createSpy('stripWhiteSpace').and.returnValue('string');
+
+  announceSelect = jasmine.createSpy('announceSelect');
+
+  announceMove = jasmine.createSpy('announceMove');
+
+  announceCancel = jasmine.createSpy('announceCancel');
+}
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.service.ts b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.service.ts
new file mode 100644
index 0000000000..bc771971d3
--- /dev/null
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.service.ts
@@ -0,0 +1,552 @@
+import { Injectable } from '@angular/core';
+import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
+import { ResponsiveTableSizes } from '../../../shared/responsive-table-sizes/responsive-table-sizes';
+import { ResponsiveColumnSizes } from '../../../shared/responsive-table-sizes/responsive-column-sizes';
+import { RemoteData } from '../../../core/data/remote-data';
+import { hasValue, hasNoValue } from '../../../shared/empty.util';
+import { Bundle } from '../../../core/shared/bundle.model';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { TranslateService } from '@ngx-translate/core';
+import { Observable, zip as observableZip, BehaviorSubject } from 'rxjs';
+import { NoContent } from '../../../core/shared/NoContent.model';
+import { take, switchMap, map, tap } from 'rxjs/operators';
+import { FieldUpdates } from '../../../core/data/object-updates/field-updates.model';
+import { FieldUpdate } from '../../../core/data/object-updates/field-update.model';
+import { FieldChangeType } from '../../../core/data/object-updates/field-change-type.model';
+import { Bitstream } from '../../../core/shared/bitstream.model';
+import { ObjectUpdatesService } from '../../../core/data/object-updates/object-updates.service';
+import { BitstreamDataService } from '../../../core/data/bitstream-data.service';
+import { getFirstSucceededRemoteDataPayload, getFirstCompletedRemoteData } from '../../../core/shared/operators';
+import { getBitstreamDownloadRoute } from '../../../app-routing-paths';
+import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
+import { BitstreamFormat } from '../../../core/shared/bitstream-format.model';
+import { MoveOperation } from 'fast-json-patch';
+import { BundleDataService } from '../../../core/data/bundle-data.service';
+import { RequestService } from '../../../core/data/request.service';
+import { LiveRegionService } from '../../../shared/live-region/live-region.service';
+
+export const MOVE_KEY = 'item.edit.bitstreams.notifications.move';
+
+/**
+ * Interface storing all the information necessary to create a row in the bitstream edit table
+ */
+export interface BitstreamTableEntry {
+  /**
+   * The bitstream
+   */
+  bitstream: Bitstream,
+  /**
+   * The uuid of the Bitstream
+   */
+  id: string,
+  /**
+   * The name of the Bitstream
+   */
+  name: string,
+  /**
+   * The name of the Bitstream with all whitespace removed
+   */
+  nameStripped: string,
+  /**
+   * The description of the Bitstream
+   */
+  description: string,
+  /**
+   * Observable emitting the Format of the Bitstream
+   */
+  format: Observable<BitstreamFormat>,
+  /**
+   * The download url of the Bitstream
+   */
+  downloadUrl: string,
+}
+
+/**
+ * Interface storing information necessary to highlight and reorder the selected bitstream entry
+ */
+export interface SelectedBitstreamTableEntry {
+  /**
+   * The selected entry
+   */
+  bitstream: BitstreamTableEntry,
+  /**
+   * The bundle the bitstream belongs to
+   */
+  bundle: Bundle,
+  /**
+   * The total number of bitstreams in the bundle
+   */
+  bundleSize: number,
+  /**
+   * The original position of the bitstream within the bundle.
+   */
+  originalPosition: number,
+  /**
+   * The current position of the bitstream within the bundle.
+   */
+  currentPosition: number,
+}
+
+/**
+ * Interface storing data regarding a change in selected bitstream
+ */
+export interface SelectionAction {
+  /**
+   * The different types of actions:
+   *  - Selected: Bitstream was selected
+   *  - Moved: Bitstream was moved
+   *  - Cleared: Selection was cleared, bitstream remains at its current position
+   *  - Cancelled: Selection was cancelled, bitstream returns to its original position
+   */
+  action: 'Selected' | 'Moved' | 'Cleared' | 'Cancelled'
+  /**
+   * The table entry to which the selection action applies
+   */
+  selectedEntry: SelectedBitstreamTableEntry,
+}
+
+/**
+ * This service handles the selection and updating of the bitstreams and their order on the
+ * 'Edit Item' -> 'Bitstreams' page.
+ */
+@Injectable(
+  { providedIn: 'root' },
+)
+export class ItemBitstreamsService {
+
+  /**
+   * BehaviorSubject which emits every time the selected bitstream changes.
+   */
+  protected selectionAction$: BehaviorSubject<SelectionAction> = new BehaviorSubject(null);
+
+  protected isPerformingMoveRequest: BehaviorSubject<boolean> = new BehaviorSubject(false);
+
+  constructor(
+    protected notificationsService: NotificationsService,
+    protected translateService: TranslateService,
+    protected objectUpdatesService: ObjectUpdatesService,
+    protected bitstreamService: BitstreamDataService,
+    protected bundleService: BundleDataService,
+    protected dsoNameService: DSONameService,
+    protected requestService: RequestService,
+    protected liveRegionService: LiveRegionService,
+  ) {
+  }
+
+  /**
+   * Returns the observable emitting the selection actions
+   */
+  getSelectionAction$(): Observable<SelectionAction> {
+    return this.selectionAction$;
+  }
+
+  /**
+   * Returns the latest selection action
+   */
+  getSelectionAction(): SelectionAction {
+    const action = this.selectionAction$.value;
+
+    if (hasNoValue(action)) {
+      return null;
+    }
+
+    return Object.assign({}, action);
+  }
+
+  /**
+   * Returns true if there currently is a selected bitstream
+   */
+  hasSelectedBitstream(): boolean {
+    const selectionAction = this.getSelectionAction();
+
+    if (hasNoValue(selectionAction)) {
+      return false;
+    }
+
+    const action = selectionAction.action;
+
+    return action === 'Selected' || action === 'Moved';
+  }
+
+  /**
+   * Returns a copy of the currently selected bitstream
+   */
+  getSelectedBitstream(): SelectedBitstreamTableEntry {
+    if (!this.hasSelectedBitstream()) {
+      return null;
+    }
+
+    const selectionAction = this.getSelectionAction();
+    return Object.assign({}, selectionAction.selectedEntry);
+  }
+
+  /**
+   * Select the provided entry
+   */
+  selectBitstreamEntry(entry: SelectedBitstreamTableEntry) {
+    if (hasValue(entry) && entry.bitstream !== this.getSelectedBitstream()?.bitstream) {
+      this.announceSelect(entry.bitstream.name);
+      this.updateSelectionAction({ action: 'Selected', selectedEntry: entry });
+    }
+  }
+
+  /**
+   * Makes the {@link selectionAction$} observable emit the provided {@link SelectedBitstreamTableEntry}.
+   * @protected
+   */
+  protected updateSelectionAction(action: SelectionAction) {
+    this.selectionAction$.next(action);
+  }
+
+  /**
+   * Unselects the selected bitstream. Does nothing if no bitstream is selected.
+   */
+  clearSelection() {
+    const selected = this.getSelectedBitstream();
+
+    if (hasValue(selected)) {
+      this.updateSelectionAction({ action: 'Cleared', selectedEntry: selected });
+      this.announceClear(selected.bitstream.name);
+
+      if (selected.currentPosition !== selected.originalPosition) {
+        this.displaySuccessNotification(MOVE_KEY);
+      }
+    }
+  }
+
+  /**
+   * Returns the currently selected bitstream to its original position and unselects the bitstream.
+   * Does nothing if no bitstream is selected.
+   */
+  cancelSelection() {
+    const selected = this.getSelectedBitstream();
+
+    if (hasNoValue(selected) || this.getPerformingMoveRequest()) {
+      return;
+    }
+
+
+    const originalPosition = selected.originalPosition;
+    const currentPosition = selected.currentPosition;
+
+    // If the selected bitstream has not moved, there is no need to return it to its original position
+    if (currentPosition === originalPosition) {
+      this.announceClear(selected.bitstream.name);
+      this.updateSelectionAction({ action: 'Cleared', selectedEntry: selected });
+    } else {
+      this.announceCancel(selected.bitstream.name, originalPosition);
+      this.performBitstreamMoveRequest(selected.bundle, currentPosition, originalPosition);
+      this.updateSelectionAction({ action: 'Cancelled', selectedEntry: selected });
+    }
+  }
+
+  /**
+   * Moves the selected bitstream one position up in the bundle. Does nothing if no bitstream is selected or the
+   * selected bitstream already is at the beginning of the bundle.
+   */
+  moveSelectedBitstreamUp() {
+    const selected = this.getSelectedBitstream();
+
+    if (hasNoValue(selected) || this.getPerformingMoveRequest()) {
+      return;
+    }
+
+    const originalPosition = selected.currentPosition;
+    if (originalPosition > 0) {
+      const newPosition = originalPosition - 1;
+      selected.currentPosition = newPosition;
+
+      const onRequestCompleted = () => {
+        this.announceMove(selected.bitstream.name, newPosition);
+      };
+
+      this.performBitstreamMoveRequest(selected.bundle, originalPosition, newPosition, onRequestCompleted);
+      this.updateSelectionAction({ action: 'Moved', selectedEntry: selected });
+    }
+  }
+
+  /**
+   * Moves the selected bitstream one position down in the bundle. Does nothing if no bitstream is selected or the
+   * selected bitstream already is at the end of the bundle.
+   */
+  moveSelectedBitstreamDown() {
+    const selected = this.getSelectedBitstream();
+
+    if (hasNoValue(selected) || this.getPerformingMoveRequest()) {
+      return;
+    }
+
+    const originalPosition = selected.currentPosition;
+    if (originalPosition < selected.bundleSize - 1) {
+      const newPosition = originalPosition + 1;
+      selected.currentPosition = newPosition;
+
+      const onRequestCompleted = () => {
+        this.announceMove(selected.bitstream.name, newPosition);
+      };
+
+      this.performBitstreamMoveRequest(selected.bundle, originalPosition, newPosition, onRequestCompleted);
+      this.updateSelectionAction({ action: 'Moved', selectedEntry: selected });
+    }
+  }
+
+  /**
+   * Sends out a Move Patch request to the REST API, display notifications,
+   * refresh the bundle's cache (so the lists can properly reload)
+   * @param bundle The bundle to send patch requests to
+   * @param fromIndex The index to move from
+   * @param toIndex The index to move to
+   * @param finish Optional: Function to execute once the response has been received
+   */
+  performBitstreamMoveRequest(bundle: Bundle, fromIndex: number, toIndex: number, finish?: () => void) {
+    if (this.getPerformingMoveRequest()) {
+      console.warn('Attempted to perform move request while previous request has not completed yet');
+      return;
+    }
+
+    const moveOperation: MoveOperation = {
+      op: 'move',
+      from: `/_links/bitstreams/${fromIndex}/href`,
+      path: `/_links/bitstreams/${toIndex}/href`,
+    };
+
+    this.announceLoading();
+    this.isPerformingMoveRequest.next(true);
+    this.bundleService.patch(bundle, [moveOperation]).pipe(
+      getFirstCompletedRemoteData(),
+      tap((response: RemoteData<Bundle>) => this.displayFailedResponseNotifications(MOVE_KEY, [response])),
+      switchMap(() => this.requestService.setStaleByHrefSubstring(bundle.self)),
+      take(1),
+    ).subscribe(() => {
+      this.isPerformingMoveRequest.next(false);
+      finish?.();
+    });
+  }
+
+  /**
+   * Whether the service currently is processing a 'move' request
+   */
+  getPerformingMoveRequest(): boolean {
+    return this.isPerformingMoveRequest.value;
+  }
+
+  /**
+   * Returns an observable which emits when the service starts, or ends, processing a 'move' request
+   */
+  getPerformingMoveRequest$(): Observable<boolean> {
+    return this.isPerformingMoveRequest;
+  }
+
+  /**
+   * Returns the pagination options to use when fetching the bundles
+   */
+  getInitialBundlesPaginationOptions(): PaginationComponentOptions {
+    return Object.assign(new PaginationComponentOptions(), {
+      id: 'bundles-pagination-options',
+      currentPage: 1,
+      pageSize: 9999
+    });
+  }
+
+  /**
+   * Returns the initial pagination options to use when fetching the bitstreams
+   * @param bundleName The name of the bundle, will be as pagination id.
+   */
+  getInitialBitstreamsPaginationOptions(bundleName: string): PaginationComponentOptions {
+    return Object.assign(new PaginationComponentOptions(),{
+      id: bundleName, // This might behave unexpectedly if the item contains two bundles with the same name
+      currentPage: 1,
+      pageSize: 10
+    });
+  }
+
+  /**
+   * Returns the {@link ResponsiveTableSizes} for use in the columns of the edit bitstreams table
+   */
+  getColumnSizes(): ResponsiveTableSizes {
+    return new ResponsiveTableSizes([
+      // Name column
+      new ResponsiveColumnSizes(2, 2, 3, 4, 4),
+      // Description column
+      new ResponsiveColumnSizes(2, 3, 3, 3, 3),
+      // Format column
+      new ResponsiveColumnSizes(2, 2, 2, 2, 2),
+      // Actions column
+      new ResponsiveColumnSizes(6, 5, 4, 3, 3)
+    ]);
+  }
+
+  /**
+   * Display notifications
+   * - Error notification for each failed response with their message
+   * - Success notification in case there's at least one successful response
+   * @param key       The i18n key for the notification messages
+   * @param responses The returned responses to display notifications for
+   */
+  displayNotifications(key: string, responses: RemoteData<any>[]) {
+    this.displayFailedResponseNotifications(key, responses);
+    this.displaySuccessFulResponseNotifications(key, responses);
+  }
+
+  /**
+   * Display an error notification for each failed response with their message
+   * @param key       The i18n key for the notification messages
+   * @param responses The returned responses to display notifications for
+   */
+  displayFailedResponseNotifications(key: string, responses: RemoteData<any>[]) {
+    const failedResponses = responses.filter((response: RemoteData<Bundle>) => hasValue(response) && response.hasFailed);
+    failedResponses.forEach((response: RemoteData<Bundle>) => {
+      this.displayErrorNotification(key, response.errorMessage);
+    });
+  }
+
+  /**
+   * Display an error notification with the provided key and message
+   * @param key          The i18n key for the notification messages
+   * @param errorMessage The error message to display
+   */
+  displayErrorNotification(key: string, errorMessage: string) {
+    this.notificationsService.error(this.translateService.instant(`${key}.failed.title`), errorMessage);
+  }
+
+  /**
+   * Display a success notification in case there's at least one successful response
+   * @param key       The i18n key for the notification messages
+   * @param responses The returned responses to display notifications for
+   */
+  displaySuccessFulResponseNotifications(key: string, responses: RemoteData<any>[]) {
+    const successfulResponses = responses.filter((response: RemoteData<Bundle>) => hasValue(response) && response.hasSucceeded);
+    if (successfulResponses.length > 0) {
+      this.displaySuccessNotification(key);
+    }
+  }
+
+  /**
+   * Display a success notification with the provided key
+   * @param key          The i18n key for the notification messages
+   */
+  displaySuccessNotification(key: string) {
+    this.notificationsService.success(this.translateService.instant(`${key}.saved.title`), this.translateService.instant(`${key}.saved.content`));
+  }
+
+  /**
+   * Removes the bitstreams marked for deletion from the Bundles emitted by the provided observable.
+   * @param bundles$
+   */
+  removeMarkedBitstreams(bundles$: Observable<Bundle[]>): Observable<RemoteData<NoContent>> {
+    const bundlesOnce$ = bundles$.pipe(take(1));
+
+    // Fetch all removed bitstreams from the object update service
+    const removedBitstreams$ = bundlesOnce$.pipe(
+      switchMap((bundles: Bundle[]) => observableZip(
+        ...bundles.map((bundle: Bundle) => this.objectUpdatesService.getFieldUpdates(bundle.self, [], true))
+      )),
+      map((fieldUpdates: FieldUpdates[]) => ([] as FieldUpdate[]).concat(
+        ...fieldUpdates.map((updates: FieldUpdates) => Object.values(updates).filter((fieldUpdate: FieldUpdate) => fieldUpdate.changeType === FieldChangeType.REMOVE))
+      )),
+      map((fieldUpdates: FieldUpdate[]) => fieldUpdates.map((fieldUpdate: FieldUpdate) => fieldUpdate.field))
+    );
+
+    // Send out delete requests for all deleted bitstreams
+    return removedBitstreams$.pipe(
+      take(1),
+      switchMap((removedBitstreams: Bitstream[]) => {
+        return this.bitstreamService.removeMultiple(removedBitstreams);
+      })
+    );
+  }
+
+  /**
+   * Creates an array of {@link BitstreamTableEntry}s from an array of {@link Bitstream}s
+   * @param bitstreams The bitstreams array to map to table entries
+   */
+  mapBitstreamsToTableEntries(bitstreams: Bitstream[]): BitstreamTableEntry[] {
+    return bitstreams.map((bitstream) => {
+      const name = this.dsoNameService.getName(bitstream);
+
+      return {
+        bitstream: bitstream,
+        id: bitstream.uuid,
+        name: name,
+        nameStripped: this.nameToHeader(name),
+        description: bitstream.firstMetadataValue('dc.description'),
+        format: bitstream.format.pipe(getFirstSucceededRemoteDataPayload()),
+        downloadUrl: getBitstreamDownloadRoute(bitstream),
+      };
+    });
+  }
+
+  /**
+   * Returns a string appropriate to be used as header ID
+   * @param name
+   */
+  nameToHeader(name: string): string {
+    // Whitespace is stripped from the Bitstream names for accessibility reasons.
+    // To make it clear which headers are relevant for a specific field in the table, the 'headers' attribute is used to
+    // refer to specific headers. The Bitstream's name is used as header ID for the row containing information regarding
+    // that bitstream. As the 'headers' attribute contains a space-separated string of header IDs, the Bitstream's header
+    // ID can not contain spaces itself.
+    return this.stripWhiteSpace(name);
+  }
+
+  /**
+   * Returns a string equal to the input string with all whitespace removed.
+   * @param str
+   */
+  stripWhiteSpace(str: string): string {
+    // '/\s+/g' matches all occurrences of any amount of whitespace characters
+    return str.replace(/\s+/g, '');
+  }
+
+  /**
+   * Adds a message to the live region mentioning that the bitstream with the provided name was selected.
+   * @param bitstreamName The name of the bitstream that was selected.
+   */
+  announceSelect(bitstreamName: string) {
+    const message = this.translateService.instant('item.edit.bitstreams.edit.live.select',
+      { bitstream: bitstreamName });
+    this.liveRegionService.addMessage(message);
+  }
+
+  /**
+   * Adds a message to the live region mentioning that the bitstream with the provided name was moved to the provided
+   * position.
+   * @param bitstreamName The name of the bitstream that moved.
+   * @param toPosition The zero-indexed position that the bitstream moved to.
+   */
+  announceMove(bitstreamName: string, toPosition: number) {
+    const message = this.translateService.instant('item.edit.bitstreams.edit.live.move',
+      { bitstream: bitstreamName, toIndex: toPosition + 1 });
+    this.liveRegionService.addMessage(message);
+  }
+
+  /**
+   * Adds a message to the live region mentioning that the bitstream with the provided name is no longer selected and
+   * was returned to the provided position.
+   * @param bitstreamName The name of the bitstream that is no longer selected
+   * @param toPosition The zero-indexed position the bitstream returned to.
+   */
+  announceCancel(bitstreamName: string, toPosition: number) {
+    const message = this.translateService.instant('item.edit.bitstreams.edit.live.cancel',
+      { bitstream: bitstreamName, toIndex: toPosition + 1 });
+    this.liveRegionService.addMessage(message);
+  }
+
+  /**
+   * Adds a message to the live region mentioning that the bitstream with the provided name is no longer selected.
+   * @param bitstreamName The name of the bitstream that is no longer selected.
+   */
+  announceClear(bitstreamName: string) {
+    const message = this.translateService.instant('item.edit.bitstreams.edit.live.clear',
+      { bitstream: bitstreamName });
+    this.liveRegionService.addMessage(message);
+  }
+
+  /**
+   * Adds a message to the live region mentioning that the
+   */
+  announceLoading() {
+    const message = this.translateService.instant('item.edit.bitstreams.edit.live.loading');
+    this.liveRegionService.addMessage(message);
+  }
+}
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.html b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.html
index 62170235a3..06201b1cbe 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.html
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.html
@@ -1,21 +1,140 @@
 <ng-template #bundleView>
-  <div class="row bundle-row">
-    <div class="{{bundleNameColumn.buildClasses()}} font-weight-bold row-element d-flex">
-      <ds-item-edit-bitstream-drag-handle></ds-item-edit-bitstream-drag-handle>
-      <div class="float-left d-flex align-items-center">
-        {{'item.edit.bitstreams.bundle.name' | translate:{ name: dsoNameService.getName(bundle) } }}
-      </div>
-    </div>
-    <div class="{{columnSizes.columns[3].buildClasses()}} text-center row-element">
-      <div class="btn-group bundle-action-buttons">
-        <button [routerLink]="[itemPageRoute, 'bitstreams', 'new']"
-                [queryParams]="{bundle: bundle.id}"
-                class="btn btn-outline-success btn-sm"
-                title="{{'item.edit.bitstreams.bundle.edit.buttons.upload' | translate}}">
-          <i class="fas fa-upload fa-fw"></i>
-        </button>
-      </div>
-    </div>
-  </div>
-  <ds-paginated-drag-and-drop-bitstream-list [bundle]="bundle" [columnSizes]="columnSizes" (dropObject)="dropObject.emit($event)"></ds-paginated-drag-and-drop-bitstream-list>
+
+  <ds-pagination *ngIf="(bitstreamsRD$ | async)?.payload as bitstreamsList"
+                 [hideGear]="true"
+                 [hidePagerWhenSinglePage]="true"
+                 [hidePaginationDetail]="true"
+                 [paginationOptions]="paginationOptions"
+                 [collectionSize]="bitstreamsList.totalElements"
+                 [retainScrollPosition]="true"
+                 [ngbTooltip]="'item.edit.bitstreams.bundle.tooltip' | translate" placement="bottom"
+                 [autoClose]="false" triggers="manual" #dragTooltip="ngbTooltip">
+    <ng-container *ngIf="(updates$ | async) as updates">
+
+      <table class="table" [class.mt-n1]="!isFirstTable"
+             [attr.aria-label]="'item.edit.bitstreams.bundle.table.aria-label' | translate: { bundle: bundleName } ">
+        <thead [class.visually-hidden]="!isFirstTable">
+        <tr class="header-row font-weight-bold">
+          <th id="name" scope="col" class="{{ columnSizes.columns[0].buildClasses() }}">
+            {{'item.edit.bitstreams.headers.name' | translate}}
+          </th>
+          <th id="description" scope="col" class="{{ columnSizes.columns[1].buildClasses() }}">
+            {{'item.edit.bitstreams.headers.description' | translate}}
+          </th>
+          <th id="format" scope="col" class="{{ columnSizes.columns[2].buildClasses() }}">
+            {{'item.edit.bitstreams.headers.format' | translate}}
+          </th>
+          <th id="actions" scope="col" class="{{ columnSizes.columns[3].buildClasses() }} text-center">
+            {{'item.edit.bitstreams.headers.actions' | translate}}
+          </th>
+        </tr>
+        </thead>
+
+        <tbody cdkDropList (cdkDropListDropped)="drop($event)">
+        <tr class="bundle-row">
+          <th id="{{ bundleName }}" class="span" colspan="3" scope="colgroup">
+            {{'item.edit.bitstreams.bundle.name' | translate:{ name: bundleName } }}
+          </th>
+          <td class="text-center">
+
+            <div class="btn-group">
+              <button [routerLink]="[itemPageRoute, 'bitstreams', 'new']"
+                      [queryParams]="{bundle: bundle.id}"
+                      [attr.aria-label]="'item.edit.bitstreams.bundle.edit.buttons.upload' | translate"
+                      class="btn btn-outline-success btn-sm"
+                      title="{{'item.edit.bitstreams.bundle.edit.buttons.upload' | translate}}">
+                <i class="fas fa-upload fa-fw"></i>
+              </button>
+              <div ngbDropdown #paginationControls="ngbDropdown" class="btn-group float-right btn-sm p-0"
+                   placement="bottom-right">
+                <button class="btn btn-outline-secondary" id="paginationControls" ngbDropdownToggle
+                        [title]="'pagination.options.description' | translate"
+                        [attr.aria-label]="'pagination.options.description' | translate" aria-haspopup="true"
+                        aria-expanded="false">
+                  <i class="fas fa-cog" aria-hidden="true"></i>
+                </button>
+
+                <ul id="paginationControlsDropdownMenu" aria-labelledby="paginationControls" role="menu"
+                    ngbDropdownMenu>
+                  <li role="menuitem">
+                    <span class="dropdown-header" id="pagination-control_results-per-page"
+                          role="heading">{{ 'pagination.results-per-page' | translate}}</span>
+                    <ul aria-labelledby="pagination-control_results-per-page" class="list-unstyled" role="listbox">
+                      <li *ngFor="let size of paginationOptions.pageSizeOptions" role="option"
+                          [attr.aria-selected]="size === (pageSize$ | async)">
+                        <button (click)="doPageSizeChange(size)" class="dropdown-item">
+                          <i [ngClass]="{'invisible': size !== (pageSize$ | async) }" class="fas fa-check"
+                             aria-hidden="true"></i> {{size}}
+                        </button>
+                      </li>
+                    </ul>
+                  </li>
+                </ul>
+              </div>
+            </div>
+
+          </td>
+        </tr>
+
+        <ng-container *ngFor="let entry of (tableEntries$ | async)">
+          <tr *ngIf="updates[entry.id] as update" [ngClass]="getRowClass(update, entry)" class="bitstream-row" cdkDrag
+              (cdkDragStarted)="dragStart()" (cdkDragEnded)="dragEnd()">
+
+            <th class="bitstream-name row-element {{ columnSizes.columns[0].buildClasses() }}"
+                scope="row" id="{{ entry.nameStripped }}" headers="{{ bundleName }} name">
+              <div class="drag-handle text-muted float-left p-1 mr-2" tabindex="0" cdkDragHandle
+                   (keydown.enter)="select($event, entry)" (keydown.space)="select($event, entry)" (click)="select($event, entry)">
+                <i class="fas fa-grip-vertical fa-fw"
+                   [title]="'item.edit.bitstreams.edit.buttons.drag' | translate"></i>
+              </div>
+              {{ entry.name }}
+            </th>
+            <td class="row-element {{ columnSizes.columns[1].buildClasses() }}"
+                headers="{{ entry.nameStripped }} {{ bundleName }} description">
+              {{ entry.description }}
+            </td>
+            <td class="row-element {{ columnSizes.columns[2].buildClasses() }}"
+                headers="{{ entry.nameStripped }} {{ bundleName }} format">
+              {{ (entry.format | async)?.shortDescription }}
+            </td>
+            <td class="row-element {{ columnSizes.columns[3].buildClasses() }}"
+                headers="{{ entry.nameStripped }} {{ bundleName }} actions">
+              <div class="text-center w-100">
+                <div class="btn-group relationship-action-buttons">
+                  <a [href]="entry.downloadUrl"
+                     [attr.aria-label]="'item.edit.bitstreams.edit.buttons.download' | translate"
+                     class="btn btn-outline-primary btn-sm"
+                     title="{{'item.edit.bitstreams.edit.buttons.download' | translate}}"
+                     [attr.data-test]="'download-button' | dsBrowserOnly">
+                    <i class="fas fa-download fa-fw"></i>
+                  </a>
+                  <button [routerLink]="['/bitstreams/', entry.id, 'edit']" class="btn btn-outline-primary btn-sm"
+                          [attr.aria-label]="'item.edit.bitstreams.edit.buttons.edit' | translate"
+                          title="{{'item.edit.bitstreams.edit.buttons.edit' | translate}}">
+                    <i class="fas fa-edit fa-fw"></i>
+                  </button>
+                  <button [disabled]="!canRemove(update)" (click)="remove(entry.bitstream)"
+                          [attr.aria-label]=" 'item. edit bitstreams.edit.buttons.remove' | translate"
+                          class="btn btn-outline-danger btn-sm"
+                          title="{{'item.edit.bitstreams.edit.buttons.remove' | translate}}">
+                    <i class="fas fa-trash-alt fa-fw"></i>
+                  </button>
+                  <button [disabled]="!canUndo(update)" (click)="undo(entry.bitstream)"
+                          [attr.aria-label]="'item.edit.bitstreams.edit.buttons.undo' | translate"
+                          class="btn btn-outline-warning btn-sm"
+                          title="{{'item.edit.bitstreams.edit.buttons.undo' | translate}}">
+                    <i class="fas fa-undo-alt fa-fw"></i>
+                  </button>
+                </div>
+              </div>
+            </td>
+          </tr>
+        </ng-container>
+
+        </tbody>
+      </table>
+
+    </ng-container>
+  </ds-pagination>
+
 </ng-template>
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.scss b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.scss
new file mode 100644
index 0000000000..bbd4e1e75c
--- /dev/null
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.scss
@@ -0,0 +1,24 @@
+.header-row {
+  color: var(--bs-table-dark-color);
+  background-color: var(--bs-table-dark-bg);
+  border-color: var(--bs-table-dark-bg);
+}
+
+.bundle-row {
+  color: var(--bs-table-head-color);
+  background-color: var(--bs-table-head-bg);
+  border-color: var(--bs-table-border-color);
+}
+
+.row-element {
+  padding: 0.75em;
+  border-bottom: var(--bs-table-border-width) solid var(--bs-table-border-color);
+}
+
+.bitstream-name {
+  font-weight: normal;
+}
+
+.table {
+  margin-bottom: 0;
+}
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.spec.ts b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.spec.ts
index c26f99eb8f..26a1b0e913 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.spec.ts
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.spec.ts
@@ -6,6 +6,20 @@ import { Item } from '../../../../core/shared/item.model';
 import { Bundle } from '../../../../core/shared/bundle.model';
 import { ResponsiveTableSizes } from '../../../../shared/responsive-table-sizes/responsive-table-sizes';
 import { ResponsiveColumnSizes } from '../../../../shared/responsive-table-sizes/responsive-column-sizes';
+import { BundleDataService } from '../../../../core/data/bundle-data.service';
+import { of as observableOf, of, Subject } from 'rxjs';
+import { ObjectUpdatesService } from '../../../../core/data/object-updates/object-updates.service';
+import { PaginationServiceStub } from '../../../../shared/testing/pagination-service.stub';
+import { RequestService } from '../../../../core/data/request.service';
+import { getMockRequestService } from '../../../../shared/mocks/request.service.mock';
+import { ItemBitstreamsService, BitstreamTableEntry, SelectedBitstreamTableEntry } from '../item-bitstreams.service';
+import { PaginationService } from '../../../../core/pagination/pagination.service';
+import { getItemBitstreamsServiceStub, ItemBitstreamsServiceStub } from '../item-bitstreams.service.stub';
+import { FieldUpdate } from '../../../../core/data/object-updates/field-update.model';
+import { FieldChangeType } from '../../../../core/data/object-updates/field-change-type.model';
+import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
+import { createPaginatedList } from '../../../../shared/testing/utils.test';
+import { CdkDragDrop } from '@angular/cdk/drag-drop';
 
 describe('ItemEditBitstreamBundleComponent', () => {
   let comp: ItemEditBitstreamBundleComponent;
@@ -31,10 +45,33 @@ describe('ItemEditBitstreamBundleComponent', () => {
     }
   });
 
+  const restEndpoint = 'fake-rest-endpoint';
+  const bundleService = jasmine.createSpyObj('bundleService', {
+    getBitstreamsEndpoint: observableOf(restEndpoint),
+    getBitstreams: createSuccessfulRemoteDataObject$(createPaginatedList([])),
+  });
+
+  let objectUpdatesService: any;
+  let itemBitstreamsService: ItemBitstreamsServiceStub;
+
   beforeEach(waitForAsync(() => {
+    objectUpdatesService = jasmine.createSpyObj('objectUpdatesService', {
+      initialize: undefined,
+      getFieldUpdatesExclusive: of(null),
+    });
+
+    itemBitstreamsService = getItemBitstreamsServiceStub();
+
     TestBed.configureTestingModule({
       imports: [TranslateModule.forRoot()],
       declarations: [ItemEditBitstreamBundleComponent],
+      providers: [
+        { provide: BundleDataService, useValue: bundleService },
+        { provide: ObjectUpdatesService, useValue: objectUpdatesService },
+        { provide: PaginationService, useValue: new PaginationServiceStub() },
+        { provide: RequestService, useValue: getMockRequestService() },
+        { provide: ItemBitstreamsService, useValue: itemBitstreamsService },
+      ],
       schemas: [
         NO_ERRORS_SCHEMA
       ]
@@ -55,4 +92,251 @@ describe('ItemEditBitstreamBundleComponent', () => {
   it('should create an embedded view of the component', () => {
     expect(viewContainerRef.createEmbeddedView).toHaveBeenCalled();
   });
+
+  describe('on selected entry change', () => {
+    let paginationComponent: any;
+    let testSubject: Subject<SelectedBitstreamTableEntry> = new Subject();
+
+    beforeEach(() => {
+      paginationComponent = jasmine.createSpyObj('paginationComponent', {
+        doPageChange: undefined,
+      });
+      comp.paginationComponent = paginationComponent;
+
+      spyOn<any>(comp, 'getCurrentPageSize').and.returnValue(2);
+    });
+
+    it('should move to the page the selected entry is on if were not on that page', () => {
+
+      const entry: SelectedBitstreamTableEntry = {
+        bitstream: null,
+        bundle: bundle,
+        bundleSize: 5,
+        originalPosition: 1,
+        currentPosition: 2,
+      };
+
+      comp.handleSelectionAction({ action: 'Moved', selectedEntry: entry });
+      expect(paginationComponent.doPageChange).toHaveBeenCalledWith(2);
+    });
+
+    it('should not change page when we are already on the correct page', () => {
+      const entry: SelectedBitstreamTableEntry = {
+        bitstream: null,
+        bundle: bundle,
+        bundleSize: 5,
+        originalPosition: 0,
+        currentPosition: 1,
+      };
+
+      comp.handleSelectionAction({ action: 'Moved', selectedEntry: entry });
+      expect(paginationComponent.doPageChange).not.toHaveBeenCalled();
+    });
+
+    it('should change to the original page when cancelling', () => {
+      const entry: SelectedBitstreamTableEntry = {
+        bitstream: null,
+        bundle: bundle,
+        bundleSize: 5,
+        originalPosition: 3,
+        currentPosition: 0,
+      };
+
+      comp.handleSelectionAction({ action: 'Cancelled', selectedEntry: entry });
+      expect(paginationComponent.doPageChange).toHaveBeenCalledWith(2);
+    });
+
+    it('should not change page when we are already on the correct page when cancelling', () => {
+      const entry: SelectedBitstreamTableEntry = {
+        bitstream: null,
+        bundle: bundle,
+        bundleSize: 5,
+        originalPosition: 0,
+        currentPosition: 3,
+      };
+
+      comp.handleSelectionAction({ action: 'Cancelled', selectedEntry: entry });
+      expect(paginationComponent.doPageChange).not.toHaveBeenCalled();
+    });
+  });
+
+  describe('getRowClass', () => {
+    it('should return \'table-info\' when the bitstream is the selected bitstream', () => {
+      itemBitstreamsService.getSelectedBitstream.and.returnValue({
+        bitstream: { id: 'bitstream-id'}
+      });
+
+      const bitstreamEntry = {
+        id: 'bitstream-id',
+      } as BitstreamTableEntry;
+
+      expect(comp.getRowClass(undefined, bitstreamEntry)).toEqual('table-info');
+    });
+
+    it('should return \'table-warning\' when the update is of type \'UPDATE\'', () => {
+      const update = {
+        changeType: FieldChangeType.UPDATE,
+      } as FieldUpdate;
+
+      expect(comp.getRowClass(update, undefined)).toEqual('table-warning');
+    });
+
+    it('should return \'table-success\' when the update is of type \'ADD\'', () => {
+      const update = {
+        changeType: FieldChangeType.ADD,
+      } as FieldUpdate;
+
+      expect(comp.getRowClass(update, undefined)).toEqual('table-success');
+    });
+
+    it('should return \'table-danger\' when the update is of type \'REMOVE\'', () => {
+      const update = {
+        changeType: FieldChangeType.REMOVE,
+      } as FieldUpdate;
+
+      expect(comp.getRowClass(update, undefined)).toEqual('table-danger');
+    });
+
+    it('should return \'bg-white\' in any other case', () => {
+      const update = {
+        changeType: undefined,
+      } as FieldUpdate;
+
+      expect(comp.getRowClass(update, undefined)).toEqual('bg-white');
+    });
+  });
+
+  describe('drag', () => {
+    let dragTooltip;
+    let paginationComponent;
+
+    beforeEach(() => {
+      dragTooltip = jasmine.createSpyObj('dragTooltip', {
+        open: undefined,
+        close: undefined,
+      });
+      comp.dragTooltip = dragTooltip;
+    });
+
+    describe('Start', () => {
+      it('should open the tooltip when there are multiple pages', () => {
+        paginationComponent = jasmine.createSpyObj('paginationComponent', {
+          doPageChange: undefined,
+        }, {
+          shouldShowBottomPager: of(true),
+        });
+        comp.paginationComponent = paginationComponent;
+
+        comp.dragStart();
+        expect(dragTooltip.open).toHaveBeenCalled();
+      });
+
+      it('should not open the tooltip when there is only a single page', () => {
+        paginationComponent = jasmine.createSpyObj('paginationComponent', {
+          doPageChange: undefined,
+        }, {
+          shouldShowBottomPager: of(false),
+        });
+        comp.paginationComponent = paginationComponent;
+
+        comp.dragStart();
+        expect(dragTooltip.open).not.toHaveBeenCalled();
+      });
+    });
+
+    describe('end', () => {
+      it('should always close the tooltip', () => {
+        paginationComponent = jasmine.createSpyObj('paginationComponent', {
+          doPageChange: undefined,
+        }, {
+          shouldShowBottomPager: of(false),
+        });
+        comp.paginationComponent = paginationComponent;
+
+        comp.dragEnd();
+        expect(dragTooltip.close).toHaveBeenCalled();
+      });
+    });
+  });
+
+  describe('drop', () => {
+    it('should correctly move the bitstream on drop', () => {
+      const event = {
+        previousIndex: 1,
+        currentIndex: 8,
+        dropPoint: { x: 100, y: 200 },
+      } as CdkDragDrop<any>;
+
+      comp.drop(event);
+      expect(itemBitstreamsService.performBitstreamMoveRequest).toHaveBeenCalledWith(jasmine.any(Bundle), 1, 8, jasmine.any(Function));
+    });
+
+    it('should not move the bitstream if dropped in the same place', () => {
+      const event = {
+        previousIndex: 1,
+        currentIndex: 1,
+        dropPoint: { x: 100, y: 200 },
+      } as CdkDragDrop<any>;
+
+      comp.drop(event);
+      expect(itemBitstreamsService.performBitstreamMoveRequest).not.toHaveBeenCalled();
+    });
+
+    it('should move to a different page if dropped on a page number', () => {
+      spyOn(document, 'elementFromPoint').and.returnValue({
+        textContent: '2',
+        classList: { contains: (token: string) => true },
+      } as Element);
+
+      const event = {
+        previousIndex: 1,
+        currentIndex: 1,
+        dropPoint: { x: 100, y: 200 },
+      } as CdkDragDrop<any>;
+
+      comp.drop(event);
+      expect(itemBitstreamsService.performBitstreamMoveRequest).toHaveBeenCalledWith(jasmine.any(Bundle), 1, 20, jasmine.any(Function));
+    });
+  });
+
+  describe('select', () => {
+    it('should select the bitstream', () => {
+      const event = new KeyboardEvent('keydown');
+      spyOnProperty(event, 'repeat', 'get').and.returnValue(false);
+
+      const entry = { } as BitstreamTableEntry;
+      comp.tableEntries$.next([entry]);
+
+      comp.select(event, entry);
+      expect(itemBitstreamsService.selectBitstreamEntry).toHaveBeenCalledWith(jasmine.objectContaining({ bitstream: entry }));
+    });
+
+    it('should cancel the selection if the bitstream already is selected', () => {
+      const event = new KeyboardEvent('keydown');
+      spyOnProperty(event, 'repeat', 'get').and.returnValue(false);
+
+      const entry = { } as BitstreamTableEntry;
+      comp.tableEntries$.next([entry]);
+
+      itemBitstreamsService.getSelectedBitstream.and.returnValue({ bitstream: entry });
+
+      comp.select(event, entry);
+      expect(itemBitstreamsService.selectBitstreamEntry).not.toHaveBeenCalled();
+      expect(itemBitstreamsService.cancelSelection).toHaveBeenCalled();
+    });
+
+    it('should not do anything if the user is holding down the select key', () => {
+      const event = new KeyboardEvent('keydown');
+      spyOnProperty(event, 'repeat', 'get').and.returnValue(true);
+
+      const entry = { } as BitstreamTableEntry;
+      comp.tableEntries$.next([entry]);
+
+      itemBitstreamsService.getSelectedBitstream.and.returnValue({ bitstream: entry });
+
+      comp.select(event, entry);
+      expect(itemBitstreamsService.selectBitstreamEntry).not.toHaveBeenCalled();
+      expect(itemBitstreamsService.cancelSelection).not.toHaveBeenCalled();
+    });
+  });
 });
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.ts b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.ts
index 70f4b63217..6351c86934 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.ts
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.ts
@@ -1,14 +1,48 @@
-import { Component, EventEmitter, Input, OnInit, Output, ViewChild, ViewContainerRef } from '@angular/core';
+import {
+  Component,
+  Input,
+  OnInit,
+  ViewChild,
+  ViewContainerRef, OnDestroy,
+} from '@angular/core';
 import { Bundle } from '../../../../core/shared/bundle.model';
 import { Item } from '../../../../core/shared/item.model';
 import { ResponsiveColumnSizes } from '../../../../shared/responsive-table-sizes/responsive-column-sizes';
 import { ResponsiveTableSizes } from '../../../../shared/responsive-table-sizes/responsive-table-sizes';
 import { getItemPageRoute } from '../../../item-page-routing-paths';
 import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
+import { RemoteData } from 'src/app/core/data/remote-data';
+import { PaginatedList } from 'src/app/core/data/paginated-list.model';
+import { Bitstream } from 'src/app/core/shared/bitstream.model';
+import { Observable, BehaviorSubject, switchMap, shareReplay, Subscription } from 'rxjs';
+import { PaginationComponentOptions } from '../../../../shared/pagination/pagination-component-options.model';
+import { FieldUpdates } from '../../../../core/data/object-updates/field-updates.model';
+import { PaginatedSearchOptions } from '../../../../shared/search/models/paginated-search-options.model';
+import { BundleDataService } from '../../../../core/data/bundle-data.service';
+import { followLink } from '../../../../shared/utils/follow-link-config.model';
+import {
+  getAllSucceededRemoteData,
+  paginatedListToArray,
+} from '../../../../core/shared/operators';
+import { ObjectUpdatesService } from '../../../../core/data/object-updates/object-updates.service';
+import { map, take, filter, tap } from 'rxjs/operators';
+import { FieldChangeType } from '../../../../core/data/object-updates/field-change-type.model';
+import { FieldUpdate } from '../../../../core/data/object-updates/field-update.model';
+import { PaginationService } from '../../../../core/pagination/pagination.service';
+import { PaginationComponent } from '../../../../shared/pagination/pagination.component';
+import { RequestService } from '../../../../core/data/request.service';
+import {
+  ItemBitstreamsService,
+  BitstreamTableEntry,
+  SelectedBitstreamTableEntry,
+  MOVE_KEY, SelectionAction
+} from '../item-bitstreams.service';
+import { CdkDragDrop } from '@angular/cdk/drag-drop';
+import { hasValue, hasNoValue } from '../../../../shared/empty.util';
 
 @Component({
   selector: 'ds-item-edit-bitstream-bundle',
-  styleUrls: ['../item-bitstreams.component.scss'],
+  styleUrls: ['../item-bitstreams.component.scss', './item-edit-bitstream-bundle.component.scss'],
   templateUrl: './item-edit-bitstream-bundle.component.html',
 })
 /**
@@ -16,13 +50,24 @@ import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
  * Creates an embedded view of the contents. This is to ensure the table structure won't break.
  * (which means it'll be added to the parents html without a wrapping ds-item-edit-bitstream-bundle element)
  */
-export class ItemEditBitstreamBundleComponent implements OnInit {
+export class ItemEditBitstreamBundleComponent implements OnInit, OnDestroy {
+  protected readonly FieldChangeType = FieldChangeType;
 
   /**
    * The view on the bundle information and bitstreams
    */
   @ViewChild('bundleView', {static: true}) bundleView;
 
+  /**
+   * The view on the pagination component
+   */
+  @ViewChild(PaginationComponent) paginationComponent: PaginationComponent;
+
+  /**
+   * The view on the drag tooltip
+   */
+  @ViewChild('dragTooltip') dragTooltip;
+
   /**
    * The bundle to display bitstreams for
    */
@@ -39,11 +84,9 @@ export class ItemEditBitstreamBundleComponent implements OnInit {
   @Input() columnSizes: ResponsiveTableSizes;
 
   /**
-   * Send an event when the user drops an object on the pagination
-   * The event contains details about the index the object came from and is dropped to (across the entirety of the list,
-   * not just within a single page)
+   * Whether this is the first in a series of bundle tables
    */
-  @Output() dropObject: EventEmitter<any> = new EventEmitter<any>();
+  @Input() isFirstTable = false;
 
   /**
    * The bootstrap sizes used for the Bundle Name column
@@ -56,9 +99,65 @@ export class ItemEditBitstreamBundleComponent implements OnInit {
    */
   itemPageRoute: string;
 
+  /**
+   * The name of the bundle
+   */
+  bundleName: string;
+
+  /**
+   * The number of bitstreams in the bundle
+   */
+  bundleSize: number;
+
+  /**
+   * The bitstreams to show in the table
+   */
+  bitstreamsRD$: Observable<RemoteData<PaginatedList<Bitstream>>>;
+
+  /**
+   * The data to show in the table
+   */
+  tableEntries$: BehaviorSubject<BitstreamTableEntry[]> = new BehaviorSubject([]);
+
+  /**
+   * The initial page options to use for fetching the bitstreams
+   */
+  paginationOptions: PaginationComponentOptions;
+
+  /**
+   * The current page options
+   */
+  currentPaginationOptions$: BehaviorSubject<PaginationComponentOptions>;
+
+  /**
+   * The currently selected page size
+   */
+  pageSize$: BehaviorSubject<number>;
+
+  /**
+   * The self url of the bundle, also used when retrieving fieldUpdates
+   */
+  bundleUrl: string;
+
+  /**
+   * The updates to the current bitstreams
+   */
+  updates$: BehaviorSubject<FieldUpdates> = new BehaviorSubject(null);
+
+  /**
+   * Array containing all subscriptions created by this component
+   */
+  subscriptions: Subscription[] = [];
+
+
   constructor(
     protected viewContainerRef: ViewContainerRef,
     public dsoNameService: DSONameService,
+    protected bundleService: BundleDataService,
+    protected objectUpdatesService: ObjectUpdatesService,
+    protected paginationService: PaginationService,
+    protected requestService: RequestService,
+    protected itemBitstreamsService: ItemBitstreamsService,
   ) {
   }
 
@@ -66,5 +165,383 @@ export class ItemEditBitstreamBundleComponent implements OnInit {
     this.bundleNameColumn = this.columnSizes.combineColumns(0, 2);
     this.viewContainerRef.createEmbeddedView(this.bundleView);
     this.itemPageRoute = getItemPageRoute(this.item);
+    this.bundleName = this.dsoNameService.getName(this.bundle);
+    this.bundleUrl = this.bundle.self;
+
+    this.initializePagination();
+    this.initializeBitstreams();
+    this.initializeSelectionActions();
+  }
+
+  ngOnDestroy() {
+    this.viewContainerRef.clear();
+    this.subscriptions.forEach(sub => sub?.unsubscribe());
+  }
+
+  protected initializePagination() {
+    this.paginationOptions = this.itemBitstreamsService.getInitialBitstreamsPaginationOptions(this.bundleName);
+
+    this.currentPaginationOptions$ = new BehaviorSubject(this.paginationOptions);
+    this.pageSize$ = new BehaviorSubject(this.paginationOptions.pageSize);
+
+    this.subscriptions.push(
+      this.paginationService.getCurrentPagination(this.paginationOptions.id, this.paginationOptions)
+        .subscribe((pagination) => {
+          this.currentPaginationOptions$.next(pagination);
+          this.pageSize$.next(pagination.pageSize);
+        })
+    );
+
+  }
+
+  protected initializeBitstreams() {
+    this.bitstreamsRD$ = this.currentPaginationOptions$.pipe(
+      switchMap((page: PaginationComponentOptions) => {
+        const paginatedOptions = new PaginatedSearchOptions({ pagination: Object.assign({}, page) });
+        return this.bundleService.getBitstreamsEndpoint(this.bundle.id, paginatedOptions).pipe(
+          switchMap((href) => this.requestService.hasByHref$(href)),
+          switchMap(() => this.bundleService.getBitstreams(
+            this.bundle.id,
+            paginatedOptions,
+            followLink('format'),
+          )),
+        );
+      }),
+      getAllSucceededRemoteData(),
+      shareReplay(1),
+    );
+
+    this.subscriptions.push(
+      this.bitstreamsRD$.pipe(
+        take(1),
+        tap(bitstreamsRD => this.bundleSize = bitstreamsRD.payload.totalElements),
+        paginatedListToArray(),
+      ).subscribe((bitstreams) => {
+        this.objectUpdatesService.initialize(this.bundleUrl, bitstreams, new Date());
+      }),
+
+      this.bitstreamsRD$.pipe(
+        paginatedListToArray(),
+        switchMap((bitstreams) => this.objectUpdatesService.getFieldUpdatesExclusive(this.bundleUrl, bitstreams))
+      ).subscribe((updates) => this.updates$.next(updates)),
+
+      this.bitstreamsRD$.pipe(
+        paginatedListToArray(),
+        map((bitstreams) => this.itemBitstreamsService.mapBitstreamsToTableEntries(bitstreams)),
+      ).subscribe((tableEntries) => this.tableEntries$.next(tableEntries)),
+    );
+  }
+
+  protected initializeSelectionActions() {
+    this.subscriptions.push(
+      this.itemBitstreamsService.getSelectionAction$().subscribe(
+        selectionAction => this.handleSelectionAction(selectionAction))
+    );
+  }
+
+  /**
+   * Handles a change in selected bitstream by changing the pagination if the change happened on a different page
+   * @param selectionAction
+   */
+  handleSelectionAction(selectionAction: SelectionAction) {
+    if (hasNoValue(selectionAction) || selectionAction.selectedEntry.bundle !== this.bundle) {
+      return;
+    }
+
+    if (selectionAction.action === 'Moved') {
+      // If the currently selected bitstream belongs to this bundle, it has possibly moved to a different page.
+      // In that case we want to change the pagination to the new page.
+      this.redirectToCurrentPage(selectionAction.selectedEntry);
+    }
+
+    if (selectionAction.action === 'Cancelled') {
+      // If the selection is cancelled (and returned to its original position), it is possible the previously selected
+      // bitstream is returned to a different page. In that case we want to change the pagination to the place where
+      // the bitstream was returned to.
+      this.redirectToOriginalPage(selectionAction.selectedEntry);
+    }
+
+    if (selectionAction.action === 'Cleared') {
+      // If the selection is cleared, it is possible the previously selected bitstream is on a different page. In that
+      // case we want to change the pagination to the place where the bitstream is.
+      this.redirectToCurrentPage(selectionAction.selectedEntry);
+    }
+  }
+
+  /**
+   * Redirect the user to the current page of the provided bitstream if it is on a different page.
+   * @param bitstreamEntry The entry that the current position will be taken from to determine the page to move to
+   * @protected
+   */
+  protected redirectToCurrentPage(bitstreamEntry: SelectedBitstreamTableEntry) {
+    const currentPage = this.getCurrentPage();
+    const selectedEntryPage = this.bundleIndexToPage(bitstreamEntry.currentPosition);
+
+    if (currentPage !== selectedEntryPage) {
+      this.changeToPage(selectedEntryPage);
+    }
+  }
+
+  /**
+   * Redirect the user to the original page of the provided bitstream if it is on a different page.
+   * @param bitstreamEntry The entry that the original position will be taken from to determine the page to move to
+   * @protected
+   */
+  protected redirectToOriginalPage(bitstreamEntry: SelectedBitstreamTableEntry) {
+    const currentPage = this.getCurrentPage();
+    const originPage = this.bundleIndexToPage(bitstreamEntry.originalPosition);
+
+    if (currentPage !== originPage) {
+      this.changeToPage(originPage);
+    }
+  }
+
+  /**
+   * Check if a user should be allowed to remove this field
+   */
+  canRemove(fieldUpdate: FieldUpdate): boolean {
+    return fieldUpdate.changeType !== FieldChangeType.REMOVE;
+  }
+
+  /**
+   * Check if a user should be allowed to cancel the update to this field
+   */
+  canUndo(fieldUpdate: FieldUpdate): boolean {
+    return fieldUpdate.changeType >= 0;
+  }
+
+  /**
+   * Sends a new remove update for this field to the object updates service
+   */
+  remove(bitstream: Bitstream): void {
+    this.objectUpdatesService.saveRemoveFieldUpdate(this.bundleUrl, bitstream);
+  }
+
+  /**
+   * Cancels the current update for this field in the object updates service
+   */
+  undo(bitstream: Bitstream): void {
+    this.objectUpdatesService.removeSingleFieldUpdate(this.bundleUrl, bitstream.uuid);
+  }
+
+  /**
+   * Returns the css class for a table row depending on the state of the table entry.
+   * @param update
+   * @param bitstream
+   */
+  getRowClass(update: FieldUpdate, bitstream: BitstreamTableEntry): string {
+    const selected = this.itemBitstreamsService.getSelectedBitstream();
+
+    if (hasValue(selected) && bitstream.id === selected.bitstream.id) {
+      return 'table-info';
+    }
+
+    switch (update.changeType) {
+      case FieldChangeType.UPDATE:
+        return 'table-warning';
+      case FieldChangeType.ADD:
+        return 'table-success';
+      case FieldChangeType.REMOVE:
+        return 'table-danger';
+      default:
+        return 'bg-white';
+    }
+  }
+
+  /**
+   * Changes the page size to the provided page size.
+   * @param pageSize
+   */
+  public doPageSizeChange(pageSize: number) {
+    this.paginationComponent.doPageSizeChange(pageSize);
+  }
+
+  /**
+   * Handles start of dragging by opening the tooltip mentioning that it is possible to drag a bitstream to a different
+   * page by dropping it on the page number, only if there are multiple pages.
+   */
+  dragStart() {
+    // Only open the drag tooltip when there are multiple pages
+    this.paginationComponent.shouldShowBottomPager.pipe(
+      take(1),
+      filter((hasMultiplePages) => hasMultiplePages),
+    ).subscribe(() => {
+      this.dragTooltip.open();
+    });
+  }
+
+  /**
+   * Handles end of dragging by closing the tooltip.
+   */
+  dragEnd() {
+    this.dragTooltip.close();
+  }
+
+  /**
+   * Handles dropping by calculation the target position, and changing the page if the bitstream was dropped on a
+   * different page.
+   * @param event
+   */
+  drop(event: CdkDragDrop<any>) {
+    const dragIndex = event.previousIndex;
+    let dropIndex = event.currentIndex;
+    const dragPage = this.getCurrentPage();
+    let dropPage = this.getCurrentPage();
+
+    // Check if the user is hovering over any of the pagination's pages at the time of dropping the object
+    const droppedOnElement = document.elementFromPoint(event.dropPoint.x, event.dropPoint.y);
+    if (hasValue(droppedOnElement) && hasValue(droppedOnElement.textContent) && droppedOnElement.classList.contains('page-link')) {
+      // The user is hovering over a page, fetch the page's number from the element
+      let droppedPage = Number(droppedOnElement.textContent);
+      if (hasValue(droppedPage) && !Number.isNaN(droppedPage)) {
+        droppedPage -= 1;
+
+        if (droppedPage !== dragPage) {
+          dropPage = droppedPage;
+
+          if (dropPage > dragPage) {
+            // When moving to later page, place bitstream at the top
+            dropIndex = 0;
+          } else {
+            // When moving to earlier page, place bitstream at the bottom
+            dropIndex = this.getCurrentPageSize() - 1;
+          }
+        }
+      }
+    }
+
+    const fromIndex = this.pageIndexToBundleIndex(dragIndex, dragPage);
+    const toIndex = this.pageIndexToBundleIndex(dropIndex, dropPage);
+
+    if (fromIndex === toIndex) {
+      return;
+    }
+
+    const selectedBitstream = this.tableEntries$.value[dragIndex];
+
+    const finish = () => {
+      this.itemBitstreamsService.announceMove(selectedBitstream.name, toIndex);
+
+      if (dropPage !== this.getCurrentPage()) {
+        this.changeToPage(dropPage);
+      }
+
+      this.itemBitstreamsService.displaySuccessNotification(MOVE_KEY);
+    };
+
+    this.itemBitstreamsService.performBitstreamMoveRequest(this.bundle, fromIndex, toIndex, finish);
+  }
+
+  /**
+   * Handles a select action for the provided bitstream entry.
+   * If the selected bitstream is currently selected, the selection is cleared.
+   * If no, or a different bitstream, is selected, the provided bitstream becomes the selected bitstream.
+   * @param event The event that triggered the select action
+   * @param bitstream The bitstream that is the target of the select action
+   */
+  select(event: UIEvent, bitstream: BitstreamTableEntry) {
+    event.preventDefault();
+
+    if (event instanceof KeyboardEvent && event.repeat) {
+      // Don't handle hold events, otherwise it would change rapidly between being selected and unselected
+      return;
+    }
+
+    const selectedBitstream = this.itemBitstreamsService.getSelectedBitstream();
+
+    if (hasValue(selectedBitstream) && selectedBitstream.bitstream === bitstream) {
+      this.itemBitstreamsService.cancelSelection();
+    } else {
+      const selectionObject = this.createBitstreamSelectionObject(bitstream);
+
+      if (hasNoValue(selectionObject)) {
+        console.warn('Failed to create selection object');
+        return;
+      }
+
+      this.itemBitstreamsService.selectBitstreamEntry(selectionObject);
+    }
+  }
+
+  /**
+   * Creates a {@link SelectedBitstreamTableEntry} from the provided {@link BitstreamTableEntry} so it can be given
+   * to the {@link ItemBitstreamsService} to select the table entry.
+   * @param bitstream The table entry to create the selection object from.
+   * @protected
+   */
+  protected createBitstreamSelectionObject(bitstream: BitstreamTableEntry): SelectedBitstreamTableEntry {
+    const pageIndex = this.findBitstreamPageIndex(bitstream);
+
+    if (pageIndex === -1) {
+      return null;
+    }
+
+    const position = this.pageIndexToBundleIndex(pageIndex, this.getCurrentPage());
+
+    return {
+      bitstream: bitstream,
+      bundle: this.bundle,
+      bundleSize: this.bundleSize,
+      currentPosition: position,
+      originalPosition: position,
+    };
+  }
+
+  /**
+   * Returns the index of the provided {@link BitstreamTableEntry} relative to the current page
+   * If the current page size is 10, it will return a value from 0 to 9 (inclusive)
+   * Returns -1 if the provided bitstream could not be found
+   * @protected
+   */
+  protected findBitstreamPageIndex(bitstream: BitstreamTableEntry): number {
+    const entries = this.tableEntries$.value;
+    return entries.findIndex(entry => entry === bitstream);
+  }
+
+  /**
+   * Returns the current zero-indexed page
+   * @protected
+   */
+  protected getCurrentPage(): number {
+    // The pagination component uses one-based numbering while zero-based numbering is more convenient for calculations
+    return this.currentPaginationOptions$.value.currentPage - 1;
+  }
+
+  /**
+   * Returns the current page size
+   * @protected
+   */
+  protected getCurrentPageSize(): number {
+    return this.currentPaginationOptions$.value.pageSize;
+  }
+
+  /**
+   * Converts an index relative to the page to an index relative to the bundle
+   * @param index The index relative to the page
+   * @param page  The zero-indexed page number
+   * @protected
+   */
+  protected pageIndexToBundleIndex(index: number, page: number) {
+    return page * this.getCurrentPageSize() + index;
+  }
+
+  /**
+   * Calculates the zero-indexed page number from the index relative to the bundle
+   * @param index The index relative to the bundle
+   * @protected
+   */
+  protected bundleIndexToPage(index: number) {
+    return Math.floor(index / this.getCurrentPageSize());
+  }
+
+  /**
+   * Change the pagination for this bundle to the provided zero-indexed page
+   * @param page The zero-indexed page to change to
+   * @protected
+   */
+  protected changeToPage(page: number) {
+    // Increments page by one because zero-indexing is way easier for calculations but the pagination component
+    // uses one-indexing.
+    this.paginationComponent.doPageChange(page + 1);
   }
 }
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/paginated-drag-and-drop-bitstream-list/paginated-drag-and-drop-bitstream-list.component.html b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/paginated-drag-and-drop-bitstream-list/paginated-drag-and-drop-bitstream-list.component.html
deleted file mode 100644
index f54aa73597..0000000000
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/paginated-drag-and-drop-bitstream-list/paginated-drag-and-drop-bitstream-list.component.html
+++ /dev/null
@@ -1,33 +0,0 @@
-<ds-pagination *ngIf="(objectsRD$ | async)?.payload"
-               [hideGear]="true"
-               [hidePagerWhenSinglePage]="true"
-               [hidePaginationDetail]="true"
-               [paginationOptions]="options"
-               [pageInfoState]="(objectsRD$ | async)?.payload"
-               [collectionSize]="(objectsRD$ | async)?.payload?.totalElements">
-  <ng-container *ngIf="!(loading$ | async)">
-    <div [id]="bundle.id" class="bundle-bitstreams-list"
-         [ngClass]="{'mb-3': (objectsRD$ | async)?.payload?.totalElements > pageSize}"
-         *ngVar="(updates$ | async) as updates" cdkDropList (cdkDropListDropped)="drop($event)">
-      <ng-container *ngIf="updates">
-        <div class="row bitstream-row" *ngFor="let uuid of customOrder" cdkDrag
-             [id]="uuid"
-             [ngClass]="{
-                  'table-warning': updates[uuid].changeType === 0,
-                  'table-danger': updates[uuid].changeType === 2,
-                  'table-success': updates[uuid].changeType === 1,
-                  'bg-white': updates[uuid].changeType === undefined
-                }">
-          <ds-item-edit-bitstream [fieldUpdate]="updates[uuid]"
-                                  [bundleUrl]="bundle.self"
-                                  [columnSizes]="columnSizes">
-            <div class="d-flex align-items-center bitstream-row-drag-handle" slot="drag-handle" cdkDragHandle tabindex="0">
-              <ds-item-edit-bitstream-drag-handle></ds-item-edit-bitstream-drag-handle>
-            </div>
-          </ds-item-edit-bitstream>
-        </div>
-      </ng-container>
-    </div>
-  </ng-container>
-  <ds-themed-loading *ngIf="(loading$ | async)" [message]="'loading.bitstreams' | translate"></ds-themed-loading>
-</ds-pagination>
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/paginated-drag-and-drop-bitstream-list/paginated-drag-and-drop-bitstream-list.component.spec.ts b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/paginated-drag-and-drop-bitstream-list/paginated-drag-and-drop-bitstream-list.component.spec.ts
deleted file mode 100644
index 7317eb93be..0000000000
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/paginated-drag-and-drop-bitstream-list/paginated-drag-and-drop-bitstream-list.component.spec.ts
+++ /dev/null
@@ -1,150 +0,0 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { Bundle } from '../../../../../core/shared/bundle.model';
-import { TranslateModule } from '@ngx-translate/core';
-import { PaginatedDragAndDropBitstreamListComponent } from './paginated-drag-and-drop-bitstream-list.component';
-import { VarDirective } from '../../../../../shared/utils/var.directive';
-import { ObjectValuesPipe } from '../../../../../shared/utils/object-values-pipe';
-import { ObjectUpdatesService } from '../../../../../core/data/object-updates/object-updates.service';
-import { BundleDataService } from '../../../../../core/data/bundle-data.service';
-import { Bitstream } from '../../../../../core/shared/bitstream.model';
-import { BitstreamFormat } from '../../../../../core/shared/bitstream-format.model';
-import { of as observableOf } from 'rxjs';
-import { take } from 'rxjs/operators';
-import { ResponsiveTableSizes } from '../../../../../shared/responsive-table-sizes/responsive-table-sizes';
-import { ResponsiveColumnSizes } from '../../../../../shared/responsive-table-sizes/responsive-column-sizes';
-import { createSuccessfulRemoteDataObject$ } from '../../../../../shared/remote-data.utils';
-import { createPaginatedList } from '../../../../../shared/testing/utils.test';
-import { RequestService } from '../../../../../core/data/request.service';
-import { PaginationService } from '../../../../../core/pagination/pagination.service';
-import { PaginationServiceStub } from '../../../../../shared/testing/pagination-service.stub';
-
-describe('PaginatedDragAndDropBitstreamListComponent', () => {
-  let comp: PaginatedDragAndDropBitstreamListComponent;
-  let fixture: ComponentFixture<PaginatedDragAndDropBitstreamListComponent>;
-  let objectUpdatesService: ObjectUpdatesService;
-  let bundleService: BundleDataService;
-  let objectValuesPipe: ObjectValuesPipe;
-  let requestService: RequestService;
-  let paginationService;
-
-  const columnSizes = new ResponsiveTableSizes([
-    new ResponsiveColumnSizes(2, 2, 3, 4, 4),
-    new ResponsiveColumnSizes(2, 3, 3, 3, 3),
-    new ResponsiveColumnSizes(2, 2, 2, 2, 2),
-    new ResponsiveColumnSizes(6, 5, 4, 3, 3)
-  ]);
-
-  const bundle = Object.assign(new Bundle(), {
-    id: 'bundle-1',
-    uuid: 'bundle-1',
-    _links: {
-      self: { href: 'bundle-1-selflink' }
-    }
-  });
-  const date = new Date();
-  const format = Object.assign(new BitstreamFormat(), {
-    shortDescription: 'PDF'
-  });
-  const bitstream1 = Object.assign(new Bitstream(), {
-    uuid: 'bitstreamUUID1',
-    name: 'Fake Bitstream 1',
-    bundleName: 'ORIGINAL',
-    description: 'Description',
-    format: createSuccessfulRemoteDataObject$(format)
-  });
-  const fieldUpdate1 = {
-    field: bitstream1,
-    changeType: undefined
-  };
-  const bitstream2 = Object.assign(new Bitstream(), {
-    uuid: 'bitstreamUUID2',
-    name: 'Fake Bitstream 2',
-    bundleName: 'ORIGINAL',
-    description: 'Description',
-    format: createSuccessfulRemoteDataObject$(format)
-  });
-  const fieldUpdate2 = {
-    field: bitstream2,
-    changeType: undefined
-  };
-
-  beforeEach(waitForAsync(() => {
-    objectUpdatesService = jasmine.createSpyObj('objectUpdatesService',
-      {
-        getFieldUpdates: observableOf({
-          [bitstream1.uuid]: fieldUpdate1,
-          [bitstream2.uuid]: fieldUpdate2,
-        }),
-        getFieldUpdatesExclusive: observableOf({
-          [bitstream1.uuid]: fieldUpdate1,
-          [bitstream2.uuid]: fieldUpdate2,
-        }),
-        getFieldUpdatesByCustomOrder: observableOf({
-          [bitstream1.uuid]: fieldUpdate1,
-          [bitstream2.uuid]: fieldUpdate2,
-        }),
-        saveMoveFieldUpdate: {},
-        saveRemoveFieldUpdate: {},
-        removeSingleFieldUpdate: {},
-        saveAddFieldUpdate: {},
-        discardFieldUpdates: {},
-        reinstateFieldUpdates: observableOf(true),
-        initialize: {},
-        getUpdatedFields: observableOf([bitstream1, bitstream2]),
-        getLastModified: observableOf(date),
-        hasUpdates: observableOf(true),
-        isReinstatable: observableOf(false),
-        isValidPage: observableOf(true),
-        initializeWithCustomOrder: {},
-        addPageToCustomOrder: {}
-      }
-    );
-
-    bundleService = jasmine.createSpyObj('bundleService', {
-      getBitstreams: createSuccessfulRemoteDataObject$(createPaginatedList([bitstream1, bitstream2])),
-      getBitstreamsEndpoint: observableOf('')
-    });
-
-    objectValuesPipe = new ObjectValuesPipe();
-
-    requestService = jasmine.createSpyObj('requestService', {
-      hasByHref$: observableOf(true)
-    });
-
-    paginationService = new PaginationServiceStub();
-
-    TestBed.configureTestingModule({
-      imports: [TranslateModule.forRoot()],
-      declarations: [PaginatedDragAndDropBitstreamListComponent, VarDirective],
-      providers: [
-        { provide: ObjectUpdatesService, useValue: objectUpdatesService },
-        { provide: BundleDataService, useValue: bundleService },
-        { provide: ObjectValuesPipe, useValue: objectValuesPipe },
-        { provide: RequestService, useValue: requestService },
-        { provide: PaginationService, useValue: paginationService }
-      ], schemas: [
-        NO_ERRORS_SCHEMA
-      ]
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(PaginatedDragAndDropBitstreamListComponent);
-    comp = fixture.componentInstance;
-    comp.bundle = bundle;
-    comp.columnSizes = columnSizes;
-    fixture.detectChanges();
-  });
-
-  it('should initialize the objectsRD$', (done) => {
-    comp.objectsRD$.pipe(take(1)).subscribe((objects) => {
-      expect(objects.payload.page).toEqual([bitstream1, bitstream2]);
-      done();
-    });
-  });
-
-  it('should initialize the URL', () => {
-    expect(comp.url).toEqual(bundle.self);
-  });
-});
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/paginated-drag-and-drop-bitstream-list/paginated-drag-and-drop-bitstream-list.component.ts b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/paginated-drag-and-drop-bitstream-list/paginated-drag-and-drop-bitstream-list.component.ts
deleted file mode 100644
index 2c81a4e2cb..0000000000
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/paginated-drag-and-drop-bitstream-list/paginated-drag-and-drop-bitstream-list.component.ts
+++ /dev/null
@@ -1,76 +0,0 @@
-import { AbstractPaginatedDragAndDropListComponent } from '../../../../../shared/pagination-drag-and-drop/abstract-paginated-drag-and-drop-list.component';
-import { Component, ElementRef, Input, OnInit } from '@angular/core';
-import { Bundle } from '../../../../../core/shared/bundle.model';
-import { Bitstream } from '../../../../../core/shared/bitstream.model';
-import { ObjectUpdatesService } from '../../../../../core/data/object-updates/object-updates.service';
-import { BundleDataService } from '../../../../../core/data/bundle-data.service';
-import { switchMap } from 'rxjs/operators';
-import { PaginatedSearchOptions } from '../../../../../shared/search/models/paginated-search-options.model';
-import { ResponsiveTableSizes } from '../../../../../shared/responsive-table-sizes/responsive-table-sizes';
-import { followLink } from '../../../../../shared/utils/follow-link-config.model';
-import { ObjectValuesPipe } from '../../../../../shared/utils/object-values-pipe';
-import { RequestService } from '../../../../../core/data/request.service';
-import { PaginationService } from '../../../../../core/pagination/pagination.service';
-import { PaginationComponentOptions } from '../../../../../shared/pagination/pagination-component-options.model';
-
-@Component({
-  selector: 'ds-paginated-drag-and-drop-bitstream-list',
-  styleUrls: ['../../item-bitstreams.component.scss'],
-  templateUrl: './paginated-drag-and-drop-bitstream-list.component.html',
-})
-/**
- * A component listing edit-bitstream rows for each bitstream within the given bundle.
- * This component makes use of the AbstractPaginatedDragAndDropListComponent, allowing for users to drag and drop
- * bitstreams within the paginated list. To drag and drop a bitstream between two pages, drag the row on top of the
- * page number you want the bitstream to end up at. Doing so will add the bitstream to the top of that page.
- */
-export class PaginatedDragAndDropBitstreamListComponent extends AbstractPaginatedDragAndDropListComponent<Bitstream> implements OnInit {
-  /**
-   * The bundle to display bitstreams for
-   */
-  @Input() bundle: Bundle;
-
-  /**
-   * The bootstrap sizes used for the columns within this table
-   */
-  @Input() columnSizes: ResponsiveTableSizes;
-
-  constructor(protected objectUpdatesService: ObjectUpdatesService,
-              protected elRef: ElementRef,
-              protected objectValuesPipe: ObjectValuesPipe,
-              protected bundleService: BundleDataService,
-              protected paginationService: PaginationService,
-              protected requestService: RequestService) {
-    super(objectUpdatesService, elRef, objectValuesPipe, paginationService);
-  }
-
-  ngOnInit() {
-    super.ngOnInit();
-  }
-
-  /**
-   * Initialize the bitstreams observable depending on currentPage$
-   */
-  initializeObjectsRD(): void {
-    this.objectsRD$ = this.currentPage$.pipe(
-      switchMap((page: PaginationComponentOptions) => {
-        const paginatedOptions = new PaginatedSearchOptions({pagination: Object.assign({}, page)});
-        return this.bundleService.getBitstreamsEndpoint(this.bundle.id, paginatedOptions).pipe(
-          switchMap((href) => this.requestService.hasByHref$(href)),
-          switchMap(() => this.bundleService.getBitstreams(
-            this.bundle.id,
-            paginatedOptions,
-            followLink('format')
-          ))
-        );
-      })
-    );
-  }
-
-  /**
-   * Initialize the URL used for the field-update store, in this case the bundle's self-link
-   */
-  initializeURL(): void {
-    this.url = this.bundle.self;
-  }
-}
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-drag-handle/item-edit-bitstream-drag-handle.component.html b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-drag-handle/item-edit-bitstream-drag-handle.component.html
deleted file mode 100644
index 1bce8667ee..0000000000
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-drag-handle/item-edit-bitstream-drag-handle.component.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<ng-template #handleView>
-  <div class="drag-handle text-muted float-left p-1 mr-2" tabindex="0">
-    <i class="fas fa-grip-vertical fa-fw" [title]="'item.edit.bitstreams.edit.buttons.drag' | translate"></i>
-  </div>
-</ng-template>
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-drag-handle/item-edit-bitstream-drag-handle.component.ts b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-drag-handle/item-edit-bitstream-drag-handle.component.ts
deleted file mode 100644
index e5cb9ba403..0000000000
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-drag-handle/item-edit-bitstream-drag-handle.component.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import { Component, OnInit, ViewChild, ViewContainerRef } from '@angular/core';
-
-@Component({
-  selector: 'ds-item-edit-bitstream-drag-handle',
-  styleUrls: ['../item-bitstreams.component.scss'],
-  templateUrl: './item-edit-bitstream-drag-handle.component.html',
-})
-/**
- * Component displaying a drag handle for the item-edit-bitstream page
- * Creates an embedded view of the contents
- * (which means it'll be added to the parents html without a wrapping ds-item-edit-bitstream-drag-handle element)
- */
-export class ItemEditBitstreamDragHandleComponent implements OnInit {
-  /**
-   * The view on the drag-handle
-   */
-  @ViewChild('handleView', {static: true}) handleView;
-
-  constructor(private viewContainerRef: ViewContainerRef) {
-  }
-
-  ngOnInit(): void {
-    this.viewContainerRef.createEmbeddedView(this.handleView);
-  }
-
-}
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream/item-edit-bitstream.component.html b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream/item-edit-bitstream.component.html
deleted file mode 100644
index 0f0fad2199..0000000000
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream/item-edit-bitstream.component.html
+++ /dev/null
@@ -1,51 +0,0 @@
-<ng-template #bitstreamView>
-  <div class="{{columnSizes.columns[0].buildClasses()}} row-element d-flex">
-    <ng-content select="[slot=drag-handle]"></ng-content>
-    <div class="float-left d-flex align-items-center overflow-hidden">
-      <span class="text-truncate">
-        {{ bitstreamName }}
-      </span>
-    </div>
-  </div>
-  <div class="{{columnSizes.columns[1].buildClasses()}} row-element d-flex align-items-center">
-    <div class="w-100">
-      <div class="text-truncate" [tooltipClass]="'larger-tooltip'" placement="bottom"
-           [ngbTooltip]="bitstream?.firstMetadataValue('dc.description')">
-        {{ bitstream?.firstMetadataValue('dc.description') }}
-      </div>
-    </div>
-  </div>
-  <div class="{{columnSizes.columns[2].buildClasses()}} row-element d-flex align-items-center">
-    <div class="text-center w-100">
-        <span class="text-truncate">
-            {{ (format$ | async)?.shortDescription }}
-        </span>
-    </div>
-  </div>
-  <div class="{{columnSizes.columns[3].buildClasses()}} row-element d-flex align-items-center">
-    <div class="text-center w-100">
-      <div class="btn-group relationship-action-buttons">
-        <a *ngIf="bitstreamDownloadUrl != null" [href]="bitstreamDownloadUrl"
-                class="btn btn-outline-primary btn-sm"
-                title="{{'item.edit.bitstreams.edit.buttons.download' | translate}}"
-                [attr.data-test]="'download-button' | dsBrowserOnly">
-          <i class="fas fa-download fa-fw"></i>
-        </a>
-        <button [routerLink]="['/bitstreams/', bitstream.id, 'edit']" class="btn btn-outline-primary btn-sm"
-                title="{{'item.edit.bitstreams.edit.buttons.edit' | translate}}">
-          <i class="fas fa-edit fa-fw"></i>
-        </button>
-        <button [disabled]="!canRemove()" (click)="remove()"
-                class="btn btn-outline-danger btn-sm"
-                title="{{'item.edit.bitstreams.edit.buttons.remove' | translate}}">
-          <i class="fas fa-trash-alt fa-fw"></i>
-        </button>
-        <button [disabled]="!canUndo()" (click)="undo()"
-                class="btn btn-outline-warning btn-sm"
-                title="{{'item.edit.bitstreams.edit.buttons.undo' | translate}}">
-          <i class="fas fa-undo-alt fa-fw"></i>
-        </button>
-      </div>
-    </div>
-  </div>
-</ng-template>
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream/item-edit-bitstream.component.spec.ts b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream/item-edit-bitstream.component.spec.ts
deleted file mode 100644
index aafa5a4fe4..0000000000
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream/item-edit-bitstream.component.spec.ts
+++ /dev/null
@@ -1,145 +0,0 @@
-import { ItemEditBitstreamComponent } from './item-edit-bitstream.component';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { ObjectUpdatesService } from '../../../../core/data/object-updates/object-updates.service';
-import { of as observableOf } from 'rxjs';
-import { Bitstream } from '../../../../core/shared/bitstream.model';
-import { TranslateModule } from '@ngx-translate/core';
-import { VarDirective } from '../../../../shared/utils/var.directive';
-import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { BitstreamFormat } from '../../../../core/shared/bitstream-format.model';
-import { ResponsiveTableSizes } from '../../../../shared/responsive-table-sizes/responsive-table-sizes';
-import { ResponsiveColumnSizes } from '../../../../shared/responsive-table-sizes/responsive-column-sizes';
-import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
-import { getBitstreamDownloadRoute } from '../../../../app-routing-paths';
-import { By } from '@angular/platform-browser';
-import { BrowserOnlyMockPipe } from '../../../../shared/testing/browser-only-mock.pipe';
-
-let comp: ItemEditBitstreamComponent;
-let fixture: ComponentFixture<ItemEditBitstreamComponent>;
-
-const columnSizes = new ResponsiveTableSizes([
-  new ResponsiveColumnSizes(2, 2, 3, 4, 4),
-  new ResponsiveColumnSizes(2, 3, 3, 3, 3),
-  new ResponsiveColumnSizes(2, 2, 2, 2, 2),
-  new ResponsiveColumnSizes(6, 5, 4, 3, 3)
-]);
-
-const format = Object.assign(new BitstreamFormat(), {
-  shortDescription: 'PDF'
-});
-const bitstream = Object.assign(new Bitstream(), {
-  uuid: 'bitstreamUUID',
-  name: 'Fake Bitstream',
-  bundleName: 'ORIGINAL',
-  description: 'Description',
-  _links: {
-    content: { href: 'content-link' }
-  },
-
-  format: createSuccessfulRemoteDataObject$(format)
-});
-const fieldUpdate = {
-  field: bitstream,
-  changeType: undefined
-};
-const date = new Date();
-const url = 'thisUrl';
-
-let objectUpdatesService: ObjectUpdatesService;
-
-describe('ItemEditBitstreamComponent', () => {
-  beforeEach(waitForAsync(() => {
-    objectUpdatesService = jasmine.createSpyObj('objectUpdatesService',
-      {
-        getFieldUpdates: observableOf({
-          [bitstream.uuid]: fieldUpdate,
-        }),
-        getFieldUpdatesExclusive: observableOf({
-          [bitstream.uuid]: fieldUpdate,
-        }),
-        saveRemoveFieldUpdate: {},
-        removeSingleFieldUpdate: {},
-        saveAddFieldUpdate: {},
-        discardFieldUpdates: {},
-        reinstateFieldUpdates: observableOf(true),
-        initialize: {},
-        getUpdatedFields: observableOf([bitstream]),
-        getLastModified: observableOf(date),
-        hasUpdates: observableOf(true),
-        isReinstatable: observableOf(false),
-        isValidPage: observableOf(true)
-      }
-    );
-
-    TestBed.configureTestingModule({
-      imports: [TranslateModule.forRoot()],
-      declarations: [
-        ItemEditBitstreamComponent,
-        VarDirective,
-        BrowserOnlyMockPipe,
-      ],
-      providers: [
-        { provide: ObjectUpdatesService, useValue: objectUpdatesService }
-      ], schemas: [
-        NO_ERRORS_SCHEMA
-      ]
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(ItemEditBitstreamComponent);
-    comp = fixture.componentInstance;
-    comp.fieldUpdate = fieldUpdate;
-    comp.bundleUrl = url;
-    comp.columnSizes = columnSizes;
-    comp.ngOnChanges(undefined);
-    fixture.detectChanges();
-  });
-
-  describe('when remove is called', () => {
-    beforeEach(() => {
-      comp.remove();
-    });
-
-    it('should call saveRemoveFieldUpdate on objectUpdatesService', () => {
-      expect(objectUpdatesService.saveRemoveFieldUpdate).toHaveBeenCalledWith(url, bitstream);
-    });
-  });
-
-  describe('when undo is called', () => {
-    beforeEach(() => {
-      comp.undo();
-    });
-
-    it('should call removeSingleFieldUpdate on objectUpdatesService', () => {
-      expect(objectUpdatesService.removeSingleFieldUpdate).toHaveBeenCalledWith(url, bitstream.uuid);
-    });
-  });
-
-  describe('when canRemove is called', () => {
-    it('should return true', () => {
-      expect(comp.canRemove()).toEqual(true);
-    });
-  });
-
-  describe('when canUndo is called', () => {
-    it('should return false', () => {
-      expect(comp.canUndo()).toEqual(false);
-    });
-  });
-
-  describe('when the component loads', () => {
-    it('should contain download button with a valid link to the bitstreams download page', () => {
-      fixture.detectChanges();
-      const downloadBtnHref = fixture.debugElement.query(By.css('[data-test="download-button"]')).nativeElement.getAttribute('href');
-      expect(downloadBtnHref).toEqual(comp.bitstreamDownloadUrl);
-    });
-  });
-
-  describe('when the bitstreamDownloadUrl property gets populated', () => {
-    it('should contain the bitstream download page route', () => {
-      expect(comp.bitstreamDownloadUrl).not.toEqual(bitstream._links.content.href);
-      expect(comp.bitstreamDownloadUrl).toEqual(getBitstreamDownloadRoute(bitstream));
-    });
-  });
-});
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream/item-edit-bitstream.component.ts b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream/item-edit-bitstream.component.ts
deleted file mode 100644
index fcb5c706ac..0000000000
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream/item-edit-bitstream.component.ts
+++ /dev/null
@@ -1,117 +0,0 @@
-import { Component, Input, OnChanges, OnInit, SimpleChanges, ViewChild, ViewContainerRef } from '@angular/core';
-import { Bitstream } from '../../../../core/shared/bitstream.model';
-import cloneDeep from 'lodash/cloneDeep';
-import { ObjectUpdatesService } from '../../../../core/data/object-updates/object-updates.service';
-import { Observable } from 'rxjs';
-import { BitstreamFormat } from '../../../../core/shared/bitstream-format.model';
-import { getRemoteDataPayload, getFirstSucceededRemoteData } from '../../../../core/shared/operators';
-import { ResponsiveTableSizes } from '../../../../shared/responsive-table-sizes/responsive-table-sizes';
-import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
-import { FieldUpdate } from '../../../../core/data/object-updates/field-update.model';
-import { FieldChangeType } from '../../../../core/data/object-updates/field-change-type.model';
-import { getBitstreamDownloadRoute } from '../../../../app-routing-paths';
-
-@Component({
-  selector: 'ds-item-edit-bitstream',
-  styleUrls: ['../item-bitstreams.component.scss'],
-  templateUrl: './item-edit-bitstream.component.html',
-})
-/**
- * Component that displays a single bitstream of an item on the edit page
- * Creates an embedded view of the contents
- * (which means it'll be added to the parents html without a wrapping ds-item-edit-bitstream element)
- */
-export class ItemEditBitstreamComponent implements OnChanges, OnInit {
-
-  /**
-   * The view on the bitstream
-   */
-  @ViewChild('bitstreamView', {static: true}) bitstreamView;
-
-  /**
-   * The current field, value and state of the bitstream
-   */
-  @Input() fieldUpdate: FieldUpdate;
-
-  /**
-   * The url of the bundle
-   */
-  @Input() bundleUrl: string;
-
-  /**
-   * The bootstrap sizes used for the columns within this table
-   */
-  @Input() columnSizes: ResponsiveTableSizes;
-
-  /**
-   * The bitstream of this field
-   */
-  bitstream: Bitstream;
-
-  /**
-   * The bitstream's name
-   */
-  bitstreamName: string;
-
-  /**
-   * The bitstream's download url
-   */
-  bitstreamDownloadUrl: string;
-
-  /**
-   * The format of the bitstream
-   */
-  format$: Observable<BitstreamFormat>;
-
-  constructor(private objectUpdatesService: ObjectUpdatesService,
-              private dsoNameService: DSONameService,
-              private viewContainerRef: ViewContainerRef) {
-  }
-
-  ngOnInit(): void {
-    this.viewContainerRef.createEmbeddedView(this.bitstreamView);
-  }
-
-  /**
-   * Update the current bitstream and its format on changes
-   * @param changes
-   */
-  ngOnChanges(changes: SimpleChanges): void {
-    this.bitstream = cloneDeep(this.fieldUpdate.field) as Bitstream;
-    this.bitstreamName = this.dsoNameService.getName(this.bitstream);
-    this.bitstreamDownloadUrl = getBitstreamDownloadRoute(this.bitstream);
-    this.format$ = this.bitstream.format.pipe(
-      getFirstSucceededRemoteData(),
-      getRemoteDataPayload()
-    );
-  }
-
-  /**
-   * Sends a new remove update for this field to the object updates service
-   */
-  remove(): void {
-    this.objectUpdatesService.saveRemoveFieldUpdate(this.bundleUrl, this.bitstream);
-  }
-
-  /**
-   * Cancels the current update for this field in the object updates service
-   */
-  undo(): void {
-    this.objectUpdatesService.removeSingleFieldUpdate(this.bundleUrl, this.bitstream.uuid);
-  }
-
-  /**
-   * Check if a user should be allowed to remove this field
-   */
-  canRemove(): boolean {
-    return this.fieldUpdate.changeType !== FieldChangeType.REMOVE;
-  }
-
-  /**
-   * Check if a user should be allowed to cancel the update to this field
-   */
-  canUndo(): boolean {
-    return this.fieldUpdate.changeType >= 0;
-  }
-
-}
diff --git a/src/app/item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.html b/src/app/item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.html
index c522b8a9c5..57287fdfe2 100644
--- a/src/app/item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.html
+++ b/src/app/item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.html
@@ -6,7 +6,7 @@
       <p>{{'item.edit.item-mapper.description' | translate}}</p>
 
       <ul ngbNav (navChange)="tabChange($event)" [destroyOnHide]="true" #tabs="ngbNav" class="nav-tabs">
-        <li [ngbNavItem]="'browseTab'">
+        <li [ngbNavItem]="'browseTab'" role="presentation" data-test="browseTab">
           <a ngbNavLink>{{'item.edit.item-mapper.tabs.browse' | translate}}</a>
           <ng-template ngbNavContent>
             <div class="mt-2">
@@ -22,7 +22,7 @@
             </div>
           </ng-template>
         </li>
-        <li [ngbNavItem]="'mapTab'">
+        <li [ngbNavItem]="'mapTab'" role="presentation" data-test="mapTab">
           <a ngbNavLink>{{'item.edit.item-mapper.tabs.map' | translate}}</a>
           <ng-template ngbNavContent>
             <div class="row mt-2">
diff --git a/src/app/item-page/edit-item-page/item-curate/item-curate.component.html b/src/app/item-page/edit-item-page/item-curate/item-curate.component.html
index 7c7ed41bd9..22b10b28b6 100644
--- a/src/app/item-page/edit-item-page/item-curate/item-curate.component.html
+++ b/src/app/item-page/edit-item-page/item-curate/item-curate.component.html
@@ -1,5 +1,5 @@
 <div class="container mt-3">
-    <h3>{{'item.edit.curate.title' |translate:{item: (itemName$ |async)} }}</h3>
+    <h2>{{'item.edit.curate.title' |translate:{item: (itemName$ |async)} }}</h2>
     <ds-curation-form
       *ngIf="dsoRD$ | async as dsoRD"
       [dsoHandle]="dsoRD?.payload.handle"
diff --git a/src/app/item-page/edit-item-page/item-delete/item-delete.component.html b/src/app/item-page/edit-item-page/item-delete/item-delete.component.html
index 7b1953d892..25780d989c 100644
--- a/src/app/item-page/edit-item-page/item-delete/item-delete.component.html
+++ b/src/app/item-page/edit-item-page/item-delete/item-delete.component.html
@@ -2,34 +2,33 @@
     <div class="row">
         <div class="col-12">
 
-            <h2>{{headerMessage | translate: {id: item.handle} }}</h2>
+            <h1>{{headerMessage | translate: {id: item.handle} }}</h1>
             <p>{{descriptionMessage | translate}}</p>
             <ds-modify-item-overview [item]="item"></ds-modify-item-overview>
 
-            <ng-container *ngVar="(types$ | async) as types">
+            <ng-container *ngVar="(typeDTOs$ | async) as types">
 
                 <div *ngIf="types && types.length > 0" class="mb-4">
 
                     {{'virtual-metadata.delete-item.info' | translate}}
 
-                    <div *ngFor="let type of types" class="mb-4">
-
-                        <div *ngVar="(isSelected(type) | async) as selected"
+                    <div *ngFor="let typeDto of types" class="mb-4">
+                        <div *ngVar="(typeDto.isSelected$ | async) as selected"
                              class="d-flex flex-row">
 
-                            <div class="m-2" (click)="setSelected(type, !selected)">
+                            <div class="m-2" (click)="setSelected(typeDto.relationshipType, !selected)">
                                 <label>
-                                    <input type="checkbox" [checked]="selected">
+                                    <input type="checkbox" [checked]="selected" [disabled]="isDeleting$ | async">
                                 </label>
                             </div>
 
                             <div class="flex-column flex-grow-1">
-                                <h5 (click)="setSelected(type, !selected)">
-                                    {{getRelationshipMessageKey(getLabel(type) | async) | translate}}
+                                <h5 (click)="setSelected(typeDto.relationshipType, !selected)">
+                                    {{getRelationshipMessageKey(typeDto.label$ | async) | translate}}
                                 </h5>
-                                <div *ngFor="let relationship of (getRelationships(type) | async)"
+                                <div *ngFor="let relationshipDto of (typeDto.relationshipDTOs$ | async)"
                                      class="d-flex flex-row">
-                                    <ng-container *ngVar="(getRelatedItem(relationship) | async) as relatedItem">
+                                    <ng-container *ngVar="(relationshipDto.relatedItem$ | async) as relatedItem">
 
                                         <ds-listable-object-component-loader
                                                 *ngIf="relatedItem"
@@ -46,7 +45,7 @@
                                         </div>
 
                                         <ng-template #virtualMetadataModal>
-                                            <div>
+                                            <div class="thumb-font-1">
                                                 <div class="modal-header">
                                                     {{'virtual-metadata.delete-item.modal-head' | translate}}
                                                     <button type="button" class="close"
@@ -60,7 +59,7 @@
                                                             [object]="relatedItem"
                                                             [viewMode]="viewMode">
                                                     </ds-listable-object-component-loader>
-                                                    <div *ngFor="let metadata of (getVirtualMetadata(relationship) | async)">
+                                                    <div *ngFor="let metadata of (relationshipDto.virtualMetadata$ | async)">
                                                         <div>
                                                             <div class="font-weight-bold">
                                                                 {{metadata.metadataField}}
@@ -87,10 +86,11 @@
             </ng-container>
 
             <div class="space-children-mr">
-              <button (click)="performAction()"
+              <button [dsBtnDisabled]="isDeleting$ | async" (click)="performAction()"
                       class="btn btn-outline-secondary perform-action">{{confirmMessage | translate}}
               </button>
-              <button [routerLink]="[itemPageRoute, 'edit']" class="btn btn-outline-secondary cancel">
+              <button [dsBtnDisabled]="isDeleting$ | async" [routerLink]="[itemPageRoute, 'edit']"
+                      class="btn btn-outline-secondary cancel">
                 {{cancelMessage| translate}}
               </button>
             </div>
diff --git a/src/app/item-page/edit-item-page/item-delete/item-delete.component.spec.ts b/src/app/item-page/edit-item-page/item-delete/item-delete.component.spec.ts
index 2a9f7fae52..d406293828 100644
--- a/src/app/item-page/edit-item-page/item-delete/item-delete.component.spec.ts
+++ b/src/app/item-page/edit-item-page/item-delete/item-delete.component.spec.ts
@@ -171,7 +171,7 @@ describe('ItemDeleteComponent', () => {
   });
 
   it('should render a page with messages based on the \'delete\' messageKey', () => {
-    const header = fixture.debugElement.query(By.css('h2')).nativeElement;
+    const header = fixture.debugElement.query(By.css('h1')).nativeElement;
     expect(header.innerHTML).toContain('item.edit.delete.header');
     const description = fixture.debugElement.query(By.css('p')).nativeElement;
     expect(description.innerHTML).toContain('item.edit.delete.description');
diff --git a/src/app/item-page/edit-item-page/item-delete/item-delete.component.ts b/src/app/item-page/edit-item-page/item-delete/item-delete.component.ts
index 9012ebe7d7..2a4fed6dac 100644
--- a/src/app/item-page/edit-item-page/item-delete/item-delete.component.ts
+++ b/src/app/item-page/edit-item-page/item-delete/item-delete.component.ts
@@ -1,3 +1,4 @@
+// eslint-disable-next-line max-classes-per-file
 import { Component, Input, OnInit, OnDestroy } from '@angular/core';
 import { defaultIfEmpty, filter, map, switchMap, take } from 'rxjs/operators';
 import {
@@ -37,6 +38,34 @@ import { getItemEditRoute } from '../../item-page-routing-paths';
 import { RemoteData } from '../../../core/data/remote-data';
 import { NoContent } from '../../../core/shared/NoContent.model';
 
+/**
+ * Data Transfer Object used to prevent the HTML template to call function returning Observables
+ */
+class RelationshipTypeDTO {
+
+  relationshipType: RelationshipType;
+
+  isSelected$: Observable<boolean>;
+
+  label$: Observable<string>;
+
+  relationshipDTOs$: Observable<RelationshipDTO[]>;
+
+}
+
+/**
+ * Data Transfer Object used to prevent the HTML template to call function returning Observables
+ */
+class RelationshipDTO {
+
+  relationship: Relationship;
+
+  relatedItem$: Observable<Item>;
+
+  virtualMetadata$: Observable<VirtualMetadata[]>;
+
+}
+
 @Component({
   selector: 'ds-item-delete',
   templateUrl: '../item-delete/item-delete.component.html'
@@ -64,7 +93,7 @@ export class ItemDeleteComponent
    * A list of the relationship types for which this item has relations as an observable.
    * The list doesn't contain duplicates.
    */
-  types$: BehaviorSubject<RelationshipType[]> = new BehaviorSubject([]);
+  typeDTOs$: BehaviorSubject<RelationshipTypeDTO[]> = new BehaviorSubject([]);
 
   /**
    * A map which stores the relationships of this item for each type as observable lists
@@ -93,6 +122,8 @@ export class ItemDeleteComponent
    */
   private subs: Subscription[] = [];
 
+  public isDeleting$: BehaviorSubject<boolean> = new BehaviorSubject(false);
+
   constructor(protected route: ActivatedRoute,
               protected router: Router,
               protected notificationsService: NotificationsService,
@@ -146,14 +177,25 @@ export class ItemDeleteComponent
               }, [])
             ),
           );
-        })
-      ).subscribe((types: RelationshipType[]) => this.types$.next(types)));
+        }),
+      ).subscribe((types: RelationshipType[]) => this.typeDTOs$.next(types.map((relationshipType: RelationshipType) => Object.assign(new RelationshipTypeDTO(), {
+        relationshipType: relationshipType,
+        isSelected$: this.isSelected(relationshipType),
+        label$: this.getLabel(relationshipType),
+        relationshipDTOs$: this.getRelationships(relationshipType).pipe(
+          map((relationships: Relationship[]) => relationships.map((relationship: Relationship) => Object.assign(new RelationshipDTO(), {
+            relationship: relationship,
+            relatedItem$: this.getRelatedItem(relationship),
+            virtualMetadata$: this.getVirtualMetadata(relationship),
+          } as RelationshipDTO))),
+        ),
+      })))));
     }
 
-    this.subs.push(this.types$.pipe(
+    this.subs.push(this.typeDTOs$.pipe(
       take(1),
-    ).subscribe((types) =>
-      this.objectUpdatesService.initialize(this.url, types, this.item.lastModified)
+    ).subscribe((types: RelationshipTypeDTO[]) =>
+      this.objectUpdatesService.initialize(this.url, types.map((relationshipTypeDto: RelationshipTypeDTO) => relationshipTypeDto.relationshipType), this.item.lastModified),
     ));
   }
 
@@ -236,8 +278,8 @@ export class ItemDeleteComponent
     this.linkService.resolveLinks(
       relationship,
       followLink('relationshipType'),
-      followLink('leftItem'),
-      followLink('rightItem'),
+      followLink('leftItem', undefined, followLink<Item>('accessStatus')),
+      followLink('rightItem', undefined, followLink<Item>('accessStatus')),
     );
     return relationship.relationshipType.pipe(
       getFirstSucceededRemoteData(),
@@ -326,34 +368,33 @@ export class ItemDeleteComponent
    * @param selected  whether the type should be selected
    */
   setSelected(type: RelationshipType, selected: boolean): void {
-    this.objectUpdatesService.setSelectedVirtualMetadata(this.url, this.item.uuid, type.uuid, selected);
+    if (this.isDeleting$.value === false) {
+      this.objectUpdatesService.setSelectedVirtualMetadata(this.url, this.item.uuid, type.uuid, selected);
+    }
   }
 
   /**
    * Perform the delete operation
    */
-  performAction() {
-
-    this.subs.push(this.types$.pipe(
-      switchMap((types) =>
+  performAction(): void {
+    this.isDeleting$.next(true);
+    this.subs.push(this.typeDTOs$.pipe(
+      switchMap((types: RelationshipTypeDTO[]) =>
         combineLatest(
-          types.map((type) => this.isSelected(type))
+          types.map((type: RelationshipTypeDTO) => type.isSelected$),
         ).pipe(
           defaultIfEmpty([]),
-          map((selection) => types.filter(
-            (type, index) => selection[index]
+          map((selection: boolean[]) => types.filter(
+            (type: RelationshipTypeDTO, index: number) => selection[index],
           )),
-          map((selectedTypes) => selectedTypes.map((type) => type.id)),
-        )
+          map((selectedDtoTypes: RelationshipTypeDTO[]) => selectedDtoTypes.map((typeDto: RelationshipTypeDTO) => typeDto.relationshipType.id)),
+        ),
       ),
-      switchMap((types) =>
-        this.itemDataService.delete(this.item.id, types).pipe(getFirstCompletedRemoteData())
-      )
-    ).subscribe(
-      (rd: RemoteData<NoContent>) => {
-        this.notify(rd.hasSucceeded);
-      }
-    ));
+      switchMap((types: string[]) => this.itemDataService.delete(this.item.id, types)),
+      getFirstCompletedRemoteData(),
+    ).subscribe((rd: RemoteData<NoContent>) => {
+      this.notify(rd.hasSucceeded);
+    }));
   }
 
   /**
@@ -363,10 +404,10 @@ export class ItemDeleteComponent
   notify(succeeded: boolean) {
     if (succeeded) {
       this.notificationsService.success(this.translateService.get('item.edit.' + this.messageKey + '.success'));
-      this.router.navigate(['']);
+      void this.router.navigate(['']);
     } else {
       this.notificationsService.error(this.translateService.get('item.edit.' + this.messageKey + '.error'));
-      this.router.navigate([getItemEditRoute(this.item)]);
+      void this.router.navigate([getItemEditRoute(this.item)]);
     }
   }
 
diff --git a/src/app/item-page/edit-item-page/item-move/item-move.component.html b/src/app/item-page/edit-item-page/item-move/item-move.component.html
index 589aac655f..e8061ae88b 100644
--- a/src/app/item-page/edit-item-page/item-move/item-move.component.html
+++ b/src/app/item-page/edit-item-page/item-move/item-move.component.html
@@ -1,7 +1,7 @@
 <div class="container">
     <div class="row">
         <div class="col-12">
-            <h2>{{'item.edit.move.head' | translate: {id: (itemRD$ | async)?.payload?.handle} }}</h2>
+            <h1>{{'item.edit.move.head' | translate: {id: (itemRD$ | async)?.payload?.handle} }}</h1>
             <p>{{'item.edit.move.description' | translate}}</p>
             <div class="row">
                 <div class="col-12">
@@ -21,7 +21,11 @@
                 <div class="col-12">
                     <p>
                       <label for="inheritPoliciesCheckbox">
-                        <input type="checkbox" name="tc" [(ngModel)]="inheritPolicies" id="inheritPoliciesCheckbox">
+                        <ng-template #tooltipContent>
+                          {{ 'item.edit.move.inheritpolicies.tooltip' | translate }}
+                        </ng-template>
+                        <input type="checkbox" name="tc" [(ngModel)]="inheritPolicies" id="inheritPoliciesCheckbox" [ngbTooltip]="tooltipContent"
+                        >
                         {{'item.edit.move.inheritpolicies.checkbox' |translate}}
                       </label>
                     </p>
@@ -36,7 +40,7 @@
               <button [routerLink]="[(itemPageRoute$ | async), 'edit']" class="btn btn-outline-secondary">
                 <i class="fas fa-arrow-left"></i> {{'item.edit.move.cancel' | translate}}
               </button>
-              <button class="btn btn-primary" [disabled]="!canMove" (click)="moveToCollection()">
+              <button class="btn btn-primary" [dsBtnDisabled]="!canMove" (click)="moveToCollection()">
               <span *ngIf="!processing">
                 <i class="fas fa-save"></i> {{'item.edit.move.save-button' | translate}}
               </span>
@@ -44,7 +48,7 @@
                 <i class="fas fa-circle-notch fa-spin"></i> {{'item.edit.move.processing' | translate}}
               </span>
               </button>
-              <button class="btn btn-danger" [disabled]="!canSubmit" (click)="discard()">
+              <button class="btn btn-danger" [dsBtnDisabled]="!canSubmit" (click)="discard()">
                 <i class="fas fa-times"></i> {{"item.edit.move.discard-button" | translate}}
               </button>
             </div>
diff --git a/src/app/item-page/edit-item-page/item-operation/item-operation.component.html b/src/app/item-page/edit-item-page/item-operation/item-operation.component.html
index 85c6a2cca1..1b37a615c4 100644
--- a/src/app/item-page/edit-item-page/item-operation/item-operation.component.html
+++ b/src/app/item-page/edit-item-page/item-operation/item-operation.component.html
@@ -1,16 +1,16 @@
-<div class="col-3 float-left d-flex h-100 action-label">
-      <span class="justify-content-center align-self-center">
+<div class="col-12 col-md-3 h-auto float-left d-flex h-100 action-label">
+      <span class="justify-content-center align-self-center font-weight-bold">
         {{'item.edit.tabs.status.buttons.' + operation.operationKey + '.label' | translate}}
       </span>
 </div>
-<div class="col-9 float-left action-button">
+<div class="col-12 col-md-9 float-left action-button">
   <span *ngIf="operation.authorized">
-    <button class="btn btn-outline-primary" [disabled]="operation.disabled" [routerLink]="operation.operationUrl" [attr.aria-label]="'item.edit.tabs.status.buttons.' + operation.operationKey + '.button' | translate">
+    <button class="btn btn-outline-primary" [dsBtnDisabled]="operation.disabled" [routerLink]="operation.operationUrl" [attr.aria-label]="'item.edit.tabs.status.buttons.' + operation.operationKey + '.button' | translate">
       {{'item.edit.tabs.status.buttons.' + operation.operationKey + '.button' | translate}}
     </button>
   </span>
   <span *ngIf="!operation.authorized" [ngbTooltip]="'item.edit.tabs.status.buttons.unauthorized' | translate">
-    <button class="btn btn-outline-primary" [disabled]="true" [attr.aria-label]="'item.edit.tabs.status.buttons.' + operation.operationKey + '.button' | translate">
+    <button class="btn btn-outline-primary" [dsBtnDisabled]="true" [attr.aria-label]="'item.edit.tabs.status.buttons.' + operation.operationKey + '.button' | translate">
       {{'item.edit.tabs.status.buttons.' + operation.operationKey + '.button' | translate}}
     </button>
   </span>
diff --git a/src/app/item-page/edit-item-page/item-operation/item-operation.component.spec.ts b/src/app/item-page/edit-item-page/item-operation/item-operation.component.spec.ts
index 7570119b3a..7d7087e02d 100644
--- a/src/app/item-page/edit-item-page/item-operation/item-operation.component.spec.ts
+++ b/src/app/item-page/edit-item-page/item-operation/item-operation.component.spec.ts
@@ -4,6 +4,7 @@ import { ItemOperationComponent } from './item-operation.component';
 import { TranslateModule } from '@ngx-translate/core';
 import { By } from '@angular/platform-browser';
 import { RouterTestingModule } from '@angular/router/testing';
+import {BtnDisabledDirective} from '../../../shared/btn-disabled.directive';
 
 describe('ItemOperationComponent', () => {
   let itemOperation: ItemOperation;
@@ -14,7 +15,7 @@ describe('ItemOperationComponent', () => {
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
       imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([])],
-      declarations: [ItemOperationComponent]
+      declarations: [ItemOperationComponent, BtnDisabledDirective]
     }).compileComponents();
   }));
 
@@ -40,7 +41,8 @@ describe('ItemOperationComponent', () => {
     const span = fixture.debugElement.query(By.css('.action-label span')).nativeElement;
     expect(span.textContent).toContain('item.edit.tabs.status.buttons.key1.label');
     const button = fixture.debugElement.query(By.css('button')).nativeElement;
-    expect(button.disabled).toBeTrue();
+    expect(button.getAttribute('aria-disabled')).toBe('true');
+    expect(button.classList.contains('disabled')).toBeTrue();
     expect(button.textContent).toContain('item.edit.tabs.status.buttons.key1.button');
   });
 });
diff --git a/src/app/item-page/edit-item-page/item-operation/itemOperation.model.ts b/src/app/item-page/edit-item-page/item-operation/itemOperation.model.ts
index 33302dcba6..a6f08ac95c 100644
--- a/src/app/item-page/edit-item-page/item-operation/itemOperation.model.ts
+++ b/src/app/item-page/edit-item-page/item-operation/itemOperation.model.ts
@@ -28,4 +28,12 @@ export class ItemOperation {
     this.disabled = disabled;
   }
 
+  /**
+   * Set whether this operation is authorized
+   * @param authorized
+   */
+  setAuthorized(authorized: boolean): void {
+    this.authorized = authorized;
+  }
+
 }
diff --git a/src/app/item-page/edit-item-page/item-page-access-control.guard.ts b/src/app/item-page/edit-item-page/item-page-access-control.guard.ts
new file mode 100644
index 0000000000..9bc953db1e
--- /dev/null
+++ b/src/app/item-page/edit-item-page/item-page-access-control.guard.ts
@@ -0,0 +1,31 @@
+import { Injectable } from '@angular/core';
+import { ActivatedRouteSnapshot, Router, RouterStateSnapshot } from '@angular/router';
+import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
+import { ItemPageResolver } from '../item-page.resolver';
+import { Item } from '../../core/shared/item.model';
+import { DsoPageSingleFeatureGuard } from '../../core/data/feature-authorization/feature-authorization-guard/dso-page-single-feature.guard';
+import { Observable, of as observableOf } from 'rxjs';
+import { FeatureID } from '../../core/data/feature-authorization/feature-id';
+import { AuthService } from '../../core/auth/auth.service';
+
+@Injectable({
+  providedIn: 'root'
+})
+/**
+ * Guard for preventing unauthorized access to certain {@link Item} pages requiring administrator rights
+ */
+export class ItemPageAccessControlGuard extends DsoPageSingleFeatureGuard<Item> {
+  constructor(protected resolver: ItemPageResolver,
+              protected authorizationService: AuthorizationDataService,
+              protected router: Router,
+              protected authService: AuthService) {
+    super(resolver, authorizationService, router, authService);
+  }
+
+  /**
+   * Check administrator authorization rights
+   */
+  getFeatureID(next: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<FeatureID> {
+    return observableOf(FeatureID.AdministratorOf);
+  }
+}
diff --git a/src/app/item-page/edit-item-page/item-page-curate.guard.ts b/src/app/item-page/edit-item-page/item-page-curate.guard.ts
new file mode 100644
index 0000000000..387b1b8bb9
--- /dev/null
+++ b/src/app/item-page/edit-item-page/item-page-curate.guard.ts
@@ -0,0 +1,31 @@
+import { Injectable } from '@angular/core';
+import { ActivatedRouteSnapshot, Router, RouterStateSnapshot } from '@angular/router';
+import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
+import { ItemPageResolver } from '../item-page.resolver';
+import { Item } from '../../core/shared/item.model';
+import { DsoPageSingleFeatureGuard } from '../../core/data/feature-authorization/feature-authorization-guard/dso-page-single-feature.guard';
+import { Observable, of as observableOf } from 'rxjs';
+import { FeatureID } from '../../core/data/feature-authorization/feature-id';
+import { AuthService } from '../../core/auth/auth.service';
+
+@Injectable({
+  providedIn: 'root'
+})
+/**
+ * Guard for preventing unauthorized access to certain {@link Item} pages requiring administrator rights
+ */
+export class ItemPageCurateGuard extends DsoPageSingleFeatureGuard<Item> {
+  constructor(protected resolver: ItemPageResolver,
+              protected authorizationService: AuthorizationDataService,
+              protected router: Router,
+              protected authService: AuthService) {
+    super(resolver, authorizationService, router, authService);
+  }
+
+  /**
+   * Check administrator authorization rights
+   */
+  getFeatureID(next: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<FeatureID> {
+    return observableOf(FeatureID.AdministratorOf);
+  }
+}
diff --git a/src/app/item-page/edit-item-page/item-private/item-private.component.spec.ts b/src/app/item-page/edit-item-page/item-private/item-private.component.spec.ts
index 323255e3d7..24a4aacc99 100644
--- a/src/app/item-page/edit-item-page/item-private/item-private.component.spec.ts
+++ b/src/app/item-page/edit-item-page/item-private/item-private.component.spec.ts
@@ -80,7 +80,7 @@ describe('ItemPrivateComponent', () => {
   });
 
   it('should render a page with messages based on the \'private\' messageKey', () => {
-    const header = fixture.debugElement.query(By.css('h2')).nativeElement;
+    const header = fixture.debugElement.query(By.css('h1')).nativeElement;
     expect(header.innerHTML).toContain('item.edit.private.header');
     const description = fixture.debugElement.query(By.css('p')).nativeElement;
     expect(description.innerHTML).toContain('item.edit.private.description');
diff --git a/src/app/item-page/edit-item-page/item-public/item-public.component.spec.ts b/src/app/item-page/edit-item-page/item-public/item-public.component.spec.ts
index 1f741fcc59..0174e6a6b0 100644
--- a/src/app/item-page/edit-item-page/item-public/item-public.component.spec.ts
+++ b/src/app/item-page/edit-item-page/item-public/item-public.component.spec.ts
@@ -74,7 +74,7 @@ describe('ItemPublicComponent', () => {
   });
 
   it('should render a page with messages based on the \'public\' messageKey', () => {
-    const header = fixture.debugElement.query(By.css('h2')).nativeElement;
+    const header = fixture.debugElement.query(By.css('h1')).nativeElement;
     expect(header.innerHTML).toContain('item.edit.public.header');
     const description = fixture.debugElement.query(By.css('p')).nativeElement;
     expect(description.innerHTML).toContain('item.edit.public.description');
diff --git a/src/app/item-page/edit-item-page/item-reinstate/item-reinstate.component.spec.ts b/src/app/item-page/edit-item-page/item-reinstate/item-reinstate.component.spec.ts
index 594e7b806a..4e2b00e4e6 100644
--- a/src/app/item-page/edit-item-page/item-reinstate/item-reinstate.component.spec.ts
+++ b/src/app/item-page/edit-item-page/item-reinstate/item-reinstate.component.spec.ts
@@ -76,7 +76,7 @@ describe('ItemReinstateComponent', () => {
   });
 
   it('should render a page with messages based on the \'reinstate\' messageKey', () => {
-    const header = fixture.debugElement.query(By.css('h2')).nativeElement;
+    const header = fixture.debugElement.query(By.css('h1')).nativeElement;
     expect(header.innerHTML).toContain('item.edit.reinstate.header');
     const description = fixture.debugElement.query(By.css('p')).nativeElement;
     expect(description.innerHTML).toContain('item.edit.reinstate.description');
diff --git a/src/app/item-page/edit-item-page/item-relationships/edit-item-relationships.service.spec.ts b/src/app/item-page/edit-item-page/item-relationships/edit-item-relationships.service.spec.ts
new file mode 100644
index 0000000000..ebc2a82d84
--- /dev/null
+++ b/src/app/item-page/edit-item-page/item-relationships/edit-item-relationships.service.spec.ts
@@ -0,0 +1,412 @@
+import { TestBed } from '@angular/core/testing';
+import { TranslateModule } from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+import { v4 as uuidv4 } from 'uuid';
+
+import { EntityTypeDataService } from '../../../core/data/entity-type-data.service';
+import { ItemDataService } from '../../../core/data/item-data.service';
+import { FieldChangeType } from '../../../core/data/object-updates/field-change-type.model';
+import { FieldUpdate } from '../../../core/data/object-updates/field-update.model';
+import { FieldUpdates } from '../../../core/data/object-updates/field-updates.model';
+import {
+  DeleteRelationship,
+  RelationshipIdentifiable,
+} from '../../../core/data/object-updates/object-updates.reducer';
+import { ObjectUpdatesService } from '../../../core/data/object-updates/object-updates.service';
+import { RelationshipDataService } from '../../../core/data/relationship-data.service';
+import { Item } from '../../../core/shared/item.model';
+import { ItemType } from '../../../core/shared/item-relationships/item-type.model';
+import { Relationship } from '../../../core/shared/item-relationships/relationship.model';
+import { RelationshipType } from '../../../core/shared/item-relationships/relationship-type.model';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import {
+  createFailedRemoteDataObject,
+  createSuccessfulRemoteDataObject,
+  createSuccessfulRemoteDataObject$,
+} from '../../../shared/remote-data.utils';
+import { EntityTypeDataServiceStub } from '../../../shared/testing/entity-type-data.service.stub';
+import { ItemDataServiceStub } from '../../../shared/testing/item-data.service.stub';
+import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
+import { ObjectUpdatesServiceStub } from '../../../shared/testing/object-updates.service.stub';
+import { RelationshipDataServiceStub } from '../../../shared/testing/relationship-data.service.stub';
+import { EditItemRelationshipsService } from './edit-item-relationships.service';
+
+describe('EditItemRelationshipsService', () => {
+  let service: EditItemRelationshipsService;
+
+  let itemService: ItemDataServiceStub;
+  let objectUpdatesService: ObjectUpdatesServiceStub;
+  let notificationsService: NotificationsServiceStub;
+  let relationshipService: RelationshipDataServiceStub;
+  let entityTypeDataService: EntityTypeDataServiceStub;
+
+  let currentItem: Item;
+
+  let relationshipItem1: Item;
+  let relationshipIdentifiable1: RelationshipIdentifiable;
+  let relationship1: Relationship;
+
+  let relationshipItem2: Item;
+  let relationshipIdentifiable2: RelationshipIdentifiable;
+  let relationship2: Relationship;
+
+  let orgUnitType: ItemType;
+  let orgUnitToOrgUnitType: RelationshipType;
+
+  beforeEach(() => {
+    itemService = new ItemDataServiceStub();
+    objectUpdatesService = new ObjectUpdatesServiceStub();
+    notificationsService = new NotificationsServiceStub();
+    relationshipService = new RelationshipDataServiceStub();
+    entityTypeDataService = new EntityTypeDataServiceStub();
+
+    TestBed.configureTestingModule({
+      imports: [
+        TranslateModule.forRoot(),
+      ],
+      providers: [
+        { provide: ItemDataService, useValue: itemService },
+        { provide: ObjectUpdatesService, useValue: objectUpdatesService },
+        { provide: NotificationsService, useValue: notificationsService },
+        { provide: RelationshipDataService, useValue: relationshipService },
+        { provide: EntityTypeDataService, useValue: entityTypeDataService },
+      ],
+    });
+    service = TestBed.inject(EditItemRelationshipsService);
+  });
+
+  beforeEach(() => {
+    currentItem = Object.assign(new Item(), {
+      uuid: uuidv4(),
+      metadata: {
+        'dspace.entity.type': 'OrgUnit',
+      },
+      _links: {
+        self: {
+          href: 'selfLink1',
+        },
+      },
+    });
+
+    relationshipItem1 = Object.assign(new Item(), {
+      uuid: uuidv4(),
+      metadata: {
+        'dspace.entity.type': 'OrgUnit',
+      },
+      _links: {
+        self: {
+          href: 'selfLink2',
+        },
+      },
+    });
+    relationshipIdentifiable1 = {
+      originalItem: currentItem,
+      relatedItem: relationshipItem1,
+      type: orgUnitToOrgUnitType,
+      uuid: `1-${relationshipItem1.uuid}`,
+    } as RelationshipIdentifiable;
+    relationship1 = Object.assign(new Relationship(), {
+      _links: {
+        leftItem: currentItem._links.self,
+        rightItem: relationshipItem1._links.self,
+      },
+    });
+
+    relationshipItem2 = Object.assign(new Item(), {
+      uuid: uuidv4(),
+      metadata: {
+        'dspace.entity.type': 'OrgUnit',
+      },
+      _links: {
+        self: {
+          href: 'selfLink3',
+        },
+      },
+    });
+    relationshipIdentifiable2 = {
+      originalItem: currentItem,
+      relatedItem: relationshipItem2,
+      type: orgUnitToOrgUnitType,
+      uuid: `1-${relationshipItem2.uuid}`,
+    } as RelationshipIdentifiable;
+    relationship2 = Object.assign(new Relationship(), {
+      _links: {
+        leftItem: currentItem._links.self,
+        rightItem: relationshipItem2._links.self,
+      },
+    });
+
+    orgUnitType = Object.assign(new ItemType(), {
+      id: '2',
+      label: 'OrgUnit',
+    });
+    orgUnitToOrgUnitType = Object.assign(new RelationshipType(), {
+      id: '1',
+      leftMaxCardinality: null,
+      leftMinCardinality: 0,
+      leftType: createSuccessfulRemoteDataObject$(orgUnitType),
+      leftwardType: 'isOrgUnitOfOrgUnit',
+      rightMaxCardinality: null,
+      rightMinCardinality: 0,
+      rightType: createSuccessfulRemoteDataObject$(orgUnitType),
+      rightwardType: 'isOrgUnitOfOrgUnit',
+      uuid: 'relationshiptype-1',
+    });
+  });
+
+  describe('submit', () => {
+    let fieldUpdateAddRelationship1: FieldUpdate;
+    let fieldUpdateRemoveRelationship2: FieldUpdate;
+
+    beforeEach(() => {
+      fieldUpdateAddRelationship1 = {
+        changeType: FieldChangeType.ADD,
+        field: relationshipIdentifiable1,
+      };
+      fieldUpdateRemoveRelationship2 = {
+        changeType: FieldChangeType.REMOVE,
+        field: relationshipIdentifiable2,
+      };
+
+      spyOn(service, 'addRelationship').withArgs(relationshipIdentifiable1).and.returnValue(createSuccessfulRemoteDataObject$(relationship1));
+      spyOn(service, 'deleteRelationship').withArgs(relationshipIdentifiable2 as DeleteRelationship).and.returnValue(createSuccessfulRemoteDataObject$({}));
+      spyOn(itemService, 'invalidateByHref').and.callThrough();
+    });
+
+    it('should support performing multiple relationships manipulations in one submit() call', () => {
+      spyOn(objectUpdatesService, 'getFieldUpdates').and.returnValue(observableOf({
+        [`1-${relationshipItem1.uuid}`]: fieldUpdateAddRelationship1,
+        [`1-${relationshipItem2.uuid}`]: fieldUpdateRemoveRelationship2,
+      } as FieldUpdates));
+      service.submit(currentItem, `/entities/orgunit/${currentItem.uuid}/edit/relationships`);
+
+      expect(service.addRelationship).toHaveBeenCalledWith(relationshipIdentifiable1);
+      expect(service.deleteRelationship).toHaveBeenCalledWith(relationshipIdentifiable2 as DeleteRelationship);
+
+      expect(itemService.invalidateByHref).toHaveBeenCalledWith(currentItem.self);
+      expect(itemService.invalidateByHref).toHaveBeenCalledWith(relationshipItem1.self);
+      expect(itemService.invalidateByHref).toHaveBeenCalledWith(relationshipItem2.self);
+
+      expect(notificationsService.success).toHaveBeenCalledTimes(1);
+    });
+  });
+
+  describe('deleteRelationship', () => {
+    beforeEach(() => {
+      spyOn(relationshipService, 'deleteRelationship').and.callThrough();
+    });
+
+    it('should pass "all" as copyVirtualMetadata when the user want to keep the data on both sides', () => {
+      service.deleteRelationship({
+        uuid: relationshipItem1.uuid,
+        keepLeftVirtualMetadata: true,
+        keepRightVirtualMetadata: true,
+      } as DeleteRelationship);
+
+      expect(relationshipService.deleteRelationship).toHaveBeenCalledWith(relationshipItem1.uuid, 'all', false);
+    });
+
+    it('should pass "left" as copyVirtualMetadata when the user only want to keep the data on the left side', () => {
+      service.deleteRelationship({
+        uuid: relationshipItem1.uuid,
+        keepLeftVirtualMetadata: true,
+        keepRightVirtualMetadata: false,
+      } as DeleteRelationship);
+
+      expect(relationshipService.deleteRelationship).toHaveBeenCalledWith(relationshipItem1.uuid, 'left', false);
+    });
+
+    it('should pass "right" as copyVirtualMetadata when the user only want to keep the data on the right side', () => {
+      service.deleteRelationship({
+        uuid: relationshipItem1.uuid,
+        keepLeftVirtualMetadata: false,
+        keepRightVirtualMetadata: true,
+      } as DeleteRelationship);
+
+      expect(relationshipService.deleteRelationship).toHaveBeenCalledWith(relationshipItem1.uuid, 'right', false);
+    });
+
+    it('should pass "none" as copyVirtualMetadata when the user doesn\'t want to keep the virtual metadata', () => {
+      service.deleteRelationship({
+        uuid: relationshipItem1.uuid,
+        keepLeftVirtualMetadata: false,
+        keepRightVirtualMetadata: false,
+      } as DeleteRelationship);
+
+      expect(relationshipService.deleteRelationship).toHaveBeenCalledWith(relationshipItem1.uuid, 'none', false);
+    });
+  });
+
+  describe('addRelationship', () => {
+    beforeEach(() => {
+      spyOn(relationshipService, 'addRelationship').and.callThrough();
+    });
+
+    it('should call the addRelationship from relationshipService correctly when original item is on the right', () => {
+      service.addRelationship({
+        originalItem: currentItem,
+        originalIsLeft: false,
+        relatedItem: relationshipItem1,
+        type: orgUnitToOrgUnitType,
+        uuid: `1-${relationshipItem1.uuid}`,
+      } as RelationshipIdentifiable);
+      expect(relationshipService.addRelationship).toHaveBeenCalledWith(orgUnitToOrgUnitType.id, relationshipItem1, currentItem, undefined, null, false);
+    });
+
+    it('should call the addRelationship from relationshipService correctly when original item is on the left', () => {
+      service.addRelationship({
+        originalItem: currentItem,
+        originalIsLeft: true,
+        relatedItem: relationshipItem1,
+        type: orgUnitToOrgUnitType,
+        uuid: `1-${relationshipItem1.uuid}`,
+      } as RelationshipIdentifiable);
+
+      expect(relationshipService.addRelationship).toHaveBeenCalledWith(orgUnitToOrgUnitType.id, currentItem, relationshipItem1, null, undefined, false);
+    });
+  });
+
+  describe('isProvidedItemTypeLeftType', () => {
+    it('should return true if the provided item corresponds to the left type of the relationship', (done) => {
+      const relationshipType = Object.assign(new RelationshipType(), {
+        leftType: createSuccessfulRemoteDataObject$({id: 'leftType'}),
+        rightType: createSuccessfulRemoteDataObject$({id: 'rightType'}),
+      });
+      const itemType = Object.assign(new ItemType(), {id: 'leftType'} );
+      const item = Object.assign(new Item(), {uuid: 'item-uuid'});
+
+      const result = service.isProvidedItemTypeLeftType(relationshipType, itemType, item);
+      result.subscribe((resultValue) => {
+        expect(resultValue).toBeTrue();
+        done();
+      });
+    });
+
+    it('should return false if the provided item corresponds to the right type of the relationship', (done) => {
+      const relationshipType = Object.assign(new RelationshipType(), {
+        leftType: createSuccessfulRemoteDataObject$({id: 'leftType'}),
+        rightType: createSuccessfulRemoteDataObject$({id: 'rightType'}),
+      });
+      const itemType = Object.assign(new ItemType(), {id: 'rightType'} );
+      const item = Object.assign(new Item(), {uuid: 'item-uuid'});
+
+      const result = service.isProvidedItemTypeLeftType(relationshipType, itemType, item);
+      result.subscribe((resultValue) => {
+        expect(resultValue).toBeFalse();
+        done();
+      });
+    });
+
+    it('should return undefined if the provided item corresponds does not match any of the relationship types', (done) => {
+      const relationshipType = Object.assign(new RelationshipType(), {
+        leftType: createSuccessfulRemoteDataObject$({id: 'leftType'}),
+        rightType: createSuccessfulRemoteDataObject$({id: 'rightType'}),
+      });
+      const itemType = Object.assign(new ItemType(), {id: 'something-else'} );
+      const item = Object.assign(new Item(), {uuid: 'item-uuid'});
+
+      const result = service.isProvidedItemTypeLeftType(relationshipType, itemType, item);
+      result.subscribe((resultValue) => {
+        expect(resultValue).toBeUndefined();
+        done();
+      });
+    });
+  });
+
+  describe('relationshipMatchesBothSameTypes', () => {
+    it('should return true if both left and right type of the relationship type are the same and match the provided itemtype', (done) => {
+      const relationshipType = Object.assign(new RelationshipType(), {
+        leftType: createSuccessfulRemoteDataObject$({id:  'sameType'}),
+        rightType: createSuccessfulRemoteDataObject$({id:'sameType'}),
+        leftwardType: 'isDepartmentOfDivision',
+        rightwardType: 'isDivisionOfDepartment',
+      });
+      const itemType = Object.assign(new ItemType(), {id: 'sameType'} );
+
+      const result = service.shouldDisplayBothRelationshipSides(relationshipType, itemType);
+      result.subscribe((resultValue) => {
+        expect(resultValue).toBeTrue();
+        done();
+      });
+    });
+    it('should return false if both left and right type of the relationship type are the same and match the provided itemtype but the leftwardType & rightwardType is identical', (done) => {
+      const relationshipType = Object.assign(new RelationshipType(), {
+        leftType: createSuccessfulRemoteDataObject$({ id: 'sameType' }),
+        rightType: createSuccessfulRemoteDataObject$({ id: 'sameType' }),
+        leftwardType: 'isOrgUnitOfOrgUnit',
+        rightwardType: 'isOrgUnitOfOrgUnit',
+      });
+      const itemType = Object.assign(new ItemType(), { id: 'sameType' });
+
+      const result = service.shouldDisplayBothRelationshipSides(relationshipType, itemType);
+      result.subscribe((resultValue) => {
+        expect(resultValue).toBeFalse();
+        done();
+      });
+    });
+    it('should return false if both left and right type of the relationship type are the same and do not match the provided itemtype', (done) => {
+      const relationshipType = Object.assign(new RelationshipType(), {
+        leftType: createSuccessfulRemoteDataObject$({id: 'sameType'}),
+        rightType: createSuccessfulRemoteDataObject$({id: 'sameType'}),
+        leftwardType: 'isDepartmentOfDivision',
+        rightwardType: 'isDivisionOfDepartment',
+      });
+      const itemType = Object.assign(new ItemType(), {id: 'something-else'} );
+
+      const result = service.shouldDisplayBothRelationshipSides(relationshipType, itemType);
+      result.subscribe((resultValue) => {
+        expect(resultValue).toBeFalse();
+        done();
+      });
+    });
+    it('should return false if both left and right type of the relationship type are different', (done) => {
+      const relationshipType = Object.assign(new RelationshipType(), {
+        leftType: createSuccessfulRemoteDataObject$({id: 'leftType'}),
+        rightType: createSuccessfulRemoteDataObject$({id: 'rightType'}),
+        leftwardType: 'isAuthorOfPublication',
+        rightwardType: 'isPublicationOfAuthor',
+      });
+      const itemType = Object.assign(new ItemType(), {id: 'leftType'} );
+
+      const result = service.shouldDisplayBothRelationshipSides(relationshipType, itemType);
+      result.subscribe((resultValue) => {
+        expect(resultValue).toBeFalse();
+        done();
+      });
+    });
+  });
+
+  describe('displayNotifications', () => {
+    it('should show one success notification when multiple requests succeeded', () => {
+      service.displayNotifications([
+        createSuccessfulRemoteDataObject({}),
+        createSuccessfulRemoteDataObject({}),
+      ]);
+
+      expect(notificationsService.success).toHaveBeenCalledTimes(1);
+    });
+
+    it('should show one success notification even when some requests failed', () => {
+      service.displayNotifications([
+        createSuccessfulRemoteDataObject({}),
+        createFailedRemoteDataObject('Request Failed'),
+        createSuccessfulRemoteDataObject({}),
+      ]);
+
+      expect(notificationsService.success).toHaveBeenCalledTimes(1);
+      expect(notificationsService.error).toHaveBeenCalledTimes(1);
+    });
+
+    it('should show a separate error notification for each failed request', () => {
+      service.displayNotifications([
+        createSuccessfulRemoteDataObject({}),
+        createFailedRemoteDataObject('Request Failed 1'),
+        createSuccessfulRemoteDataObject({}),
+        createFailedRemoteDataObject('Request Failed 2'),
+      ]);
+
+      expect(notificationsService.success).toHaveBeenCalledTimes(1);
+      expect(notificationsService.error).toHaveBeenCalledTimes(2);
+    });
+  });
+});
diff --git a/src/app/item-page/edit-item-page/item-relationships/edit-item-relationships.service.ts b/src/app/item-page/edit-item-page/item-relationships/edit-item-relationships.service.ts
new file mode 100644
index 0000000000..b9f3738e7b
--- /dev/null
+++ b/src/app/item-page/edit-item-page/item-relationships/edit-item-relationships.service.ts
@@ -0,0 +1,251 @@
+import { Injectable } from '@angular/core';
+import { take, map, switchMap, concatMap, toArray } from 'rxjs/operators';
+import { FieldUpdates } from '../../../core/data/object-updates/field-updates.model';
+import { FieldUpdate } from '../../../core/data/object-updates/field-update.model';
+import { hasValue } from '../../../shared/empty.util';
+import { FieldChangeType } from '../../../core/data/object-updates/field-change-type.model';
+import {
+  DeleteRelationship,
+  RelationshipIdentifiable
+} from '../../../core/data/object-updates/object-updates.reducer';
+import { RemoteData } from '../../../core/data/remote-data';
+import { Relationship } from '../../../core/shared/item-relationships/relationship.model';
+import { EMPTY, Observable, BehaviorSubject, Subscription, combineLatest as observableCombineLatest } from 'rxjs';
+import { ObjectUpdatesService } from '../../../core/data/object-updates/object-updates.service';
+import { ItemDataService } from '../../../core/data/item-data.service';
+import { Item } from '../../../core/shared/item.model';
+import { NoContent } from '../../../core/shared/NoContent.model';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
+import { RelationshipDataService } from '../../../core/data/relationship-data.service';
+import { EntityTypeDataService } from '../../../core/data/entity-type-data.service';
+import { TranslateService } from '@ngx-translate/core';
+import { ItemType } from '../../../core/shared/item-relationships/item-type.model';
+import { getFirstSucceededRemoteData, getRemoteDataPayload } from '../../../core/shared/operators';
+import { RelationshipType } from '../../../core/shared/item-relationships/relationship-type.model';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class EditItemRelationshipsService {
+  public notificationsPrefix = 'item.edit.relationships.notifications.';
+
+  public isSaving$: BehaviorSubject<boolean> = new BehaviorSubject(false);
+
+  constructor(
+    public itemService: ItemDataService,
+    public objectUpdatesService: ObjectUpdatesService,
+    public notificationsService: NotificationsService,
+    protected modalService: NgbModal,
+    public relationshipService: RelationshipDataService,
+    public entityTypeService: EntityTypeDataService,
+    public translateService: TranslateService,
+  ) { }
+
+
+  /**
+   * Resolve the currently selected related items back to relationships and send a delete request for each of the relationships found
+   * Make sure the lists are refreshed afterwards and notifications are sent for success and errors
+   */
+  public submit(item: Item, url: string): void {
+    this.isSaving$.next(true);
+    this.objectUpdatesService.getFieldUpdates(url, [], true).pipe(
+      map((fieldUpdates: FieldUpdates) =>
+        Object.values(fieldUpdates)
+          .filter((fieldUpdate: FieldUpdate) => hasValue(fieldUpdate))
+          .filter((fieldUpdate: FieldUpdate) => fieldUpdate.changeType === FieldChangeType.ADD || fieldUpdate.changeType === FieldChangeType.REMOVE)
+      ),
+      take(1),
+      // emit each update in the array separately
+      switchMap((updates) => updates),
+      // process each update one by one, while waiting for the previous to finish
+      concatMap((update: FieldUpdate) => {
+        if (update.changeType === FieldChangeType.REMOVE) {
+          return this.deleteRelationship(update.field as DeleteRelationship).pipe(
+            take(1),
+            switchMap((deleteRD: RemoteData<NoContent>) => {
+              if (deleteRD.hasSucceeded) {
+                return this.itemService.invalidateByHref((update.field as DeleteRelationship).relatedItem._links.self.href).pipe(
+                  map(() => deleteRD),
+                );
+              }
+              return [deleteRD];
+            }),
+          );
+        } else if (update.changeType === FieldChangeType.ADD) {
+          return this.addRelationship(update.field as RelationshipIdentifiable).pipe(
+            take(1),
+            switchMap((relationshipRD: RemoteData<Relationship>) => {
+              if (relationshipRD.hasSucceeded) {
+                // Set the newly related item to stale, so its relationships will update to include
+                // the new one. Only set the current item to stale at the very end so we only do it
+                // once
+                const { leftItem, rightItem } = relationshipRD.payload._links;
+                if (leftItem.href === item.self) {
+                  return this.itemService.invalidateByHref(rightItem.href).pipe(
+                    // when it's invalidated, emit the original relationshipRD for use in the pipe below
+                    map(() => relationshipRD)
+                  );
+                } else {
+                  return this.itemService.invalidateByHref(leftItem.href).pipe(
+                    // when it's invalidated, emit the original relationshipRD for use in the pipe below
+                    map(() => relationshipRD)
+                  );
+                }
+              } else {
+                return [relationshipRD];
+              }
+            })
+          );
+        } else {
+          return EMPTY;
+        }
+      }),
+      toArray(),
+      switchMap((responses) => {
+        // once all relationships are made and all related items have been invalidated, invalidate
+        // the current item
+        return this.itemService.invalidateByHref(item.self).pipe(
+          map(() => responses)
+        );
+      })
+    ).subscribe((responses) => {
+      if (responses.length > 0) {
+        this.initializeOriginalFields(item, url);
+        this.displayNotifications(responses);
+        this.modalService.dismissAll();
+        this.isSaving$.next(false);
+      }
+    });
+  }
+
+  /**
+   * Sends all initial values of this item to the object updates service
+   */
+  public initializeOriginalFields(item: Item, url: string): Subscription {
+    return this.relationshipService.getRelatedItems(item).pipe(
+      take(1),
+    ).subscribe((items: Item[]) => {
+      this.objectUpdatesService.initialize(url, items, item.lastModified);
+    });
+  }
+
+  deleteRelationship(deleteRelationship: DeleteRelationship): Observable<RemoteData<NoContent>> {
+    let copyVirtualMetadata: string;
+    if (deleteRelationship.keepLeftVirtualMetadata && deleteRelationship.keepRightVirtualMetadata) {
+      copyVirtualMetadata = 'all';
+    } else if (deleteRelationship.keepLeftVirtualMetadata) {
+      copyVirtualMetadata = 'left';
+    } else if (deleteRelationship.keepRightVirtualMetadata) {
+      copyVirtualMetadata = 'right';
+    } else {
+      copyVirtualMetadata = 'none';
+    }
+
+    return this.relationshipService.deleteRelationship(deleteRelationship.uuid, copyVirtualMetadata, false);
+  }
+
+  addRelationship(addRelationship: RelationshipIdentifiable): Observable<RemoteData<Relationship>> {
+    let leftItem: Item;
+    let rightItem: Item;
+    let leftwardValue: string;
+    let rightwardValue: string;
+    if (addRelationship.originalIsLeft) {
+      leftItem = addRelationship.originalItem;
+      rightItem = addRelationship.relatedItem;
+      leftwardValue = null;
+      rightwardValue = addRelationship.nameVariant;
+    } else {
+      leftItem = addRelationship.relatedItem;
+      rightItem = addRelationship.originalItem;
+      leftwardValue = addRelationship.nameVariant;
+      rightwardValue = null;
+    }
+    return this.relationshipService.addRelationship(addRelationship.type.id, leftItem, rightItem, leftwardValue, rightwardValue, false);
+  }
+
+  /**
+   * Display notifications
+   * - Error notification for each failed response with their message
+   * - Success notification in case there's at least one successful response
+   * @param responses
+   */
+  displayNotifications(responses: RemoteData<NoContent>[]): void {
+    const failedResponses = responses.filter((response: RemoteData<NoContent>) => response.hasFailed);
+    const successfulResponses = responses.filter((response: RemoteData<NoContent>) => response.hasSucceeded);
+
+    failedResponses.forEach((response: RemoteData<NoContent>) => {
+      this.notificationsService.error(this.getNotificationTitle('failed'), response.errorMessage);
+    });
+    if (successfulResponses.length > 0) {
+      this.notificationsService.success(this.getNotificationTitle('saved'), this.getNotificationContent('saved'));
+    }
+  }
+
+  isProvidedItemTypeLeftType(relationshipType: RelationshipType, itemType: ItemType, item: Item): Observable<boolean> {
+    return this.getRelationshipLeftAndRightType(relationshipType).pipe(
+      map(([leftType, rightType]: [ItemType, ItemType]) => {
+        if (leftType.id === itemType.id) {
+          return true;
+        }
+
+        if (rightType.id === itemType.id) {
+          return false;
+        }
+
+        // should never happen...
+        console.warn(`The item ${item.uuid} is not on the right or the left side of relationship type ${relationshipType.uuid}`);
+        return undefined;
+      })
+    );
+  }
+
+  /**
+   * Whether both side of the relationship need to be displayed on the edit relationship page or not.
+   *
+   * @param relationshipType The relationship type
+   * @param itemType         The item type
+   */
+  shouldDisplayBothRelationshipSides(relationshipType: RelationshipType, itemType: ItemType): Observable<boolean> {
+    return this.getRelationshipLeftAndRightType(relationshipType).pipe(
+      map(([leftType, rightType]: [ItemType, ItemType]) => {
+        return leftType.id === itemType.id && rightType.id === itemType.id && relationshipType.leftwardType !== relationshipType.rightwardType;
+      }),
+    );
+  }
+
+  protected getRelationshipLeftAndRightType(relationshipType: RelationshipType): Observable<[ItemType, ItemType]> {
+    const leftType$: Observable<ItemType> = relationshipType.leftType.pipe(
+      getFirstSucceededRemoteData(),
+      getRemoteDataPayload(),
+    );
+
+    const rightType$: Observable<ItemType> = relationshipType.rightType.pipe(
+      getFirstSucceededRemoteData(),
+      getRemoteDataPayload(),
+    );
+
+    return observableCombineLatest([
+      leftType$,
+      rightType$,
+    ]);
+  }
+
+
+
+  /**
+   * Get translated notification title
+   * @param key
+   */
+  getNotificationTitle(key: string): string {
+    return this.translateService.instant(this.notificationsPrefix + key + '.title');
+  }
+
+  /**
+   * Get translated notification content
+   * @param key
+   */
+  getNotificationContent(key: string): string {
+    return this.translateService.instant(this.notificationsPrefix + key + '.content');
+  }
+}
diff --git a/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list-wrapper/edit-relationship-list-wrapper.component.html b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list-wrapper/edit-relationship-list-wrapper.component.html
new file mode 100644
index 0000000000..ed7fb190f2
--- /dev/null
+++ b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list-wrapper/edit-relationship-list-wrapper.component.html
@@ -0,0 +1,31 @@
+<ng-container *ngIf="shouldDisplayBothRelationshipSides$ | async">
+    <ds-edit-relationship-list
+            [url]="url"
+            [item]="item"
+            [itemType]="itemType"
+            [relationshipType]="relationshipType"
+            [hasChanges]="hasChanges"
+            [currentItemIsLeftItem$]="isLeftItem$"
+            class="d-block mb-4"
+    ></ds-edit-relationship-list>
+    <ds-edit-relationship-list
+            [url]="url"
+            [item]="item"
+            [itemType]="itemType"
+            [relationshipType]="relationshipType"
+            [hasChanges]="hasChanges"
+            [currentItemIsLeftItem$]="isRightItem$"
+    ></ds-edit-relationship-list>
+</ng-container>
+
+<ng-container *ngIf="(shouldDisplayBothRelationshipSides$ | async) === false">
+    <ds-edit-relationship-list
+            [url]="url"
+            [item]="item"
+            [itemType]="itemType"
+            [relationshipType]="relationshipType"
+            [hasChanges]="hasChanges"
+            [currentItemIsLeftItem$]="currentItemIsLeftItem$"
+    ></ds-edit-relationship-list>
+</ng-container>
+
diff --git a/src/app/shared/dso-page/dso-page-subscription-button/dso-page-subscription-button.component.scss b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list-wrapper/edit-relationship-list-wrapper.component.scss
similarity index 100%
rename from src/app/shared/dso-page/dso-page-subscription-button/dso-page-subscription-button.component.scss
rename to src/app/item-page/edit-item-page/item-relationships/edit-relationship-list-wrapper/edit-relationship-list-wrapper.component.scss
diff --git a/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list-wrapper/edit-relationship-list-wrapper.component.spec.ts b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list-wrapper/edit-relationship-list-wrapper.component.spec.ts
new file mode 100644
index 0000000000..a6f0c9e0a5
--- /dev/null
+++ b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list-wrapper/edit-relationship-list-wrapper.component.spec.ts
@@ -0,0 +1,109 @@
+import { ChangeDetectorRef, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { of as observableOf } from 'rxjs';
+import { EditRelationshipListWrapperComponent } from './edit-relationship-list-wrapper.component';
+import { EditItemRelationshipsService } from '../edit-item-relationships.service';
+import { By } from '@angular/platform-browser';
+import { RelationshipType } from '../../../../core/shared/item-relationships/relationship-type.model';
+import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
+import { ItemType } from '../../../../core/shared/item-relationships/item-type.model';
+import { Item } from '../../../../core/shared/item.model';
+import { cold } from 'jasmine-marbles';
+
+describe('EditRelationshipListWrapperComponent', () => {
+  let editItemRelationshipsService: EditItemRelationshipsService;
+  let comp: EditRelationshipListWrapperComponent;
+  let fixture: ComponentFixture<EditRelationshipListWrapperComponent>;
+
+  const leftType = Object.assign(new ItemType(), {id: 'leftType', label: 'leftTypeString'});
+  const rightType = Object.assign(new ItemType(), {id: 'rightType', label: 'rightTypeString'});
+
+  const relationshipType = Object.assign(new RelationshipType(), {
+    id: '1',
+    leftMaxCardinality: null,
+    leftMinCardinality: 0,
+    leftType: createSuccessfulRemoteDataObject$(leftType),
+    leftwardType: 'isOrgUnitOfOrgUnit',
+    rightMaxCardinality: null,
+    rightMinCardinality: 0,
+    rightType: createSuccessfulRemoteDataObject$(rightType),
+    rightwardType: 'isOrgUnitOfOrgUnit',
+    uuid: 'relationshiptype-1',
+  });
+
+  const item = Object.assign(new Item(), {uuid: 'item-uuid'});
+
+  beforeEach(waitForAsync(() => {
+
+    editItemRelationshipsService = jasmine.createSpyObj('editItemRelationshipsService', {
+      isProvidedItemTypeLeftType: observableOf(true),
+      shouldDisplayBothRelationshipSides: observableOf(false),
+    });
+
+
+    TestBed.configureTestingModule({
+      // imports: [NoopAnimationsModule, SharedModule, TranslateModule.forRoot()],
+      declarations: [EditRelationshipListWrapperComponent],
+      providers: [
+        {provide: EditItemRelationshipsService, useValue: editItemRelationshipsService},
+        ChangeDetectorRef
+      ], schemas: [
+        CUSTOM_ELEMENTS_SCHEMA
+      ]
+    }).compileComponents();
+
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(EditRelationshipListWrapperComponent);
+    comp = fixture.componentInstance;
+    comp.relationshipType = relationshipType;
+    comp.itemType = leftType;
+    comp.item = item;
+
+    fixture.detectChanges();
+  });
+
+  describe('onInit', () => {
+    it('should render the component', () => {
+      expect(comp).toBeTruthy();
+    });
+    it('should set currentItemIsLeftItem$ and bothItemsMatchType$  based on the provided relationshipType, itemType and item', () => {
+      expect(editItemRelationshipsService.isProvidedItemTypeLeftType).toHaveBeenCalledWith(relationshipType, leftType, item);
+      expect(editItemRelationshipsService.shouldDisplayBothRelationshipSides).toHaveBeenCalledWith(relationshipType, leftType);
+
+      expect(comp.currentItemIsLeftItem$.getValue()).toEqual(true);
+      expect(comp.shouldDisplayBothRelationshipSides$).toBeObservable(cold('(a|)', { a: false }));
+    });
+  });
+
+  describe('when the current item is left', () => {
+    it('should render one relationship list section', () => {
+      const relationshipLists = fixture.debugElement.queryAll(By.css('ds-edit-relationship-list'));
+      expect(relationshipLists.length).toEqual(1);
+    });
+  });
+
+  describe('when the current item is right', () => {
+    it('should render one relationship list section', () => {
+      (editItemRelationshipsService.isProvidedItemTypeLeftType as jasmine.Spy).and.returnValue(observableOf(false));
+      comp.ngOnInit();
+      fixture.detectChanges();
+
+      const relationshipLists = fixture.debugElement.queryAll(By.css('ds-edit-relationship-list'));
+      expect(relationshipLists.length).toEqual(1);
+    });
+  });
+
+  describe('when the current item is both left and right', () => {
+    it('should render two relationship list sections', () => {
+      (editItemRelationshipsService.shouldDisplayBothRelationshipSides as jasmine.Spy).and.returnValue(observableOf(true));
+      comp.ngOnInit();
+      fixture.detectChanges();
+
+      const relationshipLists = fixture.debugElement.queryAll(By.css('ds-edit-relationship-list'));
+      expect(relationshipLists.length).toEqual(2);
+    });
+  });
+
+});
diff --git a/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list-wrapper/edit-relationship-list-wrapper.component.ts b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list-wrapper/edit-relationship-list-wrapper.component.ts
new file mode 100644
index 0000000000..8ff408cb79
--- /dev/null
+++ b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list-wrapper/edit-relationship-list-wrapper.component.ts
@@ -0,0 +1,88 @@
+import { Component, EventEmitter, Input, OnDestroy, OnInit, Output } from '@angular/core';
+import { BehaviorSubject, Observable, Subscription } from 'rxjs';
+import { Item } from '../../../../core/shared/item.model';
+import { hasValue } from '../../../../shared/empty.util';
+import { RelationshipType } from '../../../../core/shared/item-relationships/relationship-type.model';
+import { ItemType } from '../../../../core/shared/item-relationships/item-type.model';
+import { EditItemRelationshipsService } from '../edit-item-relationships.service';
+
+@Component({
+  selector: 'ds-edit-relationship-list-wrapper',
+  styleUrls: ['./edit-relationship-list-wrapper.component.scss'],
+  templateUrl: './edit-relationship-list-wrapper.component.html',
+})
+/**
+ * A component creating a list of editable relationships of a certain type
+ * The relationships are rendered as a list of related items
+ */
+export class EditRelationshipListWrapperComponent implements OnInit, OnDestroy {
+
+  /**
+   * The item to display related items for
+   */
+  @Input() item: Item;
+
+  @Input() itemType: ItemType;
+
+  /**
+   * The URL to the current page
+   * Used to fetch updates for the current item from the store
+   */
+  @Input() url: string;
+
+  /**
+   * The label of the relationship-type we're rendering a list for
+   */
+  @Input() relationshipType: RelationshipType;
+
+  /**
+   * If updated information has changed
+   */
+  @Input() hasChanges!: Observable<boolean>;
+
+  /**
+   * The event emmiter to submit the new information
+   */
+  @Output() submitModal: EventEmitter<void> = new EventEmitter();
+
+  /**
+   * Observable that emits true if {@link itemType} is on the left-hand side of {@link relationshipType},
+   * false if it is on the right-hand side and undefined in the rare case that it is on neither side.
+   */
+  currentItemIsLeftItem$: BehaviorSubject<boolean> = new BehaviorSubject(undefined);
+
+
+  isLeftItem$ = new BehaviorSubject(true);
+
+  isRightItem$ = new BehaviorSubject(false);
+
+  shouldDisplayBothRelationshipSides$: Observable<boolean>;
+
+  /**
+   * Array to track all subscriptions and unsubscribe them onDestroy
+   * @type {Array}
+   */
+  private subs: Subscription[] = [];
+
+  constructor(
+    protected editItemRelationshipsService: EditItemRelationshipsService,
+  ) {
+  }
+
+
+  ngOnInit(): void {
+    this.subs.push(this.editItemRelationshipsService.isProvidedItemTypeLeftType(this.relationshipType, this.itemType, this.item)
+      .subscribe((nextValue: boolean) => {
+        this.currentItemIsLeftItem$.next(nextValue);
+      }));
+
+    this.shouldDisplayBothRelationshipSides$ = this.editItemRelationshipsService.shouldDisplayBothRelationshipSides(this.relationshipType, this.itemType);
+  }
+
+
+  ngOnDestroy(): void {
+    this.subs
+      .filter((subscription) => hasValue(subscription))
+      .forEach((subscription) => subscription.unsubscribe());
+  }
+}
diff --git a/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.html b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.html
index 7cdc903f24..27faee89a7 100644
--- a/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.html
+++ b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.html
@@ -1,16 +1,15 @@
-<h5>
-    {{getRelationshipMessageKey() | async | translate}}
-    <button class="ml-2 btn btn-success" [disabled]="(hasChanges | async)" (click)="openLookup()">
+<h2 class="h4">
+   {{relationshipMessageKey$ | async | translate}}
+    <button class="ml-2 btn btn-success" [dsBtnDisabled]="(hasChanges | async)" (click)="openLookup()">
         <i class="fas fa-plus"></i>
         <span class="d-none d-sm-inline">&nbsp;{{"item.edit.relationships.edit.buttons.add" | translate}}</span>
     </button>
-</h5>
+</h2>
 <ng-container *ngVar="updates$ | async as updates">
     <ng-container *ngIf="updates && !(loading$ | async)">
         <ng-container *ngVar="updates | dsObjectValues as updateValues">
           <ds-pagination
             [paginationOptions]="paginationConfig"
-            [pageInfoState]="(relationshipsRd$ | async)?.payload?.pageInfo"
             [collectionSize]="(relationshipsRd$ | async)?.payload?.totalElements + (this.nbAddedFields$ | async)"
             [hideGear]="true"
             [hidePagerWhenSinglePage]="true">
diff --git a/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.spec.ts b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.spec.ts
index 4cd663f0fb..4ff09154cd 100644
--- a/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.spec.ts
+++ b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.spec.ts
@@ -2,7 +2,7 @@ import { DebugElement, NO_ERRORS_SCHEMA } from '@angular/core';
 import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
 import { TranslateModule } from '@ngx-translate/core';
-import { of as observableOf } from 'rxjs';
+import { BehaviorSubject, of as observableOf } from 'rxjs';
 import { LinkService } from '../../../../core/cache/builders/link.service';
 import { ObjectUpdatesService } from '../../../../core/data/object-updates/object-updates.service';
 import { RelationshipDataService } from '../../../../core/data/relationship-data.service';
@@ -28,71 +28,80 @@ import { ConfigurationDataService } from '../../../../core/data/configuration-da
 import { LinkHeadService } from '../../../../core/services/link-head.service';
 import { SearchConfigurationService } from '../../../../core/shared/search/search-configuration.service';
 import { SearchConfigurationServiceStub } from '../../../../shared/testing/search-configuration-service.stub';
+import { XSRFService } from '../../../../core/xsrf/xsrf.service';
 import { ConfigurationProperty } from '../../../../core/shared/configuration-property.model';
 import { Router } from '@angular/router';
 import { RouterMock } from '../../../../shared/mocks/router.mock';
 import { APP_CONFIG } from '../../../../../config/app-config.interface';
-
-let comp: EditRelationshipListComponent;
-let fixture: ComponentFixture<EditRelationshipListComponent>;
-let de: DebugElement;
-
-let linkService;
-let objectUpdatesService;
-let relationshipService;
-let selectableListService;
-let paginationService;
-let hostWindowService;
-const relationshipTypeService = {};
-
-const url = 'http://test-url.com/test-url';
-
-let item;
-let entityType;
-let relatedEntityType;
-let author1;
-let author2;
-let fieldUpdate1;
-let fieldUpdate2;
-let relationships;
-let relationshipType;
-let paginationOptions;
+import { EditItemRelationshipsServiceStub } from '../../../../shared/testing/edit-item-relationships.service.stub';
+import { EditItemRelationshipsService } from '../edit-item-relationships.service';
+import { cold } from 'jasmine-marbles';
+import { environment } from '../../../../../environments/environment.test';
 
 describe('EditRelationshipListComponent', () => {
 
+  let comp: EditRelationshipListComponent;
+  let fixture: ComponentFixture<EditRelationshipListComponent>;
+  let de: DebugElement;
+
+  let linkService;
+  let objectUpdatesService;
+  let relationshipService;
+  let selectableListService;
+  let paginationService: PaginationServiceStub;
+  let hostWindowService: HostWindowServiceStub;
+  const relationshipTypeService = {};
+  let editItemRelationshipsService: EditItemRelationshipsServiceStub;
+
+  const url = 'http://test-url.com/test-url';
+
+  let itemLeft: Item;
+  let entityTypeLeft: ItemType;
+  let entityTypeRight: ItemType;
+  let itemRight1: Item;
+  let itemRight2: Item;
+  let fieldUpdate1;
+  let fieldUpdate2;
+  let relationships: Relationship[];
+  let relationshipType: RelationshipType;
+  let paginationOptions: PaginationComponentOptions;
+  let currentItemIsLeftItem$ =  new BehaviorSubject<boolean>(true);
+
   const resetComponent = () => {
     fixture = TestBed.createComponent(EditRelationshipListComponent);
     comp = fixture.componentInstance;
     de = fixture.debugElement;
-    comp.item = item;
-    comp.itemType = entityType;
+    comp.item = itemLeft;
+    comp.itemType = entityTypeLeft;
     comp.url = url;
     comp.relationshipType = relationshipType;
     comp.hasChanges = observableOf(false);
+    comp.currentItemIsLeftItem$ = currentItemIsLeftItem$;
     fixture.detectChanges();
   };
 
-  beforeEach(waitForAsync(() => {
-
-    entityType = Object.assign(new ItemType(), {
-      id: 'Publication',
-      uuid: 'Publication',
-      label: 'Publication',
+  function init(leftType: string, rightType: string, leftMaxCardinality?: number, rightMaxCardinality?: number): void {
+    entityTypeLeft = Object.assign(new ItemType(), {
+      id: leftType,
+      uuid: leftType,
+      label: leftType,
     });
 
-    relatedEntityType = Object.assign(new ItemType(), {
-      id: 'Author',
-      uuid: 'Author',
-      label: 'Author',
+    entityTypeRight = Object.assign(new ItemType(), {
+      id: rightType,
+      uuid: rightType,
+      label: rightType,
     });
 
     relationshipType = Object.assign(new RelationshipType(), {
       id: '1',
       uuid: '1',
-      leftType: createSuccessfulRemoteDataObject$(entityType),
-      rightType: createSuccessfulRemoteDataObject$(relatedEntityType),
-      leftwardType: 'isAuthorOfPublication',
-      rightwardType: 'isPublicationOfAuthor',
+      leftType: createSuccessfulRemoteDataObject$(entityTypeLeft),
+      rightType: createSuccessfulRemoteDataObject$(entityTypeRight),
+      leftwardType: `is${rightType}Of${leftType}`,
+      rightwardType: `is${leftType}Of${rightType}`,
+      leftMaxCardinality: leftMaxCardinality,
+      rightMaxCardinality: rightMaxCardinality,
     });
 
     paginationOptions = Object.assign(new PaginationComponentOptions(), {
@@ -101,13 +110,13 @@ describe('EditRelationshipListComponent', () => {
       currentPage: 1,
     });
 
-    author1 = Object.assign(new Item(), {
-      id: 'author1',
-      uuid: 'author1'
+    itemRight1 = Object.assign(new Item(), {
+      id: `${rightType}-1`,
+      uuid: `${rightType}-1`,
     });
-    author2 = Object.assign(new Item(), {
-      id: 'author2',
-      uuid: 'author2'
+    itemRight2 = Object.assign(new Item(), {
+      id: `${rightType}-2`,
+      uuid: `${rightType}-2`,
     });
 
     relationships = [
@@ -116,25 +125,25 @@ describe('EditRelationshipListComponent', () => {
         id: '2',
         uuid: '2',
         relationshipType: createSuccessfulRemoteDataObject$(relationshipType),
-        leftItem: createSuccessfulRemoteDataObject$(item),
-        rightItem: createSuccessfulRemoteDataObject$(author1),
+        leftItem: createSuccessfulRemoteDataObject$(itemLeft),
+        rightItem: createSuccessfulRemoteDataObject$(itemRight1),
       }),
       Object.assign(new Relationship(), {
         self: url + '/3',
         id: '3',
         uuid: '3',
         relationshipType: createSuccessfulRemoteDataObject$(relationshipType),
-        leftItem: createSuccessfulRemoteDataObject$(item),
-        rightItem: createSuccessfulRemoteDataObject$(author2),
+        leftItem: createSuccessfulRemoteDataObject$(itemLeft),
+        rightItem: createSuccessfulRemoteDataObject$(itemRight2),
       })
     ];
 
-    item = Object.assign(new Item(), {
+    itemLeft = Object.assign(new Item(), {
       _links: {
         self: { href: 'fake-item-url/publication' }
       },
-      id: 'publication',
-      uuid: 'publication',
+      id: `1-${leftType}`,
+      uuid: `1-${leftType}`,
       relationships: createSuccessfulRemoteDataObject$(createPaginatedList(relationships))
     });
 
@@ -160,13 +169,16 @@ describe('EditRelationshipListComponent', () => {
         getFieldUpdates: observableOf({
           [relationships[0].uuid]: fieldUpdate1,
           [relationships[1].uuid]: fieldUpdate2
-        })
+        }),
+        // eslint-disable-next-line @typescript-eslint/no-empty-function
+        initialize: () => {
+        },
       }
     );
 
     relationshipService = jasmine.createSpyObj('relationshipService',
       {
-        getRelatedItemsByLabel: createSuccessfulRemoteDataObject$(createPaginatedList([author1, author2])),
+        getRelatedItemsByLabel: createSuccessfulRemoteDataObject$(createPaginatedList([itemRight1, itemRight2])),
         getItemRelationshipsByLabel: createSuccessfulRemoteDataObject$(createPaginatedList(relationships)),
         isLeftItem: observableOf(true),
       }
@@ -202,11 +214,13 @@ describe('EditRelationshipListComponent', () => {
       }))
     });
 
-    const environmentUseThumbs = {
+    editItemRelationshipsService = new EditItemRelationshipsServiceStub();
+
+    const environmentUseThumbs = Object.assign({}, environment, {
       browseBy: {
         showThumbnails: true
       }
-    };
+    });
 
     TestBed.configureTestingModule({
       imports: [SharedModule, TranslateModule.forRoot()],
@@ -224,6 +238,8 @@ describe('EditRelationshipListComponent', () => {
         { provide: LinkHeadService, useValue: linkHeadService },
         { provide: ConfigurationDataService, useValue: configurationDataService },
         { provide: SearchConfigurationService, useValue: new SearchConfigurationServiceStub() },
+        { provide: EditItemRelationshipsService, useValue: editItemRelationshipsService },
+        { provide: XSRFService, useValue: {} },
         { provide: APP_CONFIG, useValue: environmentUseThumbs }
       ], schemas: [
         NO_ERRORS_SCHEMA
@@ -231,114 +247,157 @@ describe('EditRelationshipListComponent', () => {
     }).compileComponents();
 
     resetComponent();
-  }));
+  }
 
-  describe('changeType is REMOVE', () => {
-    beforeEach(() => {
-      fieldUpdate1.changeType = FieldChangeType.REMOVE;
-      fixture.detectChanges();
-    });
-    it('the div should have class alert-danger', () => {
-      const element = de.queryAll(By.css('.relationship-row'))[1].nativeElement;
-      expect(element.classList).toContain('alert-danger');
-    });
-  });
+  describe('Publication - Author relationship', () => {
+    beforeEach(waitForAsync(() => init('Publication', 'Author')));
 
-  describe('pagination component', () => {
-    let paginationComp: PaginationComponent;
-
-    beforeEach(() => {
-      paginationComp = de.query(By.css('ds-pagination')).componentInstance;
-    });
-
-    it('should receive the correct pagination config', () => {
-      expect(paginationComp.paginationOptions).toEqual(paginationOptions);
-    });
-
-    it('should receive correct collection size', () => {
-      expect(paginationComp.collectionSize).toEqual(relationships.length);
-    });
-
-  });
-
-  describe('relationshipService.getItemRelationshipsByLabel', () => {
-    it('should receive the correct pagination info', () => {
-      expect(relationshipService.getItemRelationshipsByLabel).toHaveBeenCalledTimes(1);
-
-      const callArgs = relationshipService.getItemRelationshipsByLabel.calls.mostRecent().args;
-      const findListOptions = callArgs[2];
-      const linksToFollow = callArgs[5];
-      expect(findListOptions.elementsPerPage).toEqual(paginationOptions.pageSize);
-      expect(findListOptions.currentPage).toEqual(paginationOptions.currentPage);
-      expect(linksToFollow.linksToFollow[0].name).toEqual('thumbnail');
-
-    });
-
-    describe('when the publication is on the left side of the relationship', () => {
+    describe('changeType is REMOVE', () => {
       beforeEach(() => {
-        relationshipType = Object.assign(new RelationshipType(), {
-          id: '1',
-          uuid: '1',
-          leftType: createSuccessfulRemoteDataObject$(entityType), // publication
-          rightType: createSuccessfulRemoteDataObject$(relatedEntityType), // author
-          leftwardType: 'isAuthorOfPublication',
-          rightwardType: 'isPublicationOfAuthor',
-        });
-        relationshipService.getItemRelationshipsByLabel.calls.reset();
-        resetComponent();
-      });
-
-      it('should fetch isAuthorOfPublication', () => {
-        expect(relationshipService.getItemRelationshipsByLabel).toHaveBeenCalledTimes(1);
-
-        const callArgs = relationshipService.getItemRelationshipsByLabel.calls.mostRecent().args;
-        const label = callArgs[1];
-
-        expect(label).toEqual('isAuthorOfPublication');
-      });
-    });
-
-    describe('when the publication is on the right side of the relationship', () => {
-      beforeEach(() => {
-        relationshipType = Object.assign(new RelationshipType(), {
-          id: '1',
-          uuid: '1',
-          leftType: createSuccessfulRemoteDataObject$(relatedEntityType), // author
-          rightType: createSuccessfulRemoteDataObject$(entityType), // publication
-          leftwardType: 'isPublicationOfAuthor',
-          rightwardType: 'isAuthorOfPublication',
-        });
-        relationshipService.getItemRelationshipsByLabel.calls.reset();
-        resetComponent();
-      });
-
-      it('should fetch isAuthorOfPublication', () => {
-        expect(relationshipService.getItemRelationshipsByLabel).toHaveBeenCalledTimes(1);
-
-        const callArgs = relationshipService.getItemRelationshipsByLabel.calls.mostRecent().args;
-        const label = callArgs[1];
-
-        expect(label).toEqual('isAuthorOfPublication');
-      });
-    });
-
-
-
-    describe('changes managment for add buttons', () => {
-
-      it('should show enabled add buttons', () => {
-        const element = de.query(By.css('.btn-success'));
-        expect(element.nativeElement?.disabled).toBeFalse();
-      });
-
-      it('after hash changes changed', () => {
-        comp.hasChanges = observableOf(true);
+        fieldUpdate1.changeType = FieldChangeType.REMOVE;
         fixture.detectChanges();
-        const element = de.query(By.css('.btn-success'));
-        expect(element.nativeElement?.disabled).toBeTrue();
+      });
+      it('the div should have class alert-danger', () => {
+        const element = de.queryAll(By.css('.relationship-row'))[1].nativeElement;
+        expect(element.classList).toContain('alert-danger');
       });
     });
 
+    describe('pagination component', () => {
+      let paginationComp: PaginationComponent;
+
+      beforeEach(() => {
+        paginationComp = de.query(By.css('ds-pagination')).componentInstance;
+      });
+
+      it('should receive the correct pagination config', () => {
+        expect(paginationComp.paginationOptions).toEqual(paginationOptions);
+      });
+
+      it('should receive correct collection size', () => {
+        expect(paginationComp.collectionSize).toEqual(relationships.length);
+      });
+
+    });
+
+    describe('relationshipService.getItemRelationshipsByLabel', () => {
+      it('should receive the correct pagination info', () => {
+        expect(relationshipService.getItemRelationshipsByLabel).toHaveBeenCalledTimes(1);
+
+        const callArgs = relationshipService.getItemRelationshipsByLabel.calls.mostRecent().args;
+        const findListOptions = callArgs[2];
+        const linksToFollow = callArgs[5];
+        expect(findListOptions.elementsPerPage).toEqual(paginationOptions.pageSize);
+        expect(findListOptions.currentPage).toEqual(paginationOptions.currentPage);
+        expect(linksToFollow.linksToFollow[0].name).toEqual('thumbnail');
+
+      });
+
+      describe('when the publication is on the left side of the relationship', () => {
+        beforeEach(() => {
+          relationshipType = Object.assign(new RelationshipType(), {
+            id: '1',
+            uuid: '1',
+            leftType: createSuccessfulRemoteDataObject$(entityTypeLeft), // publication
+            rightType: createSuccessfulRemoteDataObject$(entityTypeRight), // author
+            leftwardType: 'isAuthorOfPublication',
+            rightwardType: 'isPublicationOfAuthor',
+          });
+          currentItemIsLeftItem$ =  new BehaviorSubject<boolean>(true);
+          relationshipService.getItemRelationshipsByLabel.calls.reset();
+          resetComponent();
+        });
+
+        it('should fetch isAuthorOfPublication', () => {
+          expect(relationshipService.getItemRelationshipsByLabel).toHaveBeenCalledTimes(1);
+
+          const callArgs = relationshipService.getItemRelationshipsByLabel.calls.mostRecent().args;
+          const label = callArgs[1];
+
+          expect(label).toEqual('isAuthorOfPublication');
+        });
+      });
+
+      describe('when the publication is on the right side of the relationship', () => {
+        beforeEach(() => {
+          relationshipType = Object.assign(new RelationshipType(), {
+            id: '1',
+            uuid: '1',
+            leftType: createSuccessfulRemoteDataObject$(entityTypeRight), // author
+            rightType: createSuccessfulRemoteDataObject$(entityTypeLeft), // publication
+            leftwardType: 'isPublicationOfAuthor',
+            rightwardType: 'isAuthorOfPublication',
+          });
+          currentItemIsLeftItem$ =  new BehaviorSubject<boolean>(false);
+          relationshipService.getItemRelationshipsByLabel.calls.reset();
+          resetComponent();
+        });
+
+        it('should fetch isAuthorOfPublication', () => {
+          expect(relationshipService.getItemRelationshipsByLabel).toHaveBeenCalledTimes(1);
+
+          const callArgs = relationshipService.getItemRelationshipsByLabel.calls.mostRecent().args;
+          const label = callArgs[1];
+
+          expect(label).toEqual('isAuthorOfPublication');
+        });
+      });
+
+
+
+      describe('changes managment for add buttons', () => {
+
+        it('should show enabled add buttons', () => {
+          const element = de.query(By.css('.btn-success'));
+          expect(element.nativeElement?.disabled).toBeFalse();
+        });
+
+        it('after hash changes changed', () => {
+          comp.hasChanges = observableOf(true);
+          fixture.detectChanges();
+          const element = de.query(By.css('.btn-success'));
+        expect(element.nativeElement?.getAttribute('aria-disabled')).toBe('true');
+        expect(element.nativeElement?.classList.contains('disabled')).toBeTrue();
+        });
+      });
+
+    });
   });
 
+  describe('OrgUnit - OrgUnit relationship', () => {
+    beforeEach(waitForAsync(() => init('OrgUnit', 'OrgUnit')));
+
+    it('should emit the relatedEntityType$ even for same entity relationships', () => {
+      expect(comp.relatedEntityType$).toBeObservable(cold('(a|)', {
+        a: entityTypeRight,
+      }));
+    });
+  });
+
+  describe('Is repeatable relationship', () => {
+      beforeEach(waitForAsync(() => {
+        currentItemIsLeftItem$ =  new BehaviorSubject<boolean>(true);
+      }));
+    describe('when max cardinality is 1', () => {
+      beforeEach(waitForAsync(() => init('Publication', 'OrgUnit', 1, undefined)));
+      it('should return false', () => {
+        const result = (comp as any).isRepeatable();
+        expect(result).toBeFalse();
+      });
+    });
+    describe('when max cardinality is 2', () => {
+      beforeEach(waitForAsync(() => init('Publication', 'OrgUnit', 2, undefined)));
+      it('should return true', () => {
+        const result = (comp as any).isRepeatable();
+        expect(result).toBeTrue();
+      });
+    });
+    describe('when max cardinality is undefined', () => {
+      beforeEach(waitForAsync(() => init('Publication', 'OrgUnit', undefined, undefined)));
+      it('should return true', () => {
+        const result = (comp as any).isRepeatable();
+        expect(result).toBeTrue();
+      });
+    });
+  });
 });
diff --git a/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts
index b8542f5806..b8288704f1 100644
--- a/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts
+++ b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts
@@ -5,6 +5,7 @@ import { ObjectUpdatesService } from '../../../../core/data/object-updates/objec
 import {
   BehaviorSubject,
   combineLatest as observableCombineLatest,
+  EMPTY,
   from as observableFrom,
   Observable,
   Subscription
@@ -14,33 +15,57 @@ import {
 } from '../../../../core/data/object-updates/object-updates.reducer';
 import { RelationshipDataService } from '../../../../core/data/relationship-data.service';
 import { Item } from '../../../../core/shared/item.model';
-import { defaultIfEmpty, map, mergeMap, startWith, switchMap, take, tap, toArray } from 'rxjs/operators';
-import { hasNoValue, hasValue, hasValueOperator } from '../../../../shared/empty.util';
+import {
+  defaultIfEmpty,
+  map,
+  mergeMap,
+  startWith,
+  switchMap,
+  take,
+  tap,
+  toArray,
+  concatMap
+} from 'rxjs/operators';
+import { hasNoValue, hasValue, hasValueOperator, isNotEmpty } from '../../../../shared/empty.util';
 import { Relationship } from '../../../../core/shared/item-relationships/relationship.model';
-import { RelationshipType } from '../../../../core/shared/item-relationships/relationship-type.model';
+import {
+  RelationshipType
+} from '../../../../core/shared/item-relationships/relationship-type.model';
 import {
   getAllSucceededRemoteData,
+  getFirstCompletedRemoteData,
   getFirstSucceededRemoteData,
   getFirstSucceededRemoteDataPayload,
   getRemoteDataPayload,
 } from '../../../../core/shared/operators';
 import { ItemType } from '../../../../core/shared/item-relationships/item-type.model';
-import { DsDynamicLookupRelationModalComponent } from '../../../../shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component';
-import { RelationshipOptions } from '../../../../shared/form/builder/models/relationship-options.model';
-import { SelectableListService } from '../../../../shared/object-list/selectable-list/selectable-list.service';
-import { SearchResult } from '../../../../shared/search/models/search-result.model';
+import {
+  DsDynamicLookupRelationModalComponent
+} from '../../../../shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component';
+import {
+  RelationshipOptions
+} from '../../../../shared/form/builder/models/relationship-options.model';
+import {
+  SelectableListService
+} from '../../../../shared/object-list/selectable-list/selectable-list.service';
+import {
+  ItemSearchResult
+} from '../../../../shared/object-collection/shared/item-search-result.model';
 import { FollowLinkConfig } from '../../../../shared/utils/follow-link-config.model';
 import { PaginatedList } from '../../../../core/data/paginated-list.model';
 import { RemoteData } from '../../../../core/data/remote-data';
 import { Collection } from '../../../../core/shared/collection.model';
-import { PaginationComponentOptions } from '../../../../shared/pagination/pagination-component-options.model';
+import {
+  PaginationComponentOptions
+} from '../../../../shared/pagination/pagination-component-options.model';
 import { PaginationService } from '../../../../core/pagination/pagination.service';
-import { RelationshipTypeDataService } from '../../../../core/data/relationship-type-data.service';
 import { FieldUpdate } from '../../../../core/data/object-updates/field-update.model';
 import { FieldUpdates } from '../../../../core/data/object-updates/field-updates.model';
 import { FieldChangeType } from '../../../../core/data/object-updates/field-change-type.model';
 import { APP_CONFIG, AppConfig } from '../../../../../config/app-config.interface';
 import { itemLinksToFollow } from '../../../../shared/utils/relation-query.utils';
+import { EditItemRelationshipsService } from '../edit-item-relationships.service';
+import { RequestParam } from '../../../../core/cache/models/request-param.model';
 
 @Component({
   selector: 'ds-edit-relationship-list',
@@ -79,7 +104,7 @@ export class EditRelationshipListComponent implements OnInit, OnDestroy {
   /**
    * The event emmiter to submit the new information
    */
-  @Output() submit: EventEmitter<any> = new EventEmitter();
+  @Output() submitModal: EventEmitter<void> = new EventEmitter();
 
   /**
    * Observable that emits the left and right item type of {@link relationshipType} simultaneously.
@@ -90,9 +115,14 @@ export class EditRelationshipListComponent implements OnInit, OnDestroy {
    * Observable that emits true if {@link itemType} is on the left-hand side of {@link relationshipType},
    * false if it is on the right-hand side and undefined in the rare case that it is on neither side.
    */
-  private currentItemIsLeftItem$: Observable<boolean>;
+  @Input() currentItemIsLeftItem$: BehaviorSubject<boolean> = new BehaviorSubject(undefined);
 
-  private relatedEntityType$: Observable<ItemType>;
+  relatedEntityType$: Observable<ItemType>;
+
+  /**
+   * The translation key for the entity type
+   */
+  relationshipMessageKey$: Observable<string>;
 
   /**
    * The list ID to save selected entities under
@@ -149,10 +179,10 @@ export class EditRelationshipListComponent implements OnInit, OnDestroy {
     protected objectUpdatesService: ObjectUpdatesService,
     protected linkService: LinkService,
     protected relationshipService: RelationshipDataService,
-    protected relationshipTypeService: RelationshipTypeDataService,
     protected modalService: NgbModal,
     protected paginationService: PaginationService,
     protected selectableListService: SelectableListService,
+    protected editItemRelationshipsService: EditItemRelationshipsService,
     @Inject(APP_CONFIG) protected appConfig: AppConfig
   ) {
     this.fetchThumbnail = this.appConfig.browseBy.showThumbnails;
@@ -162,11 +192,10 @@ export class EditRelationshipListComponent implements OnInit, OnDestroy {
    * Get the i18n message key for this relationship type
    */
   public getRelationshipMessageKey(): Observable<string> {
-
-    return observableCombineLatest(
+    return observableCombineLatest([
       this.getLabel(),
       this.relatedEntityType$,
-    ).pipe(
+    ]).pipe(
       map(([label, relatedEntityType]) => {
         if (hasValue(label) && label.indexOf('is') > -1 && label.indexOf('Of') > -1) {
           const relationshipLabel = `${label.substring(2, label.indexOf('Of'))}`;
@@ -186,18 +215,15 @@ export class EditRelationshipListComponent implements OnInit, OnDestroy {
    * Get the relevant label for this relationship type
    */
   private getLabel(): Observable<string> {
-    return observableCombineLatest([
-      this.relationshipType.leftType,
-      this.relationshipType.rightType,
-    ].map((itemTypeRD) => itemTypeRD.pipe(
-      getFirstSucceededRemoteData(),
-      getRemoteDataPayload(),
-    ))).pipe(
-      map((itemTypes: ItemType[]) => [
-        this.relationshipType.leftwardType,
-        this.relationshipType.rightwardType,
-      ][itemTypes.findIndex((itemType) => itemType.id === this.itemType.id)]),
-    );
+    return this.currentItemIsLeftItem$.pipe(
+      map((currentItemIsLeftItem) => {
+        if (currentItemIsLeftItem) {
+          return this.relationshipType.leftwardType;
+        } else {
+          return this.relationshipType.rightwardType;
+        }
+      })
+      );
   }
 
   /**
@@ -207,11 +233,26 @@ export class EditRelationshipListComponent implements OnInit, OnDestroy {
     return update && update.field ? update.field.uuid : undefined;
   }
 
+  /**
+   * Check whether the current entity can have multiple relationships of this type
+   * This is based on the max cardinality of the relationship
+   * @private
+   */
+  private isRepeatable(): boolean {
+    const isLeft = this.currentItemIsLeftItem$.getValue();
+    if (isLeft) {
+      const leftMaxCardinality = this.relationshipType.leftMaxCardinality;
+      return hasNoValue(leftMaxCardinality) || leftMaxCardinality > 1;
+    } else {
+      const rightMaxCardinality = this.relationshipType.rightMaxCardinality;
+      return hasNoValue(rightMaxCardinality) || rightMaxCardinality > 1;
+    }
+  }
+
   /**
    * Open the dynamic lookup modal to search for items to add as relationships
    */
   openLookup() {
-
     this.modalRef = this.modalService.open(DsDynamicLookupRelationModalComponent, {
       size: 'lg'
     });
@@ -225,6 +266,8 @@ export class EditRelationshipListComponent implements OnInit, OnDestroy {
     modalComp.toAdd = [];
     modalComp.toRemove = [];
     modalComp.isPending = false;
+    modalComp.repeatable = this.isRepeatable();
+    modalComp.hiddenQuery = '-search.resourceid:' + this.item.uuid;
 
     this.item.owningCollection.pipe(
       getFirstSucceededRemoteDataPayload()
@@ -232,11 +275,11 @@ export class EditRelationshipListComponent implements OnInit, OnDestroy {
       modalComp.collection = collection;
     });
 
-    modalComp.select = (...selectableObjects: SearchResult<Item>[]) => {
+    modalComp.select = (...selectableObjects: ItemSearchResult[]) => {
       selectableObjects.forEach((searchResult) => {
         const relatedItem: Item = searchResult.indexableObject;
 
-        const foundIndex = modalComp.toRemove.findIndex( el => el.uuid === relatedItem.uuid);
+        const foundIndex = modalComp.toRemove.findIndex((itemSearchResult: ItemSearchResult) => itemSearchResult.indexableObject.uuid === relatedItem.uuid);
 
         if (foundIndex !== -1) {
           modalComp.toRemove.splice(foundIndex,1);
@@ -253,14 +296,14 @@ export class EditRelationshipListComponent implements OnInit, OnDestroy {
                 }
               }
 
-              this.loading$.next(true);
+              this.loading$.next(isNotEmpty(modalComp.toAdd) || isNotEmpty(modalComp.toRemove));
               // emit the last page again to trigger a fieldupdates refresh
               this.relationshipsRd$.next(this.relationshipsRd$.getValue());
             });
         }
       });
     };
-    modalComp.deselect = (...selectableObjects: SearchResult<Item>[]) => {
+    modalComp.deselect = (...selectableObjects: ItemSearchResult[]) => {
       selectableObjects.forEach((searchResult) => {
         const relatedItem: Item = searchResult.indexableObject;
 
@@ -271,57 +314,65 @@ export class EditRelationshipListComponent implements OnInit, OnDestroy {
         } else {
           modalComp.toRemove.push(searchResult);
         }
+        this.loading$.next(isNotEmpty(modalComp.toAdd) || isNotEmpty(modalComp.toRemove));
       });
     };
 
 
 
     modalComp.submitEv = () => {
-
-      const subscriptions = [];
-
-      modalComp.toAdd.forEach((searchResult: SearchResult<Item>) => {
-        const relatedItem = searchResult.indexableObject;
-        subscriptions.push(this.relationshipService.getNameVariant(this.listId, relatedItem.uuid).pipe(
-          map((nameVariant) => {
-          const update = {
-            uuid: this.relationshipType.id + '-' + searchResult.indexableObject.uuid,
-            nameVariant,
-            type: this.relationshipType,
-            relatedItem,
-          } as RelationshipIdentifiable;
-          this.objectUpdatesService.saveAddFieldUpdate(this.url, update);
-          return update;
-        })
-        ));
-      });
-
-      modalComp.toRemove.forEach( (searchResult) => {
-        subscriptions.push(this.relationshipService.getNameVariant(this.listId, searchResult.indexableObjectuuid).pipe(
-          switchMap((nameVariant) => {
-            return this.getRelationFromId(searchResult.indexableObject).pipe(
-              map( (relationship: Relationship) => {
+      modalComp.isPending = true;
+      const isLeft = this.currentItemIsLeftItem$.getValue();
+      const addOperations = modalComp.toAdd.map((searchResult: ItemSearchResult) => ({ type: 'add', searchResult }));
+      const removeOperations = modalComp.toRemove.map((searchResult: ItemSearchResult) => ({ type: 'remove', searchResult }));
+      observableFrom([...addOperations, ...removeOperations]).pipe(
+        concatMap(({ type, searchResult }: { type: string, searchResult: ItemSearchResult }) => {
+          const relatedItem: Item = searchResult.indexableObject;
+          if (type === 'add') {
+            return this.relationshipService.getNameVariant(this.listId, relatedItem.uuid).pipe(
+              switchMap((nameVariant) => {
                 const update = {
-                  uuid: relationship.id,
+                  uuid: `${this.relationshipType.id}-${relatedItem.uuid}`,
                   nameVariant,
                   type: this.relationshipType,
-                  relationship,
+                  originalIsLeft: isLeft,
+                  originalItem: this.item,
+                  relatedItem,
                 } as RelationshipIdentifiable;
-                this.objectUpdatesService.saveRemoveFieldUpdate(this.url,update);
-                return update;
-              })
+                return this.objectUpdatesService.saveAddFieldUpdate(this.url, update);
+              }),
+              take(1)
             );
-          })
-        ));
-      });
-
-      observableCombineLatest(subscriptions).subscribe( (res) => {
-        // Wait until the states changes since there are multiple items
-        setTimeout( () => {
-          this.submit.emit();
-        },1000);
-
-        modalComp.isPending = true;
+          } else if (type === 'remove') {
+            return this.relationshipService.getNameVariant(this.listId, relatedItem.uuid).pipe(
+              switchMap((nameVariant) => {
+                return this.getRelationFromId(searchResult.indexableObject).pipe(
+                  map( (relationship: Relationship) => {
+                    const update = {
+                      uuid: relationship.id,
+                      nameVariant,
+                      type: this.relationshipType,
+                      originalIsLeft: isLeft,
+                      originalItem: this.item,
+                      relatedItem,
+                      relationship,
+                    } as RelationshipIdentifiable;
+                    return this.objectUpdatesService.saveRemoveFieldUpdate(this.url,update);
+                  }),
+                );
+              }),
+              take(1)
+            );
+          } else {
+            return EMPTY;
+          }
+        }),
+        toArray(),
+      ).subscribe({
+        complete: () => {
+          this.editItemRelationshipsService.submit(this.item, this.url);
+          this.submitModal.emit();
+        }
       });
     };
 
@@ -337,6 +388,11 @@ export class EditRelationshipListComponent implements OnInit, OnDestroy {
 
       modalComp.toAdd = [];
       modalComp.toRemove = [];
+      this.loading$.next(false);
+    };
+
+    modalComp.closeEv = () => {
+      this.loading$.next(false);
     };
 
     this.relatedEntityType$
@@ -355,92 +411,15 @@ export class EditRelationshipListComponent implements OnInit, OnDestroy {
   }
 
   getRelationFromId(relatedItem) {
-    return this.currentItemIsLeftItem$.pipe(
-      take(1),
-      switchMap( isLeft => {
-        let apiCall;
-        if (isLeft) {
-          apiCall = this.relationshipService.searchByItemsAndType( this.relationshipType.id, this.item.uuid, this.relationshipType.leftwardType ,[relatedItem.id] ).pipe(
-                      getFirstSucceededRemoteData(),
-                      getRemoteDataPayload(),
-                    );
-        } else {
-          apiCall = this.relationshipService.searchByItemsAndType( this.relationshipType.id, this.item.uuid, this.relationshipType.rightwardType ,[relatedItem.id] ).pipe(
-                      getFirstSucceededRemoteData(),
-                      getRemoteDataPayload(),
-                    );
-        }
-
-        return apiCall.pipe(
-          map( (res: PaginatedList<Relationship>) => res.page[0])
-        );
-      }
-    ));
-  }
-
-
-
-  /**
-   * Get the existing field updates regarding a relationship with a given item
-   * @param relatedItem The item for which to get the existing field updates
-   */
-  private getFieldUpdatesForRelatedItem(relatedItem: Item): Observable<RelationshipIdentifiable[]> {
-    return this.updates$.pipe(
-      take(1),
-      map((updates) => Object.values(updates)
-        .map((update) => update.field as RelationshipIdentifiable)
-        .filter((field) => field.relationship)
-      ),
-      mergeMap((identifiables) =>
-        observableCombineLatest(
-          identifiables.map((identifiable) => this.getRelatedItem(identifiable.relationship))
-        ).pipe(
-          defaultIfEmpty([]),
-          map((relatedItems) => {
-            return identifiables.filter( (identifiable, index) => {
-                return relatedItems[index].uuid === relatedItem.uuid;
-            });
-          }
-          ),
-        )
-      )
-    );
-  }
-
-  /**
-   * Check if the given item is related with the item we are editing relationships
-   * @param relatedItem The item for which to get the existing field updates
-   */
-  private getIsRelatedItem(relatedItem: Item): Observable<boolean> {
-
-    return this.currentItemIsLeftItem$.pipe(
-      take(1),
-      map( isLeft => {
-        if (isLeft) {
-          const listOfRelatedItems = this.item.allMetadataValues( 'relation.' + this.relationshipType.leftwardType );
-          return !!listOfRelatedItems.find( (uuid) => uuid === relatedItem.uuid );
-        } else {
-          const listOfRelatedItems = this.item.allMetadataValues( 'relation.' + this.relationshipType.rightwardType );
-          return !!listOfRelatedItems.find( (uuid) => uuid === relatedItem.uuid );
-        }
-      })
-    );
-  }
-
-  /**
-   * Get the related item for a given relationship
-   * @param relationship  The relationship for which to get the related item
-   */
-  private getRelatedItem(relationship: Relationship): Observable<Item> {
-    return this.relationshipService.isLeftItem(relationship, this.item).pipe(
-      switchMap((isLeftItem) => isLeftItem ? relationship.rightItem : relationship.leftItem),
+    const relationshipLabel = this.currentItemIsLeftItem$.getValue() ? this.relationshipType.leftwardType : this.relationshipType.rightwardType;
+    return this.relationshipService.searchByItemsAndType( this.relationshipType.id, this.item.uuid, relationshipLabel ,[relatedItem.id] ).pipe(
       getFirstSucceededRemoteData(),
       getRemoteDataPayload(),
-    ) as Observable<Item>;
+      map( (res: PaginatedList<Relationship>) => res.page[0])
+    );
   }
 
   ngOnInit(): void {
-
     // store the left and right type of the relationship in a single observable
     this.relationshipLeftAndRightType$ = observableCombineLatest([
       this.relationshipType.leftType,
@@ -451,8 +430,14 @@ export class EditRelationshipListComponent implements OnInit, OnDestroy {
     ))) as Observable<[ItemType, ItemType]>;
 
     this.relatedEntityType$ = this.relationshipLeftAndRightType$.pipe(
-      map((relatedTypes: ItemType[]) => relatedTypes.find((relatedType) => relatedType.uuid !== this.itemType.uuid)),
-      hasValueOperator()
+      map(([leftType, rightType]: [ItemType, ItemType]) => {
+        if (leftType.uuid !== this.itemType.uuid) {
+          return leftType;
+        } else {
+          return rightType;
+        }
+      }),
+      hasValueOperator(),
     );
 
     this.relatedEntityType$.pipe(
@@ -461,21 +446,7 @@ export class EditRelationshipListComponent implements OnInit, OnDestroy {
       (relatedEntityType) => this.listId = `edit-relationship-${this.itemType.id}-${relatedEntityType.id}`
     );
 
-    this.currentItemIsLeftItem$ = this.relationshipLeftAndRightType$.pipe(
-      map(([leftType, rightType]: [ItemType, ItemType]) => {
-        if (leftType.id === this.itemType.id) {
-          return true;
-        }
-
-        if (rightType.id === this.itemType.id) {
-          return false;
-        }
-
-        // should never happen...
-        console.warn(`The item ${this.item.uuid} is not on the right or the left side of relationship type ${this.relationshipType.uuid}`);
-        return undefined;
-      })
-    );
+    this.relationshipMessageKey$ = this.getRelationshipMessageKey();
 
 
     // initialize the pagination options
@@ -493,29 +464,39 @@ export class EditRelationshipListComponent implements OnInit, OnDestroy {
     );
 
     // this adds thumbnail images when required by configuration
-    let linksToFollow: FollowLinkConfig<Relationship>[] = itemLinksToFollow(this.fetchThumbnail);
+    let linksToFollow: FollowLinkConfig<Relationship>[] = itemLinksToFollow(this.fetchThumbnail, this.appConfig.item.showAccessStatuses);
 
     this.subs.push(
       observableCombineLatest([
         currentPagination$,
         this.currentItemIsLeftItem$,
+        this.relatedEntityType$,
       ]).pipe(
-        switchMap(([currentPagination, currentItemIsLeftItem]: [PaginationComponentOptions, boolean]) =>
-          // get the relationships for the current item, relationshiptype and page
-          this.relationshipService.getItemRelationshipsByLabel(
+        switchMap(([currentPagination, currentItemIsLeftItem, relatedEntityType]: [PaginationComponentOptions, boolean, ItemType]) => {
+          // get the relationships for the current page, item, relationship type and related entity type
+          return this.relationshipService.getItemRelationshipsByLabel(
             this.item,
             currentItemIsLeftItem ? this.relationshipType.leftwardType : this.relationshipType.rightwardType,
             {
               elementsPerPage: currentPagination.pageSize,
-              currentPage: currentPagination.currentPage
+              currentPage: currentPagination.currentPage,
+              searchParams: [
+                new RequestParam('relatedEntityType', relatedEntityType.label),
+              ],
             },
-            false,
+            true,
             true,
             ...linksToFollow
-          )),
-      ).subscribe((rd: RemoteData<PaginatedList<Relationship>>) => {
-        this.relationshipsRd$.next(rd);
-      })
+          );
+        }),
+        tap((rd: RemoteData<PaginatedList<Relationship>>) => {
+          this.relationshipsRd$.next(rd);
+        }),
+        getAllSucceededRemoteData(),
+        getRemoteDataPayload(),
+      ).subscribe((relationshipPaginatedList: PaginatedList<Relationship>) => {
+        this.objectUpdatesService.initialize(this.url, relationshipPaginatedList.page, new Date());
+      }),
     );
 
     // keep isLastPage$ up to date based on relationshipsRd$
@@ -537,10 +518,24 @@ export class EditRelationshipListComponent implements OnInit, OnDestroy {
             this.relationshipService.isLeftItem(relationship, this.item).pipe(
               // emit an array containing both the relationship and whether it's the left item,
               // as we'll need both
-              map((isLeftItem: boolean) => [relationship, isLeftItem])
-            )
+              switchMap((isLeftItem: boolean) => {
+                if (isLeftItem) {
+                  return relationship.rightItem.pipe(
+                    getFirstCompletedRemoteData(),
+                    getRemoteDataPayload(),
+                    map((relatedItem: Item) => [relationship, isLeftItem, relatedItem]),
+                  );
+                } else {
+                  return relationship.leftItem.pipe(
+                    getFirstCompletedRemoteData(),
+                    getRemoteDataPayload(),
+                    map((relatedItem: Item) => [relationship, isLeftItem, relatedItem]),
+                  );
+                }
+              }),
+            ),
           ),
-          map(([relationship, isLeftItem]: [Relationship, boolean]) => {
+          map(([relationship, isLeftItem, relatedItem]: [Relationship, boolean, Item]) => {
             // turn it into a RelationshipIdentifiable, an
             const nameVariant =
               isLeftItem ? relationship.rightwardValue : relationship.leftwardValue;
@@ -548,6 +543,9 @@ export class EditRelationshipListComponent implements OnInit, OnDestroy {
               uuid: relationship.id,
               type: this.relationshipType,
               relationship,
+              originalIsLeft: isLeftItem,
+              originalItem: this.item,
+              relatedItem: relatedItem,
               nameVariant,
             } as RelationshipIdentifiable;
           }),
diff --git a/src/app/item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.html b/src/app/item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.html
index e65cd237a3..8cd86d597b 100644
--- a/src/app/item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.html
+++ b/src/app/item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.html
@@ -9,12 +9,12 @@
   </div>
   <div class="col-2">
     <div class="btn-group relationship-action-buttons">
-      <button [disabled]="!canRemove()" (click)="openVirtualMetadataModal(virtualMetadataModal)"
+      <button [dsBtnDisabled]="!canRemove()" (click)="openVirtualMetadataModal(virtualMetadataModal)"
               class="btn btn-outline-danger btn-sm"
               title="{{'item.edit.metadata.edit.buttons.remove' | translate}}">
         <i class="fas fa-trash-alt fa-fw"></i>
       </button>
-      <button [disabled]="!canUndo()" (click)="undo()"
+      <button [dsBtnDisabled]="!canUndo()" (click)="undo()"
               class="btn btn-outline-warning btn-sm"
               title="{{'item.edit.metadata.edit.buttons.undo' | translate}}">
         <i class="fas fa-undo-alt fa-fw"></i>
diff --git a/src/app/item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.ts b/src/app/item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.ts
index 742cc7181c..b56fc24ebb 100644
--- a/src/app/item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.ts
+++ b/src/app/item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.ts
@@ -90,13 +90,11 @@ export class EditRelationshipComponent implements OnChanges {
         getRemoteDataPayload(),
         filter((item: Item) => hasValue(item) && isNotEmpty(item.uuid))
       );
-      this.relatedItem$ = observableCombineLatest(
+      this.relatedItem$ = observableCombineLatest([
         this.leftItem$,
         this.rightItem$,
-      ).pipe(
-        map((items: Item[]) =>
-          items.find((item) => item.uuid !== this.editItem.uuid)
-        )
+      ]).pipe(
+        map(([leftItem, rightItem]: [Item, Item]) => leftItem.uuid === this.editItem.uuid ? rightItem : leftItem),
       );
     } else {
       this.relatedItem$ = of(this.update.relatedItem);
@@ -108,10 +106,10 @@ export class EditRelationshipComponent implements OnChanges {
    */
   remove(): void {
     this.closeVirtualMetadataModal();
-    observableCombineLatest(
+    observableCombineLatest([
       this.leftItem$,
       this.rightItem$,
-    ).pipe(
+    ]).pipe(
       map((items: Item[]) =>
         items.map((item) => this.objectUpdatesService
           .isSelectedVirtualMetadata(this.url, this.relationship.id, item.uuid))
@@ -127,9 +125,9 @@ export class EditRelationshipComponent implements OnChanges {
         ) as DeleteRelationship;
       }),
       take(1),
-    ).subscribe((deleteRelationship: DeleteRelationship) =>
-      this.objectUpdatesService.saveRemoveFieldUpdate(this.url, deleteRelationship)
-    );
+    ).subscribe((deleteRelationship: DeleteRelationship) => {
+      this.objectUpdatesService.saveRemoveFieldUpdate(this.url, deleteRelationship);
+    });
   }
 
   openVirtualMetadataModal(content: any) {
diff --git a/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.html b/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.html
index c1505deb58..2a3f92377c 100644
--- a/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.html
+++ b/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.html
@@ -1,63 +1,55 @@
 <div class="item-relationships">
-  <ng-container *ngVar="entityType$ | async as entityType">
-    <ng-container *ngIf="entityType">
-      <div class="button-row top d-flex space-children-mr">
-        <button class="btn btn-danger ml-auto" *ngIf="!(isReinstatable() | async)"
-                [disabled]="!(hasChanges() | async)"
-                (click)="discard()"><i
-          class="fas fa-times"></i>
-          <span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.discard-button" | translate}}</span>
-        </button>
-        <button class="btn btn-warning ml-auto" *ngIf="isReinstatable() | async"
-                (click)="reinstate()"><i
-          class="fas fa-undo-alt"></i>
-          <span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.reinstate-button" | translate}}</span>
-        </button>
-        <button class="btn btn-primary" [disabled]="!(hasChanges() | async)"
-                (click)="submit()"><i
-          class="fas fa-save"></i>
-          <span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.save-button" | translate}}</span>
-        </button>
+  <ng-container *ngIf="entityType$ | async as entityType; else noEntityType">
+    <div class="button-row top d-flex justify-content-end">
+      <ng-container *ngTemplateOutlet="buttons"></ng-container>
+    </div>
+    <div *ngIf="relationshipTypes$ | async as relationshipTypes; else loading" class="mb-4">
+      <div *ngFor="let relationshipType of relationshipTypes; trackBy: trackById" class="mb-4">
+        <ds-edit-relationship-list-wrapper
+          [url]="url"
+          [item]="item"
+          [itemType]="entityType"
+          [relationshipType]="relationshipType"
+          [hasChanges]="hasChanges$"
+        ></ds-edit-relationship-list-wrapper>
       </div>
-      <ng-container *ngVar="relationshipTypes$ | async as relationshipTypes">
-        <ng-container *ngIf="relationshipTypes">
-          <div *ngFor="let relationshipType of relationshipTypes" class="mb-4">
-            <ds-edit-relationship-list
-              [url]="url"
-              [item]="item"
-              [itemType]="entityType$ | async"
-              [relationshipType]="relationshipType"
-              [hasChanges] = hasChanges()
-              (submit) = submit()
-            ></ds-edit-relationship-list>
-          </div>
-        </ng-container>
-        <ds-themed-loading *ngIf="!relationshipTypes"></ds-themed-loading>
-      </ng-container>
-      <div class="button-row bottom">
-        <div class="float-right space-children-mr ml-gap">
-          <button class="btn btn-danger" *ngIf="!(isReinstatable() | async)"
-                  [disabled]="!(hasChanges() | async)"
-                  (click)="discard()"><i
-            class="fas fa-times"></i>
-            <span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.discard-button" | translate}}</span>
-          </button>
-          <button class="btn btn-warning" *ngIf="isReinstatable() | async"
-                  (click)="reinstate()"><i
-            class="fas fa-undo-alt"></i>
-            <span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.reinstate-button" | translate}}</span>
-          </button>
-          <button class="btn btn-primary" [disabled]="!(hasChanges() | async)"
-                  (click)="submit()"><i
-            class="fas fa-save"></i>
-            <span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.save-button" | translate}}</span>
-          </button>
-        </div>
+    </div>
+    <div class="button-row bottom">
+      <div class="float-right ml-gap">
+        <ng-container *ngTemplateOutlet="buttons"></ng-container>
       </div>
-    </ng-container>
-    <div *ngIf="!entityType"
-         class="alert alert-info mt-2" role="alert">
-      {{ 'item.edit.relationships.no-entity-type' | translate }}
     </div>
   </ng-container>
 </div>
+
+<ng-template #noEntityType>
+  <ds-alert [type]="AlertType.Info" class="d-block mt-2">
+    {{ 'item.edit.relationships.no-entity-type' | translate }}
+  </ds-alert>
+</ng-template>
+
+<ng-template #loading>
+  <ds-themed-loading></ds-themed-loading>
+</ng-template>
+
+<ng-template #buttons>
+  <div class="d-flex space-children-mr justify-content-end">
+    <button class="btn btn-danger" *ngIf="(isReinstatable$ | async) !== true"
+            [dsBtnDisabled]="(hasChanges$ | async) !== true"
+            (click)="discard()">
+      <i aria-hidden="true" class="fas fa-times"></i>
+      <span class="d-none d-sm-inline">&nbsp;{{ 'item.edit.metadata.discard-button' | translate }}</span>
+    </button>
+    <button class="btn btn-warning" *ngIf="isReinstatable() | async" (click)="reinstate()">
+      <i aria-hidden="true" class="fas fa-undo-alt"></i>
+      <span class="d-none d-sm-inline">&nbsp;{{ 'item.edit.metadata.reinstate-button' | translate }}</span>
+    </button>
+    <button class="btn btn-primary"
+            [dsBtnDisabled]="(hasChanges$ | async) !== true || (isSaving$ | async) === true"
+            (click)="submit()">
+      <span *ngIf="isSaving$ | async" aria-hidden="true" class="spinner-border spinner-border-sm" role="status"></span>
+      <i *ngIf="(isSaving$ | async) !== true" aria-hidden="true" class="fas fa-save"></i>
+      <span class="d-none d-sm-inline">&nbsp;{{ 'item.edit.metadata.save-button' | translate }}</span>
+    </button>
+  </div>
+</ng-template>
diff --git a/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.spec.ts b/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.spec.ts
index aa711c8ea3..4f7f1a86c6 100644
--- a/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.spec.ts
+++ b/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.spec.ts
@@ -2,9 +2,7 @@ import { ChangeDetectorRef, DebugElement, NO_ERRORS_SCHEMA } from '@angular/core
 import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
 import { ActivatedRoute, Router } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
-import { getTestScheduler } from 'jasmine-marbles';
 import { combineLatest as observableCombineLatest, of as observableOf } from 'rxjs';
-import { TestScheduler } from 'rxjs/testing';
 import { ObjectCacheService } from '../../../core/cache/object-cache.service';
 import { RestResponse } from '../../../core/cache/response.models';
 import { EntityTypeDataService } from '../../../core/data/entity-type-data.service';
@@ -29,6 +27,8 @@ import { RelationshipTypeDataService } from '../../../core/data/relationship-typ
 import { relationshipTypes } from '../../../shared/testing/relationship-types.mock';
 import { ThemeService } from '../../../shared/theme-support/theme.service';
 import { getMockThemeService } from '../../../shared/mocks/theme-service.mock';
+import { ItemDataServiceStub } from '../../../shared/testing/item-data.service.stub';
+import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 
 let comp: any;
 let fixture: ComponentFixture<ItemRelationshipsComponent>;
@@ -52,12 +52,11 @@ const notificationsService = jasmine.createSpyObj('notificationsService',
 const router = new RouterStub();
 let relationshipTypeService;
 let routeStub;
-let itemService;
+let itemService: ItemDataServiceStub;
 
 const url = 'http://test-url.com/test-url';
 router.url = url;
 
-let scheduler: TestScheduler;
 let item;
 let author1;
 let author2;
@@ -137,10 +136,7 @@ describe('ItemRelationshipsComponent', () => {
       changeType: FieldChangeType.REMOVE
     };
 
-    itemService = jasmine.createSpyObj('itemService', {
-      findByHref: createSuccessfulRemoteDataObject$(item),
-      findById: createSuccessfulRemoteDataObject$(item)
-    });
+    itemService = new ItemDataServiceStub();
     routeStub = {
       data: observableOf({}),
       parent: {
@@ -208,9 +204,8 @@ describe('ItemRelationshipsComponent', () => {
       }
     );
 
-    scheduler = getTestScheduler();
     TestBed.configureTestingModule({
-      imports: [SharedModule, TranslateModule.forRoot()],
+      imports: [NoopAnimationsModule, SharedModule, TranslateModule.forRoot()],
       declarations: [ItemRelationshipsComponent],
       providers: [
         { provide: ThemeService, useValue: getMockThemeService() },
@@ -232,6 +227,8 @@ describe('ItemRelationshipsComponent', () => {
   }));
 
   beforeEach(() => {
+    spyOn(itemService, 'findByHref').and.returnValue(item);
+    spyOn(itemService, 'findById').and.returnValue(item);
     fixture = TestBed.createComponent(ItemRelationshipsComponent);
     comp = fixture.componentInstance;
     de = fixture.debugElement;
@@ -266,7 +263,7 @@ describe('ItemRelationshipsComponent', () => {
     });
 
     it('it should delete the correct relationship', () => {
-      expect(relationshipService.deleteRelationship).toHaveBeenCalledWith(relationships[1].uuid, 'left');
+      expect(relationshipService.deleteRelationship).toHaveBeenCalledWith(relationships[1].uuid, 'left', false);
     });
   });
 
diff --git a/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.ts b/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.ts
index 8f7c43e79f..b893e42bd3 100644
--- a/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.ts
+++ b/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.ts
@@ -1,11 +1,14 @@
 import { ChangeDetectorRef, Component } from '@angular/core';
-import { Item } from '../../../core/shared/item.model';
+
+
 import {
-  DeleteRelationship,
-  RelationshipIdentifiable,
-} from '../../../core/data/object-updates/object-updates.reducer';
-import { map, startWith, switchMap, take } from 'rxjs/operators';
-import { combineLatest as observableCombineLatest, of as observableOf, zip as observableZip, Observable } from 'rxjs';
+  map,
+  distinctUntilChanged
+} from 'rxjs/operators';
+import {
+  Observable,
+  BehaviorSubject
+} from 'rxjs';
 import { followLink } from '../../../shared/utils/follow-link-config.model';
 import { AbstractItemUpdateComponent } from '../abstract-item-update/abstract-item-update.component';
 import { ItemDataService } from '../../../core/data/item-data.service';
@@ -14,22 +17,18 @@ import { ActivatedRoute, Router } from '@angular/router';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
 import { TranslateService } from '@ngx-translate/core';
 import { RelationshipDataService } from '../../../core/data/relationship-data.service';
-import { RemoteData } from '../../../core/data/remote-data';
 import { ObjectCacheService } from '../../../core/cache/object-cache.service';
 import { getFirstSucceededRemoteData, getRemoteDataPayload } from '../../../core/shared/operators';
 import { RequestService } from '../../../core/data/request.service';
 import { RelationshipType } from '../../../core/shared/item-relationships/relationship-type.model';
 import { ItemType } from '../../../core/shared/item-relationships/item-type.model';
 import { EntityTypeDataService } from '../../../core/data/entity-type-data.service';
-import { Relationship } from '../../../core/shared/item-relationships/relationship.model';
-import { NoContent } from '../../../core/shared/NoContent.model';
-import { hasValue } from '../../../shared/empty.util';
-import { FieldUpdate } from '../../../core/data/object-updates/field-update.model';
-import { FieldUpdates } from '../../../core/data/object-updates/field-updates.model';
-import { FieldChangeType } from '../../../core/data/object-updates/field-change-type.model';
 import { RelationshipTypeDataService } from '../../../core/data/relationship-type-data.service';
 import { PaginatedList } from '../../../core/data/paginated-list.model';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
+import { EditItemRelationshipsService } from './edit-item-relationships.service';
+import { compareArraysUsingIds } from '../../simple/item-types/shared/item-relationships-utils';
+import { AlertType } from '../../../shared/alert/alert-type';
 
 @Component({
   selector: 'ds-item-relationships',
@@ -50,7 +49,13 @@ export class ItemRelationshipsComponent extends AbstractItemUpdateComponent {
   /**
    * The item's entity type as an observable
    */
-  entityType$: Observable<ItemType>;
+  entityType$: BehaviorSubject<ItemType> = new BehaviorSubject(undefined);
+
+  get isSaving$(): BehaviorSubject<boolean> {
+    return this.editItemRelationshipsService.isSaving$;
+  }
+
+  readonly AlertType = AlertType;
 
   constructor(
     public itemService: ItemDataService,
@@ -66,6 +71,7 @@ export class ItemRelationshipsComponent extends AbstractItemUpdateComponent {
     protected relationshipTypeService: RelationshipTypeDataService,
     public cdr: ChangeDetectorRef,
     protected modalService: NgbModal,
+    protected editItemRelationshipsService: EditItemRelationshipsService,
   ) {
     super(itemService, objectUpdatesService, router, notificationsService, translateService, route);
   }
@@ -79,16 +85,17 @@ export class ItemRelationshipsComponent extends AbstractItemUpdateComponent {
     if (label !== undefined) {
       this.relationshipTypes$ = this.relationshipTypeService.searchByEntityType(label, true, true, ...this.getRelationshipTypeFollowLinks())
       .pipe(
-        map((relationshipTypes: PaginatedList<RelationshipType>) => relationshipTypes.page)
+        map((relationshipTypes: PaginatedList<RelationshipType>) => relationshipTypes.page),
+        distinctUntilChanged(compareArraysUsingIds())
       );
 
-      this.entityType$ = this.entityTypeService.getEntityTypeByLabel(label).pipe(
+      this.entityTypeService.getEntityTypeByLabel(label).pipe(
         getFirstSucceededRemoteData(),
         getRemoteDataPayload(),
-      );
+      ).subscribe((type) => this.entityType$.next(type));
 
     } else {
-      this.entityType$ = observableOf(undefined);
+      this.entityType$.next(undefined);
     }
   }
 
@@ -104,127 +111,24 @@ export class ItemRelationshipsComponent extends AbstractItemUpdateComponent {
    * Make sure the lists are refreshed afterwards and notifications are sent for success and errors
    */
   public submit(): void {
-
-    // Get all the relationships that should be removed
-    const removedRelationshipIDs$: Observable<DeleteRelationship[]> = this.relationshipService.getItemRelationshipsArray(this.item).pipe(
-      startWith([]),
-      map((relationships: Relationship[]) => relationships.map((relationship) =>
-        Object.assign(new Relationship(), relationship, { uuid: relationship.id })
-      )),
-      switchMap((relationships: Relationship[]) => {
-        return this.objectUpdatesService.getFieldUpdatesExclusive(this.url, relationships) as Observable<FieldUpdates>;
-      }),
-      map((fieldUpdates: FieldUpdates) =>
-        Object.values(fieldUpdates)
-          .filter((fieldUpdate: FieldUpdate) => fieldUpdate.changeType === FieldChangeType.REMOVE)
-          .map((fieldUpdate: FieldUpdate) => fieldUpdate.field as DeleteRelationship)
-      ),
-    );
-
-    const addRelatedItems$: Observable<RelationshipIdentifiable[]> = this.objectUpdatesService.getFieldUpdates(this.url, []).pipe(
-      map((fieldUpdates: FieldUpdates) =>
-        Object.values(fieldUpdates)
-          .filter((fieldUpdate: FieldUpdate) => hasValue(fieldUpdate))
-          .filter((fieldUpdate: FieldUpdate) => fieldUpdate.changeType === FieldChangeType.ADD)
-          .map((fieldUpdate: FieldUpdate) => fieldUpdate.field as RelationshipIdentifiable)
-      ),
-    );
-
-    observableCombineLatest(
-      removedRelationshipIDs$,
-      addRelatedItems$,
-    ).pipe(
-      take(1),
-    ).subscribe(([removeRelationshipIDs, addRelatedItems]) => {
-      const actions = [
-        this.deleteRelationships(removeRelationshipIDs),
-        this.addRelationships(addRelatedItems),
-      ];
-      actions.forEach((action) =>
-        action.subscribe((response) => {
-          if (response.length > 0) {
-            this.initializeOriginalFields();
-            this.cdr.detectChanges();
-            this.displayNotifications(response);
-            this.modalService.dismissAll();
-          }
-        })
-      );
-    });
+    this.editItemRelationshipsService.submit(this.item, this.url);
   }
 
-  deleteRelationships(deleteRelationshipIDs: DeleteRelationship[]): Observable<RemoteData<NoContent>[]> {
-    return observableZip(...deleteRelationshipIDs.map((deleteRelationship) => {
-        let copyVirtualMetadata: string;
-        if (deleteRelationship.keepLeftVirtualMetadata && deleteRelationship.keepRightVirtualMetadata) {
-          copyVirtualMetadata = 'all';
-        } else if (deleteRelationship.keepLeftVirtualMetadata) {
-          copyVirtualMetadata = 'left';
-        } else if (deleteRelationship.keepRightVirtualMetadata) {
-          copyVirtualMetadata = 'right';
-        } else {
-          copyVirtualMetadata = 'none';
-        }
-        return this.relationshipService.deleteRelationship(deleteRelationship.uuid, copyVirtualMetadata);
-      }
-    ));
-  }
-
-  addRelationships(addRelatedItems: RelationshipIdentifiable[]): Observable<RemoteData<Relationship>[]> {
-    return observableZip(...addRelatedItems.map((addRelationship) =>
-      this.entityType$.pipe(
-        switchMap((entityType) => this.entityTypeService.isLeftType(addRelationship.type, entityType)),
-        switchMap((isLeftType) => {
-          let leftItem: Item;
-          let rightItem: Item;
-          let leftwardValue: string;
-          let rightwardValue: string;
-          if (isLeftType) {
-            leftItem = this.item;
-            rightItem = addRelationship.relatedItem;
-            leftwardValue = null;
-            rightwardValue = addRelationship.nameVariant;
-          } else {
-            leftItem = addRelationship.relatedItem;
-            rightItem = this.item;
-            leftwardValue = addRelationship.nameVariant;
-            rightwardValue = null;
-          }
-          return this.relationshipService.addRelationship(addRelationship.type.id, leftItem, rightItem, leftwardValue, rightwardValue);
-        }),
-      )
-    ));
-  }
-
-  /**
-   * Display notifications
-   * - Error notification for each failed response with their message
-   * - Success notification in case there's at least one successful response
-   * @param responses
-   */
-  displayNotifications(responses: RemoteData<NoContent>[]) {
-    const failedResponses = responses.filter((response: RemoteData<NoContent>) => response.hasFailed);
-    const successfulResponses = responses.filter((response: RemoteData<NoContent>) => response.hasSucceeded);
-
-    failedResponses.forEach((response: RemoteData<NoContent>) => {
-      this.notificationsService.error(this.getNotificationTitle('failed'), response.errorMessage);
-    });
-    if (successfulResponses.length > 0) {
-      this.notificationsService.success(this.getNotificationTitle('saved'), this.getNotificationContent('saved'));
-    }
-  }
   /**
    * Sends all initial values of this item to the object updates service
    */
   public initializeOriginalFields() {
-    return this.relationshipService.getRelatedItems(this.item).pipe(
-      take(1),
-    ).subscribe((items: Item[]) => {
-      this.objectUpdatesService.initialize(this.url, items, this.item.lastModified);
-    });
+    return this.editItemRelationshipsService.initializeOriginalFields(this.item, this.url);
   }
 
 
+  /**
+   * Method to prevent unnecessary for loop re-rendering
+   */
+  trackById(index: number, relationshipType: RelationshipType): string {
+    return relationshipType.id;
+  }
+
   getRelationshipTypeFollowLinks() {
     return [
       followLink('leftType'),
diff --git a/src/app/item-page/edit-item-page/item-status/item-status.component.html b/src/app/item-page/edit-item-page/item-status/item-status.component.html
index 8d4faaa2ac..766e61aa06 100644
--- a/src/app/item-page/edit-item-page/item-status/item-status.component.html
+++ b/src/app/item-page/edit-item-page/item-status/item-status.component.html
@@ -1,33 +1,33 @@
 <p class="mt-2">{{'item.edit.tabs.status.description' | translate}}</p>
 <div class="row">
-  <div *ngFor="let statusKey of statusDataKeys" class="w-100">
-    <div class="col-3 float-left status-label">
+  <div *ngFor="let statusKey of statusDataKeys" class="w-100 pt-1">
+    <div class="col-12 col-md-3 float-left status-label font-weight-bold">
       {{'item.edit.tabs.status.labels.' + statusKey | translate}}:
     </div>
-    <div class="col-9 float-left status-data" id="status-{{statusKey}}">
+    <div class="col-12 col-md-9 float-left status-data" id="status-{{statusKey}}">
       {{statusData[statusKey]}}
     </div>
   </div>
 
-  <div *ngFor="let identifier of (identifiers$ | async)" class="w-100">
+  <div *ngFor="let identifier of (identifiers$ | async)" class="w-100 pt-1">
     <div *ngIf="(identifier.identifierType=='doi')">
-      <div class="col-3 float-left status-label">
+      <div class="col-12 col-md-3 float-left status-label font-weight-bold">
         {{identifier.identifierType.toLocaleUpperCase()}}
       </div>
-      <div class="col-9 float-left status-label">{{identifier.value}}
+      <div class="col-12 col-md-9 float-left status-label font-weight-bold">{{identifier.value}}
         ({{"item.edit.identifiers.doi.status."+identifier.identifierStatus|translate}})</div>
     </div>
   </div>
 
-  <div class="col-3 float-left status-label">
+  <div class="col-12 col-md-3 float-left status-label font-weight-bold">
     {{'item.edit.tabs.status.labels.itemPage' | translate}}:
   </div>
-  <div class="col-9 float-left status-data" id="status-itemPage">
+  <div class="col-12 col-md-9 float-left status-data" id="status-itemPage">
     <a [routerLink]="itemPageRoute$ | async">{{itemPageRoute$ | async}}</a>
   </div>
 
   <div *ngFor="let operation of (operations$ | async)" class="w-100" [ngClass]="{'pt-3': operation}">
-    <ds-item-operation *ngIf="operation" [operation]="operation"></ds-item-operation>
+    <ds-item-operation [operation]="operation"></ds-item-operation>
   </div>
 
 </div>
diff --git a/src/app/item-page/edit-item-page/item-status/item-status.component.spec.ts b/src/app/item-page/edit-item-page/item-status/item-status.component.spec.ts
index a67de2f435..17ac3efa09 100644
--- a/src/app/item-page/edit-item-page/item-status/item-status.component.spec.ts
+++ b/src/app/item-page/edit-item-page/item-status/item-status.component.spec.ts
@@ -16,6 +16,7 @@ import { AuthorizationDataService } from '../../../core/data/feature-authorizati
 import { IdentifierDataService } from '../../../core/data/identifier-data.service';
 import { ConfigurationDataService } from '../../../core/data/configuration-data.service';
 import { ConfigurationProperty } from '../../../core/shared/configuration-property.model';
+import { OrcidAuthService } from '../../../core/orcid/orcid-auth.service';
 
 let mockIdentifierDataService: IdentifierDataService;
 let mockConfigurationDataService: ConfigurationDataService;
@@ -57,12 +58,18 @@ describe('ItemStatusComponent', () => {
   };
 
   let authorizationService: AuthorizationDataService;
+  let orcidAuthService: any;
 
   beforeEach(waitForAsync(() => {
     authorizationService = jasmine.createSpyObj('authorizationService', {
       isAuthorized: observableOf(true)
     });
 
+    orcidAuthService = jasmine.createSpyObj('OrcidAuthService', {
+      onlyAdminCanDisconnectProfileFromOrcid: observableOf ( true ),
+      isLinkedToOrcid: true
+    });
+
     TestBed.configureTestingModule({
       imports: [CommonModule, RouterTestingModule.withRoutes([]), TranslateModule.forRoot(), NgbModule],
       declarations: [ItemStatusComponent],
@@ -71,7 +78,8 @@ describe('ItemStatusComponent', () => {
         { provide: HostWindowService, useValue: new HostWindowServiceStub(0) },
         { provide: AuthorizationDataService, useValue: authorizationService },
         { provide: IdentifierDataService, useValue: mockIdentifierDataService },
-        { provide: ConfigurationDataService, useValue: mockConfigurationDataService }
+        { provide: ConfigurationDataService, useValue: mockConfigurationDataService },
+        { provide: OrcidAuthService, useValue: orcidAuthService },
       ], schemas: [CUSTOM_ELEMENTS_SCHEMA]
     }).compileComponents();
   }));
diff --git a/src/app/item-page/edit-item-page/item-status/item-status.component.ts b/src/app/item-page/edit-item-page/item-status/item-status.component.ts
index 828f8d7439..8b4dc88d9d 100644
--- a/src/app/item-page/edit-item-page/item-status/item-status.component.ts
+++ b/src/app/item-page/edit-item-page/item-status/item-status.component.ts
@@ -3,21 +3,20 @@ import { fadeIn, fadeInOut } from '../../../shared/animations/fade';
 import { Item } from '../../../core/shared/item.model';
 import { ActivatedRoute } from '@angular/router';
 import { ItemOperation } from '../item-operation/itemOperation.model';
-import { distinctUntilChanged, map, mergeMap, switchMap, toArray } from 'rxjs/operators';
-import { BehaviorSubject, Observable, Subscription } from 'rxjs';
+import {concatMap, distinctUntilChanged, first, map, mergeMap, switchMap, toArray} from 'rxjs/operators';
+import { BehaviorSubject, combineLatest, Observable, of, Subscription } from 'rxjs';
 import { RemoteData } from '../../../core/data/remote-data';
 import { getItemEditRoute, getItemPageRoute } from '../../item-page-routing-paths';
 import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
 import { FeatureID } from '../../../core/data/feature-authorization/feature-id';
-import { hasValue, isNotEmpty } from '../../../shared/empty.util';
-import {
-  getAllSucceededRemoteDataPayload, getFirstCompletedRemoteData, getFirstSucceededRemoteData, getRemoteDataPayload,
-} from '../../../core/shared/operators';
+import { hasValue } from '../../../shared/empty.util';
+import { getAllSucceededRemoteDataPayload, getFirstCompletedRemoteData, } from '../../../core/shared/operators';
 import { IdentifierDataService } from '../../../core/data/identifier-data.service';
 import { Identifier } from '../../../shared/object-list/identifier-data/identifier.model';
 import { ConfigurationProperty } from '../../../core/shared/configuration-property.model';
 import { ConfigurationDataService } from '../../../core/data/configuration-data.service';
 import { IdentifierData } from '../../../shared/object-list/identifier-data/identifier-data.model';
+import { OrcidAuthService } from '../../../core/orcid/orcid-auth.service';
 
 @Component({
   selector: 'ds-item-status',
@@ -73,6 +72,7 @@ export class ItemStatusComponent implements OnInit {
               private authorizationService: AuthorizationDataService,
               private identifierDataService: IdentifierDataService,
               private configurationService: ConfigurationDataService,
+              private orcidAuthService: OrcidAuthService
   ) {
   }
 
@@ -82,14 +82,16 @@ export class ItemStatusComponent implements OnInit {
   ngOnInit(): void {
     this.itemRD$ = this.route.parent.data.pipe(map((data) => data.dso));
     this.itemRD$.pipe(
+      first(),
       map((data: RemoteData<Item>) => data.payload)
-    ).subscribe((item: Item) => {
-      this.statusData = Object.assign({
-        id: item.id,
-        handle: item.handle,
-        lastModified: item.lastModified
-      });
-      this.statusDataKeys = Object.keys(this.statusData);
+    ).pipe(
+      switchMap((item: Item) => {
+        this.statusData = Object.assign({
+          id: item.id,
+          handle: item.handle,
+          lastModified: item.lastModified
+        });
+        this.statusDataKeys = Object.keys(this.statusData);
 
       // Observable for item identifiers (retrieved from embedded link)
       this.identifiers$ = this.identifierDataService.getIdentifierDataFor(item).pipe(
@@ -105,99 +107,120 @@ export class ItemStatusComponent implements OnInit {
       // Observable for configuration determining whether the Register DOI feature is enabled
       let registerConfigEnabled$: Observable<boolean> = this.configurationService.findByPropertyName('identifiers.item-status.register-doi').pipe(
         getFirstCompletedRemoteData(),
-        map((rd: RemoteData<ConfigurationProperty>) => {
-          // If the config property is exposed via rest and has a value set, return it
-          if (rd.hasSucceeded && hasValue(rd.payload) && isNotEmpty(rd.payload.values)) {
-            return rd.payload.values[0] === 'true';
+        map((response: RemoteData<ConfigurationProperty>) => {
+          // Return true if a successful response with a 'true' value was retrieved, otherwise return false
+          if (response.hasSucceeded) {
+            const payload = response.payload;
+            if (payload.values.length > 0 && hasValue(payload.values[0])) {
+              return payload.values[0] === 'true';
+            } else {
+              return false;
+            }
+          } else {
+            return false;
           }
-          // Otherwise, return false
-          return false;
         })
       );
 
-      /*
-      Construct a base list of operations.
-        The key is used to build messages
-          i18n example: 'item.edit.tabs.status.buttons.<key>.label'
-        The value is supposed to be a href for the button
-      */
-      const operations: ItemOperation[] = [];
-      operations.push(new ItemOperation('authorizations', this.getCurrentUrl(item) + '/authorizations', FeatureID.CanManagePolicies, true));
-      operations.push(new ItemOperation('mappedCollections', this.getCurrentUrl(item) + '/mapper', FeatureID.CanManageMappings, true));
-      if (item.isWithdrawn) {
-        operations.push(new ItemOperation('reinstate', this.getCurrentUrl(item) + '/reinstate', FeatureID.ReinstateItem, true));
-      } else {
-        operations.push(new ItemOperation('withdraw', this.getCurrentUrl(item) + '/withdraw', FeatureID.WithdrawItem, true));
-      }
-      if (item.isDiscoverable) {
-        operations.push(new ItemOperation('private', this.getCurrentUrl(item) + '/private', FeatureID.CanMakePrivate, true));
-      } else {
-        operations.push(new ItemOperation('public', this.getCurrentUrl(item) + '/public', FeatureID.CanMakePrivate, true));
-      }
-      operations.push(new ItemOperation('delete', this.getCurrentUrl(item) + '/delete', FeatureID.CanDelete, true));
-      operations.push(new ItemOperation('move', this.getCurrentUrl(item) + '/move', FeatureID.CanMove, true));
-      this.operations$.next(operations);
-
-      /*
-       When the identifier data stream changes, determine whether the register DOI button should be shown or not.
-       This is based on whether the DOI is in the right state (minted or pending, not already queued for registration
-       or registered) and whether the configuration property identifiers.item-status.register-doi is true
+      /**
+       * Construct a base list of operations.
+       * The key is used to build messages
+       * i18n example: 'item.edit.tabs.status.buttons.<key>.label'
+       * The value is supposed to be a href for the button
        */
-      this.identifierDataService.getIdentifierDataFor(item).pipe(
-        getFirstSucceededRemoteData(),
-        getRemoteDataPayload(),
-        mergeMap((data: IdentifierData) => {
-          let identifiers = data.identifiers;
-          let no_doi = true;
-          let pending = false;
-          if (identifiers !== undefined && identifiers !== null) {
-            identifiers.forEach((identifier: Identifier) => {
-              if (hasValue(identifier) && identifier.identifierType === 'doi') {
-                // The item has some kind of DOI
-                no_doi = false;
-                if (identifier.identifierStatus === 'PENDING' || identifier.identifierStatus === 'MINTED'
-                  || identifier.identifierStatus == null) {
-                  // The item's DOI is pending, minted or null.
-                  // It isn't registered, reserved, queued for registration or reservation or update, deleted
-                  // or queued for deletion.
-                  pending = true;
-                }
+      const currentUrl = this.getCurrentUrl(item);
+      const initialOperations: ItemOperation[] = [
+        new ItemOperation('authorizations', `${currentUrl}/authorizations`, FeatureID.CanManagePolicies, true),
+        new ItemOperation('mappedCollections', `${currentUrl}/mapper`, FeatureID.CanManageMappings, true),
+        item.isWithdrawn
+         ? new ItemOperation('reinstate', `${currentUrl}/reinstate`, FeatureID.ReinstateItem, true)
+         : new ItemOperation('withdraw', `${currentUrl}/withdraw`, FeatureID.WithdrawItem, true),
+        item.isDiscoverable
+         ? new ItemOperation('private', `${currentUrl}/private`, FeatureID.CanMakePrivate, true)
+         : new ItemOperation('public', `${currentUrl}/public`, FeatureID.CanMakePrivate, true),
+        new ItemOperation('move', `${currentUrl}/move`, FeatureID.CanMove, true),
+        new ItemOperation('delete', `${currentUrl}/delete`, FeatureID.CanDelete, true)
+      ];
+
+      this.operations$.next(initialOperations);
+
+        /**
+         *  When the identifier data stream changes, determine whether the register DOI button should be shown or not.
+         *  This is based on whether the DOI is in the right state (minted or pending, not already queued for registration
+         *  or registered) and whether the configuration property identifiers.item-status.register-doi is true
+         */
+        const ops$ = this.identifierDataService.getIdentifierDataFor(item).pipe(
+          getFirstCompletedRemoteData(),
+          mergeMap((dataRD: RemoteData<IdentifierData>) => {
+            if (dataRD.hasSucceeded) {
+              let identifiers = dataRD.payload.identifiers;
+              let no_doi = true;
+              let pending = false;
+              if (identifiers !== undefined && identifiers !== null) {
+                identifiers.forEach((identifier: Identifier) => {
+                  if (hasValue(identifier) && identifier.identifierType === 'doi') {
+                    // The item has some kind of DOI
+                    no_doi = false;
+                    if (['PENDING', 'MINTED', null].includes(identifier.identifierStatus)) {
+                      // The item's DOI is pending, minted or null.
+                      // It isn't registered, reserved, queued for registration or reservation or update, deleted
+                      // or queued for deletion.
+                      pending = true;
+                    }
+                  }
+                });
               }
-            });
-          }
-          // If there is no DOI, or a pending/minted/null DOI, and the config is enabled, return true
-          return registerConfigEnabled$.pipe(
-            map((enabled: boolean) => {
-              return enabled && (pending || no_doi);
+              // If there is no DOI, or a pending/minted/null DOI, and the config is enabled, return true
+              return registerConfigEnabled$.pipe(
+                map((enabled: boolean) => {
+                    return enabled && (pending || no_doi);
+                  }
+                ));
+            } else {
+              return of(false);
+            }
+          }),
+          // Switch map pushes the register DOI operation onto a copy of the base array then returns to the pipe
+          switchMap((showDoi: boolean) => {
+            const ops = [...initialOperations];
+            if (showDoi) {
+              const op = new ItemOperation('register-doi', `${currentUrl}/register-doi`, FeatureID.CanRegisterDOI, true);
+              ops.splice(ops.length - 1, 0, op); // Add item before last
+            }
+            return ops;
+          }),
+          concatMap((op: ItemOperation) => {
+            if (hasValue(op.featureID)) {
+              return this.authorizationService.isAuthorized(op.featureID, item.self).pipe(
+                distinctUntilChanged(),
+                map((authorized) => {
+                  op.setDisabled(!authorized);
+                  op.setAuthorized(authorized);
+                  return op;
+                })
+              );
             }
-          ));
-        }),
-        // Switch map pushes the register DOI operation onto a copy of the base array then returns to the pipe
-        switchMap((showDoi: boolean) => {
-          let ops = [...operations];
-          if (showDoi) {
-            ops.push(new ItemOperation('register-doi', this.getCurrentUrl(item) + '/register-doi', FeatureID.CanRegisterDOI, true));
-          }
-          return ops;
-        }),
-        // Merge map checks and transforms each operation in the array based on whether it is authorized or not (disabled)
-        mergeMap((op: ItemOperation) => {
-          if (hasValue(op.featureID)) {
-            return this.authorizationService.isAuthorized(op.featureID, item.self).pipe(
-              distinctUntilChanged(),
-              map((authorized) => new ItemOperation(op.operationKey, op.operationUrl, op.featureID, !authorized, authorized))
-            );
-          } else {
             return [op];
-          }
-        }),
-        // Wait for all operations to be emitted and return as an array
-        toArray(),
-      ).subscribe((data) => {
-        // Update the operations$ subject that draws the administrative buttons on the status page
-        this.operations$.next(data);
-      });
-    });
+          }),
+          toArray()
+        );
+
+        let orcidOps$ = of([]);
+        if (this.orcidAuthService.isLinkedToOrcid(item)) {
+          orcidOps$ = this.orcidAuthService.onlyAdminCanDisconnectProfileFromOrcid().pipe(
+              map((canDisconnect) => {
+                if (canDisconnect) {
+                  return [new ItemOperation('unlinkOrcid', `${currentUrl}/unlink-orcid`)];
+                }
+                return [];
+              })
+            );
+        }
+
+        return combineLatest([ops$, orcidOps$]);
+      }),
+      map(([ops, orcidOps]: [ItemOperation[], ItemOperation[]]) => [...ops, ...orcidOps])
+    ).subscribe((ops) => this.operations$.next(ops));
 
     this.itemPageRoute$ = this.itemRD$.pipe(
       getAllSucceededRemoteDataPayload(),
@@ -206,6 +229,7 @@ export class ItemStatusComponent implements OnInit {
 
   }
 
+
   /**
    * Get the current url without query params
    * @returns {string}  url
diff --git a/src/app/item-page/edit-item-page/item-version-history/item-version-history.component.ts b/src/app/item-page/edit-item-page/item-version-history/item-version-history.component.ts
index 18878109c2..3845c03578 100644
--- a/src/app/item-page/edit-item-page/item-version-history/item-version-history.component.ts
+++ b/src/app/item-page/edit-item-page/item-version-history/item-version-history.component.ts
@@ -5,7 +5,7 @@ import { Item } from '../../../core/shared/item.model';
 import { map } from 'rxjs/operators';
 import { getFirstSucceededRemoteData } from '../../../core/shared/operators';
 import { ActivatedRoute } from '@angular/router';
-import { AlertType } from '../../../shared/alert/aletr-type';
+import { AlertType } from '../../../shared/alert/alert-type';
 
 @Component({
   selector: 'ds-item-version-history',
diff --git a/src/app/item-page/edit-item-page/item-withdraw/item-withdraw.component.spec.ts b/src/app/item-page/edit-item-page/item-withdraw/item-withdraw.component.spec.ts
index 3397742f5b..1b7bff30e8 100644
--- a/src/app/item-page/edit-item-page/item-withdraw/item-withdraw.component.spec.ts
+++ b/src/app/item-page/edit-item-page/item-withdraw/item-withdraw.component.spec.ts
@@ -74,7 +74,7 @@ describe('ItemWithdrawComponent', () => {
   });
 
   it('should render a page with messages based on the \'withdraw\' messageKey', () => {
-    const header = fixture.debugElement.query(By.css('h2')).nativeElement;
+    const header = fixture.debugElement.query(By.css('h1')).nativeElement;
     expect(header.innerHTML).toContain('item.edit.withdraw.header');
     const description = fixture.debugElement.query(By.css('p')).nativeElement;
     expect(description.innerHTML).toContain('item.edit.withdraw.description');
diff --git a/src/app/item-page/edit-item-page/simple-item-action/abstract-simple-item-action.component.html b/src/app/item-page/edit-item-page/simple-item-action/abstract-simple-item-action.component.html
index b5757d1859..67249b085a 100644
--- a/src/app/item-page/edit-item-page/simple-item-action/abstract-simple-item-action.component.html
+++ b/src/app/item-page/edit-item-page/simple-item-action/abstract-simple-item-action.component.html
@@ -1,7 +1,7 @@
 <div class="container">
     <div class="row">
         <div class="col-12">
-            <h2>{{headerMessage | translate: {id: item.handle} }}</h2>
+            <h1>{{headerMessage | translate: {id: item.handle} }}</h1>
             <p>{{descriptionMessage | translate}}</p>
             <ds-modify-item-overview [item]="item"></ds-modify-item-overview>
           <div class="space-children-mr">
diff --git a/src/app/item-page/edit-item-page/simple-item-action/abstract-simple-item-action.component.spec.ts b/src/app/item-page/edit-item-page/simple-item-action/abstract-simple-item-action.component.spec.ts
index 9a19837665..b7d6478726 100644
--- a/src/app/item-page/edit-item-page/simple-item-action/abstract-simple-item-action.component.spec.ts
+++ b/src/app/item-page/edit-item-page/simple-item-action/abstract-simple-item-action.component.spec.ts
@@ -111,7 +111,7 @@ describe('AbstractSimpleItemActionComponent', () => {
   });
 
   it('should render a page with messages based on the provided messageKey', () => {
-    const header = fixture.debugElement.query(By.css('h2')).nativeElement;
+    const header = fixture.debugElement.query(By.css('h1')).nativeElement;
     expect(header.innerHTML).toContain('item.edit.myEditAction.header');
 
     const description = fixture.debugElement.query(By.css('p')).nativeElement;
diff --git a/src/app/item-page/edit-item-page/virtual-metadata/virtual-metadata.component.html b/src/app/item-page/edit-item-page/virtual-metadata/virtual-metadata.component.html
index b83b93d8f1..927f7dbb48 100644
--- a/src/app/item-page/edit-item-page/virtual-metadata/virtual-metadata.component.html
+++ b/src/app/item-page/edit-item-page/virtual-metadata/virtual-metadata.component.html
@@ -5,9 +5,9 @@
         </button>
     </div>
     <div class="modal-body">
-        <ng-container *ngFor="let item of items; trackBy: trackItem">
-            <div *ngVar="(isSelectedVirtualMetadataItem(item) | async) as selected"
-                 (click)="setSelectedVirtualMetadataItem(item, !selected)"
+        <ng-container *ngFor="let itemDTO of itemDTOs$ | async; trackBy: trackItemDTO">
+            <div *ngVar="(itemDTO.isSelectedVirtualMetadataItem$ | async) as selected"
+                 (click)="setSelectedVirtualMetadataItem(itemDTO.item, !selected)"
                  class="item d-flex flex-row">
                 <div class="m-2">
                     <label>
@@ -15,9 +15,9 @@
                     </label>
                 </div>
                 <div class="flex-column">
-                    <ds-listable-object-component-loader [object]="item">
+                    <ds-listable-object-component-loader [object]="itemDTO.item">
                     </ds-listable-object-component-loader>
-                    <div *ngFor="let metadata of virtualMetadata.get(item.uuid)">
+                    <div *ngFor="let metadata of virtualMetadata.get(itemDTO.item.uuid)">
                         <div class="font-weight-bold">
                             {{metadata.metadataField}}
                         </div>
@@ -31,7 +31,7 @@
         <div class="d-flex flex-row-reverse m-2">
             <button class="btn btn-primary save"
                     (click)="save.emit()">
-                <i class="fas fa-save"></i> {{"item.edit.metadata.save-button" | translate}}
+                <i aria-hidden="true" class="fas fa-save"></i> {{ 'item.edit.metadata.save-button' | translate }}
             </button>
         </div>
     </div>
diff --git a/src/app/item-page/edit-item-page/virtual-metadata/virtual-metadata.component.spec.ts b/src/app/item-page/edit-item-page/virtual-metadata/virtual-metadata.component.spec.ts
index 9391df4755..b835031e30 100644
--- a/src/app/item-page/edit-item-page/virtual-metadata/virtual-metadata.component.spec.ts
+++ b/src/app/item-page/edit-item-page/virtual-metadata/virtual-metadata.component.spec.ts
@@ -61,6 +61,7 @@ describe('VirtualMetadataComponent', () => {
     comp.url = url;
     comp.leftItem = item;
     comp.rightItem = relatedItem;
+    comp.ngOnChanges();
     comp.relationshipId = relationshipId;
 
     fixture.detectChanges();
diff --git a/src/app/item-page/edit-item-page/virtual-metadata/virtual-metadata.component.ts b/src/app/item-page/edit-item-page/virtual-metadata/virtual-metadata.component.ts
index 6f8991dc73..7b66f40010 100644
--- a/src/app/item-page/edit-item-page/virtual-metadata/virtual-metadata.component.ts
+++ b/src/app/item-page/edit-item-page/virtual-metadata/virtual-metadata.component.ts
@@ -1,9 +1,18 @@
-import { Component, EventEmitter, Inject, Input, OnInit, Output } from '@angular/core';
-import {Observable} from 'rxjs';
+import { Component, EventEmitter, Inject, Input, OnInit, Output, OnChanges, OnDestroy } from '@angular/core';
+import { Observable, Subscription, BehaviorSubject } from 'rxjs';
 import {Item} from '../../../core/shared/item.model';
 import {MetadataValue} from '../../../core/shared/metadata.models';
 import {ObjectUpdatesService} from '../../../core/data/object-updates/object-updates.service';
 import { APP_CONFIG, AppConfig } from '../../../../config/app-config.interface';
+import { hasValue } from '../../../shared/empty.util';
+
+interface ItemDTO {
+
+  item: Item;
+
+  isSelectedVirtualMetadataItem$: Observable<boolean>;
+
+}
 
 @Component({
   selector: 'ds-virtual-metadata',
@@ -14,7 +23,7 @@ import { APP_CONFIG, AppConfig } from '../../../../config/app-config.interface';
  * The component is shown when a relationship is marked to be deleted.
  * Each item has a checkbox to indicate whether its virtual metadata should be saved as real metadata.
  */
-export class VirtualMetadataComponent implements OnInit {
+export class VirtualMetadataComponent implements OnInit, OnChanges, OnDestroy {
 
   /**
    * The current url of this page
@@ -55,9 +64,9 @@ export class VirtualMetadataComponent implements OnInit {
   /**
    * Get an array of the left and the right item of the relationship to be deleted.
    */
-  get items() {
-    return [this.leftItem, this.rightItem];
-  }
+  itemDTOs$: BehaviorSubject<ItemDTO[]> = new BehaviorSubject([]);
+
+  subs: Subscription[] = [];
 
   public virtualMetadata: Map<string, VirtualMetadata[]> = new Map<string, VirtualMetadata[]>();
 
@@ -109,14 +118,33 @@ export class VirtualMetadataComponent implements OnInit {
   /**
    * Prevent unnecessary rerendering so fields don't lose focus
    */
-  trackItem(index, item: Item) {
-    return item && item.uuid;
+  trackItemDTO(index, itemDTO: ItemDTO): string {
+    return itemDTO?.item?.uuid;
   }
 
   ngOnInit(): void {
-    this.items.forEach((item) => {
-      this.virtualMetadata.set(item.uuid, this.getVirtualMetadata(item));
-    });
+    this.subs.push(this.itemDTOs$.subscribe((itemDTOs: ItemDTO[]) => {
+      itemDTOs.forEach((itemDTO: ItemDTO) => this.virtualMetadata.set(itemDTO.item.uuid, this.getVirtualMetadata(itemDTO.item)));
+    }));
+  }
+
+  ngOnChanges(): void {
+    if (hasValue(this.leftItem) && hasValue(this.rightItem)) {
+      this.itemDTOs$.next([
+        {
+          item: this.leftItem,
+          isSelectedVirtualMetadataItem$: this.isSelectedVirtualMetadataItem(this.leftItem),
+        },
+        {
+          item: this.rightItem,
+          isSelectedVirtualMetadataItem$: this.isSelectedVirtualMetadataItem(this.rightItem),
+        },
+      ]);
+    }
+  }
+
+  ngOnDestroy(): void {
+    this.subs.forEach((sub: Subscription) => sub.unsubscribe());
   }
 }
 
diff --git a/src/app/item-page/field-components/collections/collections.component.html b/src/app/item-page/field-components/collections/collections.component.html
index 27ebb41d61..dfa22237ae 100644
--- a/src/app/item-page/field-components/collections/collections.component.html
+++ b/src/app/item-page/field-components/collections/collections.component.html
@@ -1,6 +1,6 @@
 <ds-metadata-field-wrapper [label]="label | translate">
     <div class="collections">
-        <a *ngFor="let collection of (this.collections$ | async); let last=last;" [routerLink]="['/collections', collection.id]">
+        <a *ngFor="let collection of (this.collections$ | async); let last=last;" [routerLink]="['/collections', collection.id]" role="link" tabindex="0">
             <span>{{ dsoNameService.getName(collection) }}</span><span *ngIf="!last" [innerHTML]="separator"></span>
         </a>
     </div>
@@ -15,6 +15,7 @@
         class="load-more-btn btn btn-sm btn-outline-secondary"
         role="button"
         href="javascript:void(0);"
+        tabindex="0"
     >
         {{'item.page.collections.load-more' | translate}}
     </a>
diff --git a/src/app/item-page/field-components/metadata-uri-values/metadata-uri-values.component.html b/src/app/item-page/field-components/metadata-uri-values/metadata-uri-values.component.html
index 9091beb6c7..5e575e63b5 100644
--- a/src/app/item-page/field-components/metadata-uri-values/metadata-uri-values.component.html
+++ b/src/app/item-page/field-components/metadata-uri-values/metadata-uri-values.component.html
@@ -1,5 +1,5 @@
 <ds-metadata-field-wrapper [label]="label | translate">
-    <a class="dont-break-out" *ngFor="let mdValue of mdValues; let last=last;" [href]="mdValue.value">
+    <a class="dont-break-out" *ngFor="let mdValue of mdValues; let last=last;" [href]="mdValue.value" [target]="linkTarget" role="link" tabindex="0">
        {{ linktext || mdValue.value }}<span *ngIf="!last" [innerHTML]="separator"></span>
     </a>
 </ds-metadata-field-wrapper>
diff --git a/src/app/item-page/field-components/metadata-uri-values/metadata-uri-values.component.spec.ts b/src/app/item-page/field-components/metadata-uri-values/metadata-uri-values.component.spec.ts
index f869ab8aaf..56a51b01fe 100644
--- a/src/app/item-page/field-components/metadata-uri-values/metadata-uri-values.component.spec.ts
+++ b/src/app/item-page/field-components/metadata-uri-values/metadata-uri-values.component.spec.ts
@@ -73,6 +73,13 @@ describe('MetadataUriValuesComponent', () => {
     expect(separators.length).toBe(mockMetadata.length - 1);
   });
 
+  it('should contain the correct target attribute for metadata links', () => {
+    const links = fixture.debugElement.queryAll(By.css('a'));
+    for (const link of links) {
+      expect(link.nativeElement.getAttribute('target')).toBe('_blank');
+    }
+  });
+
   describe('when linktext is defined', () => {
 
     beforeEach(() => {
diff --git a/src/app/item-page/field-components/metadata-uri-values/metadata-uri-values.component.ts b/src/app/item-page/field-components/metadata-uri-values/metadata-uri-values.component.ts
index e070eccf2d..5a024bfb30 100644
--- a/src/app/item-page/field-components/metadata-uri-values/metadata-uri-values.component.ts
+++ b/src/app/item-page/field-components/metadata-uri-values/metadata-uri-values.component.ts
@@ -37,4 +37,10 @@ export class MetadataUriValuesComponent extends MetadataValuesComponent {
    * The label for this iteration of metadata values
    */
   @Input() label: string;
+
+  /**
+   * The target attribute for the metadata links.
+   * Defaults to '_blank' to open links in a new window/tab.
+   */
+  @Input() linkTarget = '_blank';
 }
diff --git a/src/app/item-page/field-components/metadata-values/metadata-values.component.html b/src/app/item-page/field-components/metadata-values/metadata-values.component.html
index 61088edd16..de6f413994 100644
--- a/src/app/item-page/field-components/metadata-values/metadata-values.component.html
+++ b/src/app/item-page/field-components/metadata-values/metadata-values.component.html
@@ -18,7 +18,12 @@
 
 <!-- Render value as a link (href and label) -->
 <ng-template #link let-value="value">
-    <a class="dont-break-out ds-simple-metadata-link" target="_blank" [href]="value">
+    <a class="dont-break-out ds-simple-metadata-link"
+      [href]="value"
+      [attr.target]="getLinkAttributes(value).target"
+      [attr.rel]="getLinkAttributes(value).rel"
+      role="link"
+      tabindex="0">
       {{value}}
     </a>
 </ng-template>
@@ -32,7 +37,5 @@
 <ng-template #browselink let-value="value">
   <a class="dont-break-out preserve-line-breaks ds-browse-link"
      [routerLink]="['/browse', browseDefinition.id]"
-     [queryParams]="getQueryParams(value)">
-    {{value}}
-  </a>
+     [queryParams]="getQueryParams(value)" role="link" tabindex="0">{{value}}</a>
 </ng-template>
diff --git a/src/app/item-page/field-components/metadata-values/metadata-values.component.spec.ts b/src/app/item-page/field-components/metadata-values/metadata-values.component.spec.ts
index 23f8098207..de46cd9e4c 100644
--- a/src/app/item-page/field-components/metadata-values/metadata-values.component.spec.ts
+++ b/src/app/item-page/field-components/metadata-values/metadata-values.component.spec.ts
@@ -73,4 +73,20 @@ describe('MetadataValuesComponent', () => {
     expect(comp.hasLink(mdValue)).toBe(true);
   });
 
+  it('should return correct target and rel for internal links', () => {
+    spyOn(comp, 'hasInternalLink').and.returnValue(true);
+    const urlValue = '/internal-link';
+    const result = comp.getLinkAttributes(urlValue);
+    expect(result.target).toBe('_self');
+    expect(result.rel).toBe('');
+  });
+
+  it('should return correct target and rel for external links', () => {
+    spyOn(comp, 'hasInternalLink').and.returnValue(false);
+    const urlValue = 'https://www.dspace.org';
+    const result = comp.getLinkAttributes(urlValue);
+    expect(result.target).toBe('_blank');
+    expect(result.rel).toBe('noopener noreferrer');
+  });
+
 });
diff --git a/src/app/item-page/field-components/metadata-values/metadata-values.component.ts b/src/app/item-page/field-components/metadata-values/metadata-values.component.ts
index cbbae9006d..a902e48ed1 100644
--- a/src/app/item-page/field-components/metadata-values/metadata-values.component.ts
+++ b/src/app/item-page/field-components/metadata-values/metadata-values.component.ts
@@ -4,6 +4,7 @@ import { APP_CONFIG, AppConfig } from '../../../../config/app-config.interface';
 import { BrowseDefinition } from '../../../core/shared/browse-definition.model';
 import { hasValue } from '../../../shared/empty.util';
 import { VALUE_LIST_BROWSE_DEFINITION } from '../../../core/shared/value-list-browse-definition.resource-type';
+import { environment } from '../../../../environments/environment';
 
 /**
  * This component renders the configured 'values' into the ds-metadata-field-wrapper component.
@@ -90,4 +91,25 @@ export class MetadataValuesComponent implements OnChanges {
     }
     return queryParams;
   }
+
+  /**
+   * Checks if the given link value is an internal link.
+   * @param linkValue - The link value to check.
+   * @returns True if the link value starts with the base URL defined in the environment configuration, false otherwise.
+   */
+  hasInternalLink(linkValue: string): boolean {
+    return linkValue.startsWith(environment.ui.baseUrl);
+  }
+
+  /**
+   * This method performs a validation and determines the target of the url.
+   * @returns - Returns the target url.
+   */
+  getLinkAttributes(urlValue: string): { target: string, rel: string } {
+    if (this.hasInternalLink(urlValue)) {
+      return { target: '_self', rel: '' };
+    } else {
+      return { target: '_blank', rel: 'noopener noreferrer' };
+    }
+  }
 }
diff --git a/src/app/item-page/full/field-components/file-section/full-file-section.component.html b/src/app/item-page/full/field-components/file-section/full-file-section.component.html
index 8b8603011d..d4b58742c4 100644
--- a/src/app/item-page/full/field-components/file-section/full-file-section.component.html
+++ b/src/app/item-page/full/field-components/file-section/full-file-section.component.html
@@ -1,12 +1,11 @@
 <ds-metadata-field-wrapper [label]="label | translate">
     <div *ngVar="(originals$ | async)?.payload as originals">
         <div *ngIf="hasValuesInBundle(originals)">
-            <h5 class="simple-view-element-header">{{"item.page.filesection.original.bundle" | translate}}</h5>
+            <h3 class="h5 simple-view-element-header">{{"item.page.filesection.original.bundle" | translate}}</h3>
             <ds-pagination *ngIf="originals?.page?.length > 0"
                            [hideGear]="true"
                            [hidePagerWhenSinglePage]="true"
                            [paginationOptions]="originalOptions"
-                           [pageInfoState]="originals"
                            [collectionSize]="originals?.totalElements"
                            [retainScrollPosition]="true">
 
@@ -44,12 +43,11 @@
     </div>
     <div *ngVar="(licenses$ | async)?.payload as licenses">
         <div *ngIf="hasValuesInBundle(licenses)">
-            <h5 class="simple-view-element-header">{{"item.page.filesection.license.bundle" | translate}}</h5>
+            <h3 class="h5 simple-view-element-header">{{"item.page.filesection.license.bundle" | translate}}</h3>
             <ds-pagination *ngIf="licenses?.page?.length > 0"
                            [hideGear]="true"
                            [hidePagerWhenSinglePage]="true"
                            [paginationOptions]="licenseOptions"
-                           [pageInfoState]="licenses"
                            [collectionSize]="licenses?.totalElements"
                            [retainScrollPosition]="true">
 
diff --git a/src/app/item-page/full/full-item-page.component.html b/src/app/item-page/full/full-item-page.component.html
index 1d83181395..39f682113a 100644
--- a/src/app/item-page/full/full-item-page.component.html
+++ b/src/app/item-page/full/full-item-page.component.html
@@ -3,7 +3,6 @@
     <div *ngIf="itemRD?.payload as item">
       <ds-themed-item-alerts [item]="item"></ds-themed-item-alerts>
       <ds-item-versions-notice [item]="item"></ds-item-versions-notice>
-      <ds-view-tracker [object]="item"></ds-view-tracker>
       <div *ngIf="!item.isWithdrawn || (isAdmin$|async)" class="full-item-info">
         <div class="d-flex flex-row">
           <ds-themed-item-page-title-field class="mr-auto" [item]="item"></ds-themed-item-page-title-field>
diff --git a/src/app/item-page/full/full-item-page.component.spec.ts b/src/app/item-page/full/full-item-page.component.spec.ts
index 9fc078c2cd..ac82134f27 100644
--- a/src/app/item-page/full/full-item-page.component.spec.ts
+++ b/src/app/item-page/full/full-item-page.component.spec.ts
@@ -15,7 +15,6 @@ import { BehaviorSubject, of as observableOf } from 'rxjs';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { By } from '@angular/platform-browser';
 import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
-import { AuthService } from '../../core/auth/auth.service';
 import { createPaginatedList } from '../../shared/testing/utils.test';
 import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
 import { createRelationshipsObservable } from '../simple/item-types/shared/item.component.spec';
@@ -54,7 +53,6 @@ describe('FullItemPageComponent', () => {
   let comp: FullItemPageComponent;
   let fixture: ComponentFixture<FullItemPageComponent>;
 
-  let authService: AuthService;
   let routeStub: ActivatedRouteStub;
   let routeData;
   let authorizationDataService: AuthorizationDataService;
@@ -75,11 +73,6 @@ describe('FullItemPageComponent', () => {
   };
 
   beforeEach(waitForAsync(() => {
-    authService = jasmine.createSpyObj('authService', {
-      isAuthenticated: observableOf(true),
-      setRedirectUrl: {}
-    });
-
     routeData = {
       dso: createSuccessfulRemoteDataObject(mockItem),
     };
@@ -117,7 +110,6 @@ describe('FullItemPageComponent', () => {
         { provide: ActivatedRoute, useValue: routeStub },
         { provide: ItemDataService, useValue: {} },
         { provide: MetadataService, useValue: metadataServiceStub },
-        { provide: AuthService, useValue: authService },
         { provide: AuthorizationDataService, useValue: authorizationDataService },
         { provide: ServerResponseService, useValue: serverResponseService },
         { provide: SignpostingDataService, useValue: signpostingDataService },
diff --git a/src/app/item-page/full/full-item-page.component.ts b/src/app/item-page/full/full-item-page.component.ts
index 31dd2c5fc2..c91ea8bfe6 100644
--- a/src/app/item-page/full/full-item-page.component.ts
+++ b/src/app/item-page/full/full-item-page.component.ts
@@ -13,7 +13,6 @@ import { Item } from '../../core/shared/item.model';
 
 import { fadeInOut } from '../../shared/animations/fade';
 import { hasValue } from '../../shared/empty.util';
-import { AuthService } from '../../core/auth/auth.service';
 import { Location } from '@angular/common';
 import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
 import { ServerResponseService } from '../../core/services/server-response.service';
@@ -49,7 +48,6 @@ export class FullItemPageComponent extends ItemPageComponent implements OnInit,
     protected route: ActivatedRoute,
     protected router: Router,
     protected items: ItemDataService,
-    protected authService: AuthService,
     protected authorizationService: AuthorizationDataService,
     protected _location: Location,
     protected responseService: ServerResponseService,
@@ -57,7 +55,7 @@ export class FullItemPageComponent extends ItemPageComponent implements OnInit,
     protected linkHeadService: LinkHeadService,
     @Inject(PLATFORM_ID) protected platformId: string,
   ) {
-    super(route, router, items, authService, authorizationService, responseService, signpostingDataService, linkHeadService, platformId);
+    super(route, router, items, authorizationService, responseService, signpostingDataService, linkHeadService, platformId);
   }
 
   /*** AoT inheritance fix, will hopefully be resolved in the near future **/
diff --git a/src/app/item-page/item-page-routing.module.ts b/src/app/item-page/item-page-routing.module.ts
index 0c855ab34d..d116eb9297 100644
--- a/src/app/item-page/item-page-routing.module.ts
+++ b/src/app/item-page/item-page-routing.module.ts
@@ -19,6 +19,7 @@ import { REQUEST_COPY_MODULE_PATH } from '../app-routing-paths';
 import { OrcidPageComponent } from './orcid-page/orcid-page.component';
 import { OrcidPageGuard } from './orcid-page/orcid-page.guard';
 import { DSOEditMenuResolver } from '../shared/dso-page/dso-edit-menu.resolver';
+import { ViewTrackerResolverService } from '../statistics/angulartics/dspace/view-tracker-resolver.service';
 
 @NgModule({
   imports: [
@@ -28,7 +29,6 @@ import { DSOEditMenuResolver } from '../shared/dso-page/dso-edit-menu.resolver';
         resolve: {
           dso: ItemPageResolver,
           breadcrumb: ItemBreadcrumbResolver,
-          menu: DSOEditMenuResolver
         },
         runGuardsAndResolvers: 'always',
         children: [
@@ -36,10 +36,18 @@ import { DSOEditMenuResolver } from '../shared/dso-page/dso-edit-menu.resolver';
             path: '',
             component: ThemedItemPageComponent,
             pathMatch: 'full',
+            resolve: {
+              menu: DSOEditMenuResolver,
+              tracking: ViewTrackerResolverService,
+            },
           },
           {
             path: 'full',
             component: ThemedFullItemPageComponent,
+            resolve: {
+              menu: DSOEditMenuResolver,
+              tracking: ViewTrackerResolverService,
+            },
           },
           {
             path: ITEM_EDIT_PATH,
@@ -98,7 +106,8 @@ import { DSOEditMenuResolver } from '../shared/dso-page/dso-edit-menu.resolver';
     LinkService,
     ItemPageAdministratorGuard,
     VersionResolver,
-    OrcidPageGuard
+    OrcidPageGuard,
+    ViewTrackerResolverService,
   ]
 
 })
diff --git a/src/app/item-page/item-page.resolver.spec.ts b/src/app/item-page/item-page.resolver.spec.ts
index 533f97d0c0..f22eba5732 100644
--- a/src/app/item-page/item-page.resolver.spec.ts
+++ b/src/app/item-page/item-page.resolver.spec.ts
@@ -3,14 +3,15 @@ import { createSuccessfulRemoteDataObject$ } from '../shared/remote-data.utils';
 import { DSpaceObject } from '../core/shared/dspace-object.model';
 import { MetadataValueFilter } from '../core/shared/metadata.models';
 import { first } from 'rxjs/operators';
-import { Router } from '@angular/router';
+import { Router, RouterModule } from '@angular/router';
 import { TestBed } from '@angular/core/testing';
-import { RouterTestingModule } from '@angular/router/testing';
+import { AuthServiceStub } from '../shared/testing/auth-service.stub';
+import { AuthService } from '../core/auth/auth.service';
 
 describe('ItemPageResolver', () => {
   beforeEach(() => {
     TestBed.configureTestingModule({
-      imports: [RouterTestingModule.withRoutes([{
+      imports: [RouterModule.forRoot([{
         path: 'entities/:entity-type/:id',
         component: {} as any
       }])]
@@ -21,7 +22,8 @@ describe('ItemPageResolver', () => {
     let resolver: ItemPageResolver;
     let itemService: any;
     let store: any;
-    let router: any;
+    let router: Router;
+    let authService: AuthServiceStub;
 
     const uuid = '1234-65487-12354-1235';
     let item: DSpaceObject;
@@ -41,7 +43,8 @@ describe('ItemPageResolver', () => {
         store = jasmine.createSpyObj('store', {
           dispatch: {},
         });
-        resolver = new ItemPageResolver(itemService, store, router);
+        authService = new AuthServiceStub();
+        resolver = new ItemPageResolver(itemService, store, router, authService as unknown as AuthService);
       });
 
       it('should redirect to the correct route for the entity type', (done) => {
diff --git a/src/app/item-page/item-page.resolver.ts b/src/app/item-page/item-page.resolver.ts
index e9b287406e..e3c1703e06 100644
--- a/src/app/item-page/item-page.resolver.ts
+++ b/src/app/item-page/item-page.resolver.ts
@@ -9,6 +9,8 @@ import { map } from 'rxjs/operators';
 import { hasValue } from '../shared/empty.util';
 import { getItemPageRoute } from './item-page-routing-paths';
 import { ItemResolver } from './item.resolver';
+import { redirectOn4xx } from '../core/shared/authorized.operators';
+import { AuthService } from '../core/auth/auth.service';
 
 /**
  * This class represents a resolver that requests a specific item before the route is activated and will redirect to the
@@ -19,7 +21,8 @@ export class ItemPageResolver extends ItemResolver {
   constructor(
     protected itemService: ItemDataService,
     protected store: Store<any>,
-    protected router: Router
+    protected router: Router,
+    protected authService: AuthService,
   ) {
     super(itemService, store, router);
   }
@@ -33,6 +36,7 @@ export class ItemPageResolver extends ItemResolver {
    */
   resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<RemoteData<Item>> {
     return super.resolve(route, state).pipe(
+      redirectOn4xx(this.router, this.authService),
       map((rd: RemoteData<Item>) => {
         if (rd.hasSucceeded && hasValue(rd.payload)) {
           const thisRoute = state.url;
diff --git a/src/app/item-page/item.resolver.ts b/src/app/item-page/item.resolver.ts
index ca6a6c5958..ffeef57ecb 100644
--- a/src/app/item-page/item.resolver.ts
+++ b/src/app/item-page/item.resolver.ts
@@ -8,20 +8,27 @@ import { followLink, FollowLinkConfig } from '../shared/utils/follow-link-config
 import { getFirstCompletedRemoteData } from '../core/shared/operators';
 import { Store } from '@ngrx/store';
 import { ResolvedAction } from '../core/resolving/resolver.actions';
+import { environment } from '../../environments/environment';
 
 /**
  * The self links defined in this list are expected to be requested somewhere in the near future
  * Requesting them as embeds will limit the number of requests
  */
-export const ITEM_PAGE_LINKS_TO_FOLLOW: FollowLinkConfig<Item>[] = [
-  followLink('owningCollection', {},
-    followLink('parentCommunity', {},
-      followLink('parentCommunity'))
-  ),
-  followLink('relationships'),
-  followLink('version', {}, followLink('versionhistory')),
-  followLink('thumbnail')
-];
+export function getItemPageLinksToFollow(): FollowLinkConfig<Item>[] {
+  const followLinks: FollowLinkConfig<Item>[] = [
+    followLink('owningCollection', {},
+      followLink('parentCommunity', {},
+        followLink('parentCommunity'))
+    ),
+    followLink('relationships'),
+    followLink('version', {}, followLink('versionhistory')),
+    followLink('thumbnail'),
+  ];
+  if (environment.item.showAccessStatuses) {
+    followLinks.push(followLink('accessStatus'));
+  }
+  return followLinks;
+}
 
 /**
  * This class represents a resolver that requests a specific item before the route is activated
@@ -46,7 +53,7 @@ export class ItemResolver implements Resolve<RemoteData<Item>> {
     const itemRD$ = this.itemService.findById(route.params.id,
       true,
       false,
-      ...ITEM_PAGE_LINKS_TO_FOLLOW
+      ...getItemPageLinksToFollow(),
     ).pipe(
       getFirstCompletedRemoteData(),
     );
diff --git a/src/app/item-page/media-viewer/media-viewer-video/media-viewer-video.component.html b/src/app/item-page/media-viewer/media-viewer-video/media-viewer-video.component.html
index 3217680815..a64b4ce548 100644
--- a/src/app/item-page/media-viewer/media-viewer-video/media-viewer-video.component.html
+++ b/src/app/item-page/media-viewer/media-viewer-video/media-viewer-video.component.html
@@ -19,7 +19,7 @@
 <div class="buttons" *ngIf="medias?.length > 1">
   <button
     class="btn btn-primary previous"
-    [disabled]="currentIndex === 0"
+    [dsBtnDisabled]="currentIndex === 0"
     (click)="prevMedia()"
   >
     {{ "media-viewer.previous" | translate }}
@@ -27,7 +27,7 @@
 
   <button
     class="btn btn-primary next"
-    [disabled]="currentIndex === medias.length - 1"
+    [dsBtnDisabled]="currentIndex === medias.length - 1"
     (click)="nextMedia()"
   >
     {{ "media-viewer.next" | translate }}
diff --git a/src/app/item-page/media-viewer/media-viewer.component.html b/src/app/item-page/media-viewer/media-viewer.component.html
index c8a02e039c..eb491c5193 100644
--- a/src/app/item-page/media-viewer/media-viewer.component.html
+++ b/src/app/item-page/media-viewer/media-viewer.component.html
@@ -16,12 +16,7 @@
     </ng-container>
   </div>
   <ng-template #showThumbnail>
-    <ds-themed-media-viewer-image *ngIf="mediaOptions.image && mediaOptions.video"
-      [image]="(thumbnailsRD$ | async)?.payload?.page[0]?._links.content.href || thumbnailPlaceholder"
-      [preview]="false"
-    ></ds-themed-media-viewer-image>
-    <ds-thumbnail *ngIf="!(mediaOptions.image && mediaOptions.video)"
-                  [thumbnail]="(thumbnailsRD$ | async)?.payload?.page[0]">
-    </ds-thumbnail>
+    <ds-themed-thumbnail [thumbnail]="(thumbnailsRD$ | async)?.payload?.page[0]">
+    </ds-themed-thumbnail>
   </ng-template>
 </ng-container>
diff --git a/src/app/item-page/media-viewer/media-viewer.component.spec.ts b/src/app/item-page/media-viewer/media-viewer.component.spec.ts
index 0c170ac8cf..6de0d82595 100644
--- a/src/app/item-page/media-viewer/media-viewer.component.spec.ts
+++ b/src/app/item-page/media-viewer/media-viewer.component.spec.ts
@@ -139,9 +139,9 @@ describe('MediaViewerComponent', () => {
       expect(mediaItem.thumbnail).toBe(null);
     });
 
-    it('should display a default, thumbnail', () => {
+    it('should display a default thumbnail', () => {
       const defaultThumbnail = fixture.debugElement.query(
-        By.css('ds-themed-media-viewer-image')
+        By.css('ds-themed-thumbnail')
       );
       expect(defaultThumbnail.nativeElement).toBeDefined();
     });
diff --git a/src/app/item-page/media-viewer/media-viewer.component.ts b/src/app/item-page/media-viewer/media-viewer.component.ts
index 242e50646e..5a17c4f01b 100644
--- a/src/app/item-page/media-viewer/media-viewer.component.ts
+++ b/src/app/item-page/media-viewer/media-viewer.component.ts
@@ -1,4 +1,4 @@
-import { Component, Input, OnDestroy, OnInit } from '@angular/core';
+import { ChangeDetectorRef, Component, Input, OnDestroy, OnInit } from '@angular/core';
 import { BehaviorSubject, Observable } from 'rxjs';
 import { filter, take } from 'rxjs/operators';
 import { BitstreamDataService } from '../../core/data/bitstream-data.service';
@@ -42,6 +42,7 @@ export class MediaViewerComponent implements OnDestroy, OnInit {
 
   constructor(
     protected bitstreamDataService: BitstreamDataService,
+    protected changeDetectorRef: ChangeDetectorRef
   ) {
   }
 
@@ -85,6 +86,7 @@ export class MediaViewerComponent implements OnDestroy, OnInit {
               }));
           }
           this.isLoading = false;
+          this.changeDetectorRef.detectChanges();
         }));
       }
     }));
diff --git a/src/app/item-page/mirador-viewer/mirador-viewer.component.ts b/src/app/item-page/mirador-viewer/mirador-viewer.component.ts
index fee8046272..15ebfc61bc 100644
--- a/src/app/item-page/mirador-viewer/mirador-viewer.component.ts
+++ b/src/app/item-page/mirador-viewer/mirador-viewer.component.ts
@@ -70,7 +70,8 @@ export class MiradorViewerComponent implements OnInit {
     const manifestApiEndpoint = encodeURIComponent(environment.rest.baseUrl + '/iiif/'
       + this.object.id + '/manifest');
     // The Express path to Mirador viewer.
-    let viewerPath = '/iiif/mirador/index.html?manifest=' + manifestApiEndpoint;
+    let viewerPath = `${environment.ui.nameSpace}${environment.ui.nameSpace.length > 1 ? '/' : ''}`
+      + `iiif/mirador/index.html?manifest=${manifestApiEndpoint}`;
     if (this.searchable) {
       // Tell the viewer add search to menu.
       viewerPath += '&searchable=' + this.searchable;
diff --git a/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.html b/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.html
index e57ce33008..c37b54aab3 100644
--- a/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.html
+++ b/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.html
@@ -1,5 +1,5 @@
 <div class="container mb-5">
-  <h2>{{'person.orcid.registry.auth' | translate}}</h2>
+  <h1>{{'person.orcid.registry.auth' | translate}}</h1>
   <ng-container *ngIf="(isLinkedToOrcid() | async); then orcidLinked; else orcidNotLinked"></ng-container>
 </div>
 
@@ -48,7 +48,7 @@
     <div class="row" *ngIf="(ownerCanDisconnectProfileFromOrcid() | async)" data-test="unlinkOwner">
       <div class="col">
         <button type="submit" class="btn btn-danger float-right" (click)="unlinkOrcid()"
-                [disabled]="(unlinkProcessing | async)">
+                [dsBtnDisabled]="(unlinkProcessing | async)">
           <span *ngIf="!(unlinkProcessing | async)"><i
             class="fas fa-unlink"></i> {{ 'person.page.orcid.unlink' | translate }}</span>
           <span *ngIf="(unlinkProcessing | async)"><i
diff --git a/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.ts b/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.ts
index ea970e7d31..73b4a7b4e1 100644
--- a/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.ts
+++ b/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.ts
@@ -1,8 +1,8 @@
 import { Component, EventEmitter, Inject, Input, OnChanges, OnInit, Output, SimpleChanges } from '@angular/core';
 
 import { TranslateService } from '@ngx-translate/core';
-import { BehaviorSubject, Observable } from 'rxjs';
-import { map } from 'rxjs/operators';
+import { BehaviorSubject, Observable, of } from 'rxjs';
+import { catchError, map } from 'rxjs/operators';
 import { NativeWindowRef, NativeWindowService } from '../../../core/services/window.service';
 import { Item } from '../../../core/shared/item.model';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
@@ -10,6 +10,8 @@ import { RemoteData } from '../../../core/data/remote-data';
 import { ResearcherProfile } from '../../../core/profile/model/researcher-profile.model';
 import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
 import { OrcidAuthService } from '../../../core/orcid/orcid-auth.service';
+import { createFailedRemoteDataObject } from '../../../shared/remote-data.utils';
+import { HttpErrorResponse } from '@angular/common/http';
 
 @Component({
   selector: 'ds-orcid-auth',
@@ -170,14 +172,15 @@ export class OrcidAuthComponent implements OnInit, OnChanges {
   unlinkOrcid(): void {
     this.unlinkProcessing.next(true);
     this.orcidAuthService.unlinkOrcidByItem(this.item).pipe(
-      getFirstCompletedRemoteData()
+      getFirstCompletedRemoteData(),
+      catchError((err: HttpErrorResponse) => of(createFailedRemoteDataObject(err.message, err.status)))
     ).subscribe((remoteData: RemoteData<ResearcherProfile>) => {
       this.unlinkProcessing.next(false);
-      if (remoteData.isSuccess) {
+      if (remoteData.hasFailed) {
+        this.notificationsService.error(this.translateService.get('person.page.orcid.unlink.error'));
+      } else {
         this.notificationsService.success(this.translateService.get('person.page.orcid.unlink.success'));
         this.unlink.emit();
-      } else {
-        this.notificationsService.error(this.translateService.get('person.page.orcid.unlink.error'));
       }
     });
   }
diff --git a/src/app/item-page/orcid-page/orcid-page.component.html b/src/app/item-page/orcid-page/orcid-page.component.html
index 33c3125d67..6c30fbe111 100644
--- a/src/app/item-page/orcid-page/orcid-page.component.html
+++ b/src/app/item-page/orcid-page/orcid-page.component.html
@@ -1,13 +1,3 @@
-<div *ngIf="!(processingConnection | async) && (item | async)" class="container">
-  <div class="button-row bottom mb-3">
-    <div class="text-right">
-      <a [routerLink]="getItemPage()" role="button" class="btn btn-outline-secondary" data-test="back-button">
-        <i class="fas fa-arrow-left"></i> {{'item.orcid.return' | translate}}
-      </a>
-    </div>
-  </div>
-</div>
-
 <ds-loading *ngIf="(processingConnection | async)" [message]="'person.page.orcid.link.processing' | translate"></ds-loading>
 <div class="container" *ngIf="!(processingConnection | async) && !(connectionStatus | async)" data-test="error-box">
   <ds-alert [type]="'alert-danger'">{{'person.page.orcid.link.error.message' | translate}}</ds-alert>
@@ -17,3 +7,13 @@
   <ds-orcid-sync-setting *ngIf="isLinkedToOrcid()" [item]="(item | async)" (settingsUpdated)="updateItem()" data-test="orcid-sync-setting"></ds-orcid-sync-setting>
   <ds-orcid-queue *ngIf="isLinkedToOrcid()" [item]="(item | async)"></ds-orcid-queue>
 </ng-container>
+
+<div *ngIf="!(processingConnection | async) && (item | async)" class="container">
+  <div class="button-row bottom mb-3">
+    <div class="text-right">
+      <a [routerLink]="getItemPage()" role="button" class="btn btn-outline-secondary" data-test="back-button">
+        <i class="fas fa-arrow-left"></i> {{'item.orcid.return' | translate}}
+      </a>
+    </div>
+  </div>
+</div>
diff --git a/src/app/item-page/orcid-page/orcid-page.component.ts b/src/app/item-page/orcid-page/orcid-page.component.ts
index f3dbb569d9..1d62c9691c 100644
--- a/src/app/item-page/orcid-page/orcid-page.component.ts
+++ b/src/app/item-page/orcid-page/orcid-page.component.ts
@@ -3,7 +3,7 @@ import { ActivatedRoute, ParamMap, Router } from '@angular/router';
 import { isPlatformBrowser } from '@angular/common';
 
 import { BehaviorSubject, combineLatest } from 'rxjs';
-import { map, take } from 'rxjs/operators';
+import { filter, map, take } from 'rxjs/operators';
 
 import { OrcidAuthService } from '../../core/orcid/orcid-auth.service';
 import { getFirstCompletedRemoteData, getFirstSucceededRemoteDataPayload } from '../../core/shared/operators';
@@ -147,7 +147,19 @@ export class OrcidPageComponent implements OnInit {
    */
   private clearRouteParams(): void {
     // update route removing the code from query params
-    const redirectUrl = this.router.url.split('?')[0];
-    this.router.navigate([redirectUrl]);
+    this.route.queryParamMap
+      .pipe(
+        filter((paramMap: ParamMap) => isNotEmpty(paramMap.keys)),
+        map(_ => Object.assign({})),
+        take(1),
+      ).subscribe(queryParams =>
+        this.router.navigate(
+          [],
+          {
+            relativeTo: this.route,
+            queryParams
+          }
+        )
+    );
   }
 }
diff --git a/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.ts b/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.ts
index 6079287f71..3e88826952 100644
--- a/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.ts
+++ b/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.ts
@@ -15,7 +15,7 @@ import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
 import { hasValue } from '../../../shared/empty.util';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
 import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
-import { AlertType } from '../../../shared/alert/aletr-type';
+import { AlertType } from '../../../shared/alert/alert-type';
 import { Item } from '../../../core/shared/item.model';
 import { OrcidAuthService } from '../../../core/orcid/orcid-auth.service';
 
diff --git a/src/app/item-page/orcid-page/orcid-sync-settings/orcid-sync-settings.component.spec.ts b/src/app/item-page/orcid-page/orcid-sync-settings/orcid-sync-settings.component.spec.ts
index f2fa9d2440..38a6df909e 100644
--- a/src/app/item-page/orcid-page/orcid-sync-settings/orcid-sync-settings.component.spec.ts
+++ b/src/app/item-page/orcid-page/orcid-sync-settings/orcid-sync-settings.component.spec.ts
@@ -1,6 +1,6 @@
 import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
 import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { UntypedFormControl, UntypedFormGroup, FormsModule, ReactiveFormsModule } from '@angular/forms';
+import { FormsModule, ReactiveFormsModule, UntypedFormControl, UntypedFormGroup } from '@angular/forms';
 import { RouterTestingModule } from '@angular/router/testing';
 import { By } from '@angular/platform-browser';
 
@@ -24,8 +24,8 @@ describe('OrcidSyncSettingsComponent test suite', () => {
   let comp: OrcidSyncSettingsComponent;
   let fixture: ComponentFixture<OrcidSyncSettingsComponent>;
   let scheduler: TestScheduler;
-  let researcherProfileService: jasmine.SpyObj<ResearcherProfileDataService>;
   let notificationsService;
+  let researcherProfileService: jasmine.SpyObj<ResearcherProfileDataService>;
   let formGroup: UntypedFormGroup;
 
   const mockResearcherProfile: ResearcherProfile = Object.assign(new ResearcherProfile(), {
@@ -161,6 +161,7 @@ describe('OrcidSyncSettingsComponent test suite', () => {
     scheduler = getTestScheduler();
     fixture = TestBed.createComponent(OrcidSyncSettingsComponent);
     comp = fixture.componentInstance;
+    researcherProfileService.findByRelatedItem.and.returnValue(createSuccessfulRemoteDataObject$(mockResearcherProfile));
     comp.item = mockItemLinkedToOrcid;
     fixture.detectChanges();
   }));
@@ -197,7 +198,6 @@ describe('OrcidSyncSettingsComponent test suite', () => {
     });
 
     it('should call updateByOrcidOperations properly', () => {
-      researcherProfileService.findByRelatedItem.and.returnValue(createSuccessfulRemoteDataObject$(mockResearcherProfile));
       researcherProfileService.patch.and.returnValue(createSuccessfulRemoteDataObject$(mockResearcherProfile));
       const expectedOps: Operation[] = [
         {
@@ -226,7 +226,6 @@ describe('OrcidSyncSettingsComponent test suite', () => {
     });
 
     it('should show notification on success', () => {
-      researcherProfileService.findByRelatedItem.and.returnValue(createSuccessfulRemoteDataObject$(mockResearcherProfile));
       researcherProfileService.patch.and.returnValue(createSuccessfulRemoteDataObject$(mockResearcherProfile));
 
       scheduler.schedule(() => comp.onSubmit(formGroup));
@@ -238,6 +237,8 @@ describe('OrcidSyncSettingsComponent test suite', () => {
 
     it('should show notification on error', () => {
       researcherProfileService.findByRelatedItem.and.returnValue(createFailedRemoteDataObject$());
+      comp.item = mockItemLinkedToOrcid;
+      fixture.detectChanges();
 
       scheduler.schedule(() => comp.onSubmit(formGroup));
       scheduler.flush();
@@ -247,7 +248,6 @@ describe('OrcidSyncSettingsComponent test suite', () => {
     });
 
     it('should show notification on error', () => {
-      researcherProfileService.findByRelatedItem.and.returnValue(createSuccessfulRemoteDataObject$(mockResearcherProfile));
       researcherProfileService.patch.and.returnValue(createFailedRemoteDataObject$());
 
       scheduler.schedule(() => comp.onSubmit(formGroup));
diff --git a/src/app/item-page/orcid-page/orcid-sync-settings/orcid-sync-settings.component.ts b/src/app/item-page/orcid-page/orcid-sync-settings/orcid-sync-settings.component.ts
index 0bcbc295ac..422041d340 100644
--- a/src/app/item-page/orcid-page/orcid-sync-settings/orcid-sync-settings.component.ts
+++ b/src/app/item-page/orcid-page/orcid-sync-settings/orcid-sync-settings.component.ts
@@ -1,80 +1,97 @@
-import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
+import { Component, EventEmitter, Input, OnDestroy, OnInit, Output } from '@angular/core';
 import { UntypedFormGroup } from '@angular/forms';
 
 import { TranslateService } from '@ngx-translate/core';
 import { Operation } from 'fast-json-patch';
-import { of } from 'rxjs';
-import { switchMap } from 'rxjs/operators';
+import { BehaviorSubject, Observable, of } from 'rxjs';
+import { catchError, filter, map, switchMap, take, takeUntil } from 'rxjs/operators';
 
 import { RemoteData } from '../../../core/data/remote-data';
 import { ResearcherProfileDataService } from '../../../core/profile/researcher-profile-data.service';
 import { Item } from '../../../core/shared/item.model';
-import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
+import { getFirstCompletedRemoteData, getRemoteDataPayload } from '../../../core/shared/operators';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
 import { ResearcherProfile } from '../../../core/profile/model/researcher-profile.model';
+import { hasValue } from '../../../shared/empty.util';
+import { HttpErrorResponse } from '@angular/common/http';
+import { createFailedRemoteDataObject } from '../../../shared/remote-data.utils';
 
 @Component({
   selector: 'ds-orcid-sync-setting',
   templateUrl: './orcid-sync-settings.component.html',
   styleUrls: ['./orcid-sync-settings.component.scss']
 })
-export class OrcidSyncSettingsComponent implements OnInit {
-
-  /**
-   * The item for which showing the orcid settings
-   */
-  @Input() item: Item;
+export class OrcidSyncSettingsComponent implements OnInit, OnDestroy {
 
   /**
    * The prefix used for i18n keys
    */
   messagePrefix = 'person.page.orcid';
-
   /**
    * The current synchronization mode
    */
   currentSyncMode: string;
-
   /**
    * The current synchronization mode for publications
    */
   currentSyncPublications: string;
-
   /**
    * The current synchronization mode for funding
    */
   currentSyncFunding: string;
-
   /**
    * The synchronization options
    */
   syncModes: { value: string, label: string }[];
-
   /**
    * The synchronization options for publications
    */
   syncPublicationOptions: { value: string, label: string }[];
-
   /**
    * The synchronization options for funding
    */
   syncFundingOptions: { value: string, label: string }[];
-
   /**
    * The profile synchronization options
    */
   syncProfileOptions: { value: string, label: string, checked: boolean }[];
-
   /**
    * An event emitted when settings are updated
    */
   @Output() settingsUpdated: EventEmitter<void> = new EventEmitter<void>();
+  /**
+   * Emitter that triggers onDestroy lifecycle
+   * @private
+   */
+  readonly #destroy$ = new EventEmitter<void>();
+  /**
+   * {@link BehaviorSubject} that reflects {@link item} input changes
+   * @private
+   */
+  readonly #item$ = new BehaviorSubject<Item>(null);
+  /**
+   * {@link Observable} that contains {@link ResearcherProfile} linked to the {@link #item$}
+   * @private
+   */
+  #researcherProfile$: Observable<ResearcherProfile>;
 
   constructor(private researcherProfileService: ResearcherProfileDataService,
               private notificationsService: NotificationsService,
               private translateService: TranslateService) {
   }
 
+  /**
+   * The item for which showing the orcid settings
+   */
+  @Input()
+  set item(item: Item) {
+    this.#item$.next(item);
+  }
+
+  ngOnDestroy(): void {
+    this.#destroy$.next();
+  }
+
   /**
    * Init orcid settings form
    */
@@ -106,20 +123,21 @@ export class OrcidSyncSettingsComponent implements OnInit {
         };
       });
 
-    const syncProfilePreferences = this.item.allMetadataValues('dspace.orcid.sync-profile');
+    this.updateSyncProfileOptions(this.#item$.asObservable());
+    this.updateSyncPreferences(this.#item$.asObservable());
 
-    this.syncProfileOptions = ['BIOGRAPHICAL', 'IDENTIFIERS']
-      .map((value) => {
-        return {
-          label: this.messagePrefix + '.sync-profile.' + value.toLowerCase(),
-          value: value,
-          checked: syncProfilePreferences.includes(value)
-        };
-      });
-
-    this.currentSyncMode = this.getCurrentPreference('dspace.orcid.sync-mode', ['BATCH', 'MANUAL'], 'MANUAL');
-    this.currentSyncPublications = this.getCurrentPreference('dspace.orcid.sync-publications', ['DISABLED', 'ALL'], 'DISABLED');
-    this.currentSyncFunding = this.getCurrentPreference('dspace.orcid.sync-fundings', ['DISABLED', 'ALL'], 'DISABLED');
+    this.#researcherProfile$ =
+      this.#item$.pipe(
+        switchMap(item =>
+          this.researcherProfileService.findByRelatedItem(item)
+            .pipe(
+              getFirstCompletedRemoteData(),
+              catchError((err: HttpErrorResponse) => of(createFailedRemoteDataObject<ResearcherProfile>(err.message, err.status))),
+              getRemoteDataPayload(),
+            )
+        ),
+        takeUntil(this.#destroy$)
+      );
   }
 
   /**
@@ -144,37 +162,84 @@ export class OrcidSyncSettingsComponent implements OnInit {
       return;
     }
 
-    this.researcherProfileService.findByRelatedItem(this.item).pipe(
-      getFirstCompletedRemoteData(),
-      switchMap((profileRD: RemoteData<ResearcherProfile>) => {
-        if (profileRD.hasSucceeded) {
-          return this.researcherProfileService.patch(profileRD.payload, operations).pipe(
-            getFirstCompletedRemoteData(),
-          );
+    this.#researcherProfile$
+      .pipe(
+        switchMap(researcherProfile => this.researcherProfileService.patch(researcherProfile, operations)),
+        getFirstCompletedRemoteData(),
+        catchError((err: HttpErrorResponse) => of(createFailedRemoteDataObject(err.message, err.status))),
+        take(1)
+      )
+      .subscribe((remoteData: RemoteData<ResearcherProfile>) => {
+        if (remoteData.hasFailed) {
+          this.notificationsService.error(this.translateService.get(this.messagePrefix + '.synchronization-settings-update.error'));
         } else {
-          return of(profileRD);
+          this.notificationsService.success(this.translateService.get(this.messagePrefix + '.synchronization-settings-update.success'));
+          this.settingsUpdated.emit();
         }
-      }),
-    ).subscribe((remoteData: RemoteData<ResearcherProfile>) => {
-      if (remoteData.isSuccess) {
-        this.notificationsService.success(this.translateService.get(this.messagePrefix + '.synchronization-settings-update.success'));
-        this.settingsUpdated.emit();
-      } else {
-        this.notificationsService.error(this.translateService.get(this.messagePrefix + '.synchronization-settings-update.error'));
-      }
-    });
+      });
+  }
+
+  /**
+   *
+   * Handles subscriptions to populate sync preferences
+   *
+   * @param item observable that emits update on item changes
+   * @private
+   */
+  private updateSyncPreferences(item: Observable<Item>) {
+    item.pipe(
+      filter(hasValue),
+      map(i => this.getCurrentPreference(i, 'dspace.orcid.sync-mode', ['BATCH', 'MANUAL'], 'MANUAL')),
+      takeUntil(this.#destroy$)
+    ).subscribe(val => this.currentSyncMode = val);
+    item.pipe(
+      filter(hasValue),
+      map(i => this.getCurrentPreference(i, 'dspace.orcid.sync-publications', ['DISABLED', 'ALL'], 'DISABLED')),
+      takeUntil(this.#destroy$)
+    ).subscribe(val => this.currentSyncPublications = val);
+    item.pipe(
+      filter(hasValue),
+      map(i => this.getCurrentPreference(i, 'dspace.orcid.sync-fundings', ['DISABLED', 'ALL'], 'DISABLED')),
+      takeUntil(this.#destroy$)
+    ).subscribe(val => this.currentSyncFunding = val);
+  }
+
+  /**
+   * Handles subscription to populate the {@link syncProfileOptions} field
+   *
+   * @param item observable that emits update on item changes
+   * @private
+   */
+  private updateSyncProfileOptions(item: Observable<Item>) {
+    item.pipe(
+      filter(hasValue),
+      map(i => i.allMetadataValues('dspace.orcid.sync-profile')),
+      map(metadata =>
+        ['BIOGRAPHICAL', 'IDENTIFIERS']
+          .map((value) => {
+            return {
+              label: this.messagePrefix + '.sync-profile.' + value.toLowerCase(),
+              value: value,
+              checked: metadata.includes(value)
+            };
+          })
+      ),
+      takeUntil(this.#destroy$)
+    )
+      .subscribe(value => this.syncProfileOptions = value);
   }
 
   /**
    * Retrieve setting saved in the item's metadata
    *
+   * @param item The item from which retrieve settings
    * @param metadataField The metadata name that contains setting
    * @param allowedValues The allowed values
    * @param defaultValue  The default value
    * @private
    */
-  private getCurrentPreference(metadataField: string, allowedValues: string[], defaultValue: string): string {
-    const currentPreference = this.item.firstMetadataValue(metadataField);
+  private getCurrentPreference(item: Item, metadataField: string, allowedValues: string[], defaultValue: string): string {
+    const currentPreference = item.firstMetadataValue(metadataField);
     return (currentPreference && allowedValues.includes(currentPreference)) ? currentPreference : defaultValue;
   }
 
diff --git a/src/app/item-page/simple/field-components/file-section/file-section.component.spec.ts b/src/app/item-page/simple/field-components/file-section/file-section.component.spec.ts
index 8acf405b55..02579b7900 100644
--- a/src/app/item-page/simple/field-components/file-section/file-section.component.spec.ts
+++ b/src/app/item-page/simple/field-components/file-section/file-section.component.spec.ts
@@ -13,6 +13,7 @@ import { of as observableOf } from 'rxjs';
 import { MockBitstreamFormat1 } from '../../../../shared/mocks/item.mock';
 import { FileSizePipe } from '../../../../shared/utils/file-size-pipe';
 import { PageInfo } from '../../../../core/shared/page-info.model';
+import { XSRFService } from '../../../../core/xsrf/xsrf.service';
 import { MetadataFieldWrapperComponent } from '../../../../shared/metadata-field-wrapper/metadata-field-wrapper.component';
 import { createPaginatedList } from '../../../../shared/testing/utils.test';
 import { NotificationsService } from '../../../../shared/notifications/notifications.service';
@@ -66,6 +67,7 @@ describe('FileSectionComponent', () => {
       }), BrowserAnimationsModule],
       declarations: [FileSectionComponent, VarDirective, FileSizePipe, MetadataFieldWrapperComponent],
       providers: [
+        { provide: XSRFService, useValue: {} },
         { provide: BitstreamDataService, useValue: bitstreamDataService },
         { provide: NotificationsService, useValue: new NotificationsServiceStub() },
         { provide: APP_CONFIG, useValue: environment }
diff --git a/src/app/item-page/simple/field-components/specific-field/abstract/item-page-abstract-field.component.spec.ts b/src/app/item-page/simple/field-components/specific-field/abstract/item-page-abstract-field.component.spec.ts
index 4fb8889440..6bbee90945 100644
--- a/src/app/item-page/simple/field-components/specific-field/abstract/item-page-abstract-field.component.spec.ts
+++ b/src/app/item-page/simple/field-components/specific-field/abstract/item-page-abstract-field.component.spec.ts
@@ -6,6 +6,8 @@ import { TranslateLoaderMock } from '../../../../../shared/testing/translate-loa
 import { SharedModule } from '../../../../../shared/shared.module';
 import { APP_CONFIG } from '../../../../../../config/app-config.interface';
 import { environment } from '../../../../../../environments/environment';
+import { BrowseService } from '../../../../../core/browse/browse.service';
+import { BrowseServiceStub } from '../../../../../shared/testing/browse-service.stub';
 import { By } from '@angular/platform-browser';
 import { BrowseDefinitionDataService } from '../../../../../core/browse/browse-definition-data.service';
 import { BrowseDefinitionDataServiceStub } from '../../../../../shared/testing/browse-definition-data-service.stub';
@@ -27,7 +29,8 @@ describe('ItemPageAbstractFieldComponent', () => {
       ],
       providers: [
         { provide: APP_CONFIG, useValue: environment },
-        { provide: BrowseDefinitionDataService, useValue: BrowseDefinitionDataServiceStub }
+        { provide: BrowseDefinitionDataService, useValue: BrowseDefinitionDataServiceStub },
+        { provide: BrowseService, useValue: BrowseServiceStub },
       ],
       declarations: [ItemPageAbstractFieldComponent],
       schemas: [NO_ERRORS_SCHEMA]
diff --git a/src/app/item-page/simple/field-components/specific-field/author/item-page-author-field.component.spec.ts b/src/app/item-page/simple/field-components/specific-field/author/item-page-author-field.component.spec.ts
index 855a995142..d45261b85b 100644
--- a/src/app/item-page/simple/field-components/specific-field/author/item-page-author-field.component.spec.ts
+++ b/src/app/item-page/simple/field-components/specific-field/author/item-page-author-field.component.spec.ts
@@ -7,6 +7,8 @@ import { mockItemWithMetadataFieldsAndValue } from '../item-page-field.component
 import { ItemPageAuthorFieldComponent } from './item-page-author-field.component';
 import { APP_CONFIG } from '../../../../../../config/app-config.interface';
 import { environment } from '../../../../../../environments/environment';
+import { BrowseService } from '../../../../../core/browse/browse.service';
+import { BrowseServiceStub } from '../../../../../shared/testing/browse-service.stub';
 import { BrowseDefinitionDataService } from '../../../../../core/browse/browse-definition-data.service';
 import { BrowseDefinitionDataServiceStub } from '../../../../../shared/testing/browse-definition-data-service.stub';
 
@@ -27,7 +29,8 @@ describe('ItemPageAuthorFieldComponent', () => {
       })],
       providers: [
         { provide: APP_CONFIG, useValue: environment },
-        { provide: BrowseDefinitionDataService, useValue: BrowseDefinitionDataServiceStub }
+        { provide: BrowseDefinitionDataService, useValue: BrowseDefinitionDataServiceStub },
+        { provide: BrowseService, useValue: BrowseServiceStub },
       ],
       declarations: [ItemPageAuthorFieldComponent, MetadataValuesComponent],
       schemas: [NO_ERRORS_SCHEMA]
diff --git a/src/app/item-page/simple/field-components/specific-field/date/item-page-date-field.component.spec.ts b/src/app/item-page/simple/field-components/specific-field/date/item-page-date-field.component.spec.ts
index be124dab82..a88e9f74a7 100644
--- a/src/app/item-page/simple/field-components/specific-field/date/item-page-date-field.component.spec.ts
+++ b/src/app/item-page/simple/field-components/specific-field/date/item-page-date-field.component.spec.ts
@@ -7,6 +7,8 @@ import { mockItemWithMetadataFieldsAndValue } from '../item-page-field.component
 import { ItemPageDateFieldComponent } from './item-page-date-field.component';
 import { APP_CONFIG } from '../../../../../../config/app-config.interface';
 import { environment } from '../../../../../../environments/environment';
+import { BrowseService } from '../../../../../core/browse/browse.service';
+import { BrowseServiceStub } from '../../../../../shared/testing/browse-service.stub';
 import { BrowseDefinitionDataService } from '../../../../../core/browse/browse-definition-data.service';
 import { BrowseDefinitionDataServiceStub } from '../../../../../shared/testing/browse-definition-data-service.stub';
 
@@ -27,7 +29,8 @@ describe('ItemPageDateFieldComponent', () => {
       })],
       providers: [
         { provide: APP_CONFIG, useValue: environment },
-        { provide: BrowseDefinitionDataService, useValue: BrowseDefinitionDataServiceStub }
+        { provide: BrowseDefinitionDataService, useValue: BrowseDefinitionDataServiceStub },
+        { provide: BrowseService, useValue: BrowseServiceStub },
       ],
       declarations: [ItemPageDateFieldComponent, MetadataValuesComponent],
       schemas: [NO_ERRORS_SCHEMA]
diff --git a/src/app/item-page/simple/field-components/specific-field/generic/generic-item-page-field.component.spec.ts b/src/app/item-page/simple/field-components/specific-field/generic/generic-item-page-field.component.spec.ts
index fdf5ac1bb5..606f43ed9a 100644
--- a/src/app/item-page/simple/field-components/specific-field/generic/generic-item-page-field.component.spec.ts
+++ b/src/app/item-page/simple/field-components/specific-field/generic/generic-item-page-field.component.spec.ts
@@ -7,6 +7,8 @@ import { mockItemWithMetadataFieldsAndValue } from '../item-page-field.component
 import { GenericItemPageFieldComponent } from './generic-item-page-field.component';
 import { APP_CONFIG } from '../../../../../../config/app-config.interface';
 import { environment } from '../../../../../../environments/environment';
+import { BrowseService } from '../../../../../core/browse/browse.service';
+import { BrowseServiceStub } from '../../../../../shared/testing/browse-service.stub';
 import { BrowseDefinitionDataService } from '../../../../../core/browse/browse-definition-data.service';
 import { BrowseDefinitionDataServiceStub } from '../../../../../shared/testing/browse-definition-data-service.stub';
 
@@ -29,7 +31,8 @@ describe('GenericItemPageFieldComponent', () => {
       })],
       providers: [
         { provide: APP_CONFIG, useValue: environment },
-        { provide: BrowseDefinitionDataService, useValue: BrowseDefinitionDataServiceStub }
+        { provide: BrowseDefinitionDataService, useValue: BrowseDefinitionDataServiceStub },
+        { provide: BrowseService, useValue: BrowseServiceStub },
       ],
       declarations: [GenericItemPageFieldComponent, MetadataValuesComponent],
       schemas: [NO_ERRORS_SCHEMA]
diff --git a/src/app/item-page/simple/field-components/specific-field/item-page-field.component.spec.ts b/src/app/item-page/simple/field-components/specific-field/item-page-field.component.spec.ts
index 15b7a9df21..f0bddbc695 100644
--- a/src/app/item-page/simple/field-components/specific-field/item-page-field.component.spec.ts
+++ b/src/app/item-page/simple/field-components/specific-field/item-page-field.component.spec.ts
@@ -13,6 +13,8 @@ import { MarkdownPipe } from '../../../../shared/utils/markdown.pipe';
 import { SharedModule } from '../../../../shared/shared.module';
 import { APP_CONFIG } from '../../../../../config/app-config.interface';
 import { By } from '@angular/platform-browser';
+import { BrowseService } from '../../../../core/browse/browse.service';
+import { BrowseServiceStub } from '../../../../shared/testing/browse-service.stub';
 import { BrowseDefinitionDataService } from '../../../../core/browse/browse-definition-data.service';
 import { BrowseDefinitionDataServiceStub } from '../../../../shared/testing/browse-definition-data-service.stub';
 import { RouterTestingModule } from '@angular/router/testing';
@@ -51,7 +53,8 @@ describe('ItemPageFieldComponent', () => {
       ],
       providers: [
         { provide: APP_CONFIG, useValue: appConfig },
-        { provide: BrowseDefinitionDataService, useValue: BrowseDefinitionDataServiceStub }
+        { provide: BrowseDefinitionDataService, useValue: BrowseDefinitionDataServiceStub },
+        { provide: BrowseService, useValue: BrowseServiceStub },
       ],
       declarations: [ItemPageFieldComponent, MetadataValuesComponent],
       schemas: [NO_ERRORS_SCHEMA]
diff --git a/src/app/item-page/simple/field-components/specific-field/item-page-field.component.ts b/src/app/item-page/simple/field-components/specific-field/item-page-field.component.ts
index fc526dabcc..aa1e78f229 100644
--- a/src/app/item-page/simple/field-components/specific-field/item-page-field.component.ts
+++ b/src/app/item-page/simple/field-components/specific-field/item-page-field.component.ts
@@ -1,10 +1,20 @@
 import { Component, Input } from '@angular/core';
 import { Item } from '../../../../core/shared/item.model';
-import { map } from 'rxjs/operators';
+import intersectionWith from 'lodash/intersectionWith';
+import {
+  filter,
+  mergeAll,
+  take,
+} from 'rxjs/operators';
 import { Observable } from 'rxjs';
+import { BrowseService } from '../../../../core/browse/browse.service';
 import { BrowseDefinition } from '../../../../core/shared/browse-definition.model';
 import { BrowseDefinitionDataService } from '../../../../core/browse/browse-definition-data.service';
-import { getRemoteDataPayload } from '../../../../core/shared/operators';
+import {
+  getFirstCompletedRemoteData,
+  getPaginatedListPayload,
+  getRemoteDataPayload,
+} from '../../../../core/shared/operators';
 
 /**
  * This component can be used to represent metadata on a simple item page.
@@ -17,7 +27,8 @@ import { getRemoteDataPayload } from '../../../../core/shared/operators';
 })
 export class ItemPageFieldComponent {
 
-    constructor(protected browseDefinitionDataService: BrowseDefinitionDataService) {
+    constructor(protected browseDefinitionDataService: BrowseDefinitionDataService,
+                protected browseService: BrowseService) {
     }
 
     /**
@@ -56,9 +67,26 @@ export class ItemPageFieldComponent {
      * link in dspace.cfg (webui.browse.link.<n>)
      */
     get browseDefinition(): Observable<BrowseDefinition> {
-      return this.browseDefinitionDataService.findByFields(this.fields).pipe(
+      return this.browseService.getBrowseDefinitions().pipe(
+        getFirstCompletedRemoteData(),
         getRemoteDataPayload(),
-        map((def) => def)
+        getPaginatedListPayload(),
+        mergeAll(),
+        filter((def: BrowseDefinition) =>
+          intersectionWith(def.metadataKeys, this.fields, ItemPageFieldComponent.fieldMatch).length > 0,
+        ),
+        take(1),
       );
     }
+
+    /**
+     * Returns true iff the spec and field match.
+     * @param spec  Specification of a metadata field name: either a metadata field, or a prefix ending in ".*".
+     * @param field A metadata field name.
+     * @private
+     */
+    private static fieldMatch(spec: string, field: string): boolean {
+      return field === spec
+        || (spec.endsWith('.*') && field.substring(0, spec.length - 1) === spec.substring(0, spec.length - 1));
+    }
 }
diff --git a/src/app/item-page/simple/field-components/specific-field/title/item-page-title-field.component.html b/src/app/item-page/simple/field-components/specific-field/title/item-page-title-field.component.html
index 15960bdc9d..85975d4533 100644
--- a/src/app/item-page/simple/field-components/specific-field/title/item-page-title-field.component.html
+++ b/src/app/item-page/simple/field-components/specific-field/title/item-page-title-field.component.html
@@ -1,6 +1,6 @@
-<h2 class="item-page-title-field">
+<h1 class="item-page-title-field">
   <div *ngIf="item.firstMetadataValue('dspace.entity.type') as type" class="d-inline">
     {{ type.toLowerCase() + '.page.titleprefix' | translate }}
   </div>
   <span class="dont-break-out">{{ dsoNameService.getName(item) }}</span>
-</h2>
+</h1>
diff --git a/src/app/item-page/simple/field-components/specific-field/uri/item-page-uri-field.component.spec.ts b/src/app/item-page/simple/field-components/specific-field/uri/item-page-uri-field.component.spec.ts
index cc55b76e3e..7b969737db 100644
--- a/src/app/item-page/simple/field-components/specific-field/uri/item-page-uri-field.component.spec.ts
+++ b/src/app/item-page/simple/field-components/specific-field/uri/item-page-uri-field.component.spec.ts
@@ -7,6 +7,8 @@ import { ItemPageUriFieldComponent } from './item-page-uri-field.component';
 import { MetadataUriValuesComponent } from '../../../../field-components/metadata-uri-values/metadata-uri-values.component';
 import { environment } from '../../../../../../environments/environment';
 import { APP_CONFIG } from '../../../../../../config/app-config.interface';
+import { BrowseService } from '../../../../../core/browse/browse.service';
+import { BrowseServiceStub } from '../../../../../shared/testing/browse-service.stub';
 import { BrowseDefinitionDataService } from '../../../../../core/browse/browse-definition-data.service';
 import { BrowseDefinitionDataServiceStub } from '../../../../../shared/testing/browse-definition-data-service.stub';
 
@@ -28,7 +30,8 @@ describe('ItemPageUriFieldComponent', () => {
       })],
       providers: [
         { provide: APP_CONFIG, useValue: environment },
-        { provide: BrowseDefinitionDataService, useValue: BrowseDefinitionDataServiceStub }
+        { provide: BrowseDefinitionDataService, useValue: BrowseDefinitionDataServiceStub },
+        { provide: BrowseService, useValue: BrowseServiceStub },
       ],
       declarations: [ItemPageUriFieldComponent, MetadataUriValuesComponent],
       schemas: [NO_ERRORS_SCHEMA]
diff --git a/src/app/item-page/simple/item-page.component.html b/src/app/item-page/simple/item-page.component.html
index cc9983bb35..5e2dc63ee9 100644
--- a/src/app/item-page/simple/item-page.component.html
+++ b/src/app/item-page/simple/item-page.component.html
@@ -3,7 +3,6 @@
     <div *ngIf="itemRD?.payload as item">
       <ds-themed-item-alerts [item]="item"></ds-themed-item-alerts>
       <ds-item-versions-notice [item]="item"></ds-item-versions-notice>
-      <ds-view-tracker [object]="item"></ds-view-tracker>
       <ds-listable-object-component-loader *ngIf="!item.isWithdrawn || (isAdmin$|async)" [object]="item" [viewMode]="viewMode"></ds-listable-object-component-loader>
       <ds-item-versions class="mt-2" [item]="item" [displayActions]="false"></ds-item-versions>
     </div>
diff --git a/src/app/item-page/simple/item-page.component.spec.ts b/src/app/item-page/simple/item-page.component.spec.ts
index b3202108f4..b1bc61a8f7 100644
--- a/src/app/item-page/simple/item-page.component.spec.ts
+++ b/src/app/item-page/simple/item-page.component.spec.ts
@@ -19,7 +19,6 @@ import {
   createSuccessfulRemoteDataObject,
   createSuccessfulRemoteDataObject$
 } from '../../shared/remote-data.utils';
-import { AuthService } from '../../core/auth/auth.service';
 import { createPaginatedList } from '../../shared/testing/utils.test';
 import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
 import { ServerResponseService } from '../../core/services/server-response.service';
@@ -57,7 +56,6 @@ const mockSignpostingLinks: SignpostingLink[] = [mocklink, mocklink2];
 describe('ItemPageComponent', () => {
   let comp: ItemPageComponent;
   let fixture: ComponentFixture<ItemPageComponent>;
-  let authService: AuthService;
   let authorizationDataService: AuthorizationDataService;
   let serverResponseService: jasmine.SpyObj<ServerResponseService>;
   let signpostingDataService: jasmine.SpyObj<SignpostingDataService>;
@@ -74,10 +72,6 @@ describe('ItemPageComponent', () => {
   });
 
   beforeEach(waitForAsync(() => {
-    authService = jasmine.createSpyObj('authService', {
-      isAuthenticated: observableOf(true),
-      setRedirectUrl: {}
-    });
     authorizationDataService = jasmine.createSpyObj('authorizationDataService', {
       isAuthorized: observableOf(false),
     });
@@ -107,7 +101,6 @@ describe('ItemPageComponent', () => {
         { provide: ItemDataService, useValue: {} },
         { provide: MetadataService, useValue: mockMetadataService },
         { provide: Router, useValue: {} },
-        { provide: AuthService, useValue: authService },
         { provide: AuthorizationDataService, useValue: authorizationDataService },
         { provide: ServerResponseService, useValue: serverResponseService },
         { provide: SignpostingDataService, useValue: signpostingDataService },
diff --git a/src/app/item-page/simple/item-page.component.ts b/src/app/item-page/simple/item-page.component.ts
index b9be6bebfb..3fd97d3261 100644
--- a/src/app/item-page/simple/item-page.component.ts
+++ b/src/app/item-page/simple/item-page.component.ts
@@ -11,9 +11,7 @@ import { Item } from '../../core/shared/item.model';
 import { fadeInOut } from '../../shared/animations/fade';
 import { getAllSucceededRemoteDataPayload } from '../../core/shared/operators';
 import { ViewMode } from '../../core/shared/view-mode.model';
-import { AuthService } from '../../core/auth/auth.service';
 import { getItemPageRoute } from '../item-page-routing-paths';
-import { redirectOn4xx } from '../../core/shared/authorized.operators';
 import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
 import { FeatureID } from '../../core/data/feature-authorization/feature-id';
 import { ServerResponseService } from '../../core/services/server-response.service';
@@ -72,7 +70,6 @@ export class ItemPageComponent implements OnInit, OnDestroy {
     protected route: ActivatedRoute,
     protected router: Router,
     protected items: ItemDataService,
-    protected authService: AuthService,
     protected authorizationService: AuthorizationDataService,
     protected responseService: ServerResponseService,
     protected signpostingDataService: SignpostingDataService,
@@ -88,7 +85,6 @@ export class ItemPageComponent implements OnInit, OnDestroy {
   ngOnInit(): void {
     this.itemRD$ = this.route.data.pipe(
       map((data) => data.dso as RemoteData<Item>),
-      redirectOn4xx(this.router, this.authService)
     );
     this.itemPageRoute$ = this.itemRD$.pipe(
       getAllSucceededRemoteDataPayload(),
diff --git a/src/app/item-page/simple/item-types/publication/publication.component.html b/src/app/item-page/simple/item-types/publication/publication.component.html
index 3749f63964..c886f5512d 100644
--- a/src/app/item-page/simple/item-types/publication/publication.component.html
+++ b/src/app/item-page/simple/item-types/publication/publication.component.html
@@ -85,7 +85,7 @@
     </ds-item-page-uri-field>
     <ds-item-page-collections [item]="object"></ds-item-page-collections>
     <div>
-      <a class="btn btn-outline-primary" role="button" [routerLink]="[itemPageRoute + '/full']">
+      <a class="btn btn-outline-primary" role="button" [routerLink]="[itemPageRoute + '/full']" role="button" tabindex="0">
         <i class="fas fa-info-circle"></i> {{"item.page.link.full" | translate}}
       </a>
     </div>
diff --git a/src/app/item-page/simple/item-types/publication/publication.component.spec.ts b/src/app/item-page/simple/item-types/publication/publication.component.spec.ts
index 211ec102bc..98db2da7f0 100644
--- a/src/app/item-page/simple/item-types/publication/publication.component.spec.ts
+++ b/src/app/item-page/simple/item-types/publication/publication.component.spec.ts
@@ -40,6 +40,8 @@ import { BrowseDefinitionDataService } from '../../../../core/browse/browse-defi
 import {
   BrowseDefinitionDataServiceStub
 } from '../../../../shared/testing/browse-definition-data-service.stub';
+import { BrowseService } from '../../../../core/browse/browse.service';
+import { BrowseServiceStub } from '../../../../shared/testing/browse-service.stub';
 
 const noMetadata = new MetadataMap();
 
@@ -93,6 +95,7 @@ describe('PublicationComponent', () => {
         { provide: SearchService, useValue: {} },
         { provide: RouteService, useValue: mockRouteService },
         { provide: BrowseDefinitionDataService, useValue: BrowseDefinitionDataServiceStub },
+        { provide: BrowseService, useValue: BrowseServiceStub },
       ],
 
       schemas: [NO_ERRORS_SCHEMA]
diff --git a/src/app/item-page/simple/item-types/shared/item-relationships-utils.ts b/src/app/item-page/simple/item-types/shared/item-relationships-utils.ts
index b4c3da2cdc..d9f3a30369 100644
--- a/src/app/item-page/simple/item-types/shared/item-relationships-utils.ts
+++ b/src/app/item-page/simple/item-types/shared/item-relationships-utils.ts
@@ -1,12 +1,11 @@
-import { combineLatest as observableCombineLatest, Observable, zip as observableZip } from 'rxjs';
+import { combineLatest as observableCombineLatest, Observable, of as observableOf, zip as observableZip } from 'rxjs';
 import { distinctUntilChanged, map, mergeMap, switchMap } from 'rxjs/operators';
 import { PaginatedList } from '../../../../core/data/paginated-list.model';
 import { RemoteData } from '../../../../core/data/remote-data';
 import { Relationship } from '../../../../core/shared/item-relationships/relationship.model';
 import { Item } from '../../../../core/shared/item.model';
 import {
-  getFirstSucceededRemoteDataPayload,
-  getFirstSucceededRemoteData
+  getFirstCompletedRemoteData
 } from '../../../../core/shared/operators';
 import { hasValue } from '../../../../shared/empty.util';
 import { InjectionToken } from '@angular/core';
@@ -46,17 +45,19 @@ export const compareArraysUsingIds = <T extends { id: string }>() =>
 /**
  * Operator for turning a list of relationships into a list of the relevant items
  * @param {string} thisId       The item's id of which the relations belong to
- * @returns {(source: Observable<Relationship[]>) => Observable<Item[]>}
  */
-export const relationsToItems = (thisId: string) =>
+export const relationsToItems = (thisId: string): (source: Observable<Relationship[]>) => Observable<Item[]> =>
   (source: Observable<Relationship[]>): Observable<Item[]> =>
     source.pipe(
-      mergeMap((rels: Relationship[]) =>
-        observableZip(
-          ...rels.map((rel: Relationship) => observableCombineLatest(rel.leftItem, rel.rightItem))
-        )
-      ),
-      map((arr) =>
+      mergeMap((relationships: Relationship[]) => {
+        if (relationships.length === 0) {
+          return observableOf([]);
+        }
+        return observableZip(
+          ...relationships.map((rel: Relationship) => observableCombineLatest([rel.leftItem, rel.rightItem])),
+        );
+      }),
+      map((arr: [RemoteData<Item>, RemoteData<Item>][]) =>
         arr
           .filter(([leftItem, rightItem]) => leftItem.hasSucceeded && rightItem.hasSucceeded)
           .map(([leftItem, rightItem]) => {
@@ -75,26 +76,44 @@ export const relationsToItems = (thisId: string) =>
  * Operator for turning a paginated list of relationships into a paginated list of the relevant items
  * The result is wrapped in the original RemoteData and PaginatedList
  * @param {string} thisId       The item's id of which the relations belong to
- * @returns {(source: Observable<Relationship[]>) => Observable<Item[]>}
  */
-export const paginatedRelationsToItems = (thisId: string) =>
+export const paginatedRelationsToItems = (thisId: string): (source: Observable<RemoteData<PaginatedList<Relationship>>>) => Observable<RemoteData<PaginatedList<Item>>> =>
   (source: Observable<RemoteData<PaginatedList<Relationship>>>): Observable<RemoteData<PaginatedList<Item>>> =>
     source.pipe(
-      getFirstSucceededRemoteData(),
+      getFirstCompletedRemoteData(),
       switchMap((relationshipsRD: RemoteData<PaginatedList<Relationship>>) => {
         return observableCombineLatest(
           relationshipsRD.payload.page.map((rel: Relationship) =>
             observableCombineLatest([
-              rel.leftItem.pipe(getFirstSucceededRemoteDataPayload()),
-              rel.rightItem.pipe(getFirstSucceededRemoteDataPayload())]
+              rel.leftItem.pipe(
+                getFirstCompletedRemoteData(),
+                map((rd: RemoteData<Item>) => {
+                  if (rd.hasSucceeded) {
+                    return rd.payload;
+                  } else {
+                    return null;
+                  }
+                })
+              ),
+              rel.rightItem.pipe(
+                getFirstCompletedRemoteData(),
+                map((rd: RemoteData<Item>) => {
+                  if (rd.hasSucceeded) {
+                    return rd.payload;
+                  } else {
+                    return null;
+                  }
+                })
+              ),
+              ]
             )
-          )).pipe(
+          )
+        ).pipe(
           map((arr) =>
-            arr
-              .map(([leftItem, rightItem]) => {
-                if (leftItem.id === thisId) {
+            arr.map(([leftItem, rightItem]) => {
+                if (hasValue(leftItem) && leftItem.id === thisId) {
                   return rightItem;
-                } else if (rightItem.id === thisId) {
+                } else if (hasValue(rightItem) && rightItem.id === thisId) {
                   return leftItem;
                 }
               })
diff --git a/src/app/item-page/simple/item-types/shared/item.component.spec.ts b/src/app/item-page/simple/item-types/shared/item.component.spec.ts
index 5bf08fc004..558cd6d379 100644
--- a/src/app/item-page/simple/item-types/shared/item.component.spec.ts
+++ b/src/app/item-page/simple/item-types/shared/item.component.spec.ts
@@ -44,6 +44,8 @@ import { BrowseDefinitionDataService } from '../../../../core/browse/browse-defi
 import {
   BrowseDefinitionDataServiceStub
 } from '../../../../shared/testing/browse-definition-data-service.stub';
+import { BrowseService } from '../../../../core/browse/browse.service';
+import { BrowseServiceStub } from '../../../../shared/testing/browse-service.stub';
 
 import { buildPaginatedList } from '../../../../core/data/paginated-list.model';
 import { PageInfo } from '../../../../core/shared/page-info.model';
@@ -133,6 +135,7 @@ export function getItemPageFieldsTest(mockItem: Item, component) {
           { provide: AuthorizationDataService, useValue: authorizationService },
           { provide: ResearcherProfileDataService, useValue: {} },
           { provide: BrowseDefinitionDataService, useValue: BrowseDefinitionDataServiceStub },
+          { provide: BrowseService, useValue: BrowseServiceStub },
         ],
 
         schemas: [NO_ERRORS_SCHEMA]
diff --git a/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.html b/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.html
index 904b7e039c..e446fffbdb 100644
--- a/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.html
+++ b/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.html
@@ -71,7 +71,7 @@
     </ds-item-page-uri-field>
     <ds-item-page-collections [item]="object"></ds-item-page-collections>
     <div>
-      <a class="btn btn-outline-primary" [routerLink]="[itemPageRoute + '/full']" role="button">
+      <a class="btn btn-outline-primary" [routerLink]="[itemPageRoute + '/full']" role="button" tabindex="0">
         <i class="fas fa-info-circle"></i> {{"item.page.link.full" | translate}}
       </a>
     </div>
diff --git a/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.spec.ts b/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.spec.ts
index 4b7da40abe..3d72ec2360 100644
--- a/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.spec.ts
+++ b/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.spec.ts
@@ -41,6 +41,8 @@ import { BrowseDefinitionDataService } from '../../../../core/browse/browse-defi
 import {
   BrowseDefinitionDataServiceStub
 } from '../../../../shared/testing/browse-definition-data-service.stub';
+import { BrowseService } from '../../../../core/browse/browse.service';
+import { BrowseServiceStub } from '../../../../shared/testing/browse-service.stub';
 
 const noMetadata = new MetadataMap();
 
@@ -96,6 +98,7 @@ describe('UntypedItemComponent', () => {
         { provide: ItemVersionsSharedService, useValue: {} },
         { provide: RouteService, useValue: mockRouteService },
         { provide: BrowseDefinitionDataService, useValue: BrowseDefinitionDataServiceStub },
+        { provide: BrowseService, useValue: BrowseServiceStub },
       ],
       schemas: [NO_ERRORS_SCHEMA]
     }).overrideComponent(UntypedItemComponent, {
diff --git a/src/app/item-page/simple/metadata-representation-list/metadata-representation-list.component.ts b/src/app/item-page/simple/metadata-representation-list/metadata-representation-list.component.ts
index 59a5377f77..30ec064e68 100644
--- a/src/app/item-page/simple/metadata-representation-list/metadata-representation-list.component.ts
+++ b/src/app/item-page/simple/metadata-representation-list/metadata-representation-list.component.ts
@@ -9,7 +9,7 @@ import { MetadataValue } from '../../../core/shared/metadata.models';
 import { Item } from '../../../core/shared/item.model';
 import { AbstractIncrementalListComponent } from '../abstract-incremental-list/abstract-incremental-list.component';
 import { map } from 'rxjs/operators';
-import { getRemoteDataPayload } from '../../../core/shared/operators';
+import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
 import {
   MetadatumRepresentation
 } from '../../../core/shared/metadata-representation/metadatum/metadatum-representation.model';
@@ -96,8 +96,8 @@ export class MetadataRepresentationListComponent extends AbstractIncrementalList
               searchKeyArray = searchKeyArray.concat(BrowseService.toSearchKeyArray(field));
             });
             return this.browseDefinitionDataService.findByFields(this.metadataFields).pipe(
-              getRemoteDataPayload(),
-              map((def) => Object.assign(new MetadatumRepresentation(this.itemType, def), metadatum))
+              getFirstCompletedRemoteData(),
+              map((def) => Object.assign(new MetadatumRepresentation(this.itemType, def.payload), metadatum))
             );
           }
         }),
diff --git a/src/app/item-page/simple/related-entities/related-entities-search/related-entities-search.component.html b/src/app/item-page/simple/related-entities/related-entities-search/related-entities-search.component.html
index 2a08efeb2c..36340bebfa 100644
--- a/src/app/item-page/simple/related-entities/related-entities-search/related-entities-search.component.html
+++ b/src/app/item-page/simple/related-entities/related-entities-search/related-entities-search.component.html
@@ -2,5 +2,6 @@
   [fixedFilterQuery]="fixedFilter"
   [configuration]="configuration"
   [searchEnabled]="searchEnabled"
-  [sideBarWidth]="sideBarWidth">
+  [sideBarWidth]="sideBarWidth"
+  [showCsvExport]="true">
 </ds-configuration-search-page>
diff --git a/src/app/item-page/simple/related-entities/tabbed-related-entities-search/tabbed-related-entities-search.component.html b/src/app/item-page/simple/related-entities/tabbed-related-entities-search/tabbed-related-entities-search.component.html
index 223d4a6ed0..3ce96b2ce3 100644
--- a/src/app/item-page/simple/related-entities/tabbed-related-entities-search/tabbed-related-entities-search.component.html
+++ b/src/app/item-page/simple/related-entities/tabbed-related-entities-search/tabbed-related-entities-search.component.html
@@ -1,7 +1,9 @@
 <ng-container *ngIf="relationTypes.length > 1">
-  <ul ngbNav #tabs="ngbNav" [destroyOnHide]="true" [activeId]="activeTab$ | async" (navChange)="onTabChange($event)" class="nav-tabs">
-    <li *ngFor="let relationType of relationTypes" [ngbNavItem]="relationType.filter">
-      <a ngbNavLink>{{'item.page.relationships.' + relationType.label | translate}}</a>
+  <ul ngbNav #tabs="ngbNav" [destroyOnHide]="true" [activeId]="activeTab$ | async" (navChange)="onTabChange($event)" class="nav-tabs" role="tablist">
+    <li *ngFor="let relationType of relationTypes" [ngbNavItem]="relationType.filter" role="presentation">
+      <a ngbNavLink role="tab">
+        {{'item.page.relationships.' + relationType.label | translate}}
+      </a>
       <ng-template ngbNavContent>
         <div class="mt-4">
           <ds-related-entities-search [item]="item"
diff --git a/src/app/item-page/simple/related-items/related-items.component.html b/src/app/item-page/simple/related-items/related-items.component.html
index bee1f345fd..b15c93178c 100644
--- a/src/app/item-page/simple/related-items/related-items.component.html
+++ b/src/app/item-page/simple/related-items/related-items.component.html
@@ -7,12 +7,12 @@
       <ds-themed-loading *ngIf="(i + 1) === objects.length && (itemsRD || i > 0) && !(itemsRD?.hasSucceeded && itemsRD?.payload && itemsRD?.payload?.page?.length > 0)" message="{{'loading.default' | translate}}"></ds-themed-loading>
       <div class="d-inline-block w-100 mt-2" *ngIf="(i + 1) === objects.length && itemsRD?.payload?.page?.length > 0">
         <div *ngIf="itemsRD?.payload?.totalPages > objects.length" class="float-left" id="view-more">
-          <button class="btn btn-link btn-link-inline" (click)="increase()">{{'item.page.related-items.view-more' |
-            translate:{ amount: (itemsRD?.payload?.totalElements - (incrementBy * objects.length) < incrementBy) ? itemsRD?.payload?.totalElements - (incrementBy * objects.length) : incrementBy } }}</button>
+          <button class="btn btn-link btn-link-inline text-capitalize" (click)="increase()">{{'item.page.related-items.view-more' |
+            translate:{ amount: (itemsRD?.payload?.totalElements - (incrementBy * objects.length) < incrementBy) ? itemsRD?.payload?.totalElements - (incrementBy * objects.length) : incrementBy } }} {{label}}</button>
         </div>
         <div *ngIf="objects.length > 1" class="float-right" id="view-less">
-          <button class="btn btn-link btn-link-inline" (click)="decrease()">{{'item.page.related-items.view-less' |
-            translate:{ amount: itemsRD?.payload?.page?.length } }}</button>
+          <button class="btn btn-link btn-link-inline text-capitalize" (click)="decrease()">{{'item.page.related-items.view-less' |
+            translate:{ amount: itemsRD?.payload?.page?.length } }} {{label}}</button>
         </div>
       </div>
     </ng-container>
diff --git a/src/app/item-page/versions/item-versions.component.html b/src/app/item-page/versions/item-versions.component.html
index 176c1f0cde..09e8f21e72 100644
--- a/src/app/item-page/versions/item-versions.component.html
+++ b/src/app/item-page/versions/item-versions.component.html
@@ -1,145 +1,149 @@
-<div *ngVar="(versionsRD$ | async)?.payload as versions">
-  <div *ngVar="(versionRD$ | async)?.payload as itemVersion">
-    <div class="mb-2" *ngIf="versions?.page?.length > 0 || displayWhenEmpty">
-      <h2 *ngIf="displayTitle">{{"item.version.history.head" | translate}}</h2>
-      <ds-alert [type]="AlertTypeEnum.Info" *ngIf="itemVersion">
-        {{ "item.version.history.selected.alert" | translate : {version: itemVersion.version} }}
-      </ds-alert>
-      <ds-pagination *ngIf="versions?.page?.length > 0"
-                     (paginationChange)="onPageChange()"
-                     [hideGear]="true"
-                     [hidePagerWhenSinglePage]="true"
-                     [paginationOptions]="options"
-                     [pageInfoState]="versions"
-                     [collectionSize]="versions?.totalElements"
-                     [retainScrollPosition]="true">
-        <table class="table table-striped table-bordered align-middle my-2">
-          <thead>
-          <tr>
-            <th scope="col">{{"item.version.history.table.version" | translate}}</th>
-            <th scope="col" *ngIf="(showSubmitter() | async)">{{"item.version.history.table.editor" | translate}}</th>
-            <th scope="col">{{"item.version.history.table.date" | translate}}</th>
-            <th scope="col">{{"item.version.history.table.summary" | translate}}</th>
-          </tr>
-          </thead>
-          <tbody>
-          <tr *ngFor="let version of versions?.page" [id]="'version-row-' + version.id">
-            <td class="version-row-element-version">
-              <!-- Get the ID of the workspace/workflow item (`undefined` if they don't exist).
-              Conditionals inside *ngVar are needed in order to avoid useless calls. -->
-              <ng-container *ngVar="((hasDraftVersion$ | async) ? getWorkspaceId(version?.item) : undefined) as workspaceId$">
-                <ng-container *ngVar=" ((workspaceId$ | async) ? undefined : getWorkflowId(version?.item)) as workflowId$">
+<div *ngIf="(versionsDTO$ | async) as versionsDTO; else noItemVersion" class="mb-2">
+  <div *ngIf="(versionRD$ | async)?.payload as itemVersion">
+    <h2 *ngIf="displayTitle" class="h4">{{ "item.version.history.head" | translate }}</h2>
+    <ds-alert [type]="AlertTypeEnum.Info">
+      {{ "item.version.history.selected.alert" | translate : { version: itemVersion.version } }}
+    </ds-alert>
+    <ds-pagination *ngIf="versionsDTO.versionDTOs.length > 0"
+                   (paginationChange)="onPageChange()"
+                   [hideGear]="true"
+                   [hidePagerWhenSinglePage]="true"
+                   [paginationOptions]="options"
+                   [collectionSize]="versionsDTO.totalElements"
+                   [retainScrollPosition]="true">
+      <table class="table table-striped table-bordered align-middle my-2">
+        <thead>
+        <tr>
+          <th scope="col">{{ "item.version.history.table.version" | translate }}</th>
+          <th scope="col" *ngIf="(showSubmitter() | async)">{{ "item.version.history.table.editor" | translate }}</th>
+          <th scope="col">{{ "item.version.history.table.date" | translate }}</th>
+          <th scope="col">{{ "item.version.history.table.summary" | translate }}</th>
+        </tr>
+        </thead>
+        <tbody>
+        <tr *ngFor="let versionDTO of versionsDTO.versionDTOs" [id]="'version-row-' + versionDTO.version.id">
+          <td class="version-row-element-version">
+            <!-- Get the ID of the workspace/workflow item (`undefined` if they don't exist).
+            Conditionals inside *ngVar are needed in order to avoid useless calls. -->
+            <ng-container
+              *ngVar="((hasDraftVersion$ | async) ? getWorkspaceId(versionDTO.version.item) : undefined) as workspaceId$">
+              <ng-container
+                *ngVar=" ((workspaceId$ | async) ? undefined : getWorkflowId(versionDTO.version.item)) as workflowId$">
 
-                  <div class="left-column">
+                <div class="left-column">
 
-                    <span *ngIf="(workspaceId$ | async) || (workflowId$ | async); then versionNumberWithoutLink else versionNumberWithLink"></span>
-                    <ng-template #versionNumberWithLink>
-                      <a [routerLink]="getVersionRoute(version.id)">{{version.version}}</a>
-                    </ng-template>
-                    <ng-template #versionNumberWithoutLink>
-                      {{version.version}}
-                    </ng-template>
-                    <span *ngIf="version?.id === itemVersion?.id">*</span>
+                  <span
+                    *ngIf="(workspaceId$ | async) || (workflowId$ | async); then versionNumberWithoutLink else versionNumberWithLink"></span>
+                  <ng-template #versionNumberWithLink>
+                    <a [routerLink]="getVersionRoute(versionDTO.version.id)">{{ versionDTO.version.version }}</a>
+                  </ng-template>
+                  <ng-template #versionNumberWithoutLink>
+                    {{ versionDTO.version.version }}
+                  </ng-template>
+                  <span *ngIf="versionDTO.version.id === itemVersion?.id">*</span>
 
-                    <span *ngIf="workspaceId$ | async" class="text-light badge badge-primary ml-3">
+                  <span *ngIf="workspaceId$ | async" class="text-light badge badge-primary ml-3">
                       {{ "item.version.history.table.workspaceItem" | translate }}
                     </span>
 
-                    <span *ngIf="workflowId$ | async" class="text-light badge badge-info ml-3">
+                  <span *ngIf="workflowId$ | async" class="text-light badge badge-info ml-3">
                       {{ "item.version.history.table.workflowItem" | translate }}
                     </span>
 
-                  </div>
+                </div>
 
-                  <div class="right-column">
+                <div class="right-column">
 
-                    <div class="btn-group edit-field space-children-mr" *ngIf="displayActions">
-                      <!--EDIT WORKSPACE ITEM-->
-                      <button class="btn btn-outline-primary btn-sm version-row-element-edit"
-                              *ngIf="workspaceId$ | async"
-                              (click)="editWorkspaceItem(workspaceId$)"
-                              title="{{'item.version.history.table.action.editWorkspaceItem' | translate }}">
-                        <i class="fas fa-pencil-alt fa-fw"></i>
+                  <div class="btn-group edit-field space-children-mr" *ngIf="displayActions">
+                    <!--EDIT WORKSPACE ITEM-->
+                    <button class="btn btn-outline-primary btn-sm version-row-element-edit"
+                            *ngIf="workspaceId$ | async"
+                            (click)="editWorkspaceItem(workspaceId$)"
+                            title="{{'item.version.history.table.action.editWorkspaceItem' | translate }}">
+                      <i class="fas fa-pencil-alt fa-fw"></i>
+                    </button>
+                    <!--CREATE-->
+                    <ng-container *ngIf="canCreateVersion$ | async">
+                      <button class="btn btn-outline-primary btn-sm version-row-element-create"
+                              [dsBtnDisabled]="isAnyBeingEdited() || (hasDraftVersion$ | async)"
+                              (click)="createNewVersion(versionDTO.version)"
+                              title="{{createVersionTitle$ | async | translate }}">
+                        <i class="fas fa-code-branch fa-fw"></i>
                       </button>
-                      <!--CREATE-->
-                      <ng-container *ngIf="canCreateVersion$ | async">
-                        <button class="btn btn-outline-primary btn-sm version-row-element-create"
-                                [disabled]="isAnyBeingEdited() || (hasDraftVersion$ | async)"
-                                (click)="createNewVersion(version)"
-                                title="{{createVersionTitle$ | async | translate }}">
-                          <i class="fas fa-code-branch fa-fw"></i>
-                        </button>
-                      </ng-container>
-                      <!--DELETE-->
-                      <ng-container *ngIf="canDeleteVersion$(version) | async">
-                        <button class="btn btn-sm version-row-element-delete"
-                                [ngClass]="isAnyBeingEdited() ? 'btn-outline-primary' : 'btn-outline-danger'"
-                                [disabled]="isAnyBeingEdited()"
-                                (click)="deleteVersion(version, version.id==itemVersion.id)"
-                                title="{{'item.version.history.table.action.deleteVersion' | translate}}">
-                          <i class="fas fa-trash fa-fw"></i>
-                        </button>
-                      </ng-container>
-                    </div>
-
+                    </ng-container>
+                    <!--DELETE-->
+                    <ng-container *ngIf="versionDTO.canDeleteVersion">
+                      <button class="btn btn-sm version-row-element-delete"
+                              [ngClass]="isAnyBeingEdited() ? 'btn-outline-primary' : 'btn-outline-danger'"
+                              [dsBtnDisabled]="isAnyBeingEdited()"
+                              (click)="deleteVersion(versionDTO.version, versionDTO.version.id==itemVersion.id)"
+                              title="{{'item.version.history.table.action.deleteVersion' | translate}}">
+                        <i class="fas fa-trash fa-fw"></i>
+                      </button>
+                    </ng-container>
                   </div>
 
-                </ng-container>
+                </div>
+
               </ng-container>
-            </td>
-            <td class="version-row-element-editor" *ngIf="(showSubmitter() | async)">
-              {{version?.submitterName}}
-            </td>
-            <td class="version-row-element-date">
-              {{version?.created | date : 'yyyy-MM-dd HH:mm:ss'}}
-            </td>
-            <td class="version-row-element-summary">
-              <div class="float-left">
-                <ng-container *ngIf="isThisBeingEdited(version); then editSummary else showSummary"></ng-container>
-                <ng-template #showSummary>{{version?.summary}}</ng-template>
-                <ng-template #editSummary>
-                  <input class="form-control" type="text" [(ngModel)]="versionBeingEditedSummary"
-                         (keyup.enter)="onSummarySubmit()"/>
-                </ng-template>
-              </div>
+            </ng-container>
+          </td>
+          <td class="version-row-element-editor" *ngIf="(showSubmitter() | async)">
+            {{ versionDTO.version.submitterName }}
+          </td>
+          <td class="version-row-element-date">
+            {{ versionDTO.version.created | date : 'yyyy-MM-dd HH:mm:ss' }}
+          </td>
+          <td class="version-row-element-summary">
+            <div class="float-left">
+              <ng-container
+                *ngIf="isThisBeingEdited(versionDTO.version); then editSummary else showSummary"></ng-container>
+              <ng-template #showSummary>{{ versionDTO.version.summary }}</ng-template>
+              <ng-template #editSummary>
+                <input [attr.aria-label]="'item.version.history.table.action.editSummary' | translate"
+                       [(ngModel)]="versionBeingEditedSummary" (keyup.enter)="onSummarySubmit()"
+                       class="form-control" type="text"/>
+              </ng-template>
+            </div>
 
-              <div class="float-right btn-group edit-field space-children-mr" *ngIf="displayActions">
-                <!--DISCARD EDIT -->
-                <ng-container *ngIf="(canEditVersion$(version) | async) && isThisBeingEdited(version)">
-                  <button class="btn btn-sm"
-                          [ngClass]="isThisBeingEdited(version) ? 'btn-outline-warning' : 'btn-outline-primary'"
-                          (click)="disableVersionEditing()"
-                          title="{{'item.version.history.table.action.discardSummary' | translate}}">
-                    <i class="fas fa-undo-alt fa-fw"></i>
-                  </button>
-                </ng-container>
-                <!--EDIT / SAVE-->
-                <ng-container *ngIf="canEditVersion$(version) | async">
-                  <button class="btn btn-outline-primary btn-sm version-row-element-edit"
-                          *ngIf="!isThisBeingEdited(version)"
-                          [disabled]="isAnyBeingEdited()"
-                          (click)="enableVersionEditing(version)"
-                          title="{{'item.version.history.table.action.editSummary' | translate}}">
-                    <i class="fas fa-edit fa-fw"></i>
-                  </button>
-                  <button class="btn btn-outline-success btn-sm"
-                          *ngIf="isThisBeingEdited(version)"
-                          (click)="onSummarySubmit()"
-                          title="{{'item.version.history.table.action.saveSummary' | translate}}">
-                    <i class="fas fa-check fa-fw"></i>
-                  </button>
-                </ng-container>
-              </div>
-
-
-            </td>
-          </tr>
-          </tbody>
-        </table>
-        <div>*&nbsp;{{"item.version.history.selected" | translate}}</div>
-      </ds-pagination>
-      <ds-alert *ngIf="!itemVersion || versions?.page?.length === 0" [content]="'item.version.history.empty'"
-                [type]="AlertTypeEnum.Info"></ds-alert>
-    </div>
+            <div class="float-right btn-group edit-field space-children-mr" *ngIf="displayActions">
+              <!--DISCARD EDIT -->
+              <ng-container *ngIf="(versionDTO.canEditVersion | async) && isThisBeingEdited(versionDTO.version)">
+                <button class="btn btn-sm"
+                        [ngClass]="isThisBeingEdited(versionDTO.version) ? 'btn-outline-warning' : 'btn-outline-primary'"
+                        (click)="disableVersionEditing()"
+                        title="{{'item.version.history.table.action.discardSummary' | translate}}">
+                  <i class="fas fa-undo-alt fa-fw"></i>
+                </button>
+              </ng-container>
+              <!--EDIT / SAVE-->
+              <ng-container *ngIf="versionDTO.canEditVersion | async">
+                <button class="btn btn-outline-primary btn-sm version-row-element-edit"
+                        *ngIf="!isThisBeingEdited(versionDTO.version)"
+                        [dsBtnDisabled]="isAnyBeingEdited()"
+                        (click)="enableVersionEditing(versionDTO.version)"
+                        title="{{'item.version.history.table.action.editSummary' | translate}}">
+                  <i class="fas fa-edit fa-fw"></i>
+                </button>
+                <button class="btn btn-outline-success btn-sm"
+                        *ngIf="isThisBeingEdited(versionDTO.version)"
+                        (click)="onSummarySubmit()"
+                        title="{{'item.version.history.table.action.saveSummary' | translate}}">
+                  <i class="fas fa-check fa-fw"></i>
+                </button>
+              </ng-container>
+            </div>
+          </td>
+        </tr>
+        </tbody>
+      </table>
+      <div>*&nbsp;{{ "item.version.history.selected" | translate }}</div>
+    </ds-pagination>
   </div>
 </div>
+<ng-template #noItemVersion>
+  <ds-alert *ngIf="displayWhenEmpty"
+            [content]="'item.version.history.empty'"
+            [type]="AlertTypeEnum.Info">
+  </ds-alert>
+</ng-template>
diff --git a/src/app/item-page/versions/item-versions.component.spec.ts b/src/app/item-page/versions/item-versions.component.spec.ts
index e46f1585d7..0f65381dcd 100644
--- a/src/app/item-page/versions/item-versions.component.spec.ts
+++ b/src/app/item-page/versions/item-versions.component.spec.ts
@@ -29,6 +29,7 @@ import { ConfigurationDataService } from '../../core/data/configuration-data.ser
 import { Router } from '@angular/router';
 import { CommonModule } from '@angular/common';
 import { ItemSharedModule } from '../item-shared.module';
+import {BtnDisabledDirective} from '../../shared/btn-disabled.directive';
 
 describe('ItemVersionsComponent', () => {
   let component: ItemVersionsComponent;
@@ -136,7 +137,7 @@ describe('ItemVersionsComponent', () => {
   beforeEach(waitForAsync(() => {
 
     TestBed.configureTestingModule({
-      declarations: [ItemVersionsComponent, VarDirective],
+      declarations: [ItemVersionsComponent, VarDirective, BtnDisabledDirective],
       imports: [TranslateModule.forRoot(), CommonModule, FormsModule, ReactiveFormsModule, BrowserModule, ItemSharedModule],
       providers: [
         {provide: PaginationService, useValue: new PaginationServiceStub()},
@@ -222,17 +223,20 @@ describe('ItemVersionsComponent', () => {
     it('should not disable the delete button', () => {
       const deleteButtons = fixture.debugElement.queryAll(By.css(`.version-row-element-delete`));
       deleteButtons.forEach((btn) => {
-        expect(btn.nativeElement.disabled).toBe(false);
+        expect(btn.nativeElement.getAttribute('aria-disabled')).toBe('false');
+        expect(btn.nativeElement.classList.contains('disabled')).toBeFalse();
       });
     });
     it('should disable other buttons', () => {
       const createButtons = fixture.debugElement.queryAll(By.css(`.version-row-element-create`));
       createButtons.forEach((btn) => {
-        expect(btn.nativeElement.disabled).toBe(true);
+        expect(btn.nativeElement.getAttribute('aria-disabled')).toBe('true');
+        expect(btn.nativeElement.classList.contains('disabled')).toBeTrue();
       });
       const editButtons = fixture.debugElement.queryAll(By.css(`.version-row-element-create`));
       editButtons.forEach((btn) => {
-        expect(btn.nativeElement.disabled).toBe(true);
+        expect(btn.nativeElement.getAttribute('aria-disabled')).toBe('true');
+        expect(btn.nativeElement.classList.contains('disabled')).toBeTrue();
       });
     });
   });
diff --git a/src/app/item-page/versions/item-versions.component.ts b/src/app/item-page/versions/item-versions.component.ts
index 700a35552c..274ca55524 100644
--- a/src/app/item-page/versions/item-versions.component.ts
+++ b/src/app/item-page/versions/item-versions.component.ts
@@ -3,7 +3,6 @@ import { Item } from '../../core/shared/item.model';
 import { Version } from '../../core/shared/version.model';
 import { RemoteData } from '../../core/data/remote-data';
 import {
-  BehaviorSubject,
   combineLatest,
   Observable,
   of,
@@ -23,7 +22,7 @@ import { PaginatedList } from '../../core/data/paginated-list.model';
 import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
 import { VersionHistoryDataService } from '../../core/data/version-history-data.service';
 import { PaginatedSearchOptions } from '../../shared/search/models/paginated-search-options.model';
-import { AlertType } from '../../shared/alert/aletr-type';
+import { AlertType } from '../../shared/alert/alert-type';
 import { followLink } from '../../shared/utils/follow-link-config.model';
 import { hasValue, hasValueOperator } from '../../shared/empty.util';
 import { PaginationService } from '../../core/pagination/pagination.service';
@@ -49,6 +48,17 @@ import { WorkspaceitemDataService } from '../../core/submission/workspaceitem-da
 import { WorkflowItemDataService } from '../../core/submission/workflowitem-data.service';
 import { ConfigurationDataService } from '../../core/data/configuration-data.service';
 
+interface VersionsDTO {
+  totalElements: number;
+  versionDTOs: VersionDTO[];
+}
+
+interface VersionDTO {
+  version: Version;
+  canEditVersion: Observable<boolean>;
+  canDeleteVersion: Observable<boolean>;
+}
+
 @Component({
   selector: 'ds-item-versions',
   templateUrl: './item-versions.component.html',
@@ -109,16 +119,15 @@ export class ItemVersionsComponent implements OnDestroy, OnInit {
   versionHistory$: Observable<VersionHistory>;
 
   /**
-   * The version history's list of versions
+   * The version history information that is used to render the HTML
    */
-  versionsRD$: BehaviorSubject<RemoteData<PaginatedList<Version>>> = new BehaviorSubject<RemoteData<PaginatedList<Version>>>(null);
+  versionsDTO$: Observable<VersionsDTO>;
 
   /**
    * Verify if the list of versions has at least one e-person to display
    * Used to hide the "Editor" column when no e-persons are present to display
    */
   hasEpersons$: Observable<boolean>;
-
   /**
    * Verify if there is an inprogress submission in the version history
    * Used to disable the "Create version" button
@@ -421,16 +430,23 @@ export class ItemVersionsComponent implements OnDestroy, OnInit {
    */
   getAllVersions(versionHistory$: Observable<VersionHistory>): void {
     const currentPagination = this.paginationService.getCurrentPagination(this.options.id, this.options);
-    combineLatest([versionHistory$, currentPagination]).pipe(
+    this.versionsDTO$ = combineLatest([versionHistory$, currentPagination]).pipe(
       switchMap(([versionHistory, options]: [VersionHistory, PaginationComponentOptions]) => {
         return this.versionHistoryService.getVersions(versionHistory.id,
           new PaginatedSearchOptions({pagination: Object.assign({}, options, {currentPage: options.currentPage})}),
           false, true, followLink('item'), followLink('eperson'));
       }),
       getFirstCompletedRemoteData(),
-    ).subscribe((res: RemoteData<PaginatedList<Version>>) => {
-      this.versionsRD$.next(res);
-    });
+      getRemoteDataPayload(),
+      map((versions: PaginatedList<Version>) => ({
+        totalElements: versions.totalElements,
+        versionDTOs: (versions?.page ?? []).map((version: Version) => ({
+          version: version,
+          canEditVersion: this.canEditVersion$(version),
+          canDeleteVersion: this.canDeleteVersion$(version),
+        })),
+      })),
+    );
   }
 
   /**
@@ -509,16 +525,12 @@ export class ItemVersionsComponent implements OnDestroy, OnInit {
       );
 
       this.getAllVersions(this.versionHistory$);
-      this.hasEpersons$ = this.versionsRD$.pipe(
-        getAllSucceededRemoteData(),
-        getRemoteDataPayload(),
-        hasValueOperator(),
-        map((versions: PaginatedList<Version>) => versions.page.filter((version: Version) => version.eperson !== undefined).length > 0),
+      this.hasEpersons$ = this.versionsDTO$.pipe(
+        map((versionsDTO: VersionsDTO) => versionsDTO.versionDTOs.filter((versionDTO: VersionDTO) => versionDTO.version.eperson !== undefined).length > 0),
         startWith(false)
       );
-      this.itemPageRoutes$ = this.versionsRD$.pipe(
-        getAllSucceededRemoteDataPayload(),
-        switchMap((versions) => combineLatest(versions.page.map((version) => version.item.pipe(getAllSucceededRemoteDataPayload())))),
+      this.itemPageRoutes$ = this.versionsDTO$.pipe(
+        switchMap((versionsDTO: VersionsDTO) => combineLatest(versionsDTO.versionDTOs.map((versionDTO: VersionDTO) => versionDTO.version.item.pipe(getAllSucceededRemoteDataPayload())))),
         map((versions) => {
           const itemPageRoutes = {};
           versions.forEach((item) => itemPageRoutes[item.uuid] = getItemPageRoute(item));
diff --git a/src/app/item-page/versions/notice/item-versions-notice.component.ts b/src/app/item-page/versions/notice/item-versions-notice.component.ts
index 8a8f5ff76f..0e5e45806b 100644
--- a/src/app/item-page/versions/notice/item-versions-notice.component.ts
+++ b/src/app/item-page/versions/notice/item-versions-notice.component.ts
@@ -12,7 +12,7 @@ import {
 } from '../../../core/shared/operators';
 import { map, startWith, switchMap } from 'rxjs/operators';
 import { VersionHistoryDataService } from '../../../core/data/version-history-data.service';
-import { AlertType } from '../../../shared/alert/aletr-type';
+import { AlertType } from '../../../shared/alert/alert-type';
 import { getItemPageRoute } from '../../item-page-routing-paths';
 
 @Component({
diff --git a/src/app/login-page/login-page.component.html b/src/app/login-page/login-page.component.html
index 2a95e0ce1c..8318b8c22b 100644
--- a/src/app/login-page/login-page.component.html
+++ b/src/app/login-page/login-page.component.html
@@ -1,10 +1,10 @@
 <div class="container w-100 h-100">
   <div class="text-center mt-5 row justify-content-center">
     <div>
-      <img class="mb-4 login-logo" src="assets/images/dspace-logo.png" alt="{{'repository.image.logo' | translate}}">
+      <img class="mb-4 login-logo" src="assets/images/dspace-logo.svg" [alt]="'repository.image.logo' | translate">
       <h1 class="h3 mb-0 font-weight-normal">{{"login.form.header" | translate}}</h1>
-      <ds-log-in
-      [isStandalonePage]="true"></ds-log-in>
+      <ds-themed-log-in
+      [isStandalonePage]="true"></ds-themed-log-in>
     </div>
   </div>
 </div>
diff --git a/src/app/login-page/login-page.component.spec.ts b/src/app/login-page/login-page.component.spec.ts
index baaa3430ac..7f5f3a7080 100644
--- a/src/app/login-page/login-page.component.spec.ts
+++ b/src/app/login-page/login-page.component.spec.ts
@@ -6,6 +6,7 @@ import { Store } from '@ngrx/store';
 import { TranslateModule } from '@ngx-translate/core';
 import { of as observableOf } from 'rxjs';
 
+import { XSRFService } from '../core/xsrf/xsrf.service';
 import { LoginPageComponent } from './login-page.component';
 import { ActivatedRouteStub } from '../shared/testing/active-router.stub';
 
@@ -31,7 +32,8 @@ describe('LoginPageComponent', () => {
       declarations: [LoginPageComponent],
       providers: [
         { provide: ActivatedRoute, useValue: activatedRouteStub },
-        { provide: Store, useValue: store }
+        { provide: Store, useValue: store },
+        { provide: XSRFService, useValue: {} },
       ],
       schemas: [NO_ERRORS_SCHEMA]
     }).compileComponents();
diff --git a/src/app/logout-page/logout-page.component.html b/src/app/logout-page/logout-page.component.html
index b5012ed53b..edb86583fd 100644
--- a/src/app/logout-page/logout-page.component.html
+++ b/src/app/logout-page/logout-page.component.html
@@ -1,7 +1,7 @@
 <div class="container w-100 h-100">
   <div class="text-center mt-5 row justify-content-md-center">
     <div class="mx-auto">
-      <img class="mb-4 login-logo" src="assets/images/dspace-logo.png">
+      <img class="mb-4 login-logo" src="assets/images/dspace-logo.svg" [alt]="'repository.image.logo' | translate">
       <h1 class="h3 mb-0 font-weight-normal">{{"logout.form.header" | translate}}</h1>
       <ds-log-out></ds-log-out>
     </div>
diff --git a/src/app/lookup-by-id/objectnotfound/objectnotfound.component.html b/src/app/lookup-by-id/objectnotfound/objectnotfound.component.html
index e1cf58b5b2..8b3e2ebded 100644
--- a/src/app/lookup-by-id/objectnotfound/objectnotfound.component.html
+++ b/src/app/lookup-by-id/objectnotfound/objectnotfound.component.html
@@ -3,6 +3,6 @@
   <h2><small><em>{{missingItem}}</em></small></h2>
   <br />
   <p class="text-center">
-    <a routerLink="/home" class="btn btn-primary">{{"404.link.home-page" | translate}}</a>
+    <a routerLink="/home" class="btn btn-primary" role="link" tabindex="0">{{"404.link.home-page" | translate}}</a>
   </p>
 </div>
diff --git a/src/app/lookup-by-id/objectnotfound/objectnotfound.component.spec.ts b/src/app/lookup-by-id/objectnotfound/objectnotfound.component.spec.ts
index f0139e9251..b293ead102 100644
--- a/src/app/lookup-by-id/objectnotfound/objectnotfound.component.spec.ts
+++ b/src/app/lookup-by-id/objectnotfound/objectnotfound.component.spec.ts
@@ -6,6 +6,7 @@ import { ObjectNotFoundComponent } from './objectnotfound.component';
 import { ActivatedRouteStub } from '../../shared/testing/active-router.stub';
 import { of as observableOf } from 'rxjs';
 import { ActivatedRoute } from '@angular/router';
+import { ServerResponseService } from 'src/app/core/services/server-response.service';
 
 describe('ObjectNotFoundComponent', () => {
   let comp: ObjectNotFoundComponent;
@@ -17,6 +18,10 @@ describe('ObjectNotFoundComponent', () => {
   const activatedRouteStub = Object.assign(new ActivatedRouteStub(), {
     params: observableOf({id: testUUID, idType: uuidType})
   });
+  const serverResponseServiceStub = jasmine.createSpyObj('ServerResponseService', {
+    setNotFound: jasmine.createSpy('setNotFound')
+  });
+
   const activatedRouteStubHandle = Object.assign(new ActivatedRouteStub(), {
     params: observableOf({id: handleId, idType: handlePrefix})
   });
@@ -26,6 +31,7 @@ describe('ObjectNotFoundComponent', () => {
         imports: [
           TranslateModule.forRoot()
         ], providers: [
+          {provide: ServerResponseService, useValue: serverResponseServiceStub},
           {provide: ActivatedRoute, useValue: activatedRouteStub}
         ],
         declarations: [ObjectNotFoundComponent],
@@ -48,6 +54,10 @@ describe('ObjectNotFoundComponent', () => {
       expect(comp.idType).toEqual(uuidType);
       expect(comp.missingItem).toEqual('uuid: ' + testUUID);
     });
+
+    it('should call serverResponseService.setNotFound', () => {
+      expect(serverResponseServiceStub.setNotFound).toHaveBeenCalled();
+    });
   });
 
   describe( 'legacy handle request', () => {
@@ -56,6 +66,7 @@ describe('ObjectNotFoundComponent', () => {
         imports: [
           TranslateModule.forRoot()
         ], providers: [
+          {provide: ServerResponseService, useValue: serverResponseServiceStub},
           {provide: ActivatedRoute, useValue: activatedRouteStubHandle}
         ],
         declarations: [ObjectNotFoundComponent],
@@ -74,6 +85,9 @@ describe('ObjectNotFoundComponent', () => {
       expect(comp.idType).toEqual(handlePrefix);
       expect(comp.missingItem).toEqual('handle: ' + handlePrefix + '/' + handleId);
     });
-  });
 
+    it('should call serverResponseService.setNotFound', () => {
+      expect(serverResponseServiceStub.setNotFound).toHaveBeenCalled();
+    });
+  });
 });
diff --git a/src/app/lookup-by-id/objectnotfound/objectnotfound.component.ts b/src/app/lookup-by-id/objectnotfound/objectnotfound.component.ts
index bbab90f39d..cad78f8555 100644
--- a/src/app/lookup-by-id/objectnotfound/objectnotfound.component.ts
+++ b/src/app/lookup-by-id/objectnotfound/objectnotfound.component.ts
@@ -1,6 +1,7 @@
 
 import { Component, ChangeDetectionStrategy, OnInit } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
+import { ServerResponseService } from 'src/app/core/services/server-response.service';
 
 /**
  * This component representing the `PageNotFound` DSpace page.
@@ -25,7 +26,7 @@ export class ObjectNotFoundComponent implements OnInit {
    * @param {AuthService} authservice
    * @param {ServerResponseService} responseService
    */
-  constructor(private route: ActivatedRoute) {
+  constructor(private route: ActivatedRoute, private serverResponseService: ServerResponseService) {
     route.params.subscribe((params) => {
       this.idType = params.idType;
       this.id = params.id;
@@ -38,6 +39,7 @@ export class ObjectNotFoundComponent implements OnInit {
     } else {
       this.missingItem = 'handle: ' + this.idType + '/' + this.id;
     }
+    this.serverResponseService.setNotFound();
   }
 
 }
diff --git a/src/app/menu.resolver.spec.ts b/src/app/menu.resolver.spec.ts
index 838d5a53c5..12d5efa24e 100644
--- a/src/app/menu.resolver.spec.ts
+++ b/src/app/menu.resolver.spec.ts
@@ -16,9 +16,11 @@ import { MenuServiceStub } from './shared/testing/menu-service.stub';
 import { MenuID } from './shared/menu/menu-id.model';
 import { BrowseService } from './core/browse/browse.service';
 import { cold } from 'jasmine-marbles';
-import createSpy = jasmine.createSpy;
 import { createSuccessfulRemoteDataObject$ } from './shared/remote-data.utils';
 import { createPaginatedList } from './shared/testing/utils.test';
+import createSpy = jasmine.createSpy;
+import { AuthService } from './core/auth/auth.service';
+import { AuthServiceStub } from './shared/testing/auth-service.stub';
 
 const BOOLEAN = { t: true, f: false };
 const MENU_STATE = {
@@ -61,6 +63,7 @@ describe('MenuResolver', () => {
         { provide: BrowseService, useValue: browseService },
         { provide: AuthorizationDataService, useValue: authorizationService },
         { provide: ScriptDataService, useValue: scriptService },
+        { provide: AuthService, useValue: AuthServiceStub },
         {
           provide: NgbModal, useValue: {
             open: () => {/*comment*/
@@ -80,19 +83,19 @@ describe('MenuResolver', () => {
   describe('resolve', () => {
     it('should create all menus', (done) => {
       spyOn(resolver, 'createPublicMenu$').and.returnValue(observableOf(true));
-      spyOn(resolver, 'createAdminMenu$').and.returnValue(observableOf(true));
+      spyOn(resolver, 'createAdminMenuIfLoggedIn$').and.returnValue(observableOf(true));
 
       resolver.resolve(null, null).subscribe(resolved => {
         expect(resolved).toBeTrue();
         expect(resolver.createPublicMenu$).toHaveBeenCalled();
-        expect(resolver.createAdminMenu$).toHaveBeenCalled();
+        expect(resolver.createAdminMenuIfLoggedIn$).toHaveBeenCalled();
         done();
       });
     });
 
     it('should return an Observable that emits true as soon as all menus are created', () => {
       spyOn(resolver, 'createPublicMenu$').and.returnValue(cold('--(t|)', BOOLEAN));
-      spyOn(resolver, 'createAdminMenu$').and.returnValue(cold('----(t|)', BOOLEAN));
+      spyOn(resolver, 'createAdminMenuIfLoggedIn$').and.returnValue(cold('----(t|)', BOOLEAN));
 
       expect(resolver.resolve(null, null)).toBeObservable(cold('----(t|)', BOOLEAN));
     });
diff --git a/src/app/menu.resolver.ts b/src/app/menu.resolver.ts
index cad6a6ec57..83c9351c7f 100644
--- a/src/app/menu.resolver.ts
+++ b/src/app/menu.resolver.ts
@@ -1,6 +1,6 @@
 import { Injectable } from '@angular/core';
 import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from '@angular/router';
-import { combineLatest as observableCombineLatest, combineLatest, Observable } from 'rxjs';
+import { combineLatest as observableCombineLatest, combineLatest, Observable, of as observableOf } from 'rxjs';
 import { MenuID } from './shared/menu/menu-id.model';
 import { MenuState } from './shared/menu/menu-state.model';
 import { MenuItemType } from './shared/menu/menu-item-type.model';
@@ -12,7 +12,7 @@ import { RemoteData } from './core/data/remote-data';
 import { TextMenuItemModel } from './shared/menu/menu-item/models/text.model';
 import { BrowseService } from './core/browse/browse.service';
 import { MenuService } from './shared/menu/menu.service';
-import { filter, find, map, take } from 'rxjs/operators';
+import { filter, find, map, mergeMap, take } from 'rxjs/operators';
 import { hasValue } from './shared/empty.util';
 import { FeatureID } from './core/data/feature-authorization/feature-id';
 import {
@@ -47,6 +47,7 @@ import {
 import {
   ExportBatchSelectorComponent
 } from './shared/dso-selector/modal-wrappers/export-batch-selector/export-batch-selector.component';
+import { AuthService } from './core/auth/auth.service';
 
 /**
  * Creates all of the app's menus
@@ -61,6 +62,7 @@ export class MenuResolver implements Resolve<boolean> {
     protected authorizationService: AuthorizationDataService,
     protected modalService: NgbModal,
     protected scriptDataService: ScriptDataService,
+    protected authService: AuthService,
   ) {
   }
 
@@ -70,7 +72,7 @@ export class MenuResolver implements Resolve<boolean> {
   resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<boolean> {
     return combineLatest([
       this.createPublicMenu$(),
-      this.createAdminMenu$(),
+      this.createAdminMenuIfLoggedIn$(),
     ]).pipe(
       map((menusDone: boolean[]) => menusDone.every(Boolean)),
     );
@@ -146,6 +148,15 @@ export class MenuResolver implements Resolve<boolean> {
     return this.waitForMenu$(MenuID.PUBLIC);
   }
 
+  /**
+   * Initialize all menu sections and items for {@link MenuID.ADMIN}, only if the user is logged in.
+   */
+  createAdminMenuIfLoggedIn$() {
+    return this.authService.isAuthenticated().pipe(
+      mergeMap((isAuthenticated) => isAuthenticated ? this.createAdminMenu$() : observableOf(true)),
+    );
+  }
+
   /**
    * Initialize all menu sections and items for {@link MenuID.ADMIN}
    */
diff --git a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.html b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.html
index 7db6db9a8d..dacf36b940 100644
--- a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.html
+++ b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.html
@@ -1,5 +1,6 @@
   <div class="add" *ngIf="!(moreThanOne$ | async)">
-    <button class="btn btn-lg btn-outline-primary mt-1 ml-2" [disabled]="!(initialized$|async)"
+    <button class="btn btn-lg btn-outline-primary mt-1 ml-2"
+            [attr.aria-label]="'mydspace.new-submission-external' | translate" [dsBtnDisabled]="!(initialized$|async)"
             (click)="openPage(singleEntity)" role="button"
             title="{{'mydspace.new-submission-external' | translate}}">
       <i class="fa fa-file-import" aria-hidden="true"></i>
@@ -9,15 +10,15 @@
        ngbDropdown
        *ngIf="(moreThanOne$ | async)">
     <button class="btn btn-lg btn-outline-primary mt-1 ml-2" id="dropdownImport" ngbDropdownToggle
-            type="button" [disabled]="!(initialized$|async)"
-            attr.aria-label="{{'mydspace.new-submission-external' | translate}}"
+            type="button" [dsBtnDisabled]="!(initialized$|async)"
+            [attr.aria-label]="'mydspace.new-submission-external' | translate"
             [attr.data-test]="'import-dropdown' | dsBrowserOnly"
             title="{{'mydspace.new-submission-external' | translate}}">
       <i class="fa fa-file-import" aria-hidden="true"></i>
-      <span class="caret"></span>
+      <span class="caret" aria-hidden="true"></span>
     </button>
     <div ngbDropdownMenu
-         class="dropdown-menu"
+         class="dropdown-menu p-0"
          id="importControlsDropdownMenu"
          aria-labelledby="dropdownImport">
       <ds-entity-dropdown [isSubmission]="false" (selectionChange)="openPage($event)"></ds-entity-dropdown>
diff --git a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.html b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.html
index 84d0649277..8de1afedec 100644
--- a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.html
+++ b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.html
@@ -1,5 +1,6 @@
   <div class="add" *ngIf="!(moreThanOne$ | async)">
-    <button class="btn btn-lg btn-primary mt-1 ml-2" [disabled]="!(initialized$|async)" (click)="openDialog(singleEntity)" role="button">
+    <button class="btn btn-lg btn-primary mt-1 ml-2" [attr.aria-label]="'mydspace.new-submission' | translate"
+            [dsBtnDisabled]="!(initialized$|async)" (click)="openDialog(singleEntity)" role="button">
       <i class="fa fa-plus-circle" aria-hidden="true"></i>
     </button>
   </div>
@@ -7,15 +8,15 @@
        ngbDropdown
        *ngIf="(moreThanOne$ | async)">
     <button class="btn btn-lg btn-primary mt-1 ml-2" id="dropdownSubmission" ngbDropdownToggle
-            type="button"  [disabled]="!(initialized$|async)"
-            attr.aria-label="{{'mydspace.new-submission' | translate}}"
+            type="button"  [dsBtnDisabled]="!(initialized$|async)"
+            [attr.aria-label]="'mydspace.new-submission' | translate"
             [attr.data-test]="'submission-dropdown' | dsBrowserOnly"
             title="{{'mydspace.new-submission' | translate}}">
       <i class="fa fa-plus-circle" aria-hidden="true"></i>
-      <span class="caret"></span>
+      <span class="caret" aria-hidden="true"></span>
     </button>
     <div ngbDropdownMenu
-         class="dropdown-menu"
+         class="dropdown-menu p-0"
          id="entityControlsDropdownMenu"
          aria-labelledby="dropdownSubmission">
       <ds-entity-dropdown [isSubmission]="true" (selectionChange)="openDialog($event)"></ds-entity-dropdown>
diff --git a/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.html b/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.html
index b502326164..0af5c706b7 100644
--- a/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.html
+++ b/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.html
@@ -1,22 +1,37 @@
-<div class="nav-item dropdown expandable-navbar-section text-md-center"
-    *ngVar="(active | async) as isActive"
-    (keyup.enter)="isActive ? deactivateSection($event) : activateSection($event)"
-    (keyup.space)="isActive ? deactivateSection($event) : activateSection($event)"
-    (keydown.space)="$event.preventDefault()"
-    (mouseenter)="activateSection($event)"
-    (mouseleave)="deactivateSection($event)">
-    <a href="javascript:void(0);" class="nav-link dropdown-toggle" routerLinkActive="active"
-       [class.disabled]="section.model?.disabled"
-       id="browseDropdown" (click)="toggleSection($event)"
-       data-toggle="dropdown">
+<div class="ds-menu-item-wrapper text-md-center"
+     [id]="'expandable-navbar-section-' + section.id"
+     (mouseenter)="onMouseEnter($event)"
+     (mouseleave)="onMouseLeave($event)"
+     data-test="navbar-section-wrapper">
+  <a href="javascript:void(0);" routerLinkActive="active"
+     role="menuitem"
+     (keyup.enter)="toggleSection($event)"
+     (keyup.space)="toggleSection($event)"
+     (click)="toggleSection($event)"
+     (keydown)="keyDown($event)"
+     aria-haspopup="menu"
+     data-test="navbar-section-toggler"
+     [attr.aria-expanded]="(active$ | async).valueOf()"
+     [attr.aria-controls]="expandableNavbarSectionId()"
+     class="d-flex flex-row flex-nowrap align-items-center gapx-1 ds-menu-toggler-wrapper"
+     [class.disabled]="section.model?.disabled">
+      <span class="flex-fill">
         <ng-container
-                *ngComponentOutlet="(sectionMap$ | async).get(section.id).component; injector: (sectionMap$ | async).get(section.id).injector;"></ng-container>
-    </a>
-    <ul @slide *ngIf="(active | async)" (click)="deactivateSection($event)"
-        class="m-0 shadow-none border-top-0 dropdown-menu show">
-        <ng-container *ngFor="let subSection of (subSections$ | async)">
-            <ng-container
-                    *ngComponentOutlet="(sectionMap$ | async).get(subSection.id).component; injector: (sectionMap$ | async).get(subSection.id).injector;"></ng-container>
-        </ng-container>
-    </ul>
+          *ngComponentOutlet="(sectionMap$ | async).get(section.id).component; injector: (sectionMap$ | async).get(section.id).injector;"></ng-container>
+      </span>
+    <i class="fas fa-caret-down fa-xs toggle-menu-icon" aria-hidden="true"></i>
+  </a>
+  <div *ngIf="(active$ | async).valueOf() === true" (click)="deactivateSection($event)"
+       [id]="expandableNavbarSectionId()"
+       [dsHoverOutsideOfParentSelector]="'#expandable-navbar-section-' + section.id"
+       (dsHoverOutside)="deactivateSection($event, false)"
+       role="menu"
+       class="dropdown-menu show nav-dropdown-menu m-0 shadow-none border-top-0 px-3 px-md-0 pt-0 pt-md-1">
+    <div @slide role="presentation">
+      <div *ngFor="let subSection of (subSections$ | async)" class="text-nowrap" role="presentation">
+        <ng-container
+          *ngComponentOutlet="(sectionMap$ | async).get(subSection.id).component; injector: (sectionMap$ | async).get(subSection.id).injector;"></ng-container>
+      </div>
+    </div>
+  </div>
 </div>
diff --git a/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.scss b/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.scss
index 65de77b600..8849fbd809 100644
--- a/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.scss
+++ b/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.scss
@@ -1,32 +1,24 @@
-.expandable-navbar-section {
-  display: flex;
-  height: 100%;
-  flex-direction: column;
-  justify-content: center;
-}
+:host {
+  .ds-menu-item-wrapper {
+    position: relative; // align dropdown menu with respect to this element
+  }
 
-.dropdown-menu {
+  .dropdown-menu {
     overflow: hidden;
-    min-width: 100%;
-    border-top-left-radius: 0;
-    border-top-right-radius: 0;
-    ::ng-deep a.nav-link {
-        padding-right: var(--bs-spacer);
-        padding-left: var(--bs-spacer);
-        white-space: nowrap;
+    @include media-breakpoint-down(sm) {
+      border: 0;
+      background-color: var(--ds-expandable-navbar-bg);
     }
-}
-
-/** Mobile menu styling **/
-@media screen and (max-width: map-get($grid-breakpoints, md)) {
-    .dropdown-toggle {
-        &:after {
-            float: right;
-            margin-top: calc(var(--bs-spacer) / 2);
-        }
-    }
-    .dropdown-menu {
-        border: 0;
+    @include media-breakpoint-up(md) {
+      border-top-left-radius: 0;
+      border-top-right-radius: 0;
+      background-color: var(--ds-navbar-dropdown-bg);
+    }
+  }
 
+  .toggle-menu-icon {
+    &, &:hover {
+      text-decoration: none;
     }
+  }
 }
diff --git a/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.spec.ts b/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.spec.ts
index 488c9ab251..f8bb35b57c 100644
--- a/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.spec.ts
+++ b/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.spec.ts
@@ -1,15 +1,17 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { ComponentFixture, TestBed, waitForAsync, fakeAsync, flush } from '@angular/core/testing';
 
 import { ExpandableNavbarSectionComponent } from './expandable-navbar-section.component';
 import { By } from '@angular/platform-browser';
 import { MenuServiceStub } from '../../shared/testing/menu-service.stub';
-import { Component } from '@angular/core';
+import { Component, DebugElement } from '@angular/core';
 import { of as observableOf } from 'rxjs';
 import { HostWindowService } from '../../shared/host-window.service';
 import { MenuService } from '../../shared/menu/menu.service';
+import { LinkMenuItemModel } from '../../shared/menu/menu-item/models/link.model';
+import { MenuSection } from '../../shared/menu/menu-section.model';
 import { HostWindowServiceStub } from '../../shared/testing/host-window-service.stub';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-import { VarDirective } from '../../shared/utils/var.directive';
+import { HoverOutsideDirective } from '../../shared/utils/hover-outside.directive';
 
 describe('ExpandableNavbarSectionComponent', () => {
   let component: ExpandableNavbarSectionComponent;
@@ -20,18 +22,18 @@ describe('ExpandableNavbarSectionComponent', () => {
     beforeEach(waitForAsync(() => {
       TestBed.configureTestingModule({
         imports: [NoopAnimationsModule],
-        declarations: [ExpandableNavbarSectionComponent, TestComponent, VarDirective],
+        declarations: [
+          ExpandableNavbarSectionComponent,
+          HoverOutsideDirective,
+          TestComponent,
+        ],
         providers: [
           { provide: 'sectionDataProvider', useValue: {} },
           { provide: MenuService, useValue: menuService },
-          { provide: HostWindowService, useValue: new HostWindowServiceStub(800) }
-        ]
-      }).overrideComponent(ExpandableNavbarSectionComponent, {
-        set: {
-          entryComponents: [TestComponent]
-        }
-      })
-        .compileComponents();
+          { provide: HostWindowService, useValue: new HostWindowServiceStub(800) },
+          TestComponent,
+        ],
+      }).compileComponents();
     }));
 
     beforeEach(() => {
@@ -43,124 +45,251 @@ describe('ExpandableNavbarSectionComponent', () => {
       fixture.detectChanges();
     });
 
-    it('should create', () => {
-      expect(component).toBeTruthy();
-    });
-
-    describe('when the mouse enters the section header', () => {
+    describe('when the mouse enters the section header (while inactive)', () => {
       beforeEach(() => {
+        spyOn(component, 'onMouseEnter').and.callThrough();
+        spyOn(component, 'activateSection').and.callThrough();
         spyOn(menuService, 'activateSection');
-        const sidebarToggler = fixture.debugElement.query(By.css('div.nav-item.dropdown'));
+        // Make sure section is 'inactive'. Requires calling ngOnInit() to update component 'active' property.
+        spyOn(menuService, 'isSectionActive').and.returnValue(observableOf(false));
+        component.ngOnInit();
+        fixture.detectChanges();
+
+        const sidebarToggler = fixture.debugElement.query(By.css('[data-test="navbar-section-wrapper"]'));
         sidebarToggler.triggerEventHandler('mouseenter', {
           preventDefault: () => {/**/
           }
         });
       });
 
-      it('should call activateSection on the menuService', () => {
+      it('should call onMouseEnter', () => {
+        expect(component.onMouseEnter).toHaveBeenCalled();
+      });
+
+      it('should activate the section', () => {
+        expect(component.activateSection).toHaveBeenCalled();
         expect(menuService.activateSection).toHaveBeenCalled();
       });
     });
 
-    describe('when the mouse leaves the section header', () => {
+    describe('when the mouse leaves the section header (while active)', () => {
       beforeEach(() => {
+        spyOn(component, 'onMouseLeave').and.callThrough();
+        spyOn(component, 'deactivateSection').and.callThrough();
         spyOn(menuService, 'deactivateSection');
-        const sidebarToggler = fixture.debugElement.query(By.css('div.nav-item.dropdown'));
+        // Make sure section is 'active'. Requires calling ngOnInit() to update component 'active' property.
+        spyOn(menuService, 'isSectionActive').and.returnValue(observableOf(true));
+        component.ngOnInit();
+        component.mouseEntered = true;
+        fixture.detectChanges();
+
+        const sidebarToggler = fixture.debugElement.query(By.css('[data-test="navbar-section-wrapper"]'));
         sidebarToggler.triggerEventHandler('mouseleave', {
           preventDefault: () => {/**/
           }
         });
       });
 
-      it('should call deactivateSection on the menuService', () => {
+      it('should call onMouseLeave', () => {
+        expect(component.onMouseLeave).toHaveBeenCalled();
+      });
+
+      it('should deactivate the section', () => {
+        expect(component.deactivateSection).toHaveBeenCalled();
         expect(menuService.deactivateSection).toHaveBeenCalled();
       });
     });
 
     describe('when Enter key is pressed on section header (while inactive)', () => {
       beforeEach(() => {
-        spyOn(menuService, 'activateSection');
+        spyOn(component, 'toggleSection').and.callThrough();
+        spyOn(menuService, 'toggleActiveSection');
         // Make sure section is 'inactive'. Requires calling ngOnInit() to update component 'active' property.
         spyOn(menuService, 'isSectionActive').and.returnValue(observableOf(false));
         component.ngOnInit();
         fixture.detectChanges();
 
-        const sidebarToggler = fixture.debugElement.query(By.css('div.nav-item.dropdown'));
+        const sidebarToggler = fixture.debugElement.query(By.css('[data-test="navbar-section-toggler"]'));
         // dispatch the (keyup.enter) action used in our component HTML
         sidebarToggler.nativeElement.dispatchEvent(new KeyboardEvent('keyup', { key: 'Enter' }));
       });
 
       it('should call activateSection on the menuService', () => {
-        expect(menuService.activateSection).toHaveBeenCalled();
+        expect(component.toggleSection).toHaveBeenCalled();
+        expect(menuService.toggleActiveSection).toHaveBeenCalled();
       });
     });
 
     describe('when Enter key is pressed on section header (while active)', () => {
       beforeEach(() => {
-        spyOn(menuService, 'deactivateSection');
+        spyOn(component, 'toggleSection').and.callThrough();
+        spyOn(menuService, 'toggleActiveSection');
         // Make sure section is 'active'. Requires calling ngOnInit() to update component 'active' property.
         spyOn(menuService, 'isSectionActive').and.returnValue(observableOf(true));
         component.ngOnInit();
         fixture.detectChanges();
 
-        const sidebarToggler = fixture.debugElement.query(By.css('div.nav-item.dropdown'));
+        const sidebarToggler = fixture.debugElement.query(By.css('[data-test="navbar-section-toggler"]'));
         // dispatch the (keyup.enter) action used in our component HTML
         sidebarToggler.nativeElement.dispatchEvent(new KeyboardEvent('keyup', { key: 'Enter' }));
       });
 
-      it('should call deactivateSection on the menuService', () => {
-        expect(menuService.deactivateSection).toHaveBeenCalled();
+      it('should call toggleSection on the menuService', () => {
+        expect(component.toggleSection).toHaveBeenCalled();
+        expect(menuService.toggleActiveSection).toHaveBeenCalled();
       });
     });
 
     describe('when spacebar is pressed on section header (while inactive)', () => {
+      let sidebarToggler: DebugElement;
+
       beforeEach(() => {
-        spyOn(menuService, 'activateSection');
+        spyOn(component, 'toggleSection').and.callThrough();
+        spyOn(menuService, 'toggleActiveSection');
         // Make sure section is 'inactive'. Requires calling ngOnInit() to update component 'active' property.
         spyOn(menuService, 'isSectionActive').and.returnValue(observableOf(false));
         component.ngOnInit();
         fixture.detectChanges();
 
-        const sidebarToggler = fixture.debugElement.query(By.css('div.nav-item.dropdown'));
-        // dispatch the (keyup.space) action used in our component HTML
-        sidebarToggler.nativeElement.dispatchEvent(new KeyboardEvent('keyup', { key: ' ' }));
+        sidebarToggler = fixture.debugElement.query(By.css('[data-test="navbar-section-toggler"]'));
       });
 
-      it('should call activateSection on the menuService', () => {
-        expect(menuService.activateSection).toHaveBeenCalled();
+      it('should call toggleSection on the menuService', () => {
+        // dispatch the (keyup.space) action used in our component HTML
+        sidebarToggler.nativeElement.dispatchEvent(new KeyboardEvent('keyup', { code: 'Space', key: ' ' }));
+
+        expect(component.toggleSection).toHaveBeenCalled();
+        expect(menuService.toggleActiveSection).toHaveBeenCalled();
+      });
+
+      // Should not do anything in order to work correctly with NVDA: https://www.nvaccess.org/
+      it('should not do anything on keydown space', () => {
+        const event: Event = new KeyboardEvent('keydown', { code: 'Space', key: ' ' });
+        spyOn(event, 'preventDefault').and.callThrough();
+
+        // dispatch the (keyup.space) action used in our component HTML
+        sidebarToggler.nativeElement.dispatchEvent(event);
+
+        expect(event.preventDefault).toHaveBeenCalled();
       });
     });
 
     describe('when spacebar is pressed on section header (while active)', () => {
       beforeEach(() => {
-        spyOn(menuService, 'deactivateSection');
+        spyOn(component, 'toggleSection').and.callThrough();
+        spyOn(menuService, 'toggleActiveSection');
         // Make sure section is 'active'. Requires calling ngOnInit() to update component 'active' property.
         spyOn(menuService, 'isSectionActive').and.returnValue(observableOf(true));
         component.ngOnInit();
         fixture.detectChanges();
 
-        const sidebarToggler = fixture.debugElement.query(By.css('div.nav-item.dropdown'));
+        const sidebarToggler = fixture.debugElement.query(By.css('[data-test="navbar-section-toggler"]'));
         // dispatch the (keyup.space) action used in our component HTML
         sidebarToggler.nativeElement.dispatchEvent(new KeyboardEvent('keyup', { key: ' ' }));
       });
 
-      it('should call deactivateSection on the menuService', () => {
-        expect(menuService.deactivateSection).toHaveBeenCalled();
+      it('should call toggleSection on the menuService', () => {
+        expect(component.toggleSection).toHaveBeenCalled();
+        expect(menuService.toggleActiveSection).toHaveBeenCalled();
       });
     });
 
-    describe('when a click occurs on the section header', () => {
+    describe('when enter is pressed on section header (while inactive)', () => {
+      let sidebarToggler: DebugElement;
+
       beforeEach(() => {
+        spyOn(component, 'toggleSection').and.callThrough();
         spyOn(menuService, 'toggleActiveSection');
-        const sidebarToggler = fixture.debugElement.query(By.css('div.nav-item.dropdown > a'));
-        sidebarToggler.triggerEventHandler('click', {
-          preventDefault: () => {/**/
-          }
-        });
+        // Make sure section is 'inactive'. Requires calling ngOnInit() to update component 'active' property.
+        spyOn(menuService, 'isSectionActive').and.returnValue(observableOf(false));
+        component.ngOnInit();
+        fixture.detectChanges();
+
+        sidebarToggler = fixture.debugElement.query(By.css('[data-test="navbar-section-toggler"]'));
       });
 
-      it('should not call toggleActiveSection on the menuService', () => {
-        expect(menuService.toggleActiveSection).not.toHaveBeenCalled();
+      // Should not do anything in order to work correctly with NVDA: https://www.nvaccess.org/
+      it('should not do anything on keydown space', () => {
+        const event: Event = new KeyboardEvent('keydown', { code: 'Enter' });
+        spyOn(event, 'preventDefault').and.callThrough();
+
+        // dispatch the (keyup.space) action used in our component HTML
+        sidebarToggler.nativeElement.dispatchEvent(event);
+
+        expect(event.preventDefault).toHaveBeenCalled();
+      });
+    });
+
+    describe('when arrow down is pressed on section header', () => {
+      it('should call activateSection', () => {
+        spyOn(component, 'activateSection').and.callThrough();
+
+        const sidebarToggler: DebugElement = fixture.debugElement.query(By.css('[data-test="navbar-section-toggler"]'));
+        // dispatch the (keydown.ArrowDown) action used in our component HTML
+        sidebarToggler.nativeElement.dispatchEvent(new KeyboardEvent('keydown', { code: 'ArrowDown' }));
+
+        expect(component.focusOnFirstChildSection).toBe(true);
+        expect(component.activateSection).toHaveBeenCalled();
+      });
+    });
+
+    describe('when tab is pressed on section header', () => {
+      it('should call deactivateSection', () => {
+        spyOn(component, 'deactivateSection').and.callThrough();
+
+        const sidebarToggler: DebugElement = fixture.debugElement.query(By.css('[data-test="navbar-section-toggler"]'));
+        // dispatch the (keydown.ArrowDown) action used in our component HTML
+        sidebarToggler.nativeElement.dispatchEvent(new KeyboardEvent('keydown', { code: 'Tab' }));
+
+        expect(component.deactivateSection).toHaveBeenCalled();
+      });
+    });
+
+    describe('navigateDropdown', () => {
+      beforeEach(fakeAsync(() => {
+        jasmine.getEnv().allowRespy(true);
+        spyOn(menuService, 'getSubSectionsByParentID').and.returnValue(observableOf([
+          Object.assign(new MenuSection(), {
+            id: 'subSection1',
+            model: Object.assign(new LinkMenuItemModel(), {
+              type: 'TEST_LINK',
+            }),
+            parentId: component.section.id,
+          }),
+          Object.assign(new MenuSection(), {
+            id: 'subSection2',
+            model: Object.assign(new LinkMenuItemModel(), {
+              type: 'TEST_LINK',
+            }),
+            parentId: component.section.id,
+          }),
+        ]));
+        component.ngOnInit();
+        flush();
+        fixture.detectChanges();
+        component.focusOnFirstChildSection = true;
+        component.active$.next(true);
+        fixture.detectChanges();
+      }));
+
+      it('should close the modal on Tab', () => {
+        spyOn(menuService, 'deactivateSection').and.callThrough();
+
+        const firstSubsection: DebugElement = fixture.debugElement.queryAll(By.css('.dropdown-menu a[role="menuitem"]'))[0];
+        firstSubsection.nativeElement.focus();
+        firstSubsection.nativeElement.dispatchEvent(new KeyboardEvent('keydown', { code: 'Tab' }));
+
+        expect(menuService.deactivateSection).toHaveBeenCalled();
+      });
+
+      it('should close the modal on Escape', () => {
+        spyOn(menuService, 'deactivateSection').and.callThrough();
+
+        const firstSubsection: DebugElement = fixture.debugElement.queryAll(By.css('.dropdown-menu a[role="menuitem"]'))[0];
+        firstSubsection.nativeElement.focus();
+        firstSubsection.nativeElement.dispatchEvent(new KeyboardEvent('keydown', { code: 'Escape' }));
+
+        expect(menuService.deactivateSection).toHaveBeenCalled();
       });
     });
   });
@@ -169,7 +298,11 @@ describe('ExpandableNavbarSectionComponent', () => {
     beforeEach(waitForAsync(() => {
       TestBed.configureTestingModule({
         imports: [NoopAnimationsModule],
-        declarations: [ExpandableNavbarSectionComponent, TestComponent, VarDirective],
+        declarations: [
+          ExpandableNavbarSectionComponent,
+          HoverOutsideDirective,
+          TestComponent,
+        ],
         providers: [
           { provide: 'sectionDataProvider', useValue: {} },
           { provide: MenuService, useValue: menuService },
@@ -195,7 +328,7 @@ describe('ExpandableNavbarSectionComponent', () => {
     describe('when the mouse enters the section header', () => {
       beforeEach(() => {
         spyOn(menuService, 'activateSection');
-        const sidebarToggler = fixture.debugElement.query(By.css('div.nav-item.dropdown > a'));
+        const sidebarToggler = fixture.debugElement.query(By.css('[data-test="navbar-section-wrapper"]'));
         sidebarToggler.triggerEventHandler('mouseenter', {
           preventDefault: () => {/**/
           }
@@ -210,7 +343,7 @@ describe('ExpandableNavbarSectionComponent', () => {
     describe('when the mouse leaves the section header', () => {
       beforeEach(() => {
         spyOn(menuService, 'deactivateSection');
-        const sidebarToggler = fixture.debugElement.query(By.css('div.nav-item.dropdown > a'));
+        const sidebarToggler = fixture.debugElement.query(By.css('[data-test="navbar-section-wrapper"]'));
         sidebarToggler.triggerEventHandler('mouseleave', {
           preventDefault: () => {/**/
           }
@@ -225,7 +358,7 @@ describe('ExpandableNavbarSectionComponent', () => {
     describe('when a click occurs on the section header link', () => {
       beforeEach(() => {
         spyOn(menuService, 'toggleActiveSection');
-        const sidebarToggler = fixture.debugElement.query(By.css('div.nav-item.dropdown > a'));
+        const sidebarToggler = fixture.debugElement.query(By.css('[data-test="navbar-section-toggler"]'));
         sidebarToggler.triggerEventHandler('click', {
           preventDefault: () => {/**/
           }
@@ -243,7 +376,9 @@ describe('ExpandableNavbarSectionComponent', () => {
 // declare a test component
 @Component({
   selector: 'ds-test-cmp',
-  template: ``
+  template: `
+    <a role="menuitem">link</a>
+  `,
 })
 class TestComponent {
 }
diff --git a/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts b/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts
index 5bc69bcbb4..c4842bbb44 100644
--- a/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts
+++ b/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts
@@ -1,11 +1,12 @@
-import { Component, Inject, Injector, OnInit } from '@angular/core';
+import { Component, HostListener, Inject, Injector, OnInit, AfterViewChecked, OnDestroy } from '@angular/core';
 import { NavbarSectionComponent } from '../navbar-section/navbar-section.component';
 import { MenuService } from '../../shared/menu/menu.service';
 import { slide } from '../../shared/animations/slide';
 import { first } from 'rxjs/operators';
 import { HostWindowService } from '../../shared/host-window.service';
-import { rendersSectionForMenu } from '../../shared/menu/menu-section.decorator';
 import { MenuID } from '../../shared/menu/menu-id.model';
+import { Observable } from 'rxjs';
+import { MenuSection } from '../../shared/menu/menu-section.model';
 
 /**
  * Represents an expandable section in the navbar
@@ -16,68 +17,210 @@ import { MenuID } from '../../shared/menu/menu-id.model';
   styleUrls: ['./expandable-navbar-section.component.scss'],
   animations: [slide]
 })
-@rendersSectionForMenu(MenuID.PUBLIC, true)
-export class ExpandableNavbarSectionComponent extends NavbarSectionComponent implements OnInit {
+export class ExpandableNavbarSectionComponent extends NavbarSectionComponent implements AfterViewChecked, OnInit, OnDestroy {
+
   /**
    * This section resides in the Public Navbar
    */
   menuID = MenuID.PUBLIC;
 
-  constructor(@Inject('sectionDataProvider') menuSection,
-              protected menuService: MenuService,
-              protected injector: Injector,
-              private windowService: HostWindowService
+  /**
+   * True if mouse has entered the menu section toggler
+   */
+  mouseEntered = false;
+
+  /**
+   * Whether the section was expanded
+   */
+  focusOnFirstChildSection = false;
+
+  /**
+   * True if screen size was small before a resize event
+   */
+  wasMobile = undefined;
+
+  /**
+   * Observable that emits true if the screen is small, false otherwise
+   */
+  isMobile$: Observable<boolean>;
+
+  /**
+   * Boolean used to add the event listeners to the items in the expandable menu when expanded. This is done for
+   * performance reasons, there is currently an *ngIf on the menu to prevent the {@link HoverOutsideDirective} to tank
+   * performance when not expanded.
+   */
+  addArrowEventListeners = false;
+
+  /**
+   * List of current dropdown items who have event listeners
+   */
+  private dropdownItems: NodeListOf<HTMLElement>;
+
+  @HostListener('window:resize', ['$event'])
+  onResize() {
+    this.isMobile$.pipe(
+      first()
+    ).subscribe((isMobile) => {
+      // When switching between desktop and mobile active sections should be deactivated
+      if (isMobile !== this.wasMobile) {
+        this.wasMobile = isMobile;
+        this.menuService.deactivateSection(this.menuID, this.section.id);
+        this.mouseEntered = false;
+      }
+    });
+  }
+
+  constructor(
+    @Inject('sectionDataProvider') public section: MenuSection,
+    protected menuService: MenuService,
+    protected injector: Injector,
+    protected windowService: HostWindowService,
   ) {
-    super(menuSection, menuService, injector);
+    super(section, menuService, injector);
+    this.isMobile$ = this.windowService.isMobile();
   }
 
   ngOnInit() {
     super.ngOnInit();
+    this.subs.push(this.active$.subscribe((active: boolean) => {
+      if (active === true) {
+        this.addArrowEventListeners = true;
+      } else {
+        this.focusOnFirstChildSection = undefined;
+        this.unsubscribeFromEventListeners();
+      }
+    }));
+  }
+
+  ngAfterViewChecked(): void {
+    if (this.addArrowEventListeners) {
+      this.dropdownItems = document.querySelectorAll(`#${this.expandableNavbarSectionId()} *[role="menuitem"]`);
+      this.dropdownItems.forEach((item: HTMLElement) => {
+        item.addEventListener('keydown', this.navigateDropdown.bind(this));
+      });
+      if (this.focusOnFirstChildSection && this.dropdownItems.length > 0) {
+        this.dropdownItems.item(0).focus();
+      }
+      this.addArrowEventListeners = false;
+    }
+  }
+
+  ngOnDestroy(): void {
+    super.ngOnDestroy();
+    this.unsubscribeFromEventListeners();
   }
 
   /**
-   * Overrides the super function that activates this section (triggered on hover)
-   * Has an extra check to make sure the section can only be activated on non-mobile devices
-   * @param {Event} event The user event that triggered this function
+   * Activate this section if it's currently inactive, deactivate it when it's currently active.
+   * Also saves whether this toggle was performed by a keyboard event (non-click event) in order to know if thi first
+   * item should be focussed when activating a section.
+   *
+   *  @param {Event} event The user event that triggered this method
    */
-  activateSection(event): void {
-    this.windowService.isXsOrSm().pipe(
+  override toggleSection(event: Event): void {
+    this.focusOnFirstChildSection = event.type !== 'click';
+    super.toggleSection(event);
+  }
+
+  /**
+   * Removes all the current event listeners on the dropdown items (called when the menu is closed & on component
+   * destruction)
+   */
+  unsubscribeFromEventListeners(): void {
+    if (this.dropdownItems) {
+      this.dropdownItems.forEach((item: HTMLElement) => {
+        item.removeEventListener('keydown', this.navigateDropdown.bind(this));
+      });
+      this.dropdownItems = undefined;
+    }
+  }
+
+  /**
+   * When the mouse enters the section toggler activate the menu section
+   * @param $event
+   */
+  onMouseEnter($event: Event): void {
+    this.isMobile$.pipe(
       first()
     ).subscribe((isMobile) => {
-      if (!isMobile) {
-        super.activateSection(event);
+      if (!isMobile && !this.active$.value && !this.mouseEntered) {
+        this.activateSection($event);
       }
+      this.mouseEntered = true;
     });
   }
 
   /**
-   * Overrides the super function that deactivates this section (triggered on hover)
-   * Has an extra check to make sure the section can only be deactivated on non-mobile devices
-   * @param {Event} event The user event that triggered this function
+   * When the mouse leaves the section toggler deactivate the menu section
+   * @param $event
    */
-  deactivateSection(event): void {
-    this.windowService.isXsOrSm().pipe(
+  onMouseLeave($event: Event): void {
+    this.isMobile$.pipe(
       first()
     ).subscribe((isMobile) => {
-      if (!isMobile) {
-        super.deactivateSection(event);
+      if (!isMobile && this.active$.value && this.mouseEntered) {
+        this.deactivateSection($event);
       }
+      this.mouseEntered = false;
     });
   }
 
   /**
-   * Overrides the super function that toggles this section (triggered on click)
-   * Has an extra check to make sure the section can only be toggled on mobile devices
-   * @param {Event} event The user event that triggered this function
+   * returns the ID of the DOM element representing the navbar section
    */
-  toggleSection(event): void {
+  expandableNavbarSectionId(): string {
+    return `expandable-navbar-section-${this.section.id}-dropdown`;
+  }
+
+  /**
+   * Handles the navigation between the menu items
+   *
+   * @param event
+   */
+  navigateDropdown(event: KeyboardEvent): void {
+    if (event.code === 'Tab') {
+      this.deactivateSection(event, false);
+      return;
+    } else if (event.code === 'Escape') {
+      this.deactivateSection(event, false);
+      (document.querySelector(`a[aria-controls="${this.expandableNavbarSectionId()}"]`) as HTMLElement)?.focus();
+      return;
+    }
     event.preventDefault();
-    this.windowService.isXsOrSm().pipe(
-      first()
-    ).subscribe((isMobile) => {
-      if (isMobile) {
-        super.toggleSection(event);
-      }
-    });
+    event.stopPropagation();
+
+    const items: NodeListOf<Element> = document.querySelectorAll(`#${this.expandableNavbarSectionId()} *[role="menuitem"]`);
+    if (items.length === 0) {
+      return;
+    }
+    const currentIndex: number = Array.from(items).findIndex((item: Element) => item === event.target);
+
+    if (event.key === 'ArrowDown') {
+      (items[(currentIndex + 1) % items.length] as HTMLElement).focus();
+    } else if (event.key === 'ArrowUp') {
+      (items[(currentIndex - 1 + items.length) % items.length] as HTMLElement).focus();
+    }
+  }
+
+  /**
+   * Handles all the keydown events on the dropdown toggle
+   *
+   * @param event
+   */
+  keyDown(event: KeyboardEvent): void {
+    switch (event.code) {
+      // Works for both Tab & Shift Tab
+      case 'Tab':
+        this.deactivateSection(event, false);
+        break;
+      case 'ArrowDown':
+        this.focusOnFirstChildSection = true;
+        this.activateSection(event);
+        break;
+      case 'Space':
+      case 'Enter':
+        event.preventDefault();
+        break;
+    }
   }
 }
diff --git a/src/app/navbar/expandable-navbar-section/themed-expandable-navbar-section.component.ts b/src/app/navbar/expandable-navbar-section/themed-expandable-navbar-section.component.ts
index e33dca4104..8f474e9949 100644
--- a/src/app/navbar/expandable-navbar-section/themed-expandable-navbar-section.component.ts
+++ b/src/app/navbar/expandable-navbar-section/themed-expandable-navbar-section.component.ts
@@ -8,8 +8,7 @@ import { MenuID } from '../../shared/menu/menu-id.model';
  * Themed wrapper for ExpandableNavbarSectionComponent
  */
 @Component({
-  /* eslint-disable @angular-eslint/component-selector */
-  selector: 'li[ds-themed-expandable-navbar-section]',
+  selector: 'ds-themed-expandable-navbar-section',
   styleUrls: [],
   templateUrl: '../../shared/theme-support/themed.component.html',
 })
diff --git a/src/app/navbar/navbar-section/navbar-section.component.html b/src/app/navbar/navbar-section/navbar-section.component.html
index 42754be1e6..1411d3b6a6 100644
--- a/src/app/navbar/navbar-section/navbar-section.component.html
+++ b/src/app/navbar/navbar-section/navbar-section.component.html
@@ -1,3 +1,4 @@
-<div class="nav-item navbar-section text-md-center">
+<div class="ds-menu-item-wrapper text-md-center"
+     [id]="'navbar-section-' + section.id">
   <ng-container *ngComponentOutlet="(sectionMap$ | async).get(section.id).component; injector: (sectionMap$ | async).get(section.id).injector;"></ng-container>
 </div>
diff --git a/src/app/navbar/navbar-section/navbar-section.component.scss b/src/app/navbar/navbar-section/navbar-section.component.scss
index 7af4ada8e6..e69de29bb2 100644
--- a/src/app/navbar/navbar-section/navbar-section.component.scss
+++ b/src/app/navbar/navbar-section/navbar-section.component.scss
@@ -1,5 +0,0 @@
-.navbar-section {
-  display: flex;
-  align-items: center;
-  height: 100%;
-}
diff --git a/src/app/navbar/navbar-section/navbar-section.component.ts b/src/app/navbar/navbar-section/navbar-section.component.ts
index 9f75a96f6e..9b86aa10f2 100644
--- a/src/app/navbar/navbar-section/navbar-section.component.ts
+++ b/src/app/navbar/navbar-section/navbar-section.component.ts
@@ -8,8 +8,7 @@ import { MenuID } from '../../shared/menu/menu-id.model';
  * Represents a non-expandable section in the navbar
  */
 @Component({
-  /* eslint-disable @angular-eslint/component-selector */
-  selector: 'li[ds-navbar-section]',
+  selector: 'ds-navbar-section',
   templateUrl: './navbar-section.component.html',
   styleUrls: ['./navbar-section.component.scss']
 })
diff --git a/src/app/navbar/navbar.component.html b/src/app/navbar/navbar.component.html
index bc1e04f513..bda9815481 100644
--- a/src/app/navbar/navbar.component.html
+++ b/src/app/navbar/navbar.component.html
@@ -1,18 +1,21 @@
-<nav [ngClass]="{'open': !(menuCollapsed | async)}" [@slideMobileNav]="!(windowService.isXsOrSm() | async) ? 'default' : ((menuCollapsed | async) ? 'collapsed' : 'expanded')"
-    class="navbar navbar-light navbar-expand-md p-md-0 navbar-container" role="navigation" [attr.aria-label]="'nav.main.description' | translate">
-    <!-- TODO remove navbar-container class when https://github.com/twbs/bootstrap/issues/24726 is fixed -->
-    <div class="navbar-inner-container w-100" [class.container]="!(isXsOrSm$ | async)">
-        <div class="reset-padding-md w-100">
-            <div id="collapsingNav">
-                <ul class="navbar-nav navbar-navigation mr-auto shadow-none">
-                    <li *ngIf="(isXsOrSm$ | async) && (isAuthenticated$ | async)">
-                        <ds-user-menu [inExpandableNavbar]="true"></ds-user-menu>
-                    </li>
-                    <ng-container *ngFor="let section of (sections | async)">
-                        <ng-container *ngComponentOutlet="(sectionMap$ | async).get(section.id)?.component; injector: (sectionMap$ | async).get(section.id)?.injector;"></ng-container>
-                    </ng-container>
-                </ul>
-            </div>
+<nav [ngClass]="{'open': !(menuCollapsed | async)}"
+     [@slideMobileNav]="!(windowService.isXsOrSm() | async) ? 'default' : ((menuCollapsed | async) ? 'collapsed' : 'expanded')"
+     class="navbar navbar-light navbar-expand-md px-md-0 pt-md-0 pt-3 navbar-container" role="navigation"
+     [attr.aria-label]="'nav.main.description' | translate" id="main-navbar">
+  <!-- TODO remove navbar-container class when https://github.com/twbs/bootstrap/issues/24726 is fixed -->
+  <div class="navbar-inner-container w-100" [class.container]="!(isMobile$ | async)">
+    <div class="w-100">
+      <div id="collapsingNav">
+        <ng-container *ngIf="(isMobile$ | async) && (isAuthenticated$ | async)">
+          <ds-themed-user-menu [inExpandableNavbar]="true"></ds-themed-user-menu>
+        </ng-container>
+        <div class="navbar-nav align-items-md-center mr-auto shadow-none gapx-3">
+          <ng-container *ngFor="let section of (sections | async)">
+            <ng-container
+              *ngComponentOutlet="(sectionMap$ | async).get(section.id)?.component; injector: (sectionMap$ | async).get(section.id)?.injector;"></ng-container>
+          </ng-container>
         </div>
+      </div>
     </div>
+  </div>
 </nav>
diff --git a/src/app/navbar/navbar.component.scss b/src/app/navbar/navbar.component.scss
index 441ee82c96..bbf5feec15 100644
--- a/src/app/navbar/navbar.component.scss
+++ b/src/app/navbar/navbar.component.scss
@@ -1,45 +1,64 @@
-nav.navbar {
-    border-bottom: 1px var(--ds-header-navbar-border-bottom-color) solid;
+:host {
+  --ds-expandable-navbar-height: auto;
+
+  nav.navbar {
+    background-color: var(--ds-navbar-bg);
     align-items: baseline;
-}
+    padding: 0;
+  }
 
-/** Mobile menu styling **/
-@media screen and (max-width: map-get($grid-breakpoints, md)-0.02) {
+  /** Mobile menu styling **/
+  @media screen and (max-width: map-get($grid-breakpoints, md)-0.02) {
     .navbar {
-        width: 100%;
-        background-color: var(--bs-white);
-        position: absolute;
-        overflow: hidden;
-        height: 0;
-        &.open {
-          height: auto;
-          min-height: 100vh; //doesn't matter because wrapper is sticky
-        }
+      width: 100vw;
+      background-color: var(--bs-white);
+      position: absolute;
+      overflow: hidden;
+      height: 0;
+      z-index: var(--ds-nav-z-index);
+      &.open {
+        height: auto;
+        min-height: 100vh; //doesn't matter because wrapper is sticky
+        border-bottom: 1px var(--ds-header-navbar-border-bottom-color) solid; // open navbar covers header-navbar-wrapper border
+      }
     }
-}
+  }
 
-@media screen and (min-width: map-get($grid-breakpoints, md)) {
+  @media screen and (min-width: map-get($grid-breakpoints, md)) {
     .reset-padding-md {
-        margin-left: calc(var(--bs-spacer) / -2);
-        margin-right: calc(var(--bs-spacer) / -2);
+      margin-left: calc(var(--bs-spacer) / -1);
+      margin-right: calc(var(--bs-spacer) / -1);
     }
-}
+  }
 
-/* TODO remove when https://github.com/twbs/bootstrap/issues/24726 is fixed */
-.navbar-expand-md.navbar-container {
+  /* TODO remove when https://github.com/twbs/bootstrap/issues/24726 is fixed */
+  .navbar-expand-md.navbar-container {
     @media screen and (max-width: map-get($grid-breakpoints, md)-0.02) {
-        > .navbar-inner-container {
-            padding: 0 var(--bs-spacer);
-        }
-        padding: 0;
+      > .navbar-inner-container {
+        padding: 0 var(--bs-spacer);
+      }
+      padding: 0;
     }
-}
+  }
 
-.navbar-nav {
-  ::ng-deep a.nav-link {
-    color: var(--ds-navbar-link-color);
-  }
-  ::ng-deep a.nav-link:hover {
-    color: var(--ds-navbar-link-color-hover);
+  #main-navbar ::ng-deep {
+    .ds-menu-item, .ds-menu-toggler-wrapper {
+      white-space: nowrap;
+      text-decoration: none;
+    }
+
+    .dropdown-menu {
+      padding: 0.5rem !important;
+    }
+
+    .ds-menu-item {
+      display: block;
+      color: var(--ds-navbar-link-color);
+      padding: 0.5rem 0;
+
+      &:hover, &:focus {
+        color: var(--ds-navbar-link-color-hover);
+      }
+    }
   }
 }
diff --git a/src/app/navbar/navbar.component.ts b/src/app/navbar/navbar.component.ts
index 0cfad9e431..d56200fd02 100644
--- a/src/app/navbar/navbar.component.ts
+++ b/src/app/navbar/navbar.component.ts
@@ -1,8 +1,8 @@
-import { Component, Injector } from '@angular/core';
+import { Component, Injector, OnInit } from '@angular/core';
 import { slideMobileNav } from '../shared/animations/slide';
 import { MenuComponent } from '../shared/menu/menu.component';
 import { MenuService } from '../shared/menu/menu.service';
-import { HostWindowService } from '../shared/host-window.service';
+import { HostWindowService, WidthCategory } from '../shared/host-window.service';
 import { BrowseService } from '../core/browse/browse.service';
 import { ActivatedRoute } from '@angular/router';
 import { AuthorizationDataService } from '../core/data/feature-authorization/authorization-data.service';
@@ -22,12 +22,13 @@ import { isAuthenticated } from '../core/auth/selectors';
   templateUrl: './navbar.component.html',
   animations: [slideMobileNav]
 })
-export class NavbarComponent extends MenuComponent {
+export class NavbarComponent extends MenuComponent implements OnInit {
   /**
    * The menu ID of the Navbar is PUBLIC
    * @type {MenuID.PUBLIC}
    */
   menuID = MenuID.PUBLIC;
+  maxMobileWidth = WidthCategory.SM;
 
   /**
    * Whether user is authenticated.
@@ -35,7 +36,7 @@ export class NavbarComponent extends MenuComponent {
    */
   public isAuthenticated$: Observable<boolean>;
 
-  public isXsOrSm$: Observable<boolean>;
+  public isMobile$: Observable<boolean>;
 
   constructor(protected menuService: MenuService,
     protected injector: Injector,
@@ -51,7 +52,7 @@ export class NavbarComponent extends MenuComponent {
 
   ngOnInit(): void {
     super.ngOnInit();
-    this.isXsOrSm$ = this.windowService.isXsOrSm();
+    this.isMobile$ = this.windowService.isUpTo(this.maxMobileWidth);
     this.isAuthenticated$ = this.store.pipe(select(isAuthenticated));
   }
 }
diff --git a/src/app/navbar/navbar.module.ts b/src/app/navbar/navbar.module.ts
index de3244099d..d282c42a07 100644
--- a/src/app/navbar/navbar.module.ts
+++ b/src/app/navbar/navbar.module.ts
@@ -13,6 +13,7 @@ import { MenuModule } from '../shared/menu/menu.module';
 import { SharedModule } from '../shared/shared.module';
 import { FormsModule } from '@angular/forms';
 import { ThemedNavbarComponent } from './themed-navbar.component';
+import { HoverOutsideDirective } from '../shared/utils/hover-outside.directive';
 
 const effects = [
   NavbarEffects
@@ -25,6 +26,10 @@ const ENTRY_COMPONENTS = [
   ThemedExpandableNavbarSectionComponent,
 ];
 
+const DIRECTIVES = [
+  HoverOutsideDirective,
+];
+
 @NgModule({
   imports: [
     CommonModule,
@@ -35,12 +40,14 @@ const ENTRY_COMPONENTS = [
     CoreModule.forRoot()
   ],
   declarations: [
+    ...DIRECTIVES,
     ...ENTRY_COMPONENTS,
     NavbarComponent,
     ThemedNavbarComponent,
   ],
   providers: [],
   exports: [
+    ...DIRECTIVES,
     ThemedNavbarComponent,
     NavbarSectionComponent,
     ThemedExpandableNavbarSectionComponent
diff --git a/src/app/page-error/page-error.component.html b/src/app/page-error/page-error.component.html
index 9a5f02600a..9a8ffc7e90 100644
--- a/src/app/page-error/page-error.component.html
+++ b/src/app/page-error/page-error.component.html
@@ -5,6 +5,6 @@
   <p>{{"error-page." + code | translate}}</p>
   <br/>
   <p class="text-center">
-    <a href="/home" class="btn btn-primary">{{ status + ".link.home-page" | translate}}</a>
+    <a href="/home" class="btn btn-primary" role="link" tabindex="0">{{ status + ".link.home-page" | translate}}</a>
   </p>
 </div>
diff --git a/src/app/pagenotfound/pagenotfound.component.html b/src/app/pagenotfound/pagenotfound.component.html
index e85316b0ec..dba2f9700e 100644
--- a/src/app/pagenotfound/pagenotfound.component.html
+++ b/src/app/pagenotfound/pagenotfound.component.html
@@ -5,6 +5,6 @@
   <p>{{"404.help" | translate}}</p>
   <br/>
   <p class="text-center">
-    <a routerLink="/home" class="btn btn-primary">{{"404.link.home-page" | translate}}</a>
+    <a routerLink="/home" class="btn btn-primary" role="link" tabindex="0">{{"404.link.home-page" | translate}}</a>
   </p>
 </div>
\ No newline at end of file
diff --git a/src/app/process-page/detail/process-detail-field/process-detail-field.component.html b/src/app/process-page/detail/process-detail-field/process-detail-field.component.html
index ce26008c28..2558b6cf7a 100644
--- a/src/app/process-page/detail/process-detail-field/process-detail-field.component.html
+++ b/src/app/process-page/detail/process-detail-field/process-detail-field.component.html
@@ -1,2 +1,2 @@
-<h4 class="mt-4">{{title | translate}}</h4>
+<h2 class="h3 mt-4">{{title | translate}}</h2>
 <ng-content></ng-content>
diff --git a/src/app/process-page/detail/process-detail-field/process-detail-field.component.spec.ts b/src/app/process-page/detail/process-detail-field/process-detail-field.component.spec.ts
index 57b596b8b6..ba0c946bfd 100644
--- a/src/app/process-page/detail/process-detail-field/process-detail-field.component.spec.ts
+++ b/src/app/process-page/detail/process-detail-field/process-detail-field.component.spec.ts
@@ -32,7 +32,7 @@ describe('ProcessDetailFieldComponent', () => {
   });
 
   it('should display the given title', () => {
-    const header = fixture.debugElement.query(By.css('h4')).nativeElement;
+    const header = fixture.debugElement.query(By.css('h2')).nativeElement;
     expect(header.textContent).toContain(title);
   });
 });
diff --git a/src/app/process-page/detail/process-detail.component.html b/src/app/process-page/detail/process-detail.component.html
index 5f905cbfff..4daee064df 100644
--- a/src/app/process-page/detail/process-detail.component.html
+++ b/src/app/process-page/detail/process-detail.component.html
@@ -1,9 +1,9 @@
 <div class="container" *ngIf="(processRD$ | async)?.payload as process">
     <div class="row">
       <div class="col-10">
-        <h2 class="flex-grow-1">
+        <h1 class="flex-grow-1">
           {{ 'process.detail.title' | translate:{ id: process?.processId, name: process?.scriptName } }}
-        </h2>
+        </h1>
       </div>
       <div *ngIf="refreshCounter$ | async as seconds" class="col-2 refresh-counter">
         Refreshing in {{ seconds }}s <i class="fas fa-sync-alt fa-spin"></i>
@@ -53,7 +53,7 @@
         </button>
         <ds-themed-loading *ngIf="retrievingOutputLogs$ | async" class="ds-themed-loading"
                            message="{{ 'process.detail.logs.loading' | translate }}"></ds-themed-loading>
-        <pre class="font-weight-bold text-secondary bg-light p-3"
+        <pre class="font-weight-bold text-secondary bg-light p-3" tabindex="0"
              *ngIf="showOutputLogs && (outputLogs$ | async)?.length > 0">{{ (outputLogs$ | async) }}</pre>
         <p id="no-output-logs-message" *ngIf="(!(retrievingOutputLogs$ | async) && showOutputLogs)
       && !(outputLogs$ | async) || (outputLogs$ | async)?.length == 0 || !process._links.output">
diff --git a/src/app/process-page/detail/process-detail.component.spec.ts b/src/app/process-page/detail/process-detail.component.spec.ts
index 9552f9a092..9a0d89a882 100644
--- a/src/app/process-page/detail/process-detail.component.spec.ts
+++ b/src/app/process-page/detail/process-detail.component.spec.ts
@@ -147,7 +147,7 @@ describe('ProcessDetailComponent', () => {
       providers: [
         {
           provide: ActivatedRoute,
-          useValue: { data: observableOf({ process: createSuccessfulRemoteDataObject(process) }) }
+          useValue: { data: observableOf({ process: createSuccessfulRemoteDataObject(process) }), snapshot: { params: { id: 1 } } },
         },
         { provide: ProcessDataService, useValue: processService },
         { provide: BitstreamDataService, useValue: bitstreamDataService },
@@ -310,10 +310,11 @@ describe('ProcessDetailComponent', () => {
       });
 
       it('should call refresh method every 5 seconds, until process is completed', fakeAsync(() => {
-        spyOn(component, 'refresh');
-        spyOn(component, 'stopRefreshTimer');
+        spyOn(component, 'refresh').and.callThrough();
+        spyOn(component, 'stopRefreshTimer').and.callThrough();
 
-        process.processStatus = ProcessStatus.COMPLETED;
+        // start off with a running process in order for the refresh counter starts counting up
+        process.processStatus = ProcessStatus.RUNNING;
         // set findbyId to return a completed process
         (processService.findById as jasmine.Spy).and.returnValue(observableOf(createSuccessfulRemoteDataObject(process)));
 
@@ -336,6 +337,10 @@ describe('ProcessDetailComponent', () => {
         tick(1001); // 1 second + 1 ms by the setTimeout
         expect(component.refreshCounter$.value).toBe(0); // 1 - 1
 
+        // set the process to completed right before the counter checks the process
+        process.processStatus = ProcessStatus.COMPLETED;
+        (processService.findById as jasmine.Spy).and.returnValue(observableOf(createSuccessfulRemoteDataObject(process)));
+
         tick(1000); // 1 second
 
         expect(component.refresh).toHaveBeenCalledTimes(1);
diff --git a/src/app/process-page/detail/process-detail.component.ts b/src/app/process-page/detail/process-detail.component.ts
index a379dfe337..be0b6ad0f6 100644
--- a/src/app/process-page/detail/process-detail.component.ts
+++ b/src/app/process-page/detail/process-detail.component.ts
@@ -17,7 +17,7 @@ import {
   getFirstSucceededRemoteDataPayload
 } from '../../core/shared/operators';
 import { URLCombiner } from '../../core/url-combiner/url-combiner';
-import { AlertType } from '../../shared/alert/aletr-type';
+import { AlertType } from '../../shared/alert/alert-type';
 import { hasValue } from '../../shared/empty.util';
 import { ProcessStatus } from '../processes/process-status.model';
 import { Process } from '../processes/process.model';
diff --git a/src/app/process-page/form/process-form.component.html b/src/app/process-page/form/process-form.component.html
index ce6d62efec..211129489e 100644
--- a/src/app/process-page/form/process-form.component.html
+++ b/src/app/process-page/form/process-form.component.html
@@ -1,18 +1,18 @@
 <div class="container">
     <div class="row">
-        <h2 class="col-12">
+        <h1 class="col-12">
             {{headerKey | translate}}
-        </h2>
-        <div class="col-12 col-md-6">
+        </h1>
+        <div class="col-12 col-md-6 mb-2">
             <form #form="ngForm" (ngSubmit)="submitForm(form)">
                 <ds-scripts-select [script]="selectedScript" (select)="selectedScript = $event; parameters = undefined"></ds-scripts-select>
                 <ds-process-parameters [initialParams]="parameters" [script]="selectedScript" (updateParameters)="parameters = $event"></ds-process-parameters>
-                <button [routerLink]="['/processes']" class="btn btn-light float-left">{{ 'process.new.cancel' | translate }}</button>
-                <button type="submit" class="btn btn-light float-right">{{ 'process.new.submit' | translate }}</button>
+                <a [routerLink]="['/processes']" class="btn btn-danger float-left">{{ 'process.new.cancel' | translate }}</a>
+                <button type="submit" class="btn btn-primary float-right">{{ 'process.new.submit' | translate }}</button>
             </form>
         </div>
         <div class="col-12 col-md-6">
-            <ds-script-help [script]="selectedScript"></ds-script-help>
+            <ds-script-help *ngIf="selectedScript" [script]="selectedScript"></ds-script-help>
         </div>
     </div>
 
diff --git a/src/app/process-page/form/process-parameters/parameter-select/parameter-select.component.html b/src/app/process-page/form/process-parameters/parameter-select/parameter-select.component.html
index 4bf06bbade..1f1559b50b 100644
--- a/src/app/process-page/form/process-parameters/parameter-select/parameter-select.component.html
+++ b/src/app/process-page/form/process-parameters/parameter-select/parameter-select.component.html
@@ -1,16 +1,20 @@
-<div class="form-row mb-2 mx-0">
+<div class="form-row gap-2 mb-2 mx-0">
     <select id="process-parameters"
             class="form-control col"
             name="parameter-{{index}}"
+            [attr.aria-label]="'process.new.select-parameter' | translate"
             [(ngModel)]="selectedParameter"
             #param="ngModel">
-        <option [ngValue]="undefined">Add a parameter...</option>
+        <option [ngValue]="undefined">{{ 'process.new.add-parameter' | translate }}</option>
         <option *ngFor="let param of parameters" [ngValue]="param.name">
             {{param.nameLong || param.name}}
         </option>
     </select>
-    <ds-parameter-value-input [initialValue]="parameterValue.value" [parameter]="selectedScriptParameter" (updateValue)="selectedParameterValue = $event" class="d-block col" [index]="index"></ds-parameter-value-input>
-    <button *ngIf="removable" class="btn btn-light col-1 remove-button" (click)="removeParameter.emit(parameterValue);"><span class="fas fa-trash"></span></button>
+    <ds-parameter-value-input [initialValue]="parameterValue.value" [parameter]="selectedScriptParameter" (updateValue)="selectedParameterValue = $event" class="d-block col px-0" [index]="index"></ds-parameter-value-input>
+    <button *ngIf="removable" [attr.aria-label]="'process.new.delete-parameter' | translate"
+            (click)="removeParameter.emit(parameterValue);" class="btn btn-danger col-1 remove-button">
+      <i class="fas fa-trash"></i>
+    </button>
     <span *ngIf="!removable" class="col-1"></span>
 </div>
 
diff --git a/src/app/process-page/form/process-parameters/parameter-select/parameter-select.component.spec.ts b/src/app/process-page/form/process-parameters/parameter-select/parameter-select.component.spec.ts
index 56fece56b4..818a292e33 100644
--- a/src/app/process-page/form/process-parameters/parameter-select/parameter-select.component.spec.ts
+++ b/src/app/process-page/form/process-parameters/parameter-select/parameter-select.component.spec.ts
@@ -1,5 +1,5 @@
 import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
-
+import { TranslateModule } from '@ngx-translate/core';
 import { ParameterSelectComponent } from './parameter-select.component';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
 import { FormsModule } from '@angular/forms';
@@ -33,7 +33,10 @@ describe('ParameterSelectComponent', () => {
   beforeEach(waitForAsync(() => {
     init();
     TestBed.configureTestingModule({
-      imports: [FormsModule],
+      imports: [
+        FormsModule,
+        TranslateModule.forRoot(),
+      ],
       declarations: [ParameterSelectComponent],
       schemas: [NO_ERRORS_SCHEMA]
     })
diff --git a/src/app/process-page/form/process-parameters/parameter-value-input/boolean-value-input/boolean-value-input.component.html b/src/app/process-page/form/process-parameters/parameter-value-input/boolean-value-input/boolean-value-input.component.html
index 914b331413..68171a23b2 100644
--- a/src/app/process-page/form/process-parameters/parameter-value-input/boolean-value-input/boolean-value-input.component.html
+++ b/src/app/process-page/form/process-parameters/parameter-value-input/boolean-value-input/boolean-value-input.component.html
@@ -1 +1 @@
-<input type="hidden" value="true" name="boolean-value-{{index}}" id="boolean-value-{{index}}"/>
+<input [attr.aria-label]="'process.new.parameter.label' | translate" type="hidden" value="true" name="boolean-value-{{index}}" id="boolean-value-{{index}}"/>
diff --git a/src/app/process-page/form/process-parameters/parameter-value-input/boolean-value-input/boolean-value-input.component.spec.ts b/src/app/process-page/form/process-parameters/parameter-value-input/boolean-value-input/boolean-value-input.component.spec.ts
index 38f119ad5b..76b01b8709 100644
--- a/src/app/process-page/form/process-parameters/parameter-value-input/boolean-value-input/boolean-value-input.component.spec.ts
+++ b/src/app/process-page/form/process-parameters/parameter-value-input/boolean-value-input/boolean-value-input.component.spec.ts
@@ -1,5 +1,5 @@
 import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-
+import { TranslateModule } from '@ngx-translate/core';
 import { BooleanValueInputComponent } from './boolean-value-input.component';
 
 describe('BooleanValueInputComponent', () => {
@@ -8,6 +8,9 @@ describe('BooleanValueInputComponent', () => {
 
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
+      imports: [
+        TranslateModule.forRoot(),
+      ],
       declarations: [BooleanValueInputComponent]
     })
       .compileComponents();
diff --git a/src/app/process-page/form/process-parameters/parameter-value-input/date-value-input/date-value-input.component.html b/src/app/process-page/form/process-parameters/parameter-value-input/date-value-input/date-value-input.component.html
index f367d3779f..4e77f4ed1b 100644
--- a/src/app/process-page/form/process-parameters/parameter-value-input/date-value-input/date-value-input.component.html
+++ b/src/app/process-page/form/process-parameters/parameter-value-input/date-value-input/date-value-input.component.html
@@ -1,6 +1,6 @@
-<input required #string="ngModel" type="text" class="form-control" name="date-value-{{index}}" id="date-value-{{index}}" [ngModel]="value" (ngModelChange)="setValue($event)"/>
+<input [attr.aria-label]="'process.new.parameter.label' | translate" required #string="ngModel" type="text" class="form-control" name="date-value-{{index}}" id="date-value-{{index}}" [ngModel]="value" (ngModelChange)="setValue($event)"/>
 <div *ngIf="string.invalid && (string.dirty || string.touched)"
-     class="alert alert-danger validation-error">
+     class="alert alert-danger validation-error mb-0">
     <div *ngIf="string.errors.required">
         {{'process.new.parameter.string.required' | translate}}
     </div>
diff --git a/src/app/process-page/form/process-parameters/parameter-value-input/date-value-input/date-value-input.component.scss b/src/app/process-page/form/process-parameters/parameter-value-input/date-value-input/date-value-input.component.scss
index e69de29bb2..8c6325f95a 100644
--- a/src/app/process-page/form/process-parameters/parameter-value-input/date-value-input/date-value-input.component.scss
+++ b/src/app/process-page/form/process-parameters/parameter-value-input/date-value-input/date-value-input.component.scss
@@ -0,0 +1,5 @@
+:host {
+  display: flex;
+  flex-direction: column;
+  gap: calc(var(--bs-spacer) / 2);
+}
diff --git a/src/app/process-page/form/process-parameters/parameter-value-input/file-value-input/file-value-input.component.html b/src/app/process-page/form/process-parameters/parameter-value-input/file-value-input/file-value-input.component.html
index cac3fbd82d..a741eacc86 100644
--- a/src/app/process-page/form/process-parameters/parameter-value-input/file-value-input/file-value-input.component.html
+++ b/src/app/process-page/form/process-parameters/parameter-value-input/file-value-input/file-value-input.component.html
@@ -1,5 +1,5 @@
 <label for="file-upload-{{index}}" class="d-flex align-items-center m-0">
-    <span class="btn btn-light">
+    <span class="btn btn-primary">
         {{'process.new.parameter.file.upload-button' | translate}}
     </span>
     <span class="file-name ml-1">{{fileObject?.name}}</span>
diff --git a/src/app/process-page/form/process-parameters/parameter-value-input/string-value-input/string-value-input.component.html b/src/app/process-page/form/process-parameters/parameter-value-input/string-value-input/string-value-input.component.html
index 246c62a0f6..bf60f9f024 100644
--- a/src/app/process-page/form/process-parameters/parameter-value-input/string-value-input/string-value-input.component.html
+++ b/src/app/process-page/form/process-parameters/parameter-value-input/string-value-input/string-value-input.component.html
@@ -1,6 +1,6 @@
-<input required #string="ngModel" type="text" name="string-value-{{index}}" class="form-control" id="string-value-{{index}}" [ngModel]="value" (ngModelChange)="setValue($event)"/>
+<input [attr.aria-label]="'process.new.parameter.label' | translate" required #string="ngModel" type="text" name="string-value-{{index}}" class="form-control" id="string-value-{{index}}" [ngModel]="value" (ngModelChange)="setValue($event)"/>
 <div *ngIf="string.invalid && (string.dirty || string.touched)"
-     class="alert alert-danger validation-error">
+     class="alert alert-danger validation-error mb-0">
     <div *ngIf="string.errors.required">
         {{'process.new.parameter.string.required' | translate}}
     </div>
diff --git a/src/app/process-page/form/process-parameters/parameter-value-input/string-value-input/string-value-input.component.scss b/src/app/process-page/form/process-parameters/parameter-value-input/string-value-input/string-value-input.component.scss
index e69de29bb2..8c6325f95a 100644
--- a/src/app/process-page/form/process-parameters/parameter-value-input/string-value-input/string-value-input.component.scss
+++ b/src/app/process-page/form/process-parameters/parameter-value-input/string-value-input/string-value-input.component.scss
@@ -0,0 +1,5 @@
+:host {
+  display: flex;
+  flex-direction: column;
+  gap: calc(var(--bs-spacer) / 2);
+}
diff --git a/src/app/process-page/form/script-help/script-help.component.html b/src/app/process-page/form/script-help/script-help.component.html
index f52ae4b6b9..7615edcfd4 100644
--- a/src/app/process-page/form/script-help/script-help.component.html
+++ b/src/app/process-page/form/script-help/script-help.component.html
@@ -1,5 +1,5 @@
 <div class="text-secondary">
-  <h3>{{script?.name}}</h3>
+  <h2>{{script?.name}}</h2>
   <span>{{script?.description}}</span>
 
   <table class="table-borderless mt-3">
diff --git a/src/app/process-page/form/scripts-select/scripts-select.component.html b/src/app/process-page/form/scripts-select/scripts-select.component.html
index 9cd86d1a6d..5c161f8d8d 100644
--- a/src/app/process-page/form/scripts-select/scripts-select.component.html
+++ b/src/app/process-page/form/scripts-select/scripts-select.component.html
@@ -1,20 +1,47 @@
-<div class="form-group" *ngIf="scripts$ | async">
-    <label for="process-script">{{'process.new.select-script' | translate}}</label>
-    <select required id="process-script"
-            class="form-control"
-            name="script"
-            [(ngModel)]="selectedScript"
-            #script="ngModel">
-        <option [ngValue]="undefined">{{'process.new.select-script.placeholder' | translate}}</option>
-        <option *ngFor="let script of scripts$ | async" [ngValue]="script.id">
-            {{script.name}}
-        </option>
-    </select>
-
+<div class="d-flex w-100 flex-column gap-3">
+  <div>
+    <div ngbDropdown class="d-flex">
+      <input id="process-script"
+             class="form-control"
+             required
+             [ngModel]="selectedScript"
+             placeholder="{{'process.new.select-script.placeholder' | translate}}"
+             [ngModelOptions]="{standalone: true}"
+             ngbDropdownToggle
+             role="combobox"
+             #script="ngModel">
+      <div ngbDropdownMenu aria-labelledby="process-script" class="w-100 scrollable-menu"
+            role="menu"
+            (scroll)="onScroll($event)"
+            infiniteScroll
+            [infiniteScrollDistance]="5"
+            [infiniteScrollThrottle]="300"
+            [infiniteScrollUpDistance]="1.5"
+            [fromRoot]="true"
+            [scrollWindow]="false">
+            <button class="dropdown-item"
+                    *ngFor="let script of scripts"
+                    role="menuitem"
+                    type="button"
+                    title="{{ script.name }}"
+                    (click)="onSelect(script);">
+              <span class="text-truncate">{{ script.name }}</span>
+            </button>
+          <ng-container *ngIf="(isLoading$ | async)">
+            <button class="dropdown-item disabled" role="menuitem">
+              <ds-loading message="{{'loading.default' | translate}}">
+              </ds-loading>
+            </button>
+          </ng-container>
+      </div>
+    </div>
+  </div>
+  <div>
     <div *ngIf="script.invalid && (script.dirty || script.touched)"
          class="alert alert-danger validation-error">
-        <div *ngIf="script.errors.required">
-            {{'process.new.select-script.required' | translate}}
-        </div>
+      <div *ngIf="script.errors.required">
+        {{ 'process.new.select-script.required' | translate }}
+      </div>
     </div>
+  </div>
 </div>
diff --git a/src/app/process-page/form/scripts-select/scripts-select.component.scss b/src/app/process-page/form/scripts-select/scripts-select.component.scss
index e69de29bb2..4f9ca62310 100644
--- a/src/app/process-page/form/scripts-select/scripts-select.component.scss
+++ b/src/app/process-page/form/scripts-select/scripts-select.component.scss
@@ -0,0 +1,23 @@
+.dropdown-item {
+  padding: 0.35rem 1rem;
+
+  &:active {
+    color: white !important;
+  }
+}
+
+.scrollable-menu {
+  height: auto;
+  max-height: var(--ds-dropdown-menu-max-height);
+  overflow-x: hidden;
+}
+
+li:not(:last-of-type) .dropdown-item {
+  border-bottom: var(--bs-dropdown-border-width) solid var(--bs-dropdown-border-color);
+}
+
+#entityControlsDropdownMenu {
+  outline: 0;
+  left: 0 !important;
+  box-shadow: var(--bs-btn-focus-box-shadow);
+}
diff --git a/src/app/process-page/form/scripts-select/scripts-select.component.spec.ts b/src/app/process-page/form/scripts-select/scripts-select.component.spec.ts
index 72dc4c9348..3250a65367 100644
--- a/src/app/process-page/form/scripts-select/scripts-select.component.spec.ts
+++ b/src/app/process-page/form/scripts-select/scripts-select.component.spec.ts
@@ -74,7 +74,7 @@ describe('ScriptsSelectComponent', () => {
     fixture.detectChanges();
     tick();
 
-    const select = fixture.debugElement.query(By.css('select'));
+    const select = fixture.debugElement.query(By.css('#process-script'));
     select.triggerEventHandler('blur', null);
 
     fixture.detectChanges();
@@ -88,7 +88,7 @@ describe('ScriptsSelectComponent', () => {
     fixture.detectChanges();
     tick();
 
-    const select = fixture.debugElement.query(By.css('select'));
+    const select = fixture.debugElement.query(By.css('#process-script'));
     select.triggerEventHandler('blur', null);
 
     fixture.detectChanges();
diff --git a/src/app/process-page/form/scripts-select/scripts-select.component.ts b/src/app/process-page/form/scripts-select/scripts-select.component.ts
index 4c7fe3bdf7..8cc31085a4 100644
--- a/src/app/process-page/form/scripts-select/scripts-select.component.ts
+++ b/src/app/process-page/form/scripts-select/scripts-select.component.ts
@@ -1,14 +1,18 @@
 import { Component, EventEmitter, Input, OnDestroy, OnInit, Optional, Output } from '@angular/core';
 import { ScriptDataService } from '../../../core/data/processes/script-data.service';
 import { Script } from '../../scripts/script.model';
-import { Observable, Subscription } from 'rxjs';
-import { distinctUntilChanged, filter, map, switchMap, take } from 'rxjs/operators';
-import { getRemoteDataPayload, getFirstSucceededRemoteData } from '../../../core/shared/operators';
+import { BehaviorSubject, Subscription, tap } from 'rxjs';
+import { map } from 'rxjs/operators';
+import {
+  getRemoteDataPayload,
+  getFirstCompletedRemoteData
+} from '../../../core/shared/operators';
 import { PaginatedList } from '../../../core/data/paginated-list.model';
-import { ActivatedRoute, Params, Router } from '@angular/router';
-import { hasNoValue, hasValue } from '../../../shared/empty.util';
+import { ActivatedRoute, Router } from '@angular/router';
+import { hasValue } from '../../../shared/empty.util';
 import { ControlContainer, NgForm } from '@angular/forms';
 import { controlContainerFactory } from '../process-form.component';
+import { FindListOptions } from '../../../core/data/find-list-options.model';
 
 const SCRIPT_QUERY_PARAMETER = 'script';
 
@@ -31,10 +35,20 @@ export class ScriptsSelectComponent implements OnInit, OnDestroy {
   /**
    * All available scripts
    */
-  scripts$: Observable<Script[]>;
+  scripts: Script[] = [];
+
   private _selectedScript: Script;
   private routeSub: Subscription;
 
+  private _isLastPage = false;
+
+  scriptOptions: FindListOptions = {
+    elementsPerPage: 20,
+    currentPage: 1,
+  };
+
+  isLoading$: BehaviorSubject<boolean> = new BehaviorSubject(false);
+
   constructor(
     private scriptService: ScriptDataService,
     private router: Router,
@@ -47,31 +61,46 @@ export class ScriptsSelectComponent implements OnInit, OnDestroy {
    * Checks if the route contains a script ID and auto selects this scripts
    */
   ngOnInit() {
-    this.scripts$ = this.scriptService.findAll({ elementsPerPage: 9999 })
-      .pipe(
-        getFirstSucceededRemoteData(),
-        getRemoteDataPayload(),
-        map((paginatedList: PaginatedList<Script>) => paginatedList.page)
-      );
+    this.loadScripts();
+  }
 
-    this.routeSub = this.route.queryParams
-      .pipe(
-        filter((params: Params) => hasNoValue(params.id)),
-        map((params: Params) => params[SCRIPT_QUERY_PARAMETER]),
-        distinctUntilChanged(),
-        switchMap((id: string) =>
-          this.scripts$
-            .pipe(
-              take(1),
-              map((scripts) =>
-                scripts.find((script) => script.id === id)
-              )
-            )
-        )
-      ).subscribe((script: Script) => {
-        this._selectedScript = script;
-        this.select.emit(script);
-      });
+  /**
+   * Load the scripts and check if the route contains a script
+   */
+  loadScripts() {
+    if (this.isLoading$.value) {return;}
+    this.isLoading$.next(true);
+
+    this.routeSub = this.scriptService.findAll(this.scriptOptions).pipe(
+      getFirstCompletedRemoteData(),
+      getRemoteDataPayload(),
+      tap((paginatedList: PaginatedList<Script>) => {
+        this._isLastPage = paginatedList?.pageInfo?.currentPage >= paginatedList?.pageInfo?.totalPages;
+      }),
+      map((paginatedList: PaginatedList<Script>) => paginatedList.page),
+    ).subscribe((newScripts: Script[]) => {
+      this.scripts = [...this.scripts, ...newScripts];
+      this.isLoading$.next(false);
+
+      const param = this.route.snapshot.queryParams[SCRIPT_QUERY_PARAMETER];
+      if (hasValue(param)) {
+        this._selectedScript = this.scripts.find((script) => script.id === param);
+        this.select.emit(this._selectedScript);
+      }
+    });
+  }
+
+  /**
+   * Load more scripts when the user scrolls to the bottom of the list
+   * @param event The scroll event
+   */
+  onScroll(event: any) {
+    if (event.target.scrollTop + event.target.clientHeight >= event.target.scrollHeight) {
+      if (!this.isLoading$.value && !this._isLastPage) {
+        this.scriptOptions.currentPage++;
+        this.loadScripts();
+      }
+    }
   }
 
   /**
@@ -93,6 +122,17 @@ export class ScriptsSelectComponent implements OnInit, OnDestroy {
     );
   }
 
+  selectScript(script: Script) {
+    this._selectedScript = script;
+  }
+
+  onSelect(newScript: Script) {
+    this.selectScript(newScript);
+    // this._selectedScript = newScript;
+    this.select.emit(newScript);
+    this.selectedScript = newScript.name;
+  }
+
   @Input()
   set script(value: Script) {
      this._selectedScript = value;
diff --git a/src/app/process-page/overview/process-overview.component.html b/src/app/process-page/overview/process-overview.component.html
index 5bf5fee79f..b904133b01 100644
--- a/src/app/process-page/overview/process-overview.component.html
+++ b/src/app/process-page/overview/process-overview.component.html
@@ -1,6 +1,6 @@
 <div class="container">
     <div class="d-flex">
-        <h2 class="flex-grow-1">{{'process.overview.title' | translate}}</h2>
+        <h1 class="flex-grow-1">{{'process.overview.title' | translate}}</h1>
     </div>
     <div class="d-flex justify-content-end">
         <button *ngIf="processBulkDeleteService.hasSelected()" class="btn btn-primary mr-2"
@@ -17,7 +17,6 @@
     </div>
     <ds-pagination *ngIf="(processesRD$ | async)?.payload?.totalElements > 0"
                    [paginationOptions]="pageConfig"
-                   [pageInfoState]="(processesRD$ | async)?.payload"
                    [collectionSize]="(processesRD$ | async)?.payload?.totalElements"
                    [hideGear]="true"
                    [hidePagerWhenSinglePage]="true">
@@ -44,9 +43,11 @@
                     <td>{{process.endTime | date:dateFormat:'UTC'}}</td>
                     <td>{{process.processStatus}}</td>
                     <td>
-                        <button class="btn btn-outline-danger"
-                                (click)="processBulkDeleteService.toggleDelete(process.processId)"><i
-                                class="fas fa-trash"></i></button>
+                        <button [attr.aria-label]="'process.overview.delete-process' | translate"
+                                (click)="processBulkDeleteService.toggleDelete(process.processId)"
+                                class="btn btn-outline-danger">
+                          <i class="fas fa-trash"></i>
+                        </button>
                     </td>
                 </tr>
                 </tbody>
@@ -76,10 +77,10 @@
                 <span> {{ 'process.overview.delete.processing' | translate: {count: processBulkDeleteService.getAmountOfSelectedProcesses()} }}</span>
             </div>
             <div class="mt-4">
-                <button class="btn btn-primary mr-2" [disabled]="processBulkDeleteService.isProcessing$() |async"
+                <button class="btn btn-primary mr-2" [dsBtnDisabled]="processBulkDeleteService.isProcessing$() |async"
                         (click)="closeModal()">{{'process.detail.delete.cancel' | translate}}</button>
                 <button id="delete-confirm" class="btn btn-danger"
-                        [disabled]="processBulkDeleteService.isProcessing$() |async"
+                        [dsBtnDisabled]="processBulkDeleteService.isProcessing$() |async"
                         (click)="deleteSelected()">{{ 'process.overview.delete' | translate: {count: processBulkDeleteService.getAmountOfSelectedProcesses()}  }}
                 </button>
             </div>
diff --git a/src/app/process-page/overview/process-overview.component.spec.ts b/src/app/process-page/overview/process-overview.component.spec.ts
index 94071c0e59..e9382b0744 100644
--- a/src/app/process-page/overview/process-overview.component.spec.ts
+++ b/src/app/process-page/overview/process-overview.component.spec.ts
@@ -1,7 +1,7 @@
 import { ProcessOverviewComponent } from './process-overview.component';
 import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
 import { VarDirective } from '../../shared/utils/var.directive';
-import { TranslateModule } from '@ngx-translate/core';
+import { TranslateModule, TranslateService } from '@ngx-translate/core';
 import { RouterTestingModule } from '@angular/router/testing';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
 import { ProcessDataService } from '../../core/data/processes/process-data.service';
@@ -33,6 +33,8 @@ describe('ProcessOverviewComponent', () => {
   let processBulkDeleteService;
   let modalService;
 
+  let translateServiceSpy: jasmine.SpyObj<TranslateService>;
+
   const pipe = new DatePipe('en-US');
 
   function init() {
@@ -42,24 +44,29 @@ describe('ProcessOverviewComponent', () => {
         scriptName: 'script-name',
         startTime: '2020-03-19 00:30:00',
         endTime: '2020-03-19 23:30:00',
-        processStatus: ProcessStatus.COMPLETED
+        processStatus: ProcessStatus.COMPLETED,
+        userId: 'testid'
       }),
       Object.assign(new Process(), {
         processId: 2,
         scriptName: 'script-name',
         startTime: '2020-03-20 00:30:00',
         endTime: '2020-03-20 23:30:00',
-        processStatus: ProcessStatus.FAILED
+        processStatus: ProcessStatus.FAILED,
+        userId: 'testid'
       }),
       Object.assign(new Process(), {
         processId: 3,
         scriptName: 'another-script-name',
         startTime: '2020-03-21 00:30:00',
         endTime: '2020-03-21 23:30:00',
-        processStatus: ProcessStatus.RUNNING
+        processStatus: ProcessStatus.RUNNING,
+        userId: 'testid'
       })
     ];
     ePerson = Object.assign(new EPerson(), {
+      id: 'testid',
+      uuid: 'testid',
       metadata: {
         'eperson.firstname': [
           {
@@ -110,6 +117,9 @@ describe('ProcessOverviewComponent', () => {
 
   beforeEach(waitForAsync(() => {
     init();
+
+    translateServiceSpy = jasmine.createSpyObj('TranslateService', ['get']);
+
     TestBed.configureTestingModule({
       declarations: [ProcessOverviewComponent, VarDirective],
       imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([])],
@@ -249,4 +259,43 @@ describe('ProcessOverviewComponent', () => {
       expect(component.setProcesses).toHaveBeenCalled();
     });
   });
+
+  describe('getEPersonName function', () => {
+    it('should return unknown user when id is null', (done: DoneFn) => {
+      const id = null;
+      const expectedTranslation = 'process.overview.unknown.user';
+
+      translateServiceSpy.get(expectedTranslation);
+
+      component.getEpersonName(id).subscribe((result: string) => {
+        expect(result).toBe(expectedTranslation);
+        done();
+      });
+      expect(translateServiceSpy.get).toHaveBeenCalledWith('process.overview.unknown.user');
+    });
+
+    it('should return unknown user when id is invalid', (done: DoneFn) => {
+      const id = '';
+      const expectedTranslation = 'process.overview.unknown.user';
+
+      translateServiceSpy.get(expectedTranslation);
+
+      component.getEpersonName(id).subscribe((result: string) => {
+        expect(result).toBe(expectedTranslation);
+        done();
+      });
+      expect(translateServiceSpy.get).toHaveBeenCalledWith('process.overview.unknown.user');
+    });
+
+    it('should return EPerson name when id is correct', (done: DoneFn) => {
+      const id = 'testid';
+      const expectedName = 'John Doe';
+
+      component.getEpersonName(id).subscribe((result: string) => {
+        expect(result).toEqual(expectedName);
+        done();
+      });
+      expect(translateServiceSpy.get).not.toHaveBeenCalled();
+    });
+  });
 });
diff --git a/src/app/process-page/overview/process-overview.component.ts b/src/app/process-page/overview/process-overview.component.ts
index 7fa3b12dac..094430706c 100644
--- a/src/app/process-page/overview/process-overview.component.ts
+++ b/src/app/process-page/overview/process-overview.component.ts
@@ -5,16 +5,17 @@ import { PaginatedList } from '../../core/data/paginated-list.model';
 import { Process } from '../processes/process.model';
 import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
 import { EPersonDataService } from '../../core/eperson/eperson-data.service';
-import { getFirstSucceededRemoteDataPayload } from '../../core/shared/operators';
+import { getFirstCompletedRemoteData } from '../../core/shared/operators';
 import { EPerson } from '../../core/eperson/models/eperson.model';
-import { map, switchMap } from 'rxjs/operators';
+import { switchMap } from 'rxjs/operators';
 import { ProcessDataService } from '../../core/data/processes/process-data.service';
 import { PaginationService } from '../../core/pagination/pagination.service';
 import { FindListOptions } from '../../core/data/find-list-options.model';
 import { ProcessBulkDeleteService } from './process-bulk-delete.service';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
-import { hasValue } from '../../shared/empty.util';
+import { hasValue, isNotEmpty } from '../../shared/empty.util';
 import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
+import { TranslateService } from '@ngx-translate/core';
 
 @Component({
   selector: 'ds-process-overview',
@@ -61,6 +62,7 @@ export class ProcessOverviewComponent implements OnInit, OnDestroy {
               protected modalService: NgbModal,
               public processBulkDeleteService: ProcessBulkDeleteService,
               protected dsoNameService: DSONameService,
+              private translateService: TranslateService,
   ) {
   }
 
@@ -83,10 +85,20 @@ export class ProcessOverviewComponent implements OnInit, OnDestroy {
    * @param id  ID of the EPerson
    */
   getEpersonName(id: string): Observable<string> {
-    return this.ePersonService.findById(id).pipe(
-      getFirstSucceededRemoteDataPayload(),
-      map((eperson: EPerson) => this.dsoNameService.getName(eperson)),
-    );
+    if (isNotEmpty(id)) {
+      return this.ePersonService.findById(id).pipe(
+        getFirstCompletedRemoteData(),
+        switchMap((rd: RemoteData<EPerson>) => {
+          if (rd.hasSucceeded) {
+            return [this.dsoNameService.getName(rd.payload)];
+          } else {
+            return this.translateService.get('process.overview.unknown.user');
+          }
+        })
+      );
+    } else {
+      return this.translateService.get('process.overview.unknown.user');
+    }
   }
 
   ngOnDestroy(): void {
diff --git a/src/app/profile-page/profile-claim-item-modal/profile-claim-item-modal.component.html b/src/app/profile-page/profile-claim-item-modal/profile-claim-item-modal.component.html
index a5bbb38d02..3233aa5555 100644
--- a/src/app/profile-page/profile-claim-item-modal/profile-claim-item-modal.component.html
+++ b/src/app/profile-page/profile-claim-item-modal/profile-claim-item-modal.component.html
@@ -29,7 +29,7 @@
       <input type="checkbox" [checked]="checked" (change)="toggleCheckbox()"/>
       {{ 'dso-selector.claim.item.not-mine-label' | translate }}
     </div>
-    <button type="submit" class="btn btn-primary ml-5 mr-2" (click)="createFromScratch()" [disabled]="!checked">
+    <button type="submit" class="btn btn-primary ml-5 mr-2" (click)="createFromScratch()" [dsBtnDisabled]="!checked">
       <i class="fas fa-plus"></i>
       {{ 'dso-selector.claim.item.create-from-scratch' | translate }}
     </button>
diff --git a/src/app/profile-page/profile-page-metadata-form/profile-page-metadata-form.component.ts b/src/app/profile-page/profile-page-metadata-form/profile-page-metadata-form.component.ts
index c4e164a7e8..53f9acdb45 100644
--- a/src/app/profile-page/profile-page-metadata-form/profile-page-metadata-form.component.ts
+++ b/src/app/profile-page/profile-page-metadata-form/profile-page-metadata-form.component.ts
@@ -43,7 +43,8 @@ export class ProfilePageMetadataFormComponent implements OnInit {
     new DynamicInputModel({
       id: 'email',
       name: 'email',
-      readOnly: true
+      readOnly: true,
+      disabled: true,
     }),
     new DynamicInputModel({
       id: 'firstname',
@@ -55,6 +56,7 @@ export class ProfilePageMetadataFormComponent implements OnInit {
       errorMessages: {
         required: 'This field is required'
       },
+      autoComplete: 'given-name',
     }),
     new DynamicInputModel({
       id: 'lastname',
@@ -66,10 +68,12 @@ export class ProfilePageMetadataFormComponent implements OnInit {
       errorMessages: {
         required: 'This field is required'
       },
+      autoComplete: 'family-name',
     }),
     new DynamicInputModel({
       id: 'phone',
-      name: 'eperson.phone'
+      name: 'eperson.phone',
+      autoComplete: 'tel',
     }),
     new DynamicSelectModel<string>({
       id: 'language',
diff --git a/src/app/profile-page/profile-page-researcher-form/profile-page-researcher-form.component.html b/src/app/profile-page/profile-page-researcher-form/profile-page-researcher-form.component.html
index 2d959c1dfe..d14a9edfec 100644
--- a/src/app/profile-page/profile-page-researcher-form/profile-page-researcher-form.component.html
+++ b/src/app/profile-page/profile-page-researcher-form/profile-page-researcher-form.component.html
@@ -13,7 +13,7 @@
     <p>{{'researcher.profile.not.associated' | translate}}</p>
   </div>
   <button *ngIf="!researcherProfile" class="btn btn-primary mr-2"
-          [disabled]="(isProcessingCreate() | async)"
+          [dsBtnDisabled]="(isProcessingCreate() | async)"
           (click)="createProfile()">
     <span *ngIf="(isProcessingCreate() | async)">
         <i class='fas fa-circle-notch fa-spin'></i> {{'researcher.profile.action.processing' | translate}}
@@ -23,10 +23,10 @@
     </span>
   </button>
   <ng-container *ngIf="researcherProfile">
-    <button class="btn btn-primary mr-2" [disabled]="!researcherProfile" (click)="viewProfile(researcherProfile)">
+    <button class="btn btn-primary mr-2" [dsBtnDisabled]="!researcherProfile" (click)="viewProfile(researcherProfile)">
       <i class="fas fa-info-circle"></i> {{'researcher.profile.view' | translate}}
     </button>
-    <button class="btn btn-danger" [disabled]="!researcherProfile" (click)="deleteProfile(researcherProfile)">
+    <button class="btn btn-danger" [dsBtnDisabled]="!researcherProfile" (click)="deleteProfile(researcherProfile)">
         <span *ngIf="(isProcessingDelete() | async)">
             <i class='fas fa-circle-notch fa-spin'></i> {{'researcher.profile.action.processing' | translate}}
         </span>
diff --git a/src/app/profile-page/profile-page-security-form/profile-page-security-form.component.ts b/src/app/profile-page/profile-page-security-form/profile-page-security-form.component.ts
index 04292ea96e..940e382c78 100644
--- a/src/app/profile-page/profile-page-security-form/profile-page-security-form.component.ts
+++ b/src/app/profile-page/profile-page-security-form/profile-page-security-form.component.ts
@@ -39,12 +39,14 @@ export class ProfilePageSecurityFormComponent implements OnInit {
     new DynamicInputModel({
       id: 'password',
       name: 'password',
-      inputType: 'password'
+      inputType: 'password',
+      autoComplete: 'new-password',
     }),
     new DynamicInputModel({
       id: 'passwordrepeat',
       name: 'passwordrepeat',
-      inputType: 'password'
+      inputType: 'password',
+      autoComplete: 'new-password',
     })
   ];
 
@@ -79,7 +81,8 @@ export class ProfilePageSecurityFormComponent implements OnInit {
         id: 'current-password',
         name: 'current-password',
         inputType: 'password',
-        required: true
+        required: true,
+        autoComplete: 'current-password',
       }));
     }
     if (this.passwordCanBeEmpty) {
diff --git a/src/app/profile-page/profile-page.component.html b/src/app/profile-page/profile-page.component.html
index 44783da84e..29ccefa209 100644
--- a/src/app/profile-page/profile-page.component.html
+++ b/src/app/profile-page/profile-page.component.html
@@ -1,7 +1,7 @@
 <ng-container *ngVar="(user$ | async) as user">
   <div class="container" *ngIf="user">
-    <ng-container *ngIf="isResearcherProfileEnabled() | async">
-      <h3 class="mb-4">{{'profile.head' | translate}}</h3>
+    <h1>{{'profile.title' | translate}}</h1>
+    <ng-container *ngIf="isResearcherProfileEnabled$ | async">
       <div class="card mb-4">
         <div class="card-header">{{'profile.card.researcher' | translate}}</div>
         <div class="card-body">
@@ -32,18 +32,34 @@
       <button class="btn btn-primary" (click)="updateProfile()"><i class="fas fa-edit"></i> {{'profile.form.submit' | translate}}</button>
     </div>
 
-    <ng-container *ngVar="(groupsRD$ | async)?.payload?.page as groups">
-      <div *ngIf="groups?.length > 0">
-        <h3 class="mt-4">{{'profile.groups.head' | translate}}</h3>
-        <ul class="list-group list-group-flush">
-          <li *ngFor="let group of groups" class="list-group-item">{{ dsoNameService.getName(group) }}</li>
-        </ul>
-      </div>
+    <ng-container *ngIf="(groupsRD$ | async) as groupsRD;">
+      <ng-container *ngTemplateOutlet="groupsRD?.isLoading ? loader : content"></ng-container>
+      <ng-template #content>
+        <ds-pagination *ngIf="groupsRD?.payload"
+                       [hideGear]="true"
+                       [hidePagerWhenSinglePage]="true"
+                       [hidePaginationDetail]="true"
+                       [paginationOptions]="optionsGroupsPagination"
+                       [collectionSize]="groupsRD?.payload?.totalElements">
+          <ng-container *ngIf="groupsRD?.payload?.page as groups">
+            <div *ngIf="groups?.length > 0">
+              <h2 class="mt-4">{{ 'profile.groups.head' | translate }}</h2>
+              <ul class="list-group list-group-flush">
+                <li *ngFor="let group of groups" class="list-group-item">{{ dsoNameService.getName(group) }}</li>
+              </ul>
+            </div>
+          </ng-container>
+        </ds-pagination>
+      </ng-template>
+      <ng-template #loader>
+        <ds-loading [showMessage]="false"></ds-loading>
+      </ng-template>
+      <ds-error *ngIf="groupsRD?.hasFailed" message="{{ 'error.profile-groups' | translate }}"></ds-error>
     </ng-container>
 
     <ng-container *ngVar="(specialGroupsRD$ | async)?.payload?.page as specialGroups">
       <div *ngIf="specialGroups?.length > 0" data-test="specialGroups">
-        <h3 class="mt-4">{{'profile.special.groups.head' | translate}}</h3>
+        <h2 class="mt-4">{{'profile.special.groups.head' | translate}}</h2>
         <ul class="list-group list-group-flush">
           <li *ngFor="let specialGroup of specialGroups" class="list-group-item">
             {{ dsoNameService.getName(specialGroup) }}
diff --git a/src/app/profile-page/profile-page.component.spec.ts b/src/app/profile-page/profile-page.component.spec.ts
index 709ed56790..ec07cddd9d 100644
--- a/src/app/profile-page/profile-page.component.spec.ts
+++ b/src/app/profile-page/profile-page.component.spec.ts
@@ -320,7 +320,7 @@ describe('ProfilePageComponent', () => {
       });
 
       it('should return true', () => {
-        const result = component.isResearcherProfileEnabled();
+        const result = component.isResearcherProfileEnabled$;
         const expected = cold('a', {
           a: true
         });
@@ -336,7 +336,7 @@ describe('ProfilePageComponent', () => {
       });
 
       it('should return false', () => {
-        const result = component.isResearcherProfileEnabled();
+        const result = component.isResearcherProfileEnabled$;
         const expected = cold('a', {
           a: false
         });
@@ -352,7 +352,7 @@ describe('ProfilePageComponent', () => {
       });
 
       it('should return false', () => {
-        const result = component.isResearcherProfileEnabled();
+        const result = component.isResearcherProfileEnabled$;
         const expected = cold('a', {
           a: false
         });
diff --git a/src/app/profile-page/profile-page.component.ts b/src/app/profile-page/profile-page.component.ts
index 343314999b..7fb1a14124 100644
--- a/src/app/profile-page/profile-page.component.ts
+++ b/src/app/profile-page/profile-page.component.ts
@@ -9,7 +9,12 @@ import { RemoteData } from '../core/data/remote-data';
 import { PaginatedList } from '../core/data/paginated-list.model';
 import { filter, switchMap, tap } from 'rxjs/operators';
 import { EPersonDataService } from '../core/eperson/eperson-data.service';
-import { getAllSucceededRemoteData, getFirstCompletedRemoteData, getRemoteDataPayload } from '../core/shared/operators';
+import {
+  getAllCompletedRemoteData,
+  getAllSucceededRemoteData,
+  getFirstCompletedRemoteData,
+  getRemoteDataPayload
+} from '../core/shared/operators';
 import { hasValue, isNotEmpty } from '../shared/empty.util';
 import { followLink } from '../shared/utils/follow-link-config.model';
 import { AuthService } from '../core/auth/auth.service';
@@ -19,6 +24,8 @@ import { FeatureID } from '../core/data/feature-authorization/feature-id';
 import { ConfigurationDataService } from '../core/data/configuration-data.service';
 import { ConfigurationProperty } from '../core/shared/configuration-property.model';
 import { DSONameService } from '../core/breadcrumbs/dso-name.service';
+import { PaginationService } from '../core/pagination/pagination.service';
+import { PaginationComponentOptions } from '../shared/pagination/pagination-component-options.model';
 
 @Component({
   selector: 'ds-profile-page',
@@ -79,6 +86,15 @@ export class ProfilePageComponent implements OnInit {
   private currentUser: EPerson;
   canChangePassword$: Observable<boolean>;
 
+  /**
+   * Default configuration for group pagination
+   **/
+  optionsGroupsPagination = Object.assign(new PaginationComponentOptions(),{
+    id: 'page_groups',
+    currentPage: 1,
+    pageSize: 20,
+  });
+
   isResearcherProfileEnabled$: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(false);
 
   constructor(private authService: AuthService,
@@ -88,6 +104,7 @@ export class ProfilePageComponent implements OnInit {
               private authorizationService: AuthorizationDataService,
               private configurationService: ConfigurationDataService,
               public dsoNameService: DSONameService,
+              private paginationService: PaginationService,
   ) {
   }
 
@@ -99,7 +116,18 @@ export class ProfilePageComponent implements OnInit {
       getRemoteDataPayload(),
       tap((user: EPerson) => this.currentUser = user)
     );
-    this.groupsRD$ = this.user$.pipe(switchMap((user: EPerson) => user.groups));
+    this.groupsRD$ = this.paginationService.getCurrentPagination(this.optionsGroupsPagination.id, this.optionsGroupsPagination).pipe(
+      switchMap((pageOptions: PaginationComponentOptions) => {
+        return this.epersonService.findById(this.currentUser.id, true, true, followLink('groups',{
+          findListOptions: {
+            elementsPerPage: pageOptions.pageSize,
+            currentPage: pageOptions.currentPage,
+          } }));
+      }),
+      getAllCompletedRemoteData(),
+      getRemoteDataPayload(),
+      switchMap((user: EPerson) => user?.groups),
+    );
     this.canChangePassword$ = this.user$.pipe(switchMap((user: EPerson) => this.authorizationService.isAuthorized(FeatureID.CanChangePassword, user._links.self.href)));
     this.specialGroupsRD$ = this.authService.getSpecialGroupsFromAuthStatus();
 
@@ -145,7 +173,8 @@ export class ProfilePageComponent implements OnInit {
    */
   updateSecurity() {
     const passEntered = isNotEmpty(this.password);
-    if (this.invalidSecurity) {
+    const validCurrentPassword = isNotEmpty(this.currentPassword);
+    if (validCurrentPassword && !passEntered) {
       this.notificationsService.error(this.translate.instant(this.PASSWORD_NOTIFICATIONS_PREFIX + 'error.general'));
     }
     if (!this.invalidSecurity && passEntered) {
@@ -161,7 +190,7 @@ export class ProfilePageComponent implements OnInit {
         } else {
           this.notificationsService.error(
             this.translate.instant(this.PASSWORD_NOTIFICATIONS_PREFIX + 'error.title'),
-            this.translate.instant(this.PASSWORD_NOTIFICATIONS_PREFIX + 'error.change-failed')
+            this.getPasswordErrorMessage(response)
           );
         }
       });
@@ -193,10 +222,17 @@ export class ProfilePageComponent implements OnInit {
   }
 
   /**
-   * Returns true if the researcher profile feature is enabled, false otherwise.
+   * Returns an error message from a password validation request with a specific reason or
+   * a default message without specific reason.
+   * @param response from the validation password patch request.
    */
-  isResearcherProfileEnabled(): Observable<boolean> {
-    return this.isResearcherProfileEnabled$.asObservable();
+  getPasswordErrorMessage(response) {
+    if (response.hasFailed && isNotEmpty(response.errorMessage)) {
+      // Response has a specific error message. Show this message in the error notification.
+      return this.translate.instant(response.errorMessage);
+    }
+    // Show default error message notification.
+    return this.translate.instant(this.PASSWORD_NOTIFICATIONS_PREFIX + 'error.change-failed');
   }
 
 }
diff --git a/src/app/register-email-form/register-email-form.component.html b/src/app/register-email-form/register-email-form.component.html
index ed79b1d2d1..d6bfeaf462 100644
--- a/src/app/register-email-form/register-email-form.component.html
+++ b/src/app/register-email-form/register-email-form.component.html
@@ -1,5 +1,5 @@
 <div class="container">
-    <h2>{{MESSAGE_PREFIX + '.header'|translate}}</h2>
+    <h1>{{MESSAGE_PREFIX + '.header'|translate}}</h1>
     <p>{{MESSAGE_PREFIX + '.info' | translate}}</p>
 
     <p *ngIf="validMailDomains.length != 0 && typeRequest === TYPE_REQUEST_REGISTER">
@@ -14,13 +14,16 @@
                     <label class="font-weight-bold"
                            for="email">{{MESSAGE_PREFIX + '.email' | translate}}</label>
                     <input [className]="(email.invalid) && (email.dirty || email.touched) ? 'form-control is-invalid' :'form-control'"
-                           type="text" id="email" formControlName="email"/>
+                           type="text" id="email" formControlName="email"
+                           [attr.aria-label]="MESSAGE_PREFIX + '.aria.label' | translate"
+                           [attr.aria-describedby]="(!email.errors) ? '' : (email.errors.required ? 'email-errors-required' : 'email-error-not-valid')"
+                           [attr.aria-invalid]="email.invalid"/>
                     <div *ngIf="email.invalid && (email.dirty || email.touched)"
                          class="invalid-feedback show-feedback">
-                    <span *ngIf="email.errors && email.errors.required">
+                    <span *ngIf="email.errors && email.errors.required" id="email-errors-required">
                         {{ MESSAGE_PREFIX + '.email.error.required' | translate }}
                     </span>
-                    <span *ngIf="email.errors && ((email.errors.pattern && this.typeRequest === TYPE_REQUEST_REGISTER) || email.errors.email)">
+                    <span *ngIf="email.errors && ((email.errors.pattern && this.typeRequest === TYPE_REQUEST_REGISTER) || email.errors.email)" id="email-error-not-valid">
                         {{ MESSAGE_PREFIX + '.email.error.not-email-form' | translate }}
                         <ng-container *ngIf="validMailDomains.length > 0">
                           {{ MESSAGE_PREFIX + '.email.error.not-valid-domain' | translate: { domains: validMailDomains.join(', ') } }}
@@ -48,13 +51,13 @@
     </div>
 
     <ng-container *ngIf="!((googleRecaptchaService.captchaVersion() | async) === 'v2' && (googleRecaptchaService.captchaMode() | async) === 'invisible'); else v2Invisible">
-      <button class="btn btn-primary" [disabled]="form.invalid || registrationVerification && !isRecaptchaCookieAccepted() || disableUntilChecked" (click)="register()">
+      <button class="btn btn-primary" [dsBtnDisabled]="form.invalid || registrationVerification && !isRecaptchaCookieAccepted() || disableUntilChecked" (click)="register()">
         {{ MESSAGE_PREFIX + '.submit' | translate }}
       </button>
     </ng-container>
 
     <ng-template #v2Invisible>
-      <button class="btn btn-primary" [disabled]="form.invalid" (click)="executeRecaptcha()">
+      <button class="btn btn-primary" [dsBtnDisabled]="form.invalid" (click)="executeRecaptcha()">
         {{ MESSAGE_PREFIX + '.submit' | translate }}
       </button>
     </ng-template>
diff --git a/src/app/register-email-form/register-email-form.component.ts b/src/app/register-email-form/register-email-form.component.ts
index ddb77b669c..c8ca0cc710 100644
--- a/src/app/register-email-form/register-email-form.component.ts
+++ b/src/app/register-email-form/register-email-form.component.ts
@@ -13,7 +13,7 @@ import {isNotEmpty} from '../shared/empty.util';
 import {BehaviorSubject, combineLatest, Observable, of, switchMap} from 'rxjs';
 import {map, startWith, take} from 'rxjs/operators';
 import {CAPTCHA_NAME, GoogleRecaptchaService} from '../core/google-recaptcha/google-recaptcha.service';
-import {AlertType} from '../shared/alert/aletr-type';
+import {AlertType} from '../shared/alert/alert-type';
 import {KlaroService} from '../shared/cookies/klaro.service';
 import {CookieService} from '../core/services/cookie.service';
 import { Subscription } from 'rxjs';
@@ -247,5 +247,4 @@ export class RegisterEmailFormComponent implements OnDestroy, OnInit {
         console.warn(`Unimplemented notification '${key}' from reCaptcha service`);
     }
   }
-
 }
diff --git a/src/app/register-email-form/register-email-form.module.ts b/src/app/register-email-form/register-email-form.module.ts
index a765759413..2fa2ddcd6e 100644
--- a/src/app/register-email-form/register-email-form.module.ts
+++ b/src/app/register-email-form/register-email-form.module.ts
@@ -2,6 +2,12 @@ import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { SharedModule } from '../shared/shared.module';
 import { RegisterEmailFormComponent } from './register-email-form.component';
+import { ThemedRegisterEmailFormComponent } from './themed-registry-email-form.component';
+
+const DECLARATIONS = [
+  RegisterEmailFormComponent,
+  ThemedRegisterEmailFormComponent,
+];
 
 @NgModule({
   imports: [
@@ -9,11 +15,11 @@ import { RegisterEmailFormComponent } from './register-email-form.component';
     SharedModule
   ],
   declarations: [
-    RegisterEmailFormComponent,
+    ...DECLARATIONS,
   ],
   providers: [],
   exports: [
-    RegisterEmailFormComponent,
+    ...DECLARATIONS,
   ]
 })
 
diff --git a/src/app/register-email-form/themed-registry-email-form.component.ts b/src/app/register-email-form/themed-registry-email-form.component.ts
new file mode 100644
index 0000000000..4f627e5b83
--- /dev/null
+++ b/src/app/register-email-form/themed-registry-email-form.component.ts
@@ -0,0 +1,36 @@
+import { Component, Input } from '@angular/core';
+import { ThemedComponent } from '../shared/theme-support/themed.component';
+import { RegisterEmailFormComponent } from './register-email-form.component';
+
+/**
+ * Themed wrapper for {@link RegisterEmailFormComponent}
+ */
+@Component({
+  selector: 'ds-themed-register-email-form',
+  styleUrls: [],
+  templateUrl: '../shared/theme-support/themed.component.html',
+})
+export class ThemedRegisterEmailFormComponent extends ThemedComponent<RegisterEmailFormComponent> {
+
+  @Input() MESSAGE_PREFIX: string;
+
+  @Input() typeRequest: string;
+
+  protected inAndOutputNames: (keyof RegisterEmailFormComponent & keyof this)[] = [
+    'MESSAGE_PREFIX',
+    'typeRequest',
+  ];
+
+  protected getComponentName(): string {
+    return 'RegisterEmailFormComponent';
+  }
+
+  protected importThemedComponent(themeName: string): Promise<any> {
+    return import(`../../themes/${themeName}/app/register-email-form/register-email-form.component`);
+  }
+
+  protected importUnthemedComponent(): Promise<any> {
+    return import('./register-email-form.component');
+  }
+
+}
diff --git a/src/app/register-page/create-profile/create-profile.component.html b/src/app/register-page/create-profile/create-profile.component.html
index f56059ad69..14c06fd8db 100644
--- a/src/app/register-page/create-profile/create-profile.component.html
+++ b/src/app/register-page/create-profile/create-profile.component.html
@@ -5,7 +5,7 @@
         <div class="card-body">
             <div class="row">
                 <div class="col-12">
-                    <label class="font-weight-bold"
+                    <label class="font-weight-bold mr-4"
                            for="email">{{'register-page.create-profile.identification.email' | translate}}</label>
                     <span id="email">{{(registration$ |async).email}}</span></div>
             </div>
@@ -81,7 +81,7 @@
     <div class="row">
         <div class="col-12">
             <button
-                    [disabled]="isInValidPassword || userInfoForm.invalid"
+                    [dsBtnDisabled]="isInValidPassword || userInfoForm.invalid"
                     class="btn btn-default btn-primary"
                     (click)="submitEperson()">{{'register-page.create-profile.submit' | translate}}</button>
         </div>
diff --git a/src/app/register-page/register-email/register-email.component.html b/src/app/register-page/register-email/register-email.component.html
index 1829bb2914..6a87a4e9e0 100644
--- a/src/app/register-page/register-email/register-email.component.html
+++ b/src/app/register-page/register-email/register-email.component.html
@@ -1,3 +1,3 @@
-<ds-register-email-form
+<ds-themed-register-email-form
         [MESSAGE_PREFIX]="'register-page.registration'" [typeRequest]="typeRequest">
-</ds-register-email-form>
+</ds-themed-register-email-form>
diff --git a/src/app/request-copy/deny-request-copy/themed-deny-request-copy.component.ts b/src/app/request-copy/deny-request-copy/themed-deny-request-copy.component.ts
index 664e4c541b..1539d49622 100644
--- a/src/app/request-copy/deny-request-copy/themed-deny-request-copy.component.ts
+++ b/src/app/request-copy/deny-request-copy/themed-deny-request-copy.component.ts
@@ -1,7 +1,7 @@
 import { Component } from '@angular/core';
 import { ThemedComponent } from 'src/app/shared/theme-support/themed.component';
 
-import { DenyRequestCopyComponent } from 'src/themes/custom/app/request-copy/deny-request-copy/deny-request-copy.component';
+import { DenyRequestCopyComponent } from './deny-request-copy.component';
 
 /**
  * Themed wrapper for deny-request-copy.component
diff --git a/src/app/request-copy/email-request-copy/email-request-copy.component.html b/src/app/request-copy/email-request-copy/email-request-copy.component.html
index 70146ab52c..b2227bfbae 100644
--- a/src/app/request-copy/email-request-copy/email-request-copy.component.html
+++ b/src/app/request-copy/email-request-copy/email-request-copy.component.html
@@ -13,7 +13,7 @@
   <ng-content></ng-content>
   <div class="d-flex flex-row-reverse">
     <button (click)="submit()"
-            [disabled]="!message || message.length === 0 || !subject || subject.length === 0"
+            [dsBtnDisabled]="!subject || subject.length === 0"
             class="btn btn-primary"
             title="{{'grant-deny-request-copy.email.send' | translate }}">
       <i class="fas fa-envelope"></i> {{'grant-deny-request-copy.email.send' | translate }}
diff --git a/src/app/request-copy/grant-deny-request-copy/grant-deny-request-copy.component.html b/src/app/request-copy/grant-deny-request-copy/grant-deny-request-copy.component.html
index 4837e0dcda..40c5548df7 100644
--- a/src/app/request-copy/grant-deny-request-copy/grant-deny-request-copy.component.html
+++ b/src/app/request-copy/grant-deny-request-copy/grant-deny-request-copy.component.html
@@ -8,13 +8,15 @@
       <div class="btn-group ">
         <a [routerLink]="grantRoute$ | async"
            class="btn btn-outline-primary"
-           title="{{'grant-deny-request-copy.grant' | translate }}">
+           title="{{'grant-deny-request-copy.grant' | translate }}"
+           role="button" tabindex="0">
           {{'grant-deny-request-copy.grant' | translate }}
         </a>
 
         <a [routerLink]="denyRoute$ | async"
            class="btn btn-outline-danger"
-           title="{{'grant-deny-request-copy.deny' | translate }}">
+           title="{{'grant-deny-request-copy.deny' | translate }}"
+           role="button" tabindex="0">
           {{'grant-deny-request-copy.deny' | translate }}
         </a>
       </div>
@@ -22,7 +24,7 @@
     <div *ngIf="itemRequestRD.payload.decisionDate" class="processed-message">
       <p>{{'grant-deny-request-copy.processed' | translate}}</p>
       <p class="text-center">
-        <a routerLink="/home" class="btn btn-primary">{{'grant-deny-request-copy.home-page' | translate}}</a>
+        <a routerLink="/home" class="btn btn-primary" role="link" tabindex="0">{{'grant-deny-request-copy.home-page' | translate}}</a>
       </p>
     </div>
   </div>
diff --git a/src/app/root/root.component.html b/src/app/root/root.component.html
index bf49e507c0..5f107a7349 100644
--- a/src/app/root/root.component.html
+++ b/src/app/root/root.component.html
@@ -1,13 +1,17 @@
+<button (click)="skipToMainContent()" class="sr-only" id="skip-to-main-content">
+  {{ 'root.skip-to-content' | translate }}
+</button>
+
 <div class="outer-wrapper" [class.d-none]="shouldShowFullscreenLoader" [@slideSidebarPadding]="{
-     value: (!(sidebarVisible | async) ? 'hidden' : (slideSidebarOver | async) ? 'shown' : 'expanded'),
-     params: {collapsedSidebarWidth: (collapsedSidebarWidth | async), totalSidebarWidth: (totalSidebarWidth | async)}
+     value: (!(isSidebarVisible$ | async) ? 'hidden' : (slideSidebarOver$ | async) ? 'unpinned' : 'pinned'),
+     params: { collapsedWidth: (collapsedSidebarWidth$ | async), expandedWidth: (expandedSidebarWidth$ | async) }
     }">
-  <ds-themed-admin-sidebar></ds-themed-admin-sidebar>
+  <ds-themed-admin-sidebar [expandedSidebarWidth$]="expandedSidebarWidth$" [collapsedSidebarWidth$]="collapsedSidebarWidth$"></ds-themed-admin-sidebar>
   <div class="inner-wrapper">
     <ds-system-wide-alert-banner></ds-system-wide-alert-banner>
     <ds-themed-header-navbar-wrapper></ds-themed-header-navbar-wrapper>
-    <main class="main-content">
-      <ds-themed-breadcrumbs></ds-themed-breadcrumbs>
+    <ds-themed-breadcrumbs></ds-themed-breadcrumbs>
+    <main class="my-cs" id="main-content">
 
       <div class="container d-flex justify-content-center align-items-center h-100" *ngIf="shouldShowRouteLoader">
         <ds-themed-loading [showMessage]="false"></ds-themed-loading>
@@ -27,3 +31,5 @@
 <div class="ds-full-screen-loader" *ngIf="shouldShowFullscreenLoader">
   <ds-themed-loading [showMessage]="false"></ds-themed-loading>
 </div>
+
+<ds-live-region></ds-live-region>
diff --git a/src/app/root/root.component.scss b/src/app/root/root.component.scss
index e69de29bb2..9eb198417a 100644
--- a/src/app/root/root.component.scss
+++ b/src/app/root/root.component.scss
@@ -0,0 +1,16 @@
+#skip-to-main-content {
+  position: absolute;
+  top: -40px;
+  left: 0;
+  opacity: 0;
+  transition: opacity 0.3s;
+  z-index: calc(var(--ds-nav-z-index) + 1);
+  border-top-left-radius: 0;
+  border-top-right-radius: 0;
+  border-bottom-left-radius: 0;
+
+  &:focus {
+    opacity: 1;
+    top: 0;
+  }
+}
diff --git a/src/app/root/root.component.ts b/src/app/root/root.component.ts
index 3c2d65fc1f..4c4370fc62 100644
--- a/src/app/root/root.component.ts
+++ b/src/app/root/root.component.ts
@@ -1,25 +1,17 @@
-import { map, startWith } from 'rxjs/operators';
-import { Component, Inject, Input, OnInit } from '@angular/core';
+import { first, map, skipWhile, startWith } from 'rxjs/operators';
+import { Component, Input, OnInit } from '@angular/core';
 import { Router } from '@angular/router';
 
 import { combineLatest as combineLatestObservable, Observable, of } from 'rxjs';
-import { Store } from '@ngrx/store';
-import { TranslateService } from '@ngx-translate/core';
-
-import { MetadataService } from '../core/metadata/metadata.service';
-import { HostWindowState } from '../shared/search/host-window.reducer';
-import { NativeWindowRef, NativeWindowService } from '../core/services/window.service';
-import { AuthService } from '../core/auth/auth.service';
 import { CSSVariableService } from '../shared/sass-helper/css-variable.service';
 import { MenuService } from '../shared/menu/menu.service';
 import { HostWindowService } from '../shared/host-window.service';
-import { ThemeConfig } from '../../config/theme.model';
-import { Angulartics2DSpace } from '../statistics/angulartics/dspace-provider';
+import { ThemeConfig } from '../../config/theme.config';
 import { environment } from '../../environments/environment';
 import { slideSidebarPadding } from '../shared/animations/slide';
 import { MenuID } from '../shared/menu/menu-id.model';
 import { getPageInternalServerErrorRoute } from '../app-routing-paths';
-import { hasValueOperator } from '../shared/empty.util';
+import { INotificationBoardOptions } from 'src/config/notifications-config.interfaces';
 
 @Component({
   selector: 'ds-root',
@@ -28,13 +20,13 @@ import { hasValueOperator } from '../shared/empty.util';
   animations: [slideSidebarPadding],
 })
 export class RootComponent implements OnInit {
-  sidebarVisible: Observable<boolean>;
-  slideSidebarOver: Observable<boolean>;
-  collapsedSidebarWidth: Observable<string>;
-  totalSidebarWidth: Observable<string>;
   theme: Observable<ThemeConfig> = of({} as any);
-  notificationOptions;
-  models;
+  isSidebarVisible$: Observable<boolean>;
+  slideSidebarOver$: Observable<boolean>;
+  collapsedSidebarWidth$: Observable<string>;
+  expandedSidebarWidth$: Observable<string>;
+  notificationOptions: INotificationBoardOptions;
+  models: any;
 
   /**
    * Whether or not to show a full screen loader
@@ -47,12 +39,6 @@ export class RootComponent implements OnInit {
   @Input() shouldShowRouteLoader: boolean;
 
   constructor(
-    @Inject(NativeWindowService) private _window: NativeWindowRef,
-    private translate: TranslateService,
-    private store: Store<HostWindowState>,
-    private metadata: MetadataService,
-    private angulartics2DSpace: Angulartics2DSpace,
-    private authService: AuthService,
     private router: Router,
     private cssService: CSSVariableService,
     private menuService: MenuService,
@@ -62,13 +48,19 @@ export class RootComponent implements OnInit {
   }
 
   ngOnInit() {
-    this.sidebarVisible = this.menuService.isMenuVisibleWithVisibleSections(MenuID.ADMIN);
+    this.isSidebarVisible$ = this.menuService.isMenuVisibleWithVisibleSections(MenuID.ADMIN);
 
-    this.collapsedSidebarWidth = this.cssService.getVariable('--ds-collapsed-sidebar-width').pipe(hasValueOperator());
-    this.totalSidebarWidth = this.cssService.getVariable('--ds-total-sidebar-width').pipe(hasValueOperator());
+    this.expandedSidebarWidth$ = this.cssService.getVariable('--ds-admin-sidebar-total-width').pipe(
+      skipWhile((val) => !val),
+      first(),
+    );
+    this.collapsedSidebarWidth$ = this.cssService.getVariable('--ds-admin-sidebar-fixed-element-width').pipe(
+      skipWhile((val) => !val),
+      first(),
+    );
 
     const sidebarCollapsed = this.menuService.isMenuCollapsed(MenuID.ADMIN);
-    this.slideSidebarOver = combineLatestObservable([sidebarCollapsed, this.windowService.isXsOrSm()])
+    this.slideSidebarOver$ = combineLatestObservable([sidebarCollapsed, this.windowService.isXsOrSm()])
       .pipe(
         map(([collapsed, mobile]) => collapsed || mobile),
         startWith(true),
@@ -78,4 +70,12 @@ export class RootComponent implements OnInit {
       this.shouldShowRouteLoader = false;
     }
   }
+
+  skipToMainContent() {
+    const mainContent = document.getElementById('main-content');
+    if (mainContent) {
+      mainContent.tabIndex = -1;
+      mainContent.focus();
+    }
+  }
 }
diff --git a/src/app/search-navbar/search-navbar.component.html b/src/app/search-navbar/search-navbar.component.html
index 2b30507f3e..84ffb5b38d 100644
--- a/src/app/search-navbar/search-navbar.component.html
+++ b/src/app/search-navbar/search-navbar.component.html
@@ -1,10 +1,13 @@
-<div id="search-navbar-container" [title]="'nav.search' | translate" (dsClickOutside)="collapse()">
+<div [title]="'nav.search' | translate" (dsClickOutside)="collapse()">
   <div class="d-inline-block position-relative">
-    <form [formGroup]="searchForm" (ngSubmit)="onSubmit(searchForm.value)" autocomplete="on">
+    <form [formGroup]="searchForm" (ngSubmit)="onSubmit(searchForm.value)" autocomplete="on" class="d-flex">
       <input #searchInput [@toggleAnimation]="isExpanded" [attr.aria-label]="('nav.search' | translate)" name="query"
              formControlName="query" type="text" placeholder="{{searchExpanded ? ('nav.search' | translate) : ''}}"
-             class="d-inline-block bg-transparent position-absolute form-control dropdown-menu-right p-1" [attr.data-test]="'header-search-box' | dsBrowserOnly">
-      <button class="submit-icon btn btn-link btn-link-inline" [attr.aria-label]="'nav.search.button' | translate" type="button" (click)="searchExpanded ? onSubmit(searchForm.value) : expand()" [attr.data-test]="'header-search-icon' | dsBrowserOnly">
+             class="bg-transparent position-absolute form-control dropdown-menu-right pl-1 pr-4"
+             [class.display]="searchExpanded ? 'inline-block' : 'none'"
+             [tabIndex]="searchExpanded ? 0 : -1"
+             [attr.data-test]="'header-search-box' | dsBrowserOnly">
+      <button class="submit-icon btn btn-link btn-link-inline" [attr.aria-label]="'nav.search.button' | translate" type="button" (click)="searchExpanded ? onSubmit(searchForm.value) : expand()" [attr.data-test]="'header-search-icon' | dsBrowserOnly" role="button" tabindex="0">
         <em class="fas fa-search fa-lg fa-fw"></em>
       </button>
     </form>
diff --git a/src/app/search-navbar/search-navbar.component.scss b/src/app/search-navbar/search-navbar.component.scss
index cf46c25d91..a276482b53 100644
--- a/src/app/search-navbar/search-navbar.component.scss
+++ b/src/app/search-navbar/search-navbar.component.scss
@@ -12,6 +12,7 @@ input[type="text"] {
   cursor: pointer;
   position: sticky;
   top: 0;
+  border: 0 !important;
 
   color: var(--ds-header-icon-color);
   &:hover, &:focus {
diff --git a/src/app/search-navbar/search-navbar.component.spec.ts b/src/app/search-navbar/search-navbar.component.spec.ts
index b67f5f0eb4..ece2391dcb 100644
--- a/src/app/search-navbar/search-navbar.component.spec.ts
+++ b/src/app/search-navbar/search-navbar.component.spec.ts
@@ -8,7 +8,6 @@ import { SearchService } from '../core/shared/search/search.service';
 import { TranslateLoaderMock } from '../shared/mocks/translate-loader.mock';
 
 import { SearchNavbarComponent } from './search-navbar.component';
-import { PaginationServiceStub } from '../shared/testing/pagination-service.stub';
 import { RouterTestingModule } from '@angular/router/testing';
 import { BrowserOnlyMockPipe } from '../shared/testing/browser-only-mock.pipe';
 
@@ -17,8 +16,6 @@ describe('SearchNavbarComponent', () => {
   let fixture: ComponentFixture<SearchNavbarComponent>;
   let mockSearchService: any;
   let router: Router;
-  let routerStub;
-  let paginationService;
 
   beforeEach(waitForAsync(() => {
     mockSearchService = {
@@ -27,12 +24,6 @@ describe('SearchNavbarComponent', () => {
       }
     };
 
-    routerStub = {
-      navigate: (commands) => commands
-    };
-
-    paginationService = new PaginationServiceStub();
-
     TestBed.configureTestingModule({
       imports: [
         FormsModule,
@@ -72,7 +63,7 @@ describe('SearchNavbarComponent', () => {
       spyOn(component, 'expand').and.callThrough();
       spyOn(component, 'onSubmit').and.callThrough();
       spyOn(router, 'navigate');
-      const searchIcon = fixture.debugElement.query(By.css('#search-navbar-container form .submit-icon'));
+      const searchIcon = fixture.debugElement.query(By.css('form .submit-icon'));
       searchIcon.triggerEventHandler('click', {
         preventDefault: () => {/**/
         }
@@ -88,7 +79,7 @@ describe('SearchNavbarComponent', () => {
     describe('empty query', () => {
       describe('press submit button', () => {
         beforeEach(fakeAsync(() => {
-          const searchIcon = fixture.debugElement.query(By.css('#search-navbar-container form .submit-icon'));
+          const searchIcon = fixture.debugElement.query(By.css('form .submit-icon'));
           searchIcon.triggerEventHandler('click', {
             preventDefault: () => {/**/
             }
@@ -97,7 +88,7 @@ describe('SearchNavbarComponent', () => {
           fixture.detectChanges();
         }));
         it('to search page with empty query', () => {
-          const extras: NavigationExtras = {queryParams: { query: '' }, queryParamsHandling: 'merge'};
+          const extras: NavigationExtras = { queryParams: { query: '' } };
           expect(component.onSubmit).toHaveBeenCalledWith({ query: '' });
           expect(router.navigate).toHaveBeenCalledWith(['search'], extras);
         });
@@ -109,20 +100,20 @@ describe('SearchNavbarComponent', () => {
       beforeEach(async () => {
         await fixture.whenStable();
         fixture.detectChanges();
-        searchInput = fixture.debugElement.query(By.css('#search-navbar-container form input'));
+        searchInput = fixture.debugElement.query(By.css('form input'));
         searchInput.nativeElement.value = 'test';
         searchInput.nativeElement.dispatchEvent(new Event('input'));
         fixture.detectChanges();
       });
       describe('press submit button', () => {
         beforeEach(fakeAsync(() => {
-          const searchIcon = fixture.debugElement.query(By.css('#search-navbar-container form .submit-icon'));
+          const searchIcon = fixture.debugElement.query(By.css('form .submit-icon'));
           searchIcon.triggerEventHandler('click', null);
           tick();
           fixture.detectChanges();
         }));
         it('to search page with query', async () => {
-          const extras: NavigationExtras = { queryParams: { query: 'test' }, queryParamsHandling: 'merge'};
+          const extras: NavigationExtras = { queryParams: { query: 'test' } };
           expect(component.onSubmit).toHaveBeenCalledWith({ query: 'test' });
 
           expect(router.navigate).toHaveBeenCalledWith(['search'], extras);
diff --git a/src/app/search-navbar/search-navbar.component.ts b/src/app/search-navbar/search-navbar.component.ts
index 98e64f6e10..7f8f951073 100644
--- a/src/app/search-navbar/search-navbar.component.ts
+++ b/src/app/search-navbar/search-navbar.component.ts
@@ -66,8 +66,7 @@ export class SearchNavbarComponent {
     this.searchForm.reset();
 
     this.router.navigate(linkToNavigateTo, {
-      queryParams: queryParams,
-      queryParamsHandling: 'merge'
+      queryParams: queryParams
     });
   }
 }
diff --git a/src/app/search-page/configuration-search-page.component.ts b/src/app/search-page/configuration-search-page.component.ts
index 768149de6a..13e4709ca0 100644
--- a/src/app/search-page/configuration-search-page.component.ts
+++ b/src/app/search-page/configuration-search-page.component.ts
@@ -1,13 +1,14 @@
 import { HostWindowService } from '../shared/host-window.service';
 import { SidebarService } from '../shared/sidebar/sidebar.service';
 import { SearchComponent } from '../shared/search/search.component';
-import { ChangeDetectionStrategy, Component, Inject } from '@angular/core';
+import { ChangeDetectionStrategy, Component, Inject, PLATFORM_ID } from '@angular/core';
 import { pushInOut } from '../shared/animations/push';
 import { SEARCH_CONFIG_SERVICE } from '../my-dspace-page/my-dspace-page.component';
 import { SearchConfigurationService } from '../core/shared/search/search-configuration.service';
 import { RouteService } from '../core/services/route.service';
 import { SearchService } from '../core/shared/search/search.service';
 import { Router } from '@angular/router';
+import { APP_CONFIG, AppConfig } from '../../config/app-config.interface';
 
 /**
  * This component renders a search page using a configuration as input.
@@ -32,7 +33,10 @@ export class ConfigurationSearchPageComponent extends SearchComponent {
               protected windowService: HostWindowService,
               @Inject(SEARCH_CONFIG_SERVICE) public searchConfigService: SearchConfigurationService,
               protected routeService: RouteService,
-              protected router: Router) {
-    super(service, sidebarService, windowService, searchConfigService, routeService, router);
+              protected router: Router,
+              @Inject(APP_CONFIG) protected appConfig: AppConfig,
+              @Inject(PLATFORM_ID) public platformId: any,
+  ) {
+    super(service, sidebarService, windowService, searchConfigService, routeService, router, appConfig, platformId);
   }
 }
diff --git a/src/app/shared/access-control-form-container/access-control-array-form/access-control-array-form.component.html b/src/app/shared/access-control-form-container/access-control-array-form/access-control-array-form.component.html
index cd56904bd7..69c49d6117 100644
--- a/src/app/shared/access-control-form-container/access-control-array-form/access-control-array-form.component.html
+++ b/src/app/shared/access-control-form-container/access-control-array-form/access-control-array-form.component.html
@@ -47,7 +47,7 @@
             <div class="input-group-append">
               <button
                 class="btn btn-outline-secondary fas fa-calendar"
-                [disabled]="ngForm.disabled"
+                [dsBtnDisabled]="ngForm.disabled"
                 (click)="d.toggle()" type="button">
               </button>
             </div>
@@ -76,7 +76,7 @@
             <div class="input-group-append">
               <button
                 type="button" class="btn btn-outline-secondary fas fa-calendar"
-                [disabled]="ngForm.disabled"
+                [dsBtnDisabled]="ngForm.disabled"
                 (click)="d1.toggle()">
               </button>
             </div>
@@ -88,11 +88,12 @@
       </div>
 
       <div>
-        <label>&nbsp;</label>
+        <span aria-hidden="true" class="mb-2 d-inline-block">&nbsp;</span>
         <div class="input-group">
 
           <button type="button" class="btn btn-outline-danger"
-                  [disabled]="ngForm.disabled || form.accessControls.length === 1"
+                  [attr.aria-label]="'access-control-remove' | translate"
+                  [dsBtnDisabled]="ngForm.disabled || form.accessControls.length === 1"
                   (click)="removeAccessControlItem(control.id)">
             <i class="fas fa-trash"></i>
           </button>
@@ -102,7 +103,7 @@
   </ng-container>
 
   <button type="button" id="add-btn-{{type}}" class="btn btn-outline-primary mt-3"
-          [disabled]="ngForm.disabled"
+          [dsBtnDisabled]="ngForm.disabled"
           (click)="addAccessControlItem()">
     <i class="fas fa-plus"></i>
     {{'access-control-add-more' | translate}}
diff --git a/src/app/shared/access-control-form-container/access-control-array-form/access-control-array-form.component.ts b/src/app/shared/access-control-form-container/access-control-array-form/access-control-array-form.component.ts
index 227de596ff..f91bae7858 100644
--- a/src/app/shared/access-control-form-container/access-control-array-form/access-control-array-form.component.ts
+++ b/src/app/shared/access-control-form-container/access-control-array-form/access-control-array-form.component.ts
@@ -119,6 +119,10 @@ export class AccessControlArrayFormComponent implements OnInit {
     return item.id;
   }
 
+  isValid() {
+    return this.ngForm.valid;
+  }
+
 }
 
 
diff --git a/src/app/shared/access-control-form-container/access-control-form-container.component.html b/src/app/shared/access-control-form-container/access-control-form-container.component.html
index a5173d10d7..0c93aabcf5 100644
--- a/src/app/shared/access-control-form-container/access-control-form-container.component.html
+++ b/src/app/shared/access-control-form-container/access-control-form-container.component.html
@@ -4,27 +4,29 @@
       <ds-alert
         *ngIf="titleMessage"
         [type]="AlertType.Info"
-        [content]="titleMessage">
+        [content]="titleMessage"
+        class="d-block pb-3">
       </ds-alert>
 
-      <div class="row mt-5">
+      <div class="row">
         <div class="col-12 col-md-6 border-right d-flex flex-column justify-content-between">
 
           <div>
             <div class="d-flex align-items-center">
-              <h4 class="mb-0 mr-4">
+              <h2 class="h3 mb-0 mr-4">
                 {{ 'access-control-item-header-toggle' | translate }}
-              </h4>
+              </h2>
               <ui-switch
+                [ariaLabel]="(state.bitstream.toggleStatus ? 'access-control-item-toggle.disable' : 'access-control-item-toggle.enable') | translate"
                 [(ngModel)]="state.item.toggleStatus"
                 (ngModelChange)="handleStatusChange('item', $event)">
               </ui-switch>
             </div>
 
-            <div class="row mt-3">
-              <div class="col-12 col-md-3">
+            <fieldset class="row mt-3">
+              <legend class="h4 col-12 col-md-3">
                 {{ 'access-control-mode' | translate }}
-              </div>
+              </legend>
               <div class="col-12 col-md-8">
                 <div class="form-check">
                   <input class="form-check-input" type="radio"
@@ -45,11 +47,11 @@
                   </label>
                 </div>
               </div>
-            </div>
+            </fieldset>
           </div>
 
           <div>
-            <h5 class="mt-3">{{'access-control-access-conditions' | translate}}</h5>
+            <h3 class="h4 mt-3">{{'access-control-access-conditions' | translate}}</h3>
 
             <ds-access-control-array-form
               #itemAccessCmp
@@ -65,20 +67,21 @@
 
           <div>
             <div class="d-flex align-items-center">
-              <h4 class="mb-0 mr-4">
+              <h2 class="h3 mb-0 mr-4">
                 {{'access-control-bitstream-header-toggle' | translate}}
-              </h4>
+              </h2>
               <ui-switch
+                [ariaLabel]="(state.bitstream.toggleStatus ? 'access-control-bitstream-toggle.disable' : 'access-control-bitstream-toggle.enable') | translate"
                 [(ngModel)]="state.bitstream.toggleStatus"
                 (ngModelChange)="handleStatusChange('bitstream', $event)">
               </ui-switch>
             </div>
 
             <div *ngIf="showLimitToSpecificBitstreams" class="row mt-3">
-            <div class="col-12">
-              {{'access-control-limit-to-specific' | translate}}
-            </div>
-            <div class="col-12">
+            <fieldset class="col-12">
+              <legend class="h4">
+                {{'access-control-limit-to-specific' | translate}}
+              </legend>
               <div class="form-check">
                 <input class="form-check-input" type="radio"
                        name="changesLimit" id="processAll" value="all"
@@ -99,7 +102,8 @@
 
                   <button
                     *ngIf="itemRD"
-                    [disabled]="!state.bitstream.toggleStatus || state.bitstream.changesLimit !== 'selected'"
+                    [attr.aria-label]="'access-control-bitstreams-select' | translate"
+                    [dsBtnDisabled]="!state.bitstream.toggleStatus || state.bitstream.changesLimit !== 'selected'"
                     (click)="openSelectBitstreamsModal(itemRD.payload)"
                     class="btn btn-outline-dark border-0" type="button">
                     <i class="fa fa-search"></i>
@@ -107,14 +111,14 @@
 
                 </label>
               </div>
-            </div>
+            </fieldset>
             </div>
           </div>
 
-          <div class="row mt-3">
-            <div class="col-12 col-md-3">
+          <fieldset class="row mt-3">
+            <legend class="h4 col-12 col-md-3">
               {{'access-control-mode' | translate}}
-            </div>
+            </legend>
             <div class="col-12 col-md-8">
               <div class="form-check">
                 <input class="form-check-input" type="radio"
@@ -135,10 +139,10 @@
                 </label>
               </div>
             </div>
-          </div>
+          </fieldset>
 
           <div>
-            <h5 class="mt-3">{{'access-control-access-conditions' | translate}}</h5>
+            <h3 class="h4 mt-3">{{'access-control-access-conditions' | translate}}</h3>
 
             <ds-access-control-array-form
               #bitstreamAccessCmp
@@ -157,7 +161,7 @@
           {{ 'access-control-cancel' | translate }}
         </button>
         <button class="btn btn-primary"
-                [disabled]="!state.item.toggleStatus && !state.bitstream.toggleStatus"
+                [dsBtnDisabled]="!state.item.toggleStatus && !state.bitstream.toggleStatus"
                 (click)="submit()" type="submit">
           {{ 'access-control-execute' | translate }}
         </button>
diff --git a/src/app/shared/access-control-form-container/access-control-form-container.component.ts b/src/app/shared/access-control-form-container/access-control-form-container.component.ts
index 69a598f7ce..ad3a3c0052 100644
--- a/src/app/shared/access-control-form-container/access-control-form-container.component.ts
+++ b/src/app/shared/access-control-form-container/access-control-form-container.component.ts
@@ -15,7 +15,7 @@ import {
 import { BulkAccessConfigDataService } from '../../core/config/bulk-access-config-data.service';
 import { getFirstCompletedRemoteData } from '../../core/shared/operators';
 import { BulkAccessConditionOptions } from '../../core/config/models/bulk-access-condition-options.model';
-import { AlertType } from '../alert/aletr-type';
+import { AlertType } from '../alert/alert-type';
 import {
   createAccessControlInitialFormState
 } from './access-control-form-container-intial-state';
@@ -156,5 +156,9 @@ export class AccessControlFormContainerComponent<T extends DSpaceObject> impleme
     this.selectableListService.deselectAll(ITEM_ACCESS_CONTROL_SELECT_BITSTREAMS_LIST_ID);
   }
 
+  isValid() {
+    return this.bitstreamAccessCmp.isValid() || this.itemAccessCmp.isValid();
+  }
+
 }
 
diff --git a/src/app/shared/access-control-form-container/item-access-control-select-bitstreams-modal/item-access-control-select-bitstreams-modal.component.html b/src/app/shared/access-control-form-container/item-access-control-select-bitstreams-modal/item-access-control-select-bitstreams-modal.component.html
index 8cf0ecea38..88706e2df3 100644
--- a/src/app/shared/access-control-form-container/item-access-control-select-bitstreams-modal/item-access-control-select-bitstreams-modal.component.html
+++ b/src/app/shared/access-control-form-container/item-access-control-select-bitstreams-modal/item-access-control-select-bitstreams-modal.component.html
@@ -8,20 +8,19 @@
   </button>
 </div>
 <div class="modal-body">
-  <ng-container *ngIf="data$ | async as data">
+  <ng-container *ngIf="bitstreams$ | async as bitstreams">
     <ds-viewable-collection
-      *ngIf="data.payload.page.length > 0"
+      *ngIf="bitstreams.payload?.page?.length > 0"
       [config]="paginationConfig"
       [context]="context"
-      [objects]="data"
+      [objects]="bitstreams"
       [selectable]="true"
       [selectionConfig]="{ repeatable: true, listId: LIST_ID }"
-      [showPaginator]="true"
-      (pageChange)="loadForPage($event)">
+      [showPaginator]="true">
     </ds-viewable-collection>
 
-    <div *ngIf="data && data.payload.page.length === 0"
-      class="alert alert-info w-100" role="alert">
+    <div *ngIf="bitstreams && bitstreams.payload?.page?.length === 0"
+         class="alert alert-info w-100" role="alert">
       {{'access-control-select-bitstreams-modal.no-items' | translate}}
     </div>
 
diff --git a/src/app/shared/access-control-form-container/item-access-control-select-bitstreams-modal/item-access-control-select-bitstreams-modal.component.ts b/src/app/shared/access-control-form-container/item-access-control-select-bitstreams-modal/item-access-control-select-bitstreams-modal.component.ts
index 617803a0c4..4c7f7d41e1 100644
--- a/src/app/shared/access-control-form-container/item-access-control-select-bitstreams-modal/item-access-control-select-bitstreams-modal.component.ts
+++ b/src/app/shared/access-control-form-container/item-access-control-select-bitstreams-modal/item-access-control-select-bitstreams-modal.component.ts
@@ -1,6 +1,6 @@
-import { Component, Input, OnInit } from '@angular/core';
+import { Component, Input, OnInit, OnDestroy } from '@angular/core';
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
-import { BehaviorSubject } from 'rxjs';
+import {  Observable } from 'rxjs';
 import { PaginatedList } from 'src/app/core/data/paginated-list.model';
 import { RemoteData } from 'src/app/core/data/remote-data';
 import { Bitstream } from 'src/app/core/shared/bitstream.model';
@@ -10,8 +10,7 @@ import { Item } from '../../../core/shared/item.model';
 import { BitstreamDataService } from '../../../core/data/bitstream-data.service';
 import { PaginationService } from '../../../core/pagination/pagination.service';
 import { TranslateService } from '@ngx-translate/core';
-import { hasValue } from '../../empty.util';
-import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
+import { switchMap } from 'rxjs/operators';
 
 export const ITEM_ACCESS_CONTROL_SELECT_BITSTREAMS_LIST_ID = 'item-access-control-select-bitstreams';
 
@@ -20,19 +19,22 @@ export const ITEM_ACCESS_CONTROL_SELECT_BITSTREAMS_LIST_ID = 'item-access-contro
   templateUrl: './item-access-control-select-bitstreams-modal.component.html',
   styleUrls: [ './item-access-control-select-bitstreams-modal.component.scss' ]
 })
-export class ItemAccessControlSelectBitstreamsModalComponent implements OnInit {
+export class ItemAccessControlSelectBitstreamsModalComponent implements OnInit, OnDestroy {
 
   LIST_ID = ITEM_ACCESS_CONTROL_SELECT_BITSTREAMS_LIST_ID;
 
   @Input() item!: Item;
   @Input() selectedBitstreams: string[] = [];
 
-  data$ = new BehaviorSubject<RemoteData<PaginatedList<Bitstream>> | null>(null);
-  paginationConfig: PaginationComponentOptions;
-  pageSize = 5;
-
+  bitstreams$: Observable<RemoteData<PaginatedList<Bitstream>>>;
   context: Context = Context.Bitstream;
 
+  paginationConfig = Object.assign(new PaginationComponentOptions(), {
+    id: 'iacsbm',
+    currentPage: 1,
+    pageSize: 5
+  });
+
   constructor(
     private bitstreamService: BitstreamDataService,
     protected paginationService: PaginationService,
@@ -40,23 +42,20 @@ export class ItemAccessControlSelectBitstreamsModalComponent implements OnInit {
     public activeModal: NgbActiveModal
   ) { }
 
-  ngOnInit() {
-    this.loadForPage(1);
-
-    this.paginationConfig = new PaginationComponentOptions();
-    this.paginationConfig.id = 'iacsbm';
-    this.paginationConfig.currentPage = 1;
-    if (hasValue(this.pageSize)) {
-      this.paginationConfig.pageSize = this.pageSize;
-    }
+  ngOnInit(): void {
+    this.bitstreams$ = this.paginationService.getCurrentPagination(this.paginationConfig.id, this.paginationConfig).pipe(
+      switchMap((options: PaginationComponentOptions) => this.bitstreamService.findAllByItemAndBundleName(
+        this.item,
+        'ORIGINAL',
+        { elementsPerPage: options.pageSize, currentPage: options.currentPage },
+        true,
+        true,
+      ))
+    );
   }
 
-  loadForPage(page: number) {
-    this.bitstreamService.findAllByItemAndBundleName(this.item, 'ORIGINAL', { currentPage: page}, false)
-      .pipe(
-        getFirstCompletedRemoteData(),
-      )
-      .subscribe(this.data$);
+  ngOnDestroy(): void {
+    this.paginationService.clearPagination(this.paginationConfig.id);
   }
 
 }
diff --git a/src/app/shared/alert/aletr-type.ts b/src/app/shared/alert/alert-type.ts
similarity index 100%
rename from src/app/shared/alert/aletr-type.ts
rename to src/app/shared/alert/alert-type.ts
diff --git a/src/app/shared/alert/alert.component.scss b/src/app/shared/alert/alert.component.scss
index 1a70081367..907edae24b 100644
--- a/src/app/shared/alert/alert.component.scss
+++ b/src/app/shared/alert/alert.component.scss
@@ -1,3 +1,9 @@
-.close:focus {
-  outline: none !important;
+.close {
+  opacity: 0.75;
+  &:focus {
+    outline: none !important;
+  }
+}
+button.close {
+  opacity: 0.6;
 }
diff --git a/src/app/shared/alert/alert.component.spec.ts b/src/app/shared/alert/alert.component.spec.ts
index 21e4d197b7..11411c7de0 100644
--- a/src/app/shared/alert/alert.component.spec.ts
+++ b/src/app/shared/alert/alert.component.spec.ts
@@ -8,7 +8,7 @@ import { TranslateModule } from '@ngx-translate/core';
 
 import { AlertComponent } from './alert.component';
 import { createTestComponent } from '../testing/utils.test';
-import { AlertType } from './aletr-type';
+import { AlertType } from './alert-type';
 
 describe('AlertComponent test suite', () => {
 
diff --git a/src/app/shared/alert/alert.component.ts b/src/app/shared/alert/alert.component.ts
index 93535d2057..07a8efbd7d 100644
--- a/src/app/shared/alert/alert.component.ts
+++ b/src/app/shared/alert/alert.component.ts
@@ -1,7 +1,7 @@
 import { ChangeDetectorRef, Component, EventEmitter, Input, Output, ViewEncapsulation } from '@angular/core';
 import { trigger } from '@angular/animations';
 
-import { AlertType } from './aletr-type';
+import { AlertType } from './alert-type';
 import { fadeOutLeave, fadeOutState } from '../animations/fade';
 
 /**
diff --git a/src/app/shared/animations/slide.ts b/src/app/shared/animations/slide.ts
index 310ddbbfde..a0f596a0fa 100644
--- a/src/app/shared/animations/slide.ts
+++ b/src/app/shared/animations/slide.ts
@@ -1,4 +1,4 @@
-import { animate, animateChild, group, query, state, style, transition, trigger } from '@angular/animations';
+import { animate, group, state, style, transition, trigger } from '@angular/animations';
 
 export const slide = trigger('slide', [
   state('expanded', style({ height: '*' })),
@@ -12,50 +12,40 @@ export const slide = trigger('slide', [
 
 export const slideMobileNav = trigger('slideMobileNav', [
 
-  state('expanded', style({ height: 'auto', 'min-height': '100vh' })),
+  state('expanded', style({ height: '*', minHeight: '*' })),
 
-  state('collapsed', style({ height: 0 })),
+  state('collapsed', style({ height: 0, minHeight: 0 })),
 
   transition('expanded <=> collapsed', animate('300ms'))
 ]);
 
-const collapsedStyle = style({ marginLeft: '-{{ sidebarWidth }}' });
-const expandedStyle = style({ marginLeft: '0' });
-const options = { params: { sidebarWidth: '*' } };
+const collapsedSidebarStyle = style({ maxWidth: '{{collapsedWidth}}' });
+const expandedSidebarStyle = style({ maxWidth: '{{expandedWidth}}' });
+const unpinnedSidebarPageStyle = style({ paddingLeft: '{{collapsedWidth}}' });
+const pinnedSidebarPageStyle = style({ paddingLeft: '{{expandedWidth}}' });
+const hiddenSidebarPageStyle = style({ paddingLeft: '0' });
+const options = { params: { collapsedWidth: '*', expandedWidth: '*' } };
+const animation = '300ms ease-in-out';
 
 export const slideSidebar = trigger('slideSidebar', [
-
-  transition('expanded => collapsed',
-    group(
-      [
-        query('@*', animateChild()),
-        query('.sidebar-collapsible', expandedStyle, options),
-        query('.sidebar-collapsible', animate('300ms ease-in-out', collapsedStyle))
-      ],
-    )),
-
-  transition('collapsed => expanded',
-    group(
-      [
-        query('@*', animateChild()),
-        query('.sidebar-collapsible', collapsedStyle),
-        query('.sidebar-collapsible', animate('300ms ease-in-out', expandedStyle), options)
-      ]
-    ))
+  state('collapsed', collapsedSidebarStyle, options),
+  state('expanded', expandedSidebarStyle, options),
+  transition('expanded => collapsed', animate(animation, collapsedSidebarStyle)),
+  transition('collapsed => expanded', animate(animation, expandedSidebarStyle)),
 ]);
 
 export const slideSidebarPadding = trigger('slideSidebarPadding', [
-  state('hidden', style({ paddingLeft: 0 })),
-  state('shown', style({ paddingLeft: '{{ collapsedSidebarWidth }}' }), { params: { collapsedSidebarWidth: '*' } }),
-  state('expanded', style({ paddingLeft: '{{ totalSidebarWidth }}' }), { params: { totalSidebarWidth: '*' } }),
-  transition('hidden <=> shown', [animate('200ms')]),
-  transition('hidden <=> expanded', [animate('200ms')]),
-  transition('shown <=> expanded', [animate('200ms')]),
+  state('hidden', hiddenSidebarPageStyle),
+  state('unpinned', unpinnedSidebarPageStyle, options),
+  state('pinned', pinnedSidebarPageStyle, options),
+  transition('hidden <=> unpinned', animate(animation)),
+  transition('hidden <=> pinned', animate(animation)),
+  transition('unpinned <=> pinned', animate(animation)),
 ]);
 
 export const expandSearchInput = trigger('toggleAnimation', [
   state('collapsed', style({
-    width: '30px',
+    width: '0',
     opacity: '0'
   })),
   state('expanded', style({
diff --git a/src/app/shared/auth-nav-menu/auth-nav-menu.component.html b/src/app/shared/auth-nav-menu/auth-nav-menu.component.html
index 05f502afa1..05eaad4351 100644
--- a/src/app/shared/auth-nav-menu/auth-nav-menu.component.html
+++ b/src/app/shared/auth-nav-menu/auth-nav-menu.component.html
@@ -1,37 +1,54 @@
-<ul class="navbar-nav" [ngClass]="{'mr-auto': (isXsOrSm$ | async)}">
-  <li *ngIf="!(isAuthenticated | async) && !(isXsOrSm$ | async) && (showAuth | async)" class="nav-item"
+<div class="navbar-nav mr-auto" *ngIf="!(isMobile$ | async); else mobileButtons" data-test="auth-nav">
+  <div *ngIf="!(isAuthenticated | async) && (showAuth | async)"
+      class="nav-item"
       (click)="$event.stopPropagation();">
-    <div ngbDropdown #loginDrop display="dynamic" placement="bottom-right" class="d-inline-block" @fadeInOut>
-      <a href="javascript:void(0);" class="dropdownLogin px-1" [attr.aria-label]="'nav.login' |translate"
+    <div ngbDropdown #loginDrop="ngbDropdown" display="dynamic" placement="bottom-right" class="d-inline-block" @fadeInOut>
+      <a href="javascript:void(0);" class="dropdownLogin px-0.5" [attr.aria-label]="'nav.login' |translate"
          (click)="$event.preventDefault()" [attr.data-test]="'login-menu' | dsBrowserOnly"
+         role="menuitem"
+         tabindex="0"
+         aria-haspopup="menu"
+         aria-controls="loginDropdownMenu"
+         [attr.aria-expanded]="loginDrop.isOpen()"
          ngbDropdownToggle>{{ 'nav.login' | translate }}</a>
-      <div class="loginDropdownMenu" [ngClass]="{'pl-3 pr-3': (loading | async)}" ngbDropdownMenu
+      <div id="loginDropdownMenu" [ngClass]="{'pl-3 pr-3': (loading | async)}" ngbDropdownMenu
+           role="menu"
            [attr.aria-label]="'nav.login' | translate">
-        <ds-log-in
-          [isStandalonePage]="false"></ds-log-in>
+        <ds-themed-log-in
+          [isStandalonePage]="false"></ds-themed-log-in>
       </div>
     </div>
-  </li>
-  <li *ngIf="!(isAuthenticated | async) && (isXsOrSm$ | async)" class="nav-item">
-    <a routerLink="/login" routerLinkActive="active" class="loginLink px-1">
+  </div>
+  <div *ngIf="(isAuthenticated | async) && (showAuth | async)" class="nav-item">
+    <div ngbDropdown display="dynamic" placement="bottom-right" class="d-inline-block" @fadeInOut>
+      <a href="javascript:void(0);"
+         role="menuitem"
+         tabindex="0"
+         [attr.aria-label]="'nav.user-profile-menu-and-logout' | translate"
+         aria-controls="user-menu-dropdown"
+         (click)="$event.preventDefault()" [title]="'nav.user-profile-menu-and-logout' | translate"
+         class="dropdownLogout px-1"
+         [attr.data-test]="'user-menu' | dsBrowserOnly"
+         ngbDropdownToggle>
+        <i class="fas fa-user-circle fa-lg fa-fw"></i></a>
+      <div id="logoutDropdownMenu" ngbDropdownMenu>
+        <ds-themed-user-menu [inExpandableNavbar]="false"></ds-themed-user-menu>
+      </div>
+    </div>
+  </div>
+</div>
+
+
+<ng-template #mobileButtons>
+  <div data-test="auth-nav">
+    <a *ngIf="!(isAuthenticated | async)" routerLink="/login" routerLinkActive="active" class="loginLink px-0.5" role="button" tabindex="0">
       {{ 'nav.login' | translate }}<span class="sr-only">(current)</span>
     </a>
-  </li>
-  <li *ngIf="(isAuthenticated | async) && !(isXsOrSm$ | async) && (showAuth | async)" class="nav-item">
-    <div ngbDropdown display="dynamic" placement="bottom-right" class="d-inline-block" @fadeInOut>
-      <a href="javascript:void(0);" role="button" [attr.aria-label]="'nav.user-profile-menu-and-logout' |translate" (click)="$event.preventDefault()" [title]="'nav.user-profile-menu-and-logout' | translate" class="dropdownLogout px-1" [attr.data-test]="'user-menu' | dsBrowserOnly" ngbDropdownToggle>
-        <i class="fas fa-user-circle fa-lg fa-fw"></i></a>
-      <div class="logoutDropdownMenu" ngbDropdownMenu [attr.aria-label]="'nav.user-profile-menu-and-logout' |translate">
-        <ds-user-menu></ds-user-menu>
-      </div>
-    </div>
-  </li>
-  <li *ngIf="(isAuthenticated | async) && (isXsOrSm$ | async)" class="nav-item">
-    <a role="button" [attr.aria-label]="'nav.logout' |translate" [title]="'nav.logout' | translate" routerLink="/logout" routerLinkActive="active" class="logoutLink px-1">
+    <a *ngIf="(isAuthenticated | async)" role="button" [attr.aria-label]="'nav.logout' |translate" [title]="'nav.logout' | translate" routerLink="/logout" routerLinkActive="active" class="logoutLink px-1" tabindex="0">
       <i class="fas fa-sign-out-alt fa-lg fa-fw"></i>
       <span class="sr-only">(current)</span>
     </a>
-  </li>
-</ul>
-
+  </div>
+</ng-template>
 
+<!-- Do not use ul/li in this menu as it breaks e2e accessibility tests -->
diff --git a/src/app/shared/auth-nav-menu/auth-nav-menu.component.scss b/src/app/shared/auth-nav-menu/auth-nav-menu.component.scss
index 40e9113b00..84e4916eff 100644
--- a/src/app/shared/auth-nav-menu/auth-nav-menu.component.scss
+++ b/src/app/shared/auth-nav-menu/auth-nav-menu.component.scss
@@ -1,10 +1,10 @@
-.loginDropdownMenu, .logoutDropdownMenu {
+#loginDropdownMenu, #logoutDropdownMenu {
   min-width: 330px;
   z-index: 1002;
 }
 
-.loginDropdownMenu {
-  min-height: 260px;
+#loginDropdownMenu {
+  min-height: 75px;
 }
 
 .dropdown-item.active, .dropdown-item:active,
@@ -19,3 +19,12 @@
     color: var(--ds-header-icon-color-hover);
   }
 }
+
+.dropdownLogin, .dropdownLogout {
+  &:not(:focus-visible).active,
+  &:not(:focus-visible):active,
+  &:not(:focus-visible).active:focus,
+  &:not(:focus-visible):active:focus {
+    box-shadow: unset;
+  }
+}
diff --git a/src/app/shared/auth-nav-menu/auth-nav-menu.component.spec.ts b/src/app/shared/auth-nav-menu/auth-nav-menu.component.spec.ts
index 58a1edfabd..6abb111e5c 100644
--- a/src/app/shared/auth-nav-menu/auth-nav-menu.component.spec.ts
+++ b/src/app/shared/auth-nav-menu/auth-nav-menu.component.spec.ts
@@ -14,8 +14,10 @@ import { HostWindowService } from '../host-window.service';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { AuthTokenInfo } from '../../core/auth/models/auth-token-info.model';
 import { AuthService } from '../../core/auth/auth.service';
+import { XSRFService } from '../../core/xsrf/xsrf.service';
 import { of } from 'rxjs';
 import { BrowserOnlyMockPipe } from '../testing/browser-only-mock.pipe';
+import { NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap';
 
 describe('AuthNavMenuComponent', () => {
 
@@ -75,7 +77,8 @@ describe('AuthNavMenuComponent', () => {
               strictActionImmutability: false
             }
           }),
-          TranslateModule.forRoot()
+          TranslateModule.forRoot(),
+          NgbDropdownModule
         ],
         declarations: [
           AuthNavMenuComponent,
@@ -83,7 +86,8 @@ describe('AuthNavMenuComponent', () => {
         ],
         providers: [
           { provide: HostWindowService, useValue: window },
-          { provide: AuthService, useValue: authService }
+          { provide: AuthService, useValue: authService },
+          { provide: XSRFService, useValue: {} },
         ],
         schemas: [
           CUSTOM_ELEMENTS_SCHEMA
@@ -117,10 +121,10 @@ describe('AuthNavMenuComponent', () => {
 
         fixture.detectChanges();
 
-        const navMenuSelector = '.navbar-nav';
+        const navMenuSelector = '[data-test="auth-nav"]';
         deNavMenu = fixture.debugElement.query(By.css(navMenuSelector));
 
-        const navMenuItemSelector = 'li';
+        const navMenuItemSelector = '.nav-item';
         deNavMenuItem = deNavMenu.query(By.css(navMenuItemSelector));
       }));
       afterEach(() => {
@@ -155,10 +159,10 @@ describe('AuthNavMenuComponent', () => {
 
         fixture.detectChanges();
 
-        const navMenuSelector = '.navbar-nav';
+        const navMenuSelector = '[data-test="auth-nav"]';
         deNavMenu = fixture.debugElement.query(By.css(navMenuSelector));
 
-        const navMenuItemSelector = 'li';
+        const navMenuItemSelector = '.nav-item';
         deNavMenuItem = deNavMenu.query(By.css(navMenuItemSelector));
       }));
 
@@ -197,10 +201,10 @@ describe('AuthNavMenuComponent', () => {
 
           fixture.detectChanges();
 
-          const navMenuSelector = '.navbar-nav';
+          const navMenuSelector = '[data-test="auth-nav"]';
           deNavMenu = fixture.debugElement.query(By.css(navMenuSelector));
 
-          const navMenuItemSelector = 'li';
+          const navMenuItemSelector = '.nav-item';
           deNavMenuItem = deNavMenu.query(By.css(navMenuItemSelector));
         }));
 
@@ -210,7 +214,7 @@ describe('AuthNavMenuComponent', () => {
         });
 
         it('should render login dropdown menu', () => {
-          const loginDropdownMenu = deNavMenuItem.query(By.css('div.loginDropdownMenu'));
+          const loginDropdownMenu = deNavMenuItem.query(By.css('div#loginDropdownMenu'));
           expect(loginDropdownMenu.nativeElement).toBeDefined();
         });
       });
@@ -236,10 +240,10 @@ describe('AuthNavMenuComponent', () => {
 
           fixture.detectChanges();
 
-          const navMenuSelector = '.navbar-nav';
+          const navMenuSelector = '[data-test="auth-nav"]';
           deNavMenu = fixture.debugElement.query(By.css(navMenuSelector));
 
-          const navMenuItemSelector = 'li';
+          const navMenuItemSelector = '.nav-item';
           deNavMenuItem = deNavMenu.query(By.css(navMenuItemSelector));
         }));
 
@@ -248,7 +252,7 @@ describe('AuthNavMenuComponent', () => {
           component = null;
         });
         it('should render UserMenuComponent component', () => {
-          const logoutDropdownMenu = deNavMenuItem.query(By.css('ds-user-menu'));
+          const logoutDropdownMenu = deNavMenuItem.query(By.css('ds-themed-user-menu'));
           expect(logoutDropdownMenu.nativeElement).toBeDefined();
         });
       });
@@ -309,11 +313,8 @@ describe('AuthNavMenuComponent', () => {
 
         fixture.detectChanges();
 
-        const navMenuSelector = '.navbar-nav';
+        const navMenuSelector = '[data-test="auth-nav"]';
         deNavMenu = fixture.debugElement.query(By.css(navMenuSelector));
-
-        const navMenuItemSelector = 'li';
-        deNavMenuItem = deNavMenu.query(By.css(navMenuItemSelector));
       }));
 
       afterEach(() => {
@@ -322,7 +323,7 @@ describe('AuthNavMenuComponent', () => {
       });
 
       it('should render login link', () => {
-        const loginDropdownMenu = deNavMenuItem.query(By.css('.loginLink'));
+        const loginDropdownMenu = deNavMenu.query(By.css('.loginLink'));
         expect(loginDropdownMenu.nativeElement).toBeDefined();
       });
     });
@@ -345,11 +346,8 @@ describe('AuthNavMenuComponent', () => {
 
         fixture.detectChanges();
 
-        const navMenuSelector = '.navbar-nav';
+        const navMenuSelector = '[data-test="auth-nav"]';
         deNavMenu = fixture.debugElement.query(By.css(navMenuSelector));
-
-        const navMenuItemSelector = 'li';
-        deNavMenuItem = deNavMenu.query(By.css(navMenuItemSelector));
       }));
 
       afterEach(() => {
@@ -358,7 +356,7 @@ describe('AuthNavMenuComponent', () => {
       });
 
       it('should render logout link', inject([Store], (store: Store<AppState>) => {
-        const logoutDropdownMenu = deNavMenuItem.query(By.css('a.logoutLink'));
+        const logoutDropdownMenu = deNavMenu.query(By.css('a.logoutLink'));
         expect(logoutDropdownMenu.nativeElement).toBeDefined();
       }));
     });
diff --git a/src/app/shared/auth-nav-menu/auth-nav-menu.component.ts b/src/app/shared/auth-nav-menu/auth-nav-menu.component.ts
index 37a45e1b20..3174462fc3 100644
--- a/src/app/shared/auth-nav-menu/auth-nav-menu.component.ts
+++ b/src/app/shared/auth-nav-menu/auth-nav-menu.component.ts
@@ -32,7 +32,7 @@ export class AuthNavMenuComponent implements OnInit {
    */
   public loading: Observable<boolean>;
 
-  public isXsOrSm$: Observable<boolean>;
+  public isMobile$: Observable<boolean>;
 
   public showAuth = observableOf(false);
 
@@ -44,7 +44,7 @@ export class AuthNavMenuComponent implements OnInit {
               private windowService: HostWindowService,
               private authService: AuthService
   ) {
-    this.isXsOrSm$ = this.windowService.isXsOrSm();
+    this.isMobile$ = this.windowService.isMobile();
   }
 
   ngOnInit(): void {
diff --git a/src/app/shared/auth-nav-menu/user-menu/themed-user-menu.component.ts b/src/app/shared/auth-nav-menu/user-menu/themed-user-menu.component.ts
new file mode 100644
index 0000000000..9dafe6c426
--- /dev/null
+++ b/src/app/shared/auth-nav-menu/user-menu/themed-user-menu.component.ts
@@ -0,0 +1,33 @@
+import {Component, Input} from '@angular/core';
+import {ThemedComponent} from '../../theme-support/themed.component';
+import {UserMenuComponent} from './user-menu.component';
+
+/**
+ * This component represents the user nav menu.
+ */
+@Component({
+  selector: 'ds-themed-user-menu',
+  templateUrl: './../../theme-support/themed.component.html',
+  styleUrls: []
+})
+export class ThemedUserMenuComponent extends ThemedComponent<UserMenuComponent>{
+
+  /**
+   * The input flag to show user details in navbar expandable menu
+   */
+  @Input() inExpandableNavbar: boolean;
+
+  protected inAndOutputNames: (keyof UserMenuComponent & keyof this)[] = ['inExpandableNavbar'];
+
+  protected getComponentName(): string {
+    return 'UserMenuComponent';
+  }
+
+  protected importThemedComponent(themeName: string): Promise<any> {
+    return import((`../../../../themes/${themeName}/app/shared/auth-nav-menu/user-menu/user-menu.component`));
+  }
+
+  protected importUnthemedComponent(): Promise<any> {
+    return import('./user-menu.component');
+  }
+}
diff --git a/src/app/shared/auth-nav-menu/user-menu/user-menu.component.html b/src/app/shared/auth-nav-menu/user-menu/user-menu.component.html
index 85b9d8aece..c20ad463d1 100644
--- a/src/app/shared/auth-nav-menu/user-menu/user-menu.component.html
+++ b/src/app/shared/auth-nav-menu/user-menu/user-menu.component.html
@@ -1,15 +1,32 @@
 <ds-themed-loading *ngIf="(loading$ | async)"></ds-themed-loading>
-<div *ngIf="!(loading$ | async)">
-  <span class="dropdown-item-text" [class.pl-0]="inExpandableNavbar">
+<ul *ngIf="!(loading$ | async)" class="user-menu" role="menu"
+    [ngClass]="inExpandableNavbar ? 'user-menu-mobile pb-2 mb-2 border-bottom' : 'user-menu-dropdown'"
+    [attr.aria-label]="'nav.user-profile-menu-and-logout' |translate" id="user-menu-dropdown">
+  <li class="ds-menu-item-wrapper username-email-wrapper" role="presentation">
     {{dsoNameService.getName(user$ | async)}}<br>
     <span class="text-muted">{{(user$ | async)?.email}}</span>
-  </span>
-  <a [ngClass]="inExpandableNavbar ? 'nav-item nav-link' : 'dropdown-item'" [routerLink]="[profileRoute]" routerLinkActive="active">{{'nav.profile' | translate}}</a>
-  <a [ngClass]="inExpandableNavbar ? 'nav-item nav-link' : 'dropdown-item'" [routerLink]="[mydspaceRoute]" routerLinkActive="active">{{'nav.mydspace' | translate}}</a>
-  <a [ngClass]="inExpandableNavbar ? 'nav-item nav-link' : 'dropdown-item'" [routerLink]="[subscriptionsRoute]" routerLinkActive="active">{{'nav.subscriptions' | translate}}</a>
-
-  <div class="dropdown-divider"></div>
-  <ds-log-out *ngIf="!inExpandableNavbar" data-test="log-out-component"></ds-log-out>
-</div>
+  </li>
+  <li class="ds-menu-item-wrapper" role="presentation">
+    <a class="ds-menu-item" role="menuitem"
+       [routerLink]="[profileRoute]"
+       routerLinkActive="active">{{'nav.profile' | translate}}</a>
+  </li>
+  <li class="ds-menu-item-wrapper" role="presentation">
+    <a class="ds-menu-item" role="menuitem"
+       [routerLink]="[mydspaceRoute]"
+       routerLinkActive="active">{{'nav.mydspace' | translate}}</a>
+  </li>
+  <li class="ds-menu-item-wrapper" role="presentation">
+    <a class="ds-menu-item" role="menuitem"
+       [routerLink]="[subscriptionsRoute]"
+       routerLinkActive="active">{{'nav.subscriptions' | translate}}</a>
+  </li>
+  <ng-container *ngIf="!inExpandableNavbar">
+    <li class="dropdown-divider" aria-hidden="true"></li>
+    <li class="ds-menu-item-wrapper" role="presentation">
+      <ds-log-out data-test="log-out-component"></ds-log-out>
+    </li>
+  </ng-container>
+</ul>
 
 
diff --git a/src/app/shared/auth-nav-menu/user-menu/user-menu.component.scss b/src/app/shared/auth-nav-menu/user-menu/user-menu.component.scss
index e69de29bb2..8fa0019bf1 100644
--- a/src/app/shared/auth-nav-menu/user-menu/user-menu.component.scss
+++ b/src/app/shared/auth-nav-menu/user-menu/user-menu.component.scss
@@ -0,0 +1,45 @@
+:host {
+  ul.user-menu  {
+    list-style: none;
+    margin: 0;
+    padding: 0;
+
+    &.user-menu-dropdown {
+      .ds-menu-item-wrapper {
+        a.ds-menu-item, &.username-email-wrapper {
+          padding: var(--ds-user-menu-item-vertical-padding) var(--ds-user-menu-dropdown-padding);
+        }
+
+        a.ds-menu-item {
+          display: block;
+          color: var(--ds-expandable-navbar-link-color);
+          &:hover {
+            color: var(--ds-expandable-navbar-link-color-hover);
+            background-color: var(--ds-user-menu-dropdown-link-background-hover);
+          }
+        }
+      }
+    }
+
+    &.user-menu-mobile {
+      .ds-menu-item-wrapper {
+        padding-top: var(--ds-user-menu-item-vertical-padding);
+        padding-bottom: var(--ds-user-menu-item-vertical-padding);
+      }
+
+      .ds-menu-item {
+        display: inline-block;
+      }
+
+      .ds-menu-item, .ds-menu-toggler-wrapper {
+        color: var(--ds-expandable-navbar-link-color) !important;
+
+        &:hover, &:focus {
+          color: var(--ds-expandable-navbar-link-background-hover) !important;
+        }
+      }
+
+    }
+  }
+
+}
diff --git a/src/app/shared/auth-nav-menu/user-menu/user-menu.component.spec.ts b/src/app/shared/auth-nav-menu/user-menu/user-menu.component.spec.ts
index 5576b942b3..3ef4847168 100644
--- a/src/app/shared/auth-nav-menu/user-menu/user-menu.component.spec.ts
+++ b/src/app/shared/auth-nav-menu/user-menu/user-menu.component.spec.ts
@@ -7,6 +7,7 @@ import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
 import { UserMenuComponent } from './user-menu.component';
 import { authReducer, AuthState } from '../../../core/auth/auth.reducer';
 import { AuthTokenInfo } from '../../../core/auth/models/auth-token-info.model';
+import { XSRFService } from '../../../core/xsrf/xsrf.service';
 import { EPersonMock } from '../../testing/eperson.mock';
 import { AppState } from '../../../app.reducer';
 import { TranslateLoaderMock } from '../../mocks/translate-loader.mock';
@@ -69,7 +70,8 @@ describe('UserMenuComponent', () => {
         })
       ],
       providers: [
-        { provide: AuthService, useValue: authService }
+        { provide: AuthService, useValue: authService },
+        { provide: XSRFService, useValue: {} },
       ],
       declarations: [
         UserMenuComponent
@@ -140,7 +142,7 @@ describe('UserMenuComponent', () => {
 
       fixture.detectChanges();
 
-      deUserMenu = fixture.debugElement.query(By.css('div'));
+      deUserMenu = fixture.debugElement.query(By.css('ul#user-menu-dropdown'));
     }));
 
     afterEach(() => {
@@ -164,7 +166,7 @@ describe('UserMenuComponent', () => {
     it('should display user name and email', () => {
       const username = 'User Test';
       const email = 'test@test.com';
-      const span = deUserMenu.query(By.css('.dropdown-item-text'));
+      const span = deUserMenu.query(By.css('.username-email-wrapper'));
       expect(span).toBeDefined();
       expect(span.nativeElement.innerHTML).toContain(username);
       expect(span.nativeElement.innerHTML).toContain(email);
diff --git a/src/app/shared/browse-by/browse-by.component.html b/src/app/shared/browse-by/browse-by.component.html
index d6a0005173..37799e805f 100644
--- a/src/app/shared/browse-by/browse-by.component.html
+++ b/src/app/shared/browse-by/browse-by.component.html
@@ -1,5 +1,5 @@
 <ng-container *ngVar="(objects$ | async) as objects">
-  <h3 [ngClass]="{'sr-only': parentname }">{{title | translate}}</h3>
+  <h1 [ngClass]="{'sr-only': parentname }">{{title | translate}}</h1>
   <ng-container *ngComponentOutlet="getStartsWithComponent(); injector: objectInjector;"></ng-container>
   <div *ngIf="objects?.hasSucceeded && !objects?.isLoading && objects?.payload?.page.length > 0" @fadeIn>
       <div *ngIf="shouldDisplayResetButton$ |async" class="mb-2 reset">
diff --git a/src/app/shared/browse-by/browse-by.component.spec.ts b/src/app/shared/browse-by/browse-by.component.spec.ts
index 9317a68007..260e27c8cb 100644
--- a/src/app/shared/browse-by/browse-by.component.spec.ts
+++ b/src/app/shared/browse-by/browse-by.component.spec.ts
@@ -142,6 +142,8 @@ describe('BrowseByComponent', () => {
         { provide: RouteService, useValue: routeServiceStub},
         { provide: SelectableListService, useValue: {} },
         { provide: HostWindowService, useValue: new HostWindowServiceStub(800) },
+        { provide: 'startsWithOptions', useValue: [] },
+        { provide: 'paginationId', useValue: 'bbm' },
       ],
       schemas: [NO_ERRORS_SCHEMA]
     }).compileComponents();
diff --git a/src/app/shared/browse-by/browse-by.component.ts b/src/app/shared/browse-by/browse-by.component.ts
index 0dc20033f8..0e4c8cdca9 100644
--- a/src/app/shared/browse-by/browse-by.component.ts
+++ b/src/app/shared/browse-by/browse-by.component.ts
@@ -1,4 +1,4 @@
-import { Component, EventEmitter, Injector, Input, OnDestroy, OnInit, Output } from '@angular/core';
+import { Component, EventEmitter, Injector, Input, OnDestroy, OnInit, Output, SimpleChanges, OnChanges } from '@angular/core';
 import { RemoteData } from '../../core/data/remote-data';
 import { PaginatedList } from '../../core/data/paginated-list.model';
 import { PaginationComponentOptions } from '../pagination/pagination-component-options.model';
@@ -26,7 +26,7 @@ import { TranslateService } from '@ngx-translate/core';
 /**
  * Component to display a browse-by page for any ListableObject
  */
-export class BrowseByComponent implements OnInit, OnDestroy {
+export class BrowseByComponent implements OnInit, OnDestroy, OnChanges {
 
   /**
    * ViewMode that should be passed to {@link ListableObjectComponentLoaderComponent}.
@@ -182,14 +182,7 @@ export class BrowseByComponent implements OnInit, OnDestroy {
   }
 
   ngOnInit(): void {
-    this.objectInjector = Injector.create({
-      providers: [
-        { provide: 'startsWithOptions', useFactory: () => (this.startsWithOptions), deps:[] },
-        { provide: 'paginationId', useFactory: () => (this.paginationConfig?.id), deps:[] }
-      ],
-      parent: this.injector
-    });
-
+    this.generateInjector();
     const startsWith$ = this.routeService.getQueryParameterValue('startsWith');
     const value$ = this.routeService.getQueryParameterValue('value');
 
@@ -199,9 +192,26 @@ export class BrowseByComponent implements OnInit, OnDestroy {
     this.sub = this.routeService.getQueryParameterValue(this.paginationConfig.id + '.return').subscribe(this.previousPage$);
   }
 
+  ngOnChanges(changes: SimpleChanges): void {
+    if (changes.startsWithOptions || changes.paginationId) {
+      this.generateInjector();
+    }
+  }
+
   ngOnDestroy(): void {
     if (this.sub) {
       this.sub.unsubscribe();
     }
   }
+
+  generateInjector(): void {
+    this.objectInjector = Injector.create({
+      providers: [
+        { provide: 'startsWithOptions', useFactory: () => (this.startsWithOptions), deps:[] },
+        { provide: 'paginationId', useFactory: () => (this.paginationConfig?.id), deps:[] }
+      ],
+      parent: this.injector
+    });
+  }
+
 }
diff --git a/src/app/shared/browse-by/shared-browse-by.module.ts b/src/app/shared/browse-by/shared-browse-by.module.ts
index ae42576e9b..4041f296c8 100644
--- a/src/app/shared/browse-by/shared-browse-by.module.ts
+++ b/src/app/shared/browse-by/shared-browse-by.module.ts
@@ -1,15 +1,21 @@
 import { NgModule } from '@angular/core';
 import { BrowseByComponent } from './browse-by.component';
+import { ThemedBrowseByComponent } from './themed-browse-by.component';
 import { CommonModule } from '@angular/common';
 import { SharedModule } from '../shared.module';
 import { ResultsBackButtonModule } from '../results-back-button/results-back-button.module';
 import { BrowseByRoutingModule } from '../../browse-by/browse-by-routing.module';
 import { AccessControlRoutingModule } from '../../access-control/access-control-routing.module';
 
+const DECLARATIONS = [
+  BrowseByComponent,
+  ThemedBrowseByComponent,
+];
+
 @NgModule({
   declarations: [
-    BrowseByComponent,
-],
+    ...DECLARATIONS,
+  ],
   imports: [
     ResultsBackButtonModule,
     BrowseByRoutingModule,
@@ -18,8 +24,7 @@ import { AccessControlRoutingModule } from '../../access-control/access-control-
     SharedModule,
   ],
   exports: [
-    BrowseByComponent,
-    SharedModule,
+    ...DECLARATIONS,
   ]
 })
 export class SharedBrowseByModule { }
diff --git a/src/app/shared/browse-by/themed-browse-by.component.ts b/src/app/shared/browse-by/themed-browse-by.component.ts
new file mode 100644
index 0000000000..eaa17ebf16
--- /dev/null
+++ b/src/app/shared/browse-by/themed-browse-by.component.ts
@@ -0,0 +1,76 @@
+import { Component, Input, Output, EventEmitter } from '@angular/core';
+import { ThemedComponent } from '../theme-support/themed.component';
+import { BrowseByComponent } from './browse-by.component';
+import { Observable } from 'rxjs';
+import { RemoteData } from '../../core/data/remote-data';
+import { PaginatedList } from '../../core/data/paginated-list.model';
+import { ListableObject } from '../object-collection/shared/listable-object.model';
+import { PaginationComponentOptions } from '../pagination/pagination-component-options.model';
+import { SortOptions, SortDirection } from '../../core/cache/models/sort-options.model';
+import { StartsWithType } from '../starts-with/starts-with-decorator';
+
+/**
+ * Themed wrapper for {@link BrowseByComponent}
+ */
+@Component({
+  selector: 'ds-themed-browse-by',
+  styleUrls: [],
+  templateUrl: '../theme-support/themed.component.html',
+})
+export class ThemedBrowseByComponent extends ThemedComponent<BrowseByComponent> {
+
+  @Input() title: string;
+
+  @Input() parentname: string;
+
+  @Input() objects$: Observable<RemoteData<PaginatedList<ListableObject>>>;
+
+  @Input() paginationConfig: PaginationComponentOptions;
+
+  @Input() sortConfig: SortOptions;
+
+  @Input() type: StartsWithType;
+
+  @Input() startsWithOptions: number[];
+
+  @Input() showPaginator: boolean;
+
+  @Input() hideGear: boolean;
+
+  @Output() prev: EventEmitter<boolean> = new EventEmitter();
+
+  @Output() next: EventEmitter<boolean> = new EventEmitter();
+
+  @Output() pageSizeChange: EventEmitter<number> = new EventEmitter();
+
+  @Output() sortDirectionChange: EventEmitter<SortDirection> = new EventEmitter();
+
+  protected inAndOutputNames: (keyof BrowseByComponent & keyof this)[] = [
+    'title',
+    'parentname',
+    'objects$',
+    'paginationConfig',
+    'sortConfig',
+    'type',
+    'startsWithOptions',
+    'showPaginator',
+    'hideGear',
+    'prev',
+    'next',
+    'pageSizeChange',
+    'sortDirectionChange',
+  ];
+
+  protected getComponentName(): string {
+    return 'BrowseByComponent';
+  }
+
+  protected importThemedComponent(themeName: string): Promise<any> {
+    return import(`../../../themes/${themeName}/app/shared/browse-by/browse-by.component.ts`);
+  }
+
+  protected importUnthemedComponent(): Promise<any> {
+    return import('./browse-by.component');
+  }
+
+}
diff --git a/src/app/shared/btn-disabled.directive.ts b/src/app/shared/btn-disabled.directive.ts
new file mode 100644
index 0000000000..512aa87ede
--- /dev/null
+++ b/src/app/shared/btn-disabled.directive.ts
@@ -0,0 +1,57 @@
+import { Directive, Input, HostBinding, HostListener } from '@angular/core';
+
+@Directive({
+    selector: '[dsBtnDisabled]'
+})
+
+/**
+ * This directive can be added to a html element to disable it (make it non-interactive).
+ * It acts as a replacement for HTML's disabled attribute.
+ *
+ * This directive should always be used instead of the HTML disabled attribute as it is more accessible.
+ */
+export class BtnDisabledDirective {
+
+    @Input() set dsBtnDisabled(value: boolean) {
+        this.isDisabled = !!value;
+    }
+
+    /**
+     * Binds the aria-disabled attribute to the directive's isDisabled property.
+     * This is used to make the element accessible to screen readers. If the element is disabled, the screen reader will announce it as such.
+     */
+    @HostBinding('attr.aria-disabled') isDisabled = false;
+
+    /**
+     * Binds the class attribute to the directive's isDisabled property.
+     * This is used to style the element when it is disabled (make it look disabled).
+     */
+    @HostBinding('class.disabled') get disabledClass() { return this.isDisabled; }
+
+    /**
+     * Prevents the default action and stops the event from propagating when the element is disabled.
+     * This is used to prevent the element from being interacted with when it is disabled (via mouse click).
+     * @param event The click event.
+     */
+    @HostListener('click', ['$event'])
+    handleClick(event: Event) {
+        if (this.isDisabled) {
+            event.preventDefault();
+            event.stopImmediatePropagation();
+        }
+    }
+
+    /**
+     * Prevents the default action and stops the event from propagating when the element is disabled.
+     * This is used to prevent the element from being interacted with when it is disabled (via keystrokes).
+     * @param event The keydown event.
+     */
+  @HostListener('keydown', ['$event'])
+    handleKeydown(event: KeyboardEvent) {
+        if (this.isDisabled && (event.key === 'Enter' || event.key === 'Space')) {
+            event.preventDefault();
+            event.stopImmediatePropagation();
+        }
+    }
+}
+
diff --git a/src/app/shared/collection-dropdown/collection-dropdown.component.html b/src/app/shared/collection-dropdown/collection-dropdown.component.html
index 470291373f..a27aafa31d 100644
--- a/src/app/shared/collection-dropdown/collection-dropdown.component.html
+++ b/src/app/shared/collection-dropdown/collection-dropdown.component.html
@@ -1,4 +1,4 @@
-<div *ngIf="searchField" class="form-group w-100 pr-2 pl-2">
+<div *ngIf="searchField" class="form-group w-100 pr-2 pl-2 my-2">
   <input type="search"
          class="form-control w-100"
          (click)="$event.stopPropagation();"
@@ -6,9 +6,9 @@
          [formControl]="searchField"
          #searchFieldEl>
 </div>
-<div class="dropdown-divider"></div>
-<ul class="scrollable-menu p-0"
-     aria-labelledby="dropdownMenuButton"
+<div class="dropdown-divider m-0"></div>
+<ul class="scrollable-menu p-0 m-0"
+    role="menu"
      (scroll)="onScroll($event)"
      infiniteScroll
      [infiniteScrollDistance]="1.5"
@@ -18,12 +18,13 @@
      [scrollWindow]="false"
      (scrolled)="onScrollDown()">
 
-  <li class="dropdown-item disabled" *ngIf="searchListCollection?.length == 0 && !(isLoading | async)">
+  <li class="dropdown-item disabled" role="menuitem" *ngIf="searchListCollection?.length == 0 && !(isLoading | async)">
     {{'submission.sections.general.no-collection' | translate}}
   </li>
   <ng-container *ngIf="searchListCollection?.length > 0">
     <li *ngFor="let listItem of searchListCollection"
             class="dropdown-item collection-item"
+            role="menuitem"
             title="{{ listItem.collection.name }}"
             (click)="onSelect(listItem)">
       <div class="list-unstyled mb-0">
@@ -34,9 +35,10 @@
       </div>
     </li>
   </ng-container>
-  <button class="dropdown-item disabled" *ngIf="(isLoading | async)">
-    <ds-themed-loading message="{{'loading.default' | translate}}">
-    </ds-themed-loading>
-  </button>
-
+  <li *ngIf="(isLoading | async)">
+    <button class="dropdown-item disabled">
+      <ds-themed-loading message="{{'loading.default' | translate}}">
+      </ds-themed-loading>
+    </button>
+  </li>
 </ul>
diff --git a/src/app/shared/collection-dropdown/collection-dropdown.component.scss b/src/app/shared/collection-dropdown/collection-dropdown.component.scss
index 907a111900..8a28a3ff7e 100644
--- a/src/app/shared/collection-dropdown/collection-dropdown.component.scss
+++ b/src/app/shared/collection-dropdown/collection-dropdown.component.scss
@@ -4,7 +4,8 @@
   overflow-x: hidden;
 }
 
-.collection-item {
+li:not(:last-of-type), .dropdown-divider {
+  border-top: none;
   border-bottom: var(--bs-dropdown-border-width) solid var(--bs-dropdown-border-color);
 }
 
diff --git a/src/app/shared/comcol/comcol-forms/comcol-form/comcol-form.component.html b/src/app/shared/comcol/comcol-forms/comcol-form/comcol-form.component.html
index 5d7b092f74..c79dba42b7 100644
--- a/src/app/shared/comcol/comcol-forms/comcol-form/comcol-form.component.html
+++ b/src/app/shared/comcol/comcol-forms/comcol-form/comcol-form.component.html
@@ -1,13 +1,13 @@
 <div class="container-fluid">
   <div class="row">
-    <div class="col-12 d-inline-block">
-      <label>{{type.value + '.edit.logo.label' | translate}}</label>
+    <div class="col-12 d-inline-block mb-1">
+      <span>{{type.value + '.edit.logo.label' | translate}}</span>
     </div>
     <ng-container *ngVar="(dso?.logo | async)?.payload as logo">
       <div class="col-12 d-inline-block alert" [ngClass]="{'alert-danger': markLogoForDeletion}" id="logo-section" *ngIf="logo">
         <div class="row">
           <div class="col-8 d-inline-block">
-            <ds-comcol-page-logo [logo]="logo"></ds-comcol-page-logo>
+            <ds-comcol-page-logo [alternateText]="type.value + '.logo.alt'" [logo]="logo"></ds-comcol-page-logo>
           </div>
           <div class="col-4 d-inline-block">
             <div *ngIf="logo" class="btn-group btn-group-sm float-right" role="group">
@@ -27,6 +27,7 @@
       </div>
       <div *ngIf="!logo" class="col-12 d-inline-block">
         <ds-uploader  *ngIf="initializedUploaderOptions | async"
+                      [ariaLabel]="type.value + '.browse.logo'"
                       [dropMsg]="type.value + '.edit.logo.upload'"
                       [dropOverDocumentMsg]="type.value + '.edit.logo.upload'"
                       [enableDragOverDocument]="true"
@@ -42,7 +43,7 @@
          [formModel]="formModel"
          [displayCancel]="false"
          (submitForm)="onSubmit()">
-  <button before (click)="back.emit()" class="btn btn-outline-secondary">
-    <i class="fas fa-arrow-left"></i> {{ type.value + '.edit.return' | translate }}
+  <button before (click)="back.emit()" class="btn btn-outline-secondary" type="button">
+    <i class="fas fa-arrow-left" aria-hidden="true"></i> {{ type.value + '.edit.return' | translate }}
   </button>
 </ds-form>
diff --git a/src/app/shared/comcol/comcol-forms/edit-comcol-page/comcol-role/comcol-role.component.html b/src/app/shared/comcol/comcol-forms/edit-comcol-page/comcol-role/comcol-role.component.html
index 1e1f3d8209..b6d598d562 100644
--- a/src/app/shared/comcol/comcol-forms/edit-comcol-page/comcol-role/comcol-role.component.html
+++ b/src/app/shared/comcol/comcol-forms/edit-comcol-page/comcol-role/comcol-role.component.html
@@ -3,9 +3,9 @@
   <div class="card-body d-flex flex-column"
        *ngVar="group$ | async as group">
 
-    <h5 class="w-100">
+    <h2 class="h4 w-100">
       {{ roleName$ | async }}
-    </h5>
+    </h2>
 
     <div class="mt-2 mb-2">
       <ds-alert [type]="'alert-info'" >{{'comcol-role.edit.' + (comcolRole$ | async)?.name + '.description' | translate}}</ds-alert>
diff --git a/src/app/shared/comcol/comcol-forms/edit-comcol-page/edit-comcol-page.component.html b/src/app/shared/comcol/comcol-forms/edit-comcol-page/edit-comcol-page.component.html
index 819d080f89..7797ba13c9 100644
--- a/src/app/shared/comcol/comcol-forms/edit-comcol-page/edit-comcol-page.component.html
+++ b/src/app/shared/comcol/comcol-forms/edit-comcol-page/edit-comcol-page.component.html
@@ -2,19 +2,22 @@
   <div class="row">
     <div class="col-12">
       <div class="d-flex justify-content-between border-bottom">
-        <h2>{{ type + '.edit.head' | translate }}</h2>
-        <div>
+        <h1>{{ type + '.edit.head' | translate }}</h1>
+        <div class="my-auto">
           <a class="btn btn-danger"
-             [routerLink]="((type === 'community') ? '/communities/' : '/collections/') + (dsoRD$ | async)?.payload.uuid + '/delete'">
-            <i class="fas fa-trash"></i> {{type + '.edit.delete' | translate}}</a>
+             [routerLink]="((type === 'community') ? '/communities/' : '/collections/') + (dsoRD$ | async)?.payload.uuid + '/delete'"
+             data-test="delete-button">
+            <i class="fas fa-trash" aria-hidden="true"></i> {{type + '.edit.delete' | translate}}</a>
         </div>
       </div>
       <div class="pt-2">
-        <ul class="nav nav-tabs justify-content-start mb-2">
-          <li *ngFor="let page of pages" class="nav-item">
-            <a class="nav-link"
+        <ul class="nav nav-tabs justify-content-start mb-2" role="tablist">
+          <li *ngFor="let page of pages" class="nav-item" role="presentation">
+            <a class="nav-link" role="tab"
+               [attr.aria-selected]="page === currentPage"
                [ngClass]="{'active' : page === currentPage}"
-               [routerLink]="['./' + page]">
+               [routerLink]="['./' + page]"
+               [attr.data-test]="page">
               {{ type + '.edit.tabs.' + page + '.head' | translate}}
             </a>
           </li>
@@ -25,7 +28,7 @@
           </div>
           <div class="col-12 text-right">
             <a *ngIf="!hideReturnButton" [routerLink]="getPageUrl((dsoRD$ | async)?.payload)" class="btn btn-outline-secondary">
-              <i class="fas fa-arrow-left"></i> {{ type + '.edit.return' | translate }}
+              <i class="fas fa-arrow-left" aria-hidden="true"></i> {{ type + '.edit.return' | translate }}
             </a>
           </div>
         </div>
diff --git a/src/app/shared/comcol/comcol-page-browse-by/comcol-page-browse-by.component.html b/src/app/shared/comcol/comcol-page-browse-by/comcol-page-browse-by.component.html
index 504d9f4bcd..c38b039148 100644
--- a/src/app/shared/comcol/comcol-page-browse-by/comcol-page-browse-by.component.html
+++ b/src/app/shared/comcol/comcol-page-browse-by/comcol-page-browse-by.component.html
@@ -2,12 +2,15 @@
 <nav class="comcol-browse mb-4" aria-label="Browse Community or Collection">
   <div class="d-none d-sm-block">
 
-    <div class="list-group list-group-horizontal">
+    <div class="list-group list-group-horizontal" role="tablist">
       <a *ngFor="let option of allOptions"
+         [attr.aria-current]="(currentOptionId$ | async) === option.id"
          class="list-group-item"
+         role="tab"
          [routerLink]="option.routerLink"
          [queryParams]="option.params"
-         routerLinkActive="active">{{ option.label | translate }}</a>
+         [class.active]="(currentOptionId$ | async) === option.id"
+         tabindex="0">{{ option.label | translate }}</a>
     </div>
   </div>
 
diff --git a/src/app/shared/comcol/comcol-page-handle/comcol-page-handle.component.html b/src/app/shared/comcol/comcol-page-handle/comcol-page-handle.component.html
index 552854a0c0..42bbb9328c 100644
--- a/src/app/shared/comcol/comcol-page-handle/comcol-page-handle.component.html
+++ b/src/app/shared/comcol/comcol-page-handle/comcol-page-handle.component.html
@@ -1,4 +1,4 @@
-<div *ngIf="content" class="content-with-optional-title mb-2">
-    <h2 class="d-inline-block h6" *ngIf="title">{{ title | translate }}</h2>
-    <div class="d-inline-block px-2"><a href="{{getHandle()}}">{{getHandle()}}</a></div>
-</div>
+<p *ngIf="content" class="d-flex flex-wrap gapx-2 text-break">
+  <span class="mb-0" *ngIf="title">{{ title | translate }}</span>
+  <a [href]="getHandle()" role="link" tabindex="0">{{getHandle()}}</a>
+</p>
diff --git a/src/app/shared/comcol/comcol-page-handle/comcol-page-handle.component.scss b/src/app/shared/comcol/comcol-page-handle/comcol-page-handle.component.scss
index 5d7bac26c7..e69de29bb2 100644
--- a/src/app/shared/comcol/comcol-page-handle/comcol-page-handle.component.scss
+++ b/src/app/shared/comcol/comcol-page-handle/comcol-page-handle.component.scss
@@ -1,5 +0,0 @@
-div {
-  word-break: break-word;
-  word-wrap: break-word;
-  overflow-wrap: break-word;
-}
diff --git a/src/app/shared/comcol/comcol-page-logo/comcol-page-logo.component.html b/src/app/shared/comcol/comcol-page-logo/comcol-page-logo.component.html
index 057c358223..cb3feecbe5 100644
--- a/src/app/shared/comcol/comcol-page-logo/comcol-page-logo.component.html
+++ b/src/app/shared/comcol/comcol-page-logo/comcol-page-logo.component.html
@@ -1,3 +1,3 @@
 <div *ngIf="logo" class="dso-logo mb-3">
-    <img [src]="logo._links.content.href" class="img-fluid" [attr.alt]="alternateText ? alternateText : null" (error)="errorHandler($event)"/>
+    <img [src]="logo._links.content.href" class="w-100 img-fluid" [attr.alt]="alternateText ? alternateText : null" (error)="errorHandler($event)"/>
 </div>
diff --git a/src/app/shared/comcol/comcol-page-logo/comcol-page-logo.component.scss b/src/app/shared/comcol/comcol-page-logo/comcol-page-logo.component.scss
index e69de29bb2..db6e7daecf 100644
--- a/src/app/shared/comcol/comcol-page-logo/comcol-page-logo.component.scss
+++ b/src/app/shared/comcol/comcol-page-logo/comcol-page-logo.component.scss
@@ -0,0 +1,4 @@
+img {
+  max-width: var(--ds-comcol-logo-max-width);
+  max-height: var(--ds-comcol-logo-max-height);
+}
diff --git a/src/app/shared/context-help.directive.ts b/src/app/shared/context-help.directive.ts
index 41d6daec21..52a822de2c 100644
--- a/src/app/shared/context-help.directive.ts
+++ b/src/app/shared/context-help.directive.ts
@@ -1,5 +1,4 @@
 import {
-  ComponentFactoryResolver,
   ComponentRef,
   Directive,
   Input,
@@ -12,6 +11,7 @@ import { PlacementArray } from '@ng-bootstrap/ng-bootstrap/util/positioning';
 import { ContextHelpWrapperComponent } from './context-help-wrapper/context-help-wrapper.component';
 import { PlacementDir } from './context-help-wrapper/placement-dir.model';
 import { ContextHelpService } from './context-help.service';
+import { hasValue } from './empty.util';
 
 export interface ContextHelpDirectiveInput {
   content: string;
@@ -43,7 +43,6 @@ export class ContextHelpDirective implements OnChanges, OnDestroy {
   constructor(
     private templateRef: TemplateRef<any>,
     private viewContainerRef: ViewContainerRef,
-    private componentFactoryResolver: ComponentFactoryResolver,
     private contextHelpService: ContextHelpService
   ) {}
 
@@ -53,19 +52,21 @@ export class ContextHelpDirective implements OnChanges, OnDestroy {
     this.contextHelpService.add({id: this.dsContextHelp.id, isTooltipVisible: false});
 
     if (this.wrapper === undefined) {
-      const factory
-        = this.componentFactoryResolver.resolveComponentFactory(ContextHelpWrapperComponent);
-      this.wrapper = this.viewContainerRef.createComponent(factory);
+      this.wrapper = this.viewContainerRef.createComponent(ContextHelpWrapperComponent);
     }
-    this.wrapper.instance.templateRef = this.templateRef;
-    this.wrapper.instance.content = this.dsContextHelp.content;
-    this.wrapper.instance.id = this.dsContextHelp.id;
-    this.wrapper.instance.tooltipPlacement = this.dsContextHelp.tooltipPlacement;
-    this.wrapper.instance.iconPlacement = this.dsContextHelp.iconPlacement;
+    this.wrapper.setInput('templateRef', this.templateRef);
+    this.wrapper.setInput('content', this.dsContextHelp.content);
+    this.wrapper.setInput('id', this.dsContextHelp.id);
+    this.wrapper.setInput('tooltipPlacement', this.dsContextHelp.tooltipPlacement);
+    this.wrapper.setInput('iconPlacement', this.dsContextHelp.iconPlacement);
   }
 
   ngOnDestroy() {
     this.clearMostRecentId();
+    if (hasValue(this.wrapper)) {
+      this.wrapper.destroy();
+      this.wrapper = undefined;
+    }
   }
 
   private clearMostRecentId(): void {
diff --git a/src/app/shared/cookies/browser-klaro.service.spec.ts b/src/app/shared/cookies/browser-klaro.service.spec.ts
index 7fd72b54b3..3da3a8b7a3 100644
--- a/src/app/shared/cookies/browser-klaro.service.spec.ts
+++ b/src/app/shared/cookies/browser-klaro.service.spec.ts
@@ -101,7 +101,7 @@ describe('BrowserKlaroService', () => {
 
     mockConfig = {
       translations: {
-        zz: {
+        zy: {
           purposes: {},
           test: {
             testeritis: testKey
@@ -159,8 +159,8 @@ describe('BrowserKlaroService', () => {
 
   it('addAppMessages', () => {
     service.addAppMessages();
-    expect(mockConfig.translations.zz[appName]).toBeDefined();
-    expect(mockConfig.translations.zz.purposes[purpose]).toBeDefined();
+    expect(mockConfig.translations.zy[appName]).toBeDefined();
+    expect(mockConfig.translations.zy.purposes[purpose]).toBeDefined();
   });
 
   it('translateConfiguration', () => {
diff --git a/src/app/shared/cookies/browser-klaro.service.ts b/src/app/shared/cookies/browser-klaro.service.ts
index 2b09c0bf15..adcb59e146 100644
--- a/src/app/shared/cookies/browser-klaro.service.ts
+++ b/src/app/shared/cookies/browser-klaro.service.ts
@@ -91,7 +91,7 @@ export class BrowserKlaroService extends KlaroService {
   initialize() {
     if (!environment.info.enablePrivacyStatement) {
       delete this.klaroConfig.privacyPolicy;
-      this.klaroConfig.translations.zz.consentNotice.description = 'cookies.consent.content-notice.description.no-privacy';
+      this.klaroConfig.translations.zy.consentNotice.description = 'cookies.consent.content-notice.description.no-privacy';
     }
 
     const hideGoogleAnalytics$ = this.configService.findByPropertyName(this.GOOGLE_ANALYTICS_KEY).pipe(
@@ -238,12 +238,12 @@ export class BrowserKlaroService extends KlaroService {
    */
   addAppMessages() {
     this.klaroConfig.services.forEach((app) => {
-      this.klaroConfig.translations.zz[app.name] = {
+      this.klaroConfig.translations.zy[app.name] = {
         title: this.getTitleTranslation(app.name),
         description: this.getDescriptionTranslation(app.name)
       };
       app.purposes.forEach((purpose) => {
-        this.klaroConfig.translations.zz.purposes[purpose] = this.getPurposeTranslation(purpose);
+        this.klaroConfig.translations.zy.purposes[purpose] = this.getPurposeTranslation(purpose);
       });
     });
   }
@@ -257,7 +257,7 @@ export class BrowserKlaroService extends KlaroService {
      */
     this.translateService.setDefaultLang(environment.defaultLanguage);
 
-    this.translate(this.klaroConfig.translations.zz);
+    this.translate(this.klaroConfig.translations.zy);
   }
 
   /**
diff --git a/src/app/shared/cookies/klaro-configuration.ts b/src/app/shared/cookies/klaro-configuration.ts
index a41b641dec..6ec4855e28 100644
--- a/src/app/shared/cookies/klaro-configuration.ts
+++ b/src/app/shared/cookies/klaro-configuration.ts
@@ -17,12 +17,12 @@ export const GOOGLE_ANALYTICS_KLARO_KEY = 'google-analytics';
 
 /**
  * Klaro configuration
- * For more information see https://kiprotect.com/docs/klaro/annotated-config
+ * For more information see https://klaro.org/docs/integration/annotated-configuration
  */
 export const klaroConfiguration: any = {
   storageName: ANONYMOUS_STORAGE_NAME_KLARO,
 
-  privacyPolicy: '/info/privacy',
+  privacyPolicy: './info/privacy',
 
   /*
   Setting 'hideLearnMore' to 'true' will hide the "learn more / customize" link in
@@ -47,21 +47,30 @@ export const klaroConfiguration: any = {
 
   htmlTexts: true,
 
+  /*
+  Force Klaro to use our custom "zy" lang configs defined below.
+  */
+  lang: 'zy',
+
   /*
   You can overwrite existing translations and add translations for your app
   descriptions and purposes. See `src/translations/` for a full list of
   translations that can be overwritten:
-  https://github.com/KIProtect/klaro/tree/master/src/translations
+  https://github.com/klaro-org/klaro-js/tree/master/src/translations
   */
   translations: {
     /*
-      The `zz` key contains default translations that will be used as fallback values.
-      This can e.g. be useful for defining a fallback privacy policy URL.
-      FOR DSPACE: We use 'zz' to map to our own i18n translations for klaro, see
+      For DSpace we use this custom 'zy' key to map to our own i18n translations for klaro, see
       translateConfiguration() in browser-klaro.service.ts. All the below i18n keys are specified
       in your /src/assets/i18n/*.json5 translation pack.
+      This 'zy' key has no special meaning to Klaro & is not a valid language code. It just
+      allows DSpace to override Klaro's own translations in favor of DSpace's i18n keys.
+      NOTE: we do not use 'zz' as that has special meaning to Klaro and is ONLY used as a "fallback"
+      if no other translations can be found within Klaro. Currently, a bug in Klaro means that
+      'zz' is never used as there's no way to exclude translations:
+      https://github.com/klaro-org/klaro-js/issues/515
     */
-    zz: {
+    zy: {
       acceptAll: 'cookies.consent.accept-all',
       acceptSelected: 'cookies.consent.accept-selected',
       close: 'cookies.consent.close',
@@ -183,7 +192,6 @@ export const klaroConfiguration: any = {
       purposes: ['registration-password-recovery'],
       required: false,
       cookies: [
-        [/^klaro-.+$/],
         CAPTCHA_COOKIE
       ],
       onAccept: `window.refreshCaptchaScript?.call()`,
diff --git a/src/app/shared/disabled-directive.spec.ts b/src/app/shared/disabled-directive.spec.ts
new file mode 100644
index 0000000000..71515c48ff
--- /dev/null
+++ b/src/app/shared/disabled-directive.spec.ts
@@ -0,0 +1,97 @@
+import { Component, DebugElement } from '@angular/core';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+import { BtnDisabledDirective } from './btn-disabled.directive';
+
+@Component({
+    template: `
+    <button [dsBtnDisabled]="isDisabled">Test Button</button>
+  `
+})
+class TestComponent {
+    isDisabled = false;
+}
+
+describe('DisabledDirective', () => {
+    let component: TestComponent;
+    let fixture: ComponentFixture<TestComponent>;
+    let button: DebugElement;
+
+    beforeEach(() => {
+        TestBed.configureTestingModule({
+            declarations: [TestComponent, BtnDisabledDirective]
+        });
+        fixture = TestBed.createComponent(TestComponent);
+        component = fixture.componentInstance;
+        button = fixture.debugElement.query(By.css('button'));
+        fixture.detectChanges();
+    });
+
+    it('should bind aria-disabled to false initially', () => {
+        expect(button.nativeElement.getAttribute('aria-disabled')).toBe('false');
+        expect(button.nativeElement.classList.contains('disabled')).toBeFalse();
+    });
+
+    it('should bind aria-disabled to true and add disabled class when isDisabled is true', () => {
+        component.isDisabled = true;
+        fixture.detectChanges();
+
+        expect(button.nativeElement.getAttribute('aria-disabled')).toBe('true');
+        expect(button.nativeElement.classList.contains('disabled')).toBeTrue();
+    });
+
+  it('should bind aria-disabled to false and not have disabled class when isDisabled is false', () => {
+    component.isDisabled = false;
+    fixture.detectChanges();
+
+    expect(button.nativeElement.getAttribute('aria-disabled')).toBe('false');
+    expect(button.nativeElement.classList.contains('disabled')).toBeFalse();
+  });
+
+    it('should prevent click events when disabled', () => {
+        component.isDisabled = true;
+        fixture.detectChanges();
+
+        let clickHandled = false;
+        button.nativeElement.addEventListener('click', () => clickHandled = true);
+
+        button.nativeElement.click();
+
+        expect(clickHandled).toBeFalse();
+    });
+
+    it('should prevent Enter or Space keydown events when disabled', () => {
+        component.isDisabled = true;
+        fixture.detectChanges();
+
+        let keydownHandled = false;
+        button.nativeElement.addEventListener('keydown', () => keydownHandled = true);
+
+        const enterEvent = new KeyboardEvent('keydown', { key: 'Enter' });
+        const spaceEvent = new KeyboardEvent('keydown', { key: 'Space' });
+
+        button.nativeElement.dispatchEvent(enterEvent);
+        button.nativeElement.dispatchEvent(spaceEvent);
+
+        expect(keydownHandled).toBeFalse();
+    });
+
+    it('should allow click and keydown events when not disabled', () => {
+        let clickHandled = false;
+        let keydownHandled = false;
+
+        button.nativeElement.addEventListener('click', () => clickHandled = true);
+        button.nativeElement.addEventListener('keydown', () => keydownHandled = true);
+
+        button.nativeElement.click();
+
+        const enterEvent = new KeyboardEvent('keydown', { key: 'Enter' });
+        const spaceEvent = new KeyboardEvent('keydown', { key: 'Space' });
+
+        button.nativeElement.dispatchEvent(enterEvent);
+        button.nativeElement.dispatchEvent(spaceEvent);
+
+        expect(clickHandled).toBeTrue();
+        expect(keydownHandled).toBeTrue();
+    });
+});
diff --git a/src/app/shared/ds-select/ds-select.component.html b/src/app/shared/ds-select/ds-select.component.html
index 5a15155d4f..e87b7c5cc6 100644
--- a/src/app/shared/ds-select/ds-select.component.html
+++ b/src/app/shared/ds-select/ds-select.component.html
@@ -13,7 +13,7 @@
             class="btn btn-outline-primary selection"
             (blur)="close.emit($event)"
             (click)="close.emit($event)"
-            [disabled]="disabled"
+            [dsBtnDisabled]="disabled"
             ngbDropdownToggle>
       <ng-content select=".selection"></ng-content>
     </button>
@@ -22,7 +22,7 @@
          class="dropdown-menu"
          id="dsSelectDropdownMenu"
          aria-labelledby="dsSelectMenuButton">
-      <div aria-labelledby="dropdownMenuButton">
+      <div>
         <ng-content select=".menu"></ng-content>
       </div>
     </div>
diff --git a/src/app/shared/dso-page/dso-edit-menu.resolver.spec.ts b/src/app/shared/dso-page/dso-edit-menu.resolver.spec.ts
index abfe618174..e28a416f23 100644
--- a/src/app/shared/dso-page/dso-edit-menu.resolver.spec.ts
+++ b/src/app/shared/dso-page/dso-edit-menu.resolver.spec.ts
@@ -1,6 +1,6 @@
 import { TestBed, waitForAsync } from '@angular/core/testing';
 import { MenuServiceStub } from '../testing/menu-service.stub';
-import { of as observableOf } from 'rxjs';
+import { combineLatest, map, of as observableOf } from 'rxjs';
 import { TranslateModule, TranslateService } from '@ngx-translate/core';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { RouterTestingModule } from '@angular/router/testing';
@@ -16,10 +16,13 @@ import { Item } from '../../core/shared/item.model';
 import { createFailedRemoteDataObject$, createSuccessfulRemoteDataObject$ } from '../remote-data.utils';
 import { MenuID } from '../menu/menu-id.model';
 import { MenuItemType } from '../menu/menu-item-type.model';
-import { TextMenuItemModel } from '../menu/menu-item/models/text.model';
 import { LinkMenuItemModel } from '../menu/menu-item/models/link.model';
 import { ResearcherProfileDataService } from '../../core/profile/researcher-profile-data.service';
 import { NotificationsService } from '../notifications/notifications.service';
+import { DSpaceObject } from '../../core/shared/dspace-object.model';
+import { Community } from '../../core/shared/community.model';
+import { Collection } from '../../core/shared/collection.model';
+import flatten from 'lodash/flatten';
 
 describe('DSOEditMenuResolver', () => {
 
@@ -37,25 +40,44 @@ describe('DSOEditMenuResolver', () => {
   let notificationsService;
   let translate;
 
-  const route = {
-    data: {
-      menu: {
-        'statistics': [{
-          id: 'statistics-dummy-1',
-          active: false,
-          visible: true,
-          model: null
-        }]
-      }
-    },
-    params: {id: 'test-uuid'},
+  const dsoRoute = (dso: DSpaceObject) => {
+    return {
+      data: {
+        menu: {
+          'statistics': [{
+            id: 'statistics-dummy-1',
+            active: false,
+            visible: true,
+            model: null
+          }]
+        }
+      },
+      params: {id: dso.uuid},
+    };
   };
 
   const state = {
     url: 'test-url'
   };
 
-  const testObject = Object.assign(new Item(), {uuid: 'test-uuid', type: 'item', _links: {self: {href: 'self-link'}}});
+  const testCommunity: Community = Object.assign(new Community(), {
+    uuid: 'test-community-uuid',
+    type: 'community',
+    _links: {self: {href: 'self-link'}},
+  });
+  const testCollection: Collection = Object.assign(new Collection(), {
+    uuid: 'test-collection-uuid',
+    type: 'collection',
+    _links: {self: {href: 'self-link'}},
+  });
+  const testItem: Item = Object.assign(new Item(), {
+    uuid: 'test-item-uuid',
+    type: 'item',
+    _links: {self: {href: 'self-link'}},
+  });
+
+  let testObject: DSpaceObject;
+  let route;
 
   const dummySections1 = [{
     id: 'dummy-1',
@@ -90,6 +112,10 @@ describe('DSOEditMenuResolver', () => {
     }];
 
   beforeEach(waitForAsync(() => {
+    // test with Items unless specified otherwise
+    testObject = testItem;
+    route = dsoRoute(testItem);
+
     menuService = new MenuServiceStub();
     spyOn(menuService, 'getMenu').and.returnValue(observableOf(MENU_STATE));
 
@@ -154,16 +180,17 @@ describe('DSOEditMenuResolver', () => {
           {
             ...route.data.menu,
             [MenuID.DSO_EDIT]: [
-              ...dummySections1.map((menu) => Object.assign(menu, {id: menu.id + '-test-uuid'})),
-              ...dummySections2.map((menu) => Object.assign(menu, {id: menu.id + '-test-uuid'}))
+              ...dummySections1.map((menu) => Object.assign(menu, {id: menu.id + '-test-item-uuid'})),
+              ...dummySections2.map((menu) => Object.assign(menu, {id: menu.id + '-test-item-uuid'}))
             ]
           }
         );
-        expect(dSpaceObjectDataService.findById).toHaveBeenCalledWith('test-uuid', true, false);
+        expect(dSpaceObjectDataService.findById).toHaveBeenCalledWith('test-item-uuid', true, false);
         expect(resolver.getDsoMenus).toHaveBeenCalled();
         done();
       });
     });
+
     it('should create all menus when a dso is found based on the route scope query param when no id param is present', (done) => {
       spyOn(resolver, 'getDsoMenus').and.returnValue(
         [observableOf(dummySections1), observableOf(dummySections2)]
@@ -198,6 +225,7 @@ describe('DSOEditMenuResolver', () => {
         done();
       });
     });
+
     it('should return the statistics menu when no dso is found', (done) => {
       (dSpaceObjectDataService.findById as jasmine.Spy).and.returnValue(createFailedRemoteDataObject$());
 
@@ -211,49 +239,165 @@ describe('DSOEditMenuResolver', () => {
       });
     });
   });
+
   describe('getDsoMenus', () => {
-    it('should return as first part the item version, orcid and claim list ', (done) => {
-      const result = resolver.getDsoMenus(testObject, route, state);
-      result[0].subscribe((menuList) => {
-        expect(menuList.length).toEqual(3);
-        expect(menuList[0].id).toEqual('orcid-dso');
-        expect(menuList[0].active).toEqual(false);
-        // Visible should be false due to the item not being of type person
-        expect(menuList[0].visible).toEqual(false);
-        expect(menuList[0].model.type).toEqual(MenuItemType.LINK);
-
-        expect(menuList[1].id).toEqual('version-dso');
-        expect(menuList[1].active).toEqual(false);
-        expect(menuList[1].visible).toEqual(true);
-        expect(menuList[1].model.type).toEqual(MenuItemType.ONCLICK);
-        expect((menuList[1].model as TextMenuItemModel).text).toEqual('message');
-        expect(menuList[1].model.disabled).toEqual(false);
-        expect(menuList[1].icon).toEqual('code-branch');
-
-        expect(menuList[2].id).toEqual('claim-dso');
-        expect(menuList[2].active).toEqual(false);
-        // Visible should be false due to the item not being of type person
-        expect(menuList[2].visible).toEqual(false);
-        expect(menuList[2].model.type).toEqual(MenuItemType.ONCLICK);
-        expect((menuList[2].model as TextMenuItemModel).text).toEqual('item.page.claim.button');
-        done();
+    describe('for Communities', () => {
+      beforeEach(() => {
+        testObject = testCommunity;
+        dSpaceObjectDataService.findById.and.returnValue(createSuccessfulRemoteDataObject$(testCommunity));
+        route = dsoRoute(testCommunity);
       });
 
+      it('should not return Item-specific entries', (done) => {
+        const result = resolver.getDsoMenus(testObject, route, state);
+        combineLatest(result).pipe(map(flatten)).subscribe((menu) => {
+          const orcidEntry = menu.find(entry => entry.id === 'orcid-dso');
+          expect(orcidEntry).toBeFalsy();
+
+          const versionEntry = menu.find(entry => entry.id === 'version-dso');
+          expect(versionEntry).toBeFalsy();
+
+          const claimEntry = menu.find(entry => entry.id === 'claim-dso');
+          expect(claimEntry).toBeFalsy();
+
+          done();
+        });
+      });
+
+      it('should return Community/Collection-specific entries', (done) => {
+        const result = resolver.getDsoMenus(testObject, route, state);
+        combineLatest(result).pipe(map(flatten)).subscribe((menu) => {
+          const subscribeEntry = menu.find(entry => entry.id === 'subscribe');
+          expect(subscribeEntry).toBeTruthy();
+          expect(subscribeEntry.active).toBeFalse();
+          expect(subscribeEntry.visible).toBeTrue();
+          expect(subscribeEntry.model.type).toEqual(MenuItemType.ONCLICK);
+          done();
+        });
+      });
+
+      it('should return as third part the common list ', (done) => {
+        const result = resolver.getDsoMenus(testObject, route, state);
+        combineLatest(result).pipe(map(flatten)).subscribe((menu) => {
+          const editEntry = menu.find(entry => entry.id === 'edit-dso');
+          expect(editEntry).toBeTruthy();
+          expect(editEntry.active).toBeFalse();
+          expect(editEntry.visible).toBeTrue();
+          expect(editEntry.model.type).toEqual(MenuItemType.LINK);
+          expect((editEntry.model as LinkMenuItemModel).link).toEqual(
+            '/communities/test-community-uuid/edit/metadata'
+          );
+          done();
+        });
+      });
     });
-    it('should return as second part the common list ', (done) => {
-      const result = resolver.getDsoMenus(testObject, route, state);
-      result[1].subscribe((menuList) => {
-        expect(menuList.length).toEqual(1);
-        expect(menuList[0].id).toEqual('edit-dso');
-        expect(menuList[0].active).toEqual(false);
-        expect(menuList[0].visible).toEqual(true);
-        expect(menuList[0].model.type).toEqual(MenuItemType.LINK);
-        expect((menuList[0].model as LinkMenuItemModel).text).toEqual('item.page.edit');
-        expect((menuList[0].model as LinkMenuItemModel).link).toEqual('/items/test-uuid/edit/metadata');
-        expect(menuList[0].icon).toEqual('pencil-alt');
-        done();
+
+    describe('for Collections', () => {
+      beforeEach(() => {
+        testObject = testCollection;
+        dSpaceObjectDataService.findById.and.returnValue(createSuccessfulRemoteDataObject$(testCollection));
+        route = dsoRoute(testCollection);
       });
 
+      it('should not return Item-specific entries', (done) => {
+        const result = resolver.getDsoMenus(testObject, route, state);
+        combineLatest(result).pipe(map(flatten)).subscribe((menu) => {
+          const orcidEntry = menu.find(entry => entry.id === 'orcid-dso');
+          expect(orcidEntry).toBeFalsy();
+
+          const versionEntry = menu.find(entry => entry.id === 'version-dso');
+          expect(versionEntry).toBeFalsy();
+
+          const claimEntry = menu.find(entry => entry.id === 'claim-dso');
+          expect(claimEntry).toBeFalsy();
+
+          done();
+        });
+      });
+
+      it('should return Community/Collection-specific entries', (done) => {
+        const result = resolver.getDsoMenus(testObject, route, state);
+        combineLatest(result).pipe(map(flatten)).subscribe((menu) => {
+          const subscribeEntry = menu.find(entry => entry.id === 'subscribe');
+          expect(subscribeEntry).toBeTruthy();
+          expect(subscribeEntry.active).toBeFalse();
+          expect(subscribeEntry.visible).toBeTrue();
+          expect(subscribeEntry.model.type).toEqual(MenuItemType.ONCLICK);
+          done();
+        });
+      });
+
+      it('should return as third part the common list ', (done) => {
+        const result = resolver.getDsoMenus(testObject, route, state);
+        combineLatest(result).pipe(map(flatten)).subscribe((menu) => {
+          const editEntry = menu.find(entry => entry.id === 'edit-dso');
+          expect(editEntry).toBeTruthy();
+          expect(editEntry.active).toBeFalse();
+          expect(editEntry.visible).toBeTrue();
+          expect(editEntry.model.type).toEqual(MenuItemType.LINK);
+          expect((editEntry.model as LinkMenuItemModel).link).toEqual(
+            '/collections/test-collection-uuid/edit/metadata'
+          );
+          done();
+        });
+      });
+    });
+
+    describe('for Items', () => {
+      beforeEach(() => {
+        testObject = testItem;
+        dSpaceObjectDataService.findById.and.returnValue(createSuccessfulRemoteDataObject$(testItem));
+        route = dsoRoute(testItem);
+      });
+
+      it('should return Item-specific entries', (done) => {
+        const result = resolver.getDsoMenus(testObject, route, state);
+        combineLatest(result).pipe(map(flatten)).subscribe((menu) => {
+          const orcidEntry = menu.find(entry => entry.id === 'orcid-dso');
+          expect(orcidEntry).toBeTruthy();
+          expect(orcidEntry.active).toBeFalse();
+          expect(orcidEntry.visible).toBeFalse();
+          expect(orcidEntry.model.type).toEqual(MenuItemType.LINK);
+
+          const versionEntry = menu.find(entry => entry.id === 'version-dso');
+          expect(versionEntry).toBeTruthy();
+          expect(versionEntry.active).toBeFalse();
+          expect(versionEntry.visible).toBeTrue();
+          expect(versionEntry.model.type).toEqual(MenuItemType.ONCLICK);
+          expect(versionEntry.model.disabled).toBeFalse();
+
+          const claimEntry = menu.find(entry => entry.id === 'claim-dso');
+          expect(claimEntry).toBeTruthy();
+          expect(claimEntry.active).toBeFalse();
+          expect(claimEntry.visible).toBeFalse();
+          expect(claimEntry.model.type).toEqual(MenuItemType.ONCLICK);
+          done();
+        });
+      });
+
+      it('should not return Community/Collection-specific entries', (done) => {
+        const result = resolver.getDsoMenus(testObject, route, state);
+        combineLatest(result).pipe(map(flatten)).subscribe((menu) => {
+          const subscribeEntry = menu.find(entry => entry.id === 'subscribe');
+          expect(subscribeEntry).toBeFalsy();
+          done();
+        });
+      });
+
+      it('should return as third part the common list ', (done) => {
+        const result = resolver.getDsoMenus(testObject, route, state);
+        combineLatest(result).pipe(map(flatten)).subscribe((menu) => {
+          const editEntry = menu.find(entry => entry.id === 'edit-dso');
+          expect(editEntry).toBeTruthy();
+          expect(editEntry.active).toBeFalse();
+          expect(editEntry.visible).toBeTrue();
+          expect(editEntry.model.type).toEqual(MenuItemType.LINK);
+          expect((editEntry.model as LinkMenuItemModel).link).toEqual(
+            '/items/test-item-uuid/edit/metadata'
+          );
+          done();
+        });
+      });
     });
   });
 });
diff --git a/src/app/shared/dso-page/dso-edit-menu.resolver.ts b/src/app/shared/dso-page/dso-edit-menu.resolver.ts
index 80a69c2830..1ade457840 100644
--- a/src/app/shared/dso-page/dso-edit-menu.resolver.ts
+++ b/src/app/shared/dso-page/dso-edit-menu.resolver.ts
@@ -21,6 +21,9 @@ import { getDSORoute } from '../../app-routing-paths';
 import { ResearcherProfileDataService } from '../../core/profile/researcher-profile-data.service';
 import { NotificationsService } from '../notifications/notifications.service';
 import { TranslateService } from '@ngx-translate/core';
+import { SubscriptionModalComponent } from '../subscriptions/subscription-modal/subscription-modal.component';
+import { Community } from '../../core/shared/community.model';
+import { Collection } from '../../core/shared/collection.model';
 
 /**
  * Creates the menus for the dspace object pages
@@ -84,6 +87,7 @@ export class DSOEditMenuResolver implements Resolve<{ [key: string]: MenuSection
   getDsoMenus(dso, route, state): Observable<MenuSection[]>[] {
     return [
       this.getItemMenu(dso),
+      this.getComColMenu(dso),
       this.getCommonMenu(dso, state)
     ];
   }
@@ -178,6 +182,39 @@ export class DSOEditMenuResolver implements Resolve<{ [key: string]: MenuSection
     }
   }
 
+  /**
+   * Get Community/Collection-specific menus
+   */
+  protected getComColMenu(dso): Observable<MenuSection[]> {
+    if (dso instanceof Community || dso instanceof Collection) {
+      return combineLatest([
+        this.authorizationService.isAuthorized(FeatureID.CanSubscribe, dso.self),
+      ]).pipe(
+        map(([canSubscribe]) => {
+          return [
+            {
+              id: 'subscribe',
+              active: false,
+              visible: canSubscribe,
+              model: {
+                type: MenuItemType.ONCLICK,
+                text: 'subscriptions.tooltip',
+                function: () => {
+                  const modalRef = this.modalService.open(SubscriptionModalComponent);
+                  modalRef.componentInstance.dso = dso;
+                }
+              } as OnClickMenuItemModel,
+              icon: 'bell',
+              index: 4
+            },
+          ];
+        })
+      );
+    } else {
+      return observableOf([]);
+    }
+  }
+
   /**
    * Claim a researcher by creating a profile
    * Shows notifications and/or hides the menu section on success/error
diff --git a/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.html b/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.html
index cb725e7d70..0503281329 100644
--- a/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.html
+++ b/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.html
@@ -1,7 +1,7 @@
 <div class="dso-button-menu mb-1" ngbDropdown container="body" placement="bottom-right">
     <div class="d-flex flex-row flex-nowrap"
-         [ngbTooltip]="itemModel.text | translate">
-        <button [attr.aria-label]="itemModel.text | translate" [title]="itemModel.text | translate" class="btn btn-dark btn-sm" ngbDropdownToggle [disabled]="section.model?.disabled">
+         [ngbTooltip]="itemModel.text | translate" container="body">
+        <button [attr.aria-label]="itemModel.text | translate" [title]="itemModel.text | translate" class="btn btn-dark btn-sm" ngbDropdownToggle [dsBtnDisabled]="section.model?.disabled">
             <i class="fas fa-{{section.icon}} fa-fw"></i>
         </button>
         <ul ngbDropdownMenu class="dso-edit-menu-dropdown">
diff --git a/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.ts b/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.ts
index 8e4a7008af..1925099418 100644
--- a/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.ts
+++ b/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.ts
@@ -13,7 +13,6 @@ import { hasValue } from '../../../empty.util';
  * Represents an expandable section in the dso edit menus
  */
 @Component({
-  /* tslint:disable:component-selector */
   selector: 'ds-dso-edit-menu-expandable-section',
   templateUrl: './dso-edit-menu-expandable-section.component.html',
   styleUrls: ['./dso-edit-menu-expandable-section.component.scss'],
diff --git a/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.html b/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.html
index 16fda1caa8..0738e2f28a 100644
--- a/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.html
+++ b/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.html
@@ -1,25 +1,21 @@
 <div *ngIf="!canActivate" class="dso-button-menu mb-1"
-     [title]="itemModel.text | translate"
      [ngbTooltip]="itemModel.text | translate">
-    <a *ngIf="!section.model.disabled" class="d-flex flex-row flex-nowrap"
-       [routerLink]="itemModel.link"
-       href="javascript:void(0);">
-        <button [attr.aria-label]="itemModel.text | translate" [title]="itemModel.text | translate" class="btn btn-dark btn-sm" [disabled]="section.model.disabled">
-            <i class="fas fa-{{section.icon}} fa-fw"></i>
-        </button>
+    <a *ngIf="!section.model.disabled" class="btn btn-dark btn-sm"
+       [routerLink]="itemModel.link">
+        <i class="fas fa-{{section.icon}} fa-fw" aria-hidden="true"></i>
+        <span class="sr-only">{{itemModel.text | translate}}</span>
     </a>
-    <div *ngIf="section.model.disabled" class="d-flex flex-row flex-nowrap">
-        <button [attr.aria-label]="itemModel.text | translate" [title]="itemModel.text | translate" class="btn btn-dark btn-sm" [disabled]="section.model.disabled">
-            <i class="fas fa-{{section.icon}} fa-fw"></i>
-        </button>
-    </div>
+    <button *ngIf="section.model.disabled" class="btn btn-dark btn-sm" [dsBtnDisabled]="true">
+        <i class="fas fa-{{section.icon}} fa-fw" aria-hidden="true"></i>
+        <span class="sr-only">{{itemModel.text | translate}}</span>
+    </button>
 </div>
 
 <div *ngIf="canActivate" class="dso-button-menu mb-1"
-     [title]="itemModel.text | translate"
      [ngbTooltip]="itemModel.text | translate">
-    <button [attr.aria-label]="itemModel.text | translate" [title]="itemModel.text | translate" class="btn btn-dark btn-sm" [disabled]="section.model.disabled"
+    <button class="btn btn-dark btn-sm" [dsBtnDisabled]="section.model.disabled"
             (click)="activate($event)">
-        <i class="fas fa-{{section.icon}} fa-fw"></i>
+        <i class="fas fa-{{section.icon}} fa-fw" aria-hidden="true"></i>
+        <span class="sr-only">{{itemModel.text | translate}}</span>
     </button>
 </div>
diff --git a/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.spec.ts b/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.spec.ts
index f0815c5415..bdf121f799 100644
--- a/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.spec.ts
+++ b/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.spec.ts
@@ -96,7 +96,7 @@ describe('DsoEditMenuSectionComponent', () => {
     });
     describe('when the section model in a disabled link or text', () => {
       it('should show just the button', () => {
-        const textButton = fixture.debugElement.query(By.css('div div button'));
+        const textButton = fixture.debugElement.query(By.css('div a'));
         expect(textButton.nativeElement.innerHTML).toContain('fa-' + iconString);
       });
     });
@@ -144,7 +144,7 @@ describe('DsoEditMenuSectionComponent', () => {
 
   });
 
-  describe('link model', () => {
+  describe('when the section model in a non disabled link', () => {
     initAsync(dummySectionLink, menuService);
     beforeEach(() => {
       spyOn(menuService, 'getSubSectionsByParentID').and.returnValue(observableOf([]));
@@ -154,11 +154,8 @@ describe('DsoEditMenuSectionComponent', () => {
       fixture.detectChanges();
     });
 
-    describe('when the section model in a non disabled link', () => {
-      it('should show a link element with the button in it', () => {
-        const link = fixture.debugElement.query(By.css('a'));
-        expect(link.nativeElement.innerHTML).toContain('button');
-      });
+    it('should show the link element', () => {
+      expect(fixture.debugElement.query(By.css('a'))).not.toBeNull();
     });
 
   });
diff --git a/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.ts b/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.ts
index af3381ef71..060049ef5f 100644
--- a/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.ts
+++ b/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.ts
@@ -10,7 +10,6 @@ import { MenuSection } from '../../../menu/menu-section.model';
  * Represents a non-expandable section in the dso edit menus
  */
 @Component({
-  /* tslint:disable:component-selector */
   selector: 'ds-dso-edit-menu-section',
   templateUrl: './dso-edit-menu-section.component.html',
   styleUrls: ['./dso-edit-menu-section.component.scss']
diff --git a/src/app/shared/dso-page/dso-page-subscription-button/dso-page-subscription-button.component.html b/src/app/shared/dso-page/dso-page-subscription-button/dso-page-subscription-button.component.html
deleted file mode 100644
index 15135009fc..0000000000
--- a/src/app/shared/dso-page/dso-page-subscription-button/dso-page-subscription-button.component.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<button *ngIf="isAuthorized$ | async" data-test="subscription-button"
-        (click)="openSubscriptionModal()"
-        [ngbTooltip]="'subscriptions.tooltip' | translate"
-        [title]="'subscriptions.tooltip' | translate"
-        [attr.aria-label]="'subscriptions.tooltip' | translate"
-        class="subscription-button btn btn-dark btn-sm">
-  <i class="fas fa-bell fa-fw"></i>
-</button>
diff --git a/src/app/shared/dso-page/dso-page-subscription-button/dso-page-subscription-button.component.spec.ts b/src/app/shared/dso-page/dso-page-subscription-button/dso-page-subscription-button.component.spec.ts
deleted file mode 100644
index 726854778d..0000000000
--- a/src/app/shared/dso-page/dso-page-subscription-button/dso-page-subscription-button.component.spec.ts
+++ /dev/null
@@ -1,83 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { DsoPageSubscriptionButtonComponent } from './dso-page-subscription-button.component';
-import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
-import { of as observableOf } from 'rxjs';
-import { NgbModalModule } from '@ng-bootstrap/ng-bootstrap';
-import { By } from '@angular/platform-browser';
-import { DebugElement } from '@angular/core';
-import { Item } from '../../../core/shared/item.model';
-import { ITEM } from '../../../core/shared/item.resource-type';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
-import { TranslateLoaderMock } from '../../mocks/translate-loader.mock';
-
-describe('DsoPageSubscriptionButtonComponent', () => {
-  let component: DsoPageSubscriptionButtonComponent;
-  let fixture: ComponentFixture<DsoPageSubscriptionButtonComponent>;
-  let de: DebugElement;
-
-  const authorizationService = jasmine.createSpyObj('authorizationService', {
-    isAuthorized: jasmine.createSpy('isAuthorized') // observableOf(true)
-  });
-
-  const mockItem = Object.assign(new Item(), {
-    id: 'fake-id',
-    uuid: 'fake-id',
-    handle: 'fake/handle',
-    lastModified: '2018',
-    type: ITEM,
-    _links: {
-      self: {
-        href: 'https://localhost:8000/items/fake-id'
-      }
-    }
-  });
-
-  beforeEach(async () => {
-    await TestBed.configureTestingModule({
-      imports: [
-        NgbModalModule,
-        TranslateModule.forRoot({
-          loader: {
-            provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
-        })
-      ],
-      declarations: [ DsoPageSubscriptionButtonComponent ],
-      providers: [
-        { provide: AuthorizationDataService, useValue: authorizationService },
-      ]
-    })
-    .compileComponents();
-  });
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(DsoPageSubscriptionButtonComponent);
-    component = fixture.componentInstance;
-    de = fixture.debugElement;
-    component.dso = mockItem;
-  });
-
-  describe('when is authorized', () => {
-    beforeEach(() => {
-      authorizationService.isAuthorized.and.returnValue(observableOf(true));
-      fixture.detectChanges();
-    });
-
-    it('should display subscription button', () => {
-      expect(de.query(By.css(' [data-test="subscription-button"]'))).toBeTruthy();
-    });
-  });
-
-  describe('when is not authorized', () => {
-    beforeEach(() => {
-      authorizationService.isAuthorized.and.returnValue(observableOf(false));
-      fixture.detectChanges();
-    });
-
-    it('should not display subscription button', () => {
-      expect(de.query(By.css(' [data-test="subscription-button"]'))).toBeNull();
-    });
-  });
-});
diff --git a/src/app/shared/dso-page/dso-page-subscription-button/dso-page-subscription-button.component.ts b/src/app/shared/dso-page/dso-page-subscription-button/dso-page-subscription-button.component.ts
deleted file mode 100644
index 54cd9e6bb0..0000000000
--- a/src/app/shared/dso-page/dso-page-subscription-button/dso-page-subscription-button.component.ts
+++ /dev/null
@@ -1,57 +0,0 @@
-import { Component, Input, OnInit } from '@angular/core';
-
-import { Observable, of } from 'rxjs';
-import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap';
-
-import { DSpaceObject } from '../../../core/shared/dspace-object.model';
-import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
-import { SubscriptionModalComponent } from '../../subscriptions/subscription-modal/subscription-modal.component';
-import { FeatureID } from '../../../core/data/feature-authorization/feature-id';
-
-@Component({
-  selector: 'ds-dso-page-subscription-button',
-  templateUrl: './dso-page-subscription-button.component.html',
-  styleUrls: ['./dso-page-subscription-button.component.scss']
-})
-/**
- * Display a button that opens the modal to manage subscriptions
- */
-export class DsoPageSubscriptionButtonComponent implements OnInit {
-
-  /**
-   * Whether the current user is authorized to edit the DSpaceObject
-   */
-  isAuthorized$: Observable<boolean> = of(false);
-
-  /**
-   * Reference to NgbModal
-   */
-  public modalRef: NgbModalRef;
-
-  /**
-   * DSpaceObject that is being viewed
-   */
-  @Input() dso: DSpaceObject;
-
-  constructor(
-    protected authorizationService: AuthorizationDataService,
-    private modalService: NgbModal,
-  ) {
-  }
-
-  /**
-   * check if the current DSpaceObject can be subscribed by the user
-   */
-  ngOnInit(): void {
-    this.isAuthorized$ = this.authorizationService.isAuthorized(FeatureID.CanSubscribe, this.dso.self);
-  }
-
-  /**
-   * Open the modal to subscribe to the related DSpaceObject
-   */
-  public openSubscriptionModal() {
-    this.modalRef = this.modalService.open(SubscriptionModalComponent);
-    this.modalRef.componentInstance.dso = this.dso;
-  }
-
-}
diff --git a/src/app/shared/dso-page/dso-page.module.ts b/src/app/shared/dso-page/dso-page.module.ts
index d700b34e77..568de5beae 100644
--- a/src/app/shared/dso-page/dso-page.module.ts
+++ b/src/app/shared/dso-page/dso-page.module.ts
@@ -10,6 +10,7 @@ import {
   DsoEditMenuExpandableSectionComponent
 } from '../dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component';
 import { NgbDropdownModule, NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap';
+import {SharedModule} from '../shared.module';
 
 const COMPONENTS = [
   DsoEditMenuComponent,
@@ -26,6 +27,7 @@ const MODULES = [
   CommonModule,
   NgbTooltipModule,
   NgbDropdownModule,
+  SharedModule
 ];
 const PROVIDERS = [
 
diff --git a/src/app/shared/dso-page/dso-versioning-modal-service/dso-versioning-modal.service.ts b/src/app/shared/dso-page/dso-versioning-modal-service/dso-versioning-modal.service.ts
index 46792294dd..b9c77dc56b 100644
--- a/src/app/shared/dso-page/dso-versioning-modal-service/dso-versioning-modal.service.ts
+++ b/src/app/shared/dso-page/dso-versioning-modal-service/dso-versioning-modal.service.ts
@@ -1,7 +1,7 @@
 import { getFirstCompletedRemoteData, getFirstSucceededRemoteDataPayload } from '../../../core/shared/operators';
 import { RemoteData } from '../../../core/data/remote-data';
 import { Version } from '../../../core/shared/version.model';
-import { map, startWith, switchMap, tap } from 'rxjs/operators';
+import { map, switchMap, tap } from 'rxjs/operators';
 import { Item } from '../../../core/shared/item.model';
 import { WorkspaceItem } from '../../../core/submission/models/workspaceitem.model';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
@@ -13,9 +13,7 @@ import { ItemDataService } from '../../../core/data/item-data.service';
 import { Injectable } from '@angular/core';
 import { Observable, of } from 'rxjs';
 import { ItemVersionsSharedService } from '../../../item-page/versions/item-versions-shared.service';
-import {
-  ItemVersionsSummaryModalComponent
-} from '../../../item-page/versions/item-versions-summary-modal/item-versions-summary-modal.component';
+import { ItemVersionsSummaryModalComponent } from '../../../item-page/versions/item-versions-summary-modal/item-versions-summary-modal.component';
 
 /**
  * Service to take care of all the functionality related to the version creation modal
@@ -86,7 +84,6 @@ export class DsoVersioningModalService {
       // button is disabled if hasDraftVersion = true, and enabled if hasDraftVersion = false or null
       // (hasDraftVersion is null when a version history does not exist)
       map((res) => Boolean(res)),
-      startWith(true),
     );
   }
 
diff --git a/src/app/shared/dso-selector/dso-selector/dso-selector.component.html b/src/app/shared/dso-selector/dso-selector/dso-selector.component.html
index c4f5dbc4cd..5ee43573f1 100644
--- a/src/app/shared/dso-selector/dso-selector/dso-selector.component.html
+++ b/src/app/shared/dso-selector/dso-selector/dso-selector.component.html
@@ -2,16 +2,17 @@
     <input type="search"
            class="form-control"
            (click)="$event.stopPropagation();"
+           [attr.aria-label]="'dso-selector.placeholder' | translate: { type: typesString }"
            placeholder="{{'dso-selector.placeholder' | translate: { type: typesString } }}"
            [formControl]="input" ngbAutofocus (keyup.enter)="selectSingleResult()">
 </div>
 <div class="dropdown-divider"></div>
-<div class="scrollable-menu list-group">
+<div id="scrollable-menu-dso-selector-{{randomSeed}}" class="scrollable-menu list-group">
   <div
     infiniteScroll
     [infiniteScrollDistance]="1"
     [infiniteScrollThrottle]="0"
-    [infiniteScrollContainer]="'.scrollable-menu'"
+    [infiniteScrollContainer]="'#scrollable-menu-dso-selector-' + randomSeed"
     [fromRoot]="true"
     (scrolled)="onScrollDown()">
     <ng-container *ngIf="listEntries$ | async">
@@ -30,6 +31,7 @@
       </button>
     </ng-container>
     <button *ngIf="loading"
+            title="{{'loading.default' | translate}}"
             class="list-group-item list-group-item-action border-0 list-entry">
       <ds-themed-loading [showMessage]="false"></ds-themed-loading>
     </button>
diff --git a/src/app/shared/dso-selector/dso-selector/dso-selector.component.ts b/src/app/shared/dso-selector/dso-selector/dso-selector.component.ts
index 503e4c4412..4ae338dee8 100644
--- a/src/app/shared/dso-selector/dso-selector/dso-selector.component.ts
+++ b/src/app/shared/dso-selector/dso-selector/dso-selector.component.ts
@@ -75,6 +75,11 @@ export class DSOSelectorComponent implements OnInit, OnDestroy {
    */
   @Input() sort: SortOptions;
 
+  /**
+   * The id that should be given to the input box, this is required for accessibility reasons
+   */
+  @Input() searchBoxId: string | null = null;
+
   // list of allowed selectable dsoTypes
   typesString: string;
 
@@ -136,6 +141,11 @@ export class DSOSelectorComponent implements OnInit, OnDestroy {
    */
   public subs: Subscription[] = [];
 
+  /**
+   * Random seed of 4 characters to avoid duplicate ids
+   */
+  randomSeed: string = Math.random().toString(36).substring(2, 6);
+
   constructor(
     protected searchService: SearchService,
     protected notifcationsService: NotificationsService,
diff --git a/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.html b/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.html
index a13be63880..a8ec02239d 100644
--- a/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.html
+++ b/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.html
@@ -5,15 +5,16 @@
         </button>
     </div>
     <div class="modal-body">
+      <div data-test="admin-div" *ngIf="(isAdmin$ | async)">
         <button class="btn btn-outline-primary btn-lg btn-block" (click)="selectObject(undefined)">{{'dso-selector.create.community.top-level' | translate}}</button>
-        <h3 class="position-relative py-1 my-3 font-weight-normal">
+        <div class="h3 position-relative py-1 my-3 font-weight-normal">
             <hr>
             <div id="create-community-or-separator" class="text-center position-absolute w-100">
                 <span class="px-4 bg-white">{{'dso-selector.create.community.or-divider' | translate}}</span>
             </div>
-        </h3>
-
-        <h5 class="px-2">{{'dso-selector.create.community.sub-level' | translate}}</h5>
+        </div>
+      </div>
+        <span class="h5 px-2">{{'dso-selector.create.community.sub-level' | translate}}</span>
         <ds-dso-selector [currentDSOId]="dsoRD?.payload.uuid" [types]="selectorTypes" [sort]="defaultSort" (onSelect)="selectObject($event)"></ds-dso-selector>
     </div>
 </div>
diff --git a/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.spec.ts b/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.spec.ts
index 2d0a2a25de..d21714a5ef 100644
--- a/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.spec.ts
+++ b/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.spec.ts
@@ -8,6 +8,9 @@ import { Community } from '../../../../core/shared/community.model';
 import { CreateCommunityParentSelectorComponent } from './create-community-parent-selector.component';
 import { MetadataValue } from '../../../../core/shared/metadata.models';
 import { createSuccessfulRemoteDataObject } from '../../../remote-data.utils';
+import { AuthorizationDataService } from '../../../../core/data/feature-authorization/authorization-data.service';
+import { By } from '@angular/platform-browser';
+import { of as observableOf } from 'rxjs';
 
 describe('CreateCommunityParentSelectorComponent', () => {
   let component: CreateCommunityParentSelectorComponent;
@@ -26,7 +29,9 @@ describe('CreateCommunityParentSelectorComponent', () => {
   const communityRD = createSuccessfulRemoteDataObject(community);
   const modalStub = jasmine.createSpyObj('modalStub', ['close']);
   const createPath = '/communities/create';
-
+  const mockAuthorizationDataService = jasmine.createSpyObj('authorizationService', {
+    isAuthorized: observableOf(true),
+  });
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
       imports: [TranslateModule.forRoot()],
@@ -47,7 +52,8 @@ describe('CreateCommunityParentSelectorComponent', () => {
         },
         {
           provide: Router, useValue: router
-        }
+        },
+        { provide: AuthorizationDataService, useValue: mockAuthorizationDataService },
       ],
       schemas: [NO_ERRORS_SCHEMA]
     }).compileComponents();
@@ -70,4 +76,20 @@ describe('CreateCommunityParentSelectorComponent', () => {
     expect(router.navigate).toHaveBeenCalledWith([createPath], { queryParams: { parent: community.uuid } });
   });
 
+  it('should show the div when user is an admin', (waitForAsync(() => {
+    component.isAdmin$ = observableOf(true);
+    fixture.detectChanges();
+
+    const divElement = fixture.debugElement.query(By.css('div[data-test="admin-div"]'));
+    expect(divElement).toBeTruthy();
+  })));
+
+  it('should hide the div when user is not an admin', (waitForAsync(() => {
+    component.isAdmin$ = observableOf(false);
+    fixture.detectChanges();
+
+    const divElement = fixture.debugElement.query(By.css('div[data-test="admin-div"]'));
+    expect(divElement).toBeFalsy();
+  })));
+
 });
diff --git a/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.ts
index 77458d9802..e44a7450e6 100644
--- a/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.ts
+++ b/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.ts
@@ -14,6 +14,9 @@ import {
 } from '../../../../community-page/community-page-routing-paths';
 import { SortDirection, SortOptions } from '../../../../core/cache/models/sort-options.model';
 import { environment } from '../../../../../environments/environment';
+import { FeatureID } from '../../../../core/data/feature-authorization/feature-id';
+import { AuthorizationDataService } from '../../../../core/data/feature-authorization/authorization-data.service';
+import { Observable } from 'rxjs';
 
 /**
  * Component to wrap a button - for top communities -
@@ -32,11 +35,16 @@ export class CreateCommunityParentSelectorComponent extends DSOSelectorModalWrap
   selectorTypes = [DSpaceObjectType.COMMUNITY];
   action = SelectorActionType.CREATE;
   defaultSort = new SortOptions(environment.comcolSelectionSort.sortField, environment.comcolSelectionSort.sortDirection as SortDirection);
+  isAdmin$: Observable<boolean>;
 
-  constructor(protected activeModal: NgbActiveModal, protected route: ActivatedRoute, private router: Router) {
+  constructor(protected activeModal: NgbActiveModal, protected route: ActivatedRoute, private router: Router, protected authorizationService: AuthorizationDataService) {
     super(activeModal, route);
   }
 
+  ngOnInit() {
+    this.isAdmin$ = this.authorizationService.isAuthorized(FeatureID.AdministratorOf);
+  }
+
   /**
    * Navigate to the community create page
    */
diff --git a/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.html b/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.html
index 5fccd58f48..5288f08e02 100644
--- a/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.html
+++ b/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.html
@@ -5,7 +5,7 @@
     </button>
   </div>
   <div class="modal-body">
-    <h5 *ngIf="header" class="px-2">{{header | translate}}</h5>
+    <span *ngIf="header" class="h5 px-2">{{header | translate}}</span>
     <ds-authorized-collection-selector [currentDSOId]="dsoRD?.payload.uuid"
                                        [entityType]="entityType"
                                        [types]="selectorTypes"
diff --git a/src/app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.html b/src/app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.html
index 54044f5d79..6d3d45cb3d 100644
--- a/src/app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.html
+++ b/src/app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.html
@@ -5,7 +5,7 @@
     </button>
   </div>
   <div class="modal-body">
-    <h5 *ngIf="header" class="px-2">{{header | translate}}</h5>
+    <span *ngIf="header" class="h5 px-2">{{header | translate}}</span>
     <ds-dso-selector [currentDSOId]="dsoRD?.payload.uuid" [types]="selectorTypes" [sort]="defaultSort" (onSelect)="selectObject($event)"></ds-dso-selector>
   </div>
 </div>
diff --git a/src/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component.html b/src/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component.html
index 85d8797e66..999a96e730 100644
--- a/src/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component.html
+++ b/src/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component.html
@@ -5,7 +5,7 @@
     </button>
   </div>
   <div class="modal-body">
-    <h5 *ngIf="header" class="px-2">{{header | translate}}</h5>
+    <span *ngIf="header" class="h5 px-2">{{header | translate}}</span>
     <ds-dso-selector [currentDSOId]="dsoRD?.payload.uuid" [types]="selectorTypes" (onSelect)="selectObject($event)"></ds-dso-selector>
   </div>
 </div>
diff --git a/src/app/shared/entity-dropdown/entity-dropdown.component.html b/src/app/shared/entity-dropdown/entity-dropdown.component.html
index a4d539625f..38b4ecc53e 100644
--- a/src/app/shared/entity-dropdown/entity-dropdown.component.html
+++ b/src/app/shared/entity-dropdown/entity-dropdown.component.html
@@ -1,6 +1,5 @@
-<div
-    class="scrollable-menu"
-    aria-labelledby="dropdownMenuButton"
+<ul class="scrollable-menu list-unstyled mb-0"
+    role="menu"
     (scroll)="onScroll($event)"
     infiniteScroll
     [infiniteScrollDistance]="5"
@@ -9,20 +8,23 @@
     [fromRoot]="true"
     [scrollWindow]="false"
     (scrolled)="onScrollDown()">
-    <button class="dropdown-item disabled" *ngIf="searchListEntity?.length == 0 && !(isLoadingList | async)">
+  <li *ngIf="searchListEntity?.length == 0 && !(isLoadingList | async)">
+    <button class="dropdown-item disabled" role="menuitem">
       {{'submission.sections.general.no-entity' | translate}}
     </button>
-    <button *ngFor="let listItem of searchListEntity"
-            class="dropdown-item entity-item"
+  </li>
+  <li *ngFor="let listItem of searchListEntity" class="entity-item text-primary">
+    <button class="dropdown-item"
+            role="menuitem"
             title="{{ listItem.label }}"
             (click)="onSelect(listItem)">
-      <ul class="list-unstyled mb-0">
-        <li class="list-item text-truncate text-primary font-weight-bold">{{ listItem.label.toLowerCase() + '.listelement.badge' | translate }}</li>
-      </ul>
+      <span class="text-truncate font-weight-bold">{{ listItem.label.toLowerCase() + '.listelement.badge' | translate }}</span>
     </button>
-    <button class="dropdown-item disabled" *ngIf="(isLoadingList | async)" >
+  </li>
+  <li *ngIf="(isLoadingList | async)">
+    <button class="dropdown-item disabled" role="menuitem">
       <ds-themed-loading message="{{'loading.default' | translate}}">
       </ds-themed-loading>
     </button>
-
-</div>
+  </li>
+</ul>
diff --git a/src/app/shared/entity-dropdown/entity-dropdown.component.scss b/src/app/shared/entity-dropdown/entity-dropdown.component.scss
index a5f43f359b..4f9ca62310 100644
--- a/src/app/shared/entity-dropdown/entity-dropdown.component.scss
+++ b/src/app/shared/entity-dropdown/entity-dropdown.component.scss
@@ -1,5 +1,9 @@
-.list-item:active {
-  color: white !important;
+.dropdown-item {
+  padding: 0.35rem 1rem;
+
+  &:active {
+    color: white !important;
+  }
 }
 
 .scrollable-menu {
@@ -8,7 +12,7 @@
   overflow-x: hidden;
 }
 
-.entity-item {
+li:not(:last-of-type) .dropdown-item {
   border-bottom: var(--bs-dropdown-border-width) solid var(--bs-dropdown-border-color);
 }
 
diff --git a/src/app/shared/entity-dropdown/entity-dropdown.component.spec.ts b/src/app/shared/entity-dropdown/entity-dropdown.component.spec.ts
index 13e6dbc9c5..2f3aa763bc 100644
--- a/src/app/shared/entity-dropdown/entity-dropdown.component.spec.ts
+++ b/src/app/shared/entity-dropdown/entity-dropdown.component.spec.ts
@@ -123,7 +123,7 @@ describe('EntityDropdownComponent', () => {
     scheduler.flush();
 
     spyOn(component, 'onSelect');
-    const entityItem = fixture.debugElement.query(By.css('.entity-item:nth-child(2)'));
+    const entityItem = fixture.debugElement.query(By.css('.entity-item:nth-child(2) button'));
     entityItem.triggerEventHandler('click', null);
 
     scheduler.schedule(() => fixture.detectChanges());
diff --git a/src/app/shared/error/error.component.ts b/src/app/shared/error/error.component.ts
index 9a6b0660bb..6572598c8b 100644
--- a/src/app/shared/error/error.component.ts
+++ b/src/app/shared/error/error.component.ts
@@ -3,7 +3,7 @@ import { Component, Input } from '@angular/core';
 import { TranslateService } from '@ngx-translate/core';
 
 import { Subscription } from 'rxjs';
-import { AlertType } from '../alert/aletr-type';
+import { AlertType } from '../alert/alert-type';
 
 @Component({
   selector: 'ds-error',
diff --git a/src/app/shared/file-download-link/file-download-link.component.html b/src/app/shared/file-download-link/file-download-link.component.html
index 8ebe622a5b..2a01d9dbdc 100644
--- a/src/app/shared/file-download-link/file-download-link.component.html
+++ b/src/app/shared/file-download-link/file-download-link.component.html
@@ -1,5 +1,11 @@
-<a [routerLink]="(bitstreamPath$| async)?.routerLink" class="dont-break-out" [queryParams]="(bitstreamPath$| async)?.queryParams" [target]="isBlank ? '_blank': '_self'" [ngClass]="cssClasses">
-  <span *ngIf="!(canDownload$ |async)" class="pr-1"><i class="fas fa-lock"></i></span>
+<a [routerLink]="(bitstreamPath$| async)?.routerLink" class="dont-break-out"
+   [queryParams]="(bitstreamPath$| async)?.queryParams"
+   [target]="isBlank ? '_blank': '_self'"
+   [ngClass]="cssClasses"
+   [attr.aria-label]="('file-download-link.download' | translate) + dsoNameService.getName(bitstream)"
+   role="link"
+   tabindex="0">
+  <span *ngIf="!(canDownload$ |async)" [attr.aria-label]="'file-download-link.restricted' | translate" class="pr-1"><i class="fas fa-lock"></i></span>
   <ng-container *ngTemplateOutlet="content"></ng-container>
 </a>
 
diff --git a/src/app/shared/file-download-link/file-download-link.component.spec.ts b/src/app/shared/file-download-link/file-download-link.component.spec.ts
index 61e9ecb4aa..21e1cdae19 100644
--- a/src/app/shared/file-download-link/file-download-link.component.spec.ts
+++ b/src/app/shared/file-download-link/file-download-link.component.spec.ts
@@ -10,6 +10,7 @@ import { FeatureID } from '../../core/data/feature-authorization/feature-id';
 import { Item } from '../../core/shared/item.model';
 import { getItemModuleRoute } from '../../item-page/item-page-routing-paths';
 import { RouterLinkDirectiveStub } from '../testing/router-link-directive.stub';
+import { TranslateModule } from '@ngx-translate/core';
 
 describe('FileDownloadLinkComponent', () => {
   let component: FileDownloadLinkComponent;
@@ -41,6 +42,9 @@ describe('FileDownloadLinkComponent', () => {
 
   function initTestbed() {
     TestBed.configureTestingModule({
+      imports: [
+        TranslateModule.forRoot(),
+      ],
       declarations: [FileDownloadLinkComponent, RouterLinkDirectiveStub],
       providers: [
         {provide: AuthorizationDataService, useValue: authorizationService},
diff --git a/src/app/shared/file-download-link/file-download-link.component.ts b/src/app/shared/file-download-link/file-download-link.component.ts
index a79a71b634..1488401ab1 100644
--- a/src/app/shared/file-download-link/file-download-link.component.ts
+++ b/src/app/shared/file-download-link/file-download-link.component.ts
@@ -1,6 +1,7 @@
 import { Component, Input, OnInit } from '@angular/core';
 import { Bitstream } from '../../core/shared/bitstream.model';
 import { getBitstreamDownloadRoute, getBitstreamRequestACopyRoute } from '../../app-routing-paths';
+import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
 import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
 import { FeatureID } from '../../core/data/feature-authorization/feature-id';
 import { hasValue, isNotEmpty } from '../empty.util';
@@ -48,6 +49,7 @@ export class FileDownloadLinkComponent implements OnInit {
 
   constructor(
     private authorizationService: AuthorizationDataService,
+    public dsoNameService: DSONameService,
   ) {
   }
 
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.html
index 9e1f1d48aa..606db29db3 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.html
@@ -45,7 +45,9 @@
       <button class="btn btn-secondary"
               type="button"
               ngbTooltip="{{'form.lookup-help' | translate}}"
+              [attr.aria-label]="'form.lookup-help' | translate"
               placement="top"
+              data-test="lookup-button"
               (click)="openLookup(); $event.stopPropagation();"><i class="fa fa-search"></i>
       </button>
     </div>
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.spec.ts
index b77ee9950c..355e10b9a0 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.spec.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.spec.ts
@@ -169,7 +169,7 @@ describe('DsDynamicFormControlContainerComponent test suite', () => {
       metadataFields: [],
       hasSelectableMetadata: false
     }),
-    new DynamicDsDatePickerModel({ id: 'datepicker' }),
+    new DynamicDsDatePickerModel({ id: 'datepicker', repeatable: false }),
     new DynamicLookupModel({
       id: 'lookup',
       metadataFields: [],
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts
index ff5a119b6f..a04c10bf3a 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts
@@ -328,7 +328,7 @@ export class DsDynamicFormControlContainerComponent extends DynamicFormControlCo
         const relationship$ = this.relationshipService.findById(this.value.virtualValue,
           true,
           true,
-          ... itemLinksToFollow(this.fetchThumbnail)).pipe(
+          ... itemLinksToFollow(this.fetchThumbnail, this.appConfig.item.showAccessStatuses)).pipe(
             getAllSucceededRemoteData(),
             getRemoteDataPayload());
         this.relationshipValue$ = observableCombineLatest([this.item$.pipe(take(1)), relationship$]).pipe(
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-type-bind-relation.service.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-type-bind-relation.service.ts
index d5e735ed1a..5f7e2e3e22 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-type-bind-relation.service.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-type-bind-relation.service.ts
@@ -183,7 +183,8 @@ export class DsDynamicTypeBindRelationService {
         const initValue = (hasNoValue(relatedModel.value) || typeof relatedModel.value === 'string') ? relatedModel.value :
           (Array.isArray(relatedModel.value) ? relatedModel.value : relatedModel.value.value);
 
-        const valueChanges = relatedModel.valueChanges.pipe(
+        const updateSubject = (relatedModel.type === 'CHECKBOX_GROUP' ? relatedModel.valueUpdates : relatedModel.valueChanges);
+        const valueChanges = updateSubject.pipe(
           startWith(initValue)
         );
 
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.html
index dd19e6158d..1d395dafd9 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.html
@@ -5,18 +5,27 @@
          [ngClass]="getClass('element', 'control')">
 
       <!-- Draggable Container -->
-      <div cdkDropList cdkDropListLockAxis="y" (cdkDropListDropped)="moveSelection($event)">
+      <div role="listbox" [attr.aria-label]="'dynamic-form-array.sortable-list.label' | translate" #dropList cdkDropList
+           cdkDropListLockAxis="y" (cdkDropListDropped)="moveSelection($event)">
         <!-- Draggable Items -->
-        <div *ngFor="let groupModel of model.groups; let idx = index"
+        <div #sortableElement
+             *ngFor="let groupModel of model.groups; let idx = index; let length = count"
              role="group"
-             [formGroupName]="idx"
+             [formGroupName]="groupModel.index"
              [ngClass]="[getClass('element', 'group'), getClass('grid', 'group')]"
              cdkDrag
              [cdkDragDisabled]="dragDisabled"
              [cdkDragPreviewClass]="'ds-submission-reorder-dragging'"
              [class.grey-background]="model.isInlineGroupArray">
           <!-- Item content -->
-          <div class="drag-handle" [class.drag-disable]="dragDisabled" tabindex="0" cdkDragHandle>
+          <div class="drag-handle" [class.drag-disable]="dragDisabled" tabindex="0" cdkDragHandle
+               (focus)="addInstructionMessageToLiveRegion(sortableElement)"
+               (keydown.space)="toggleKeyboardDragAndDrop($event, sortableElement, idx, length)"
+               (keydown.enter)="toggleKeyboardDragAndDrop($event, sortableElement, idx, length)"
+               (keydown.tab)="stopKeyboardDragAndDrop(sortableElement, idx, length)"
+               (keydown.escape)="cancelKeyboardDragAndDrop(sortableElement, idx, length)"
+               (keydown.arrowUp)="handleArrowPress($event, dropList, length, idx, 'up')"
+               (keydown.arrowDown)="handleArrowPress($event, dropList, length, idx, 'down')">
             <i class="drag-icon fas fa-grip-vertical fa-fw" [class.drag-disable]="dragDisabled" ></i>
           </div>
           <ng-container *ngTemplateOutlet="startTemplate?.templateRef; context: groupModel"></ng-container>
@@ -25,7 +34,7 @@
                                              [formGroup]="group"
                                              [formModel]="formModel"
                                              [context]="groupModel"
-                                             [group]="control.get([idx])"
+                                             [group]="getControlOfGroup(groupModel)"
                                              [hidden]="_model.hidden"
                                              [class.d-none]="_model.hidden"
                                              [layout]="formLayout"
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.scss b/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.scss
index ce4a89226a..f93fcb1eac 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.scss
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.scss
@@ -17,7 +17,6 @@
   margin-right: calc(-0.5 * var(--bs-spacer));
   padding-right: calc(0.5 * var(--bs-spacer));
   .drag-icon {
-    visibility: hidden;
     width: calc(2 * var(--bs-spacer));
     color: var(--bs-gray-600);
     margin: var(--bs-btn-padding-y) 0;
@@ -27,9 +26,6 @@
 
   &:hover, &:focus {
     cursor: grab;
-    .drag-icon {
-      visibility: visible;
-    }
   }
 
 }
@@ -40,18 +36,12 @@
   }
 
   &:focus {
-    .drag-icon {
-      visibility: visible;
-    }
   }
 }
 
 .cdk-drop-list-dragging {
   .drag-handle {
     cursor: grabbing;
-    .drag-icon {
-      visibility: hidden;
-    }
   }
 }
 
@@ -63,3 +53,9 @@
 .cdk-drag-placeholder {
   opacity: 0;
 }
+
+::ng-deep {
+  .sorting-with-keyboard input {
+    background-color: var(--bs-gray-400);
+  }
+}
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.spec.ts
new file mode 100644
index 0000000000..dc6565a0a4
--- /dev/null
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.spec.ts
@@ -0,0 +1,169 @@
+import { HttpClient } from '@angular/common/http';
+import { EventEmitter } from '@angular/core';
+import {
+  ComponentFixture,
+  inject,
+  TestBed,
+} from '@angular/core/testing';
+import { ReactiveFormsModule } from '@angular/forms';
+import { By } from '@angular/platform-browser';
+import {
+  DynamicFormLayoutService,
+  DynamicFormService,
+  DynamicFormValidationService,
+  DynamicInputModel,
+} from '@ng-dynamic-forms/core';
+import { provideMockStore } from '@ngrx/store/testing';
+import {
+  TranslateLoader,
+  TranslateModule,
+  TranslateService,
+} from '@ngx-translate/core';
+import { NgxMaskModule } from 'ngx-mask';
+import { of } from 'rxjs';
+
+import {
+  APP_CONFIG,
+} from '../../../../../../../config/app-config.interface';
+import { environment } from '../../../../../../../environments/environment.test';
+import { SubmissionService } from '../../../../../../submission/submission.service';
+import { DsDynamicFormControlContainerComponent } from '../../ds-dynamic-form-control-container.component';
+import { DynamicRowArrayModel } from '../ds-dynamic-row-array-model';
+import { DsDynamicFormArrayComponent } from './dynamic-form-array.component';
+import { UUIDService } from '../../../../../../core/shared/uuid.service';
+import { TranslateLoaderMock } from '../../../../../mocks/translate-loader.mock';
+
+describe('DsDynamicFormArrayComponent', () => {
+  const translateServiceStub = {
+    get: () => of('translated-text'),
+    instant: () => 'translated-text',
+    onLangChange: new EventEmitter(),
+    onTranslationChange: new EventEmitter(),
+    onDefaultLangChange: new EventEmitter(),
+  };
+
+  const uuidServiceStub = {
+    generate: () => 'fake-id'
+  };
+
+  let component: DsDynamicFormArrayComponent;
+  let fixture: ComponentFixture<DsDynamicFormArrayComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [
+        DsDynamicFormArrayComponent,
+      ],
+      imports: [
+        ReactiveFormsModule,
+        NgxMaskModule.forRoot(),
+        TranslateModule.forRoot({
+          loader: {
+            provide: TranslateLoader,
+            useClass: TranslateLoaderMock
+          }
+        }),
+      ],
+      providers: [
+        DynamicFormLayoutService,
+        DynamicFormValidationService,
+        provideMockStore(),
+        { provide: TranslateService, useValue: translateServiceStub },
+        { provide: HttpClient, useValue: {} },
+        { provide: SubmissionService, useValue: {} },
+        { provide: APP_CONFIG, useValue: environment },
+        { provide: UUIDService, useValue: uuidServiceStub },
+      ],
+    }).overrideComponent(DsDynamicFormArrayComponent, {
+      remove: {
+        imports: [DsDynamicFormControlContainerComponent],
+      },
+    })
+      .compileComponents();
+  });
+
+  beforeEach(inject([DynamicFormService], (service: DynamicFormService) => {
+    const formModel = [
+      new DynamicRowArrayModel({
+        id: 'testFormRowArray',
+        initialCount: 5,
+        notRepeatable: false,
+        relationshipConfig: undefined,
+        submissionId: '1234',
+        isDraggable: true,
+        groupFactory: () => {
+          return [
+            new DynamicInputModel({ id: 'testFormRowArrayGroupInput' }),
+          ];
+        },
+        required: false,
+        metadataKey: 'dc.contributor.author',
+        metadataFields: ['dc.contributor.author'],
+        hasSelectableMetadata: true,
+        showButtons: true,
+        typeBindRelations: [{ match: 'VISIBLE', operator: 'OR', when: [{ id: 'dc.type', value: 'Book' }] }],
+      }),
+    ];
+
+    fixture = TestBed.createComponent(DsDynamicFormArrayComponent);
+    component = fixture.componentInstance;
+    component.model = formModel[0] as DynamicRowArrayModel;
+
+    component.group = service.createFormGroup(formModel);
+
+    fixture.detectChanges();
+  }));
+
+  it('should move element up and maintain focus', () => {
+    const dropList = fixture.debugElement.query(By.css('[cdkDropList]')).nativeElement;
+    component.handleArrowPress(new KeyboardEvent('keydown', { key: 'ArrowUp' }), dropList, 3, 1, 'up');
+    fixture.detectChanges();
+    expect(component.model.groups[0]).toBeDefined();
+    expect(document.activeElement).toBe(dropList.querySelectorAll('[cdkDragHandle]')[0]);
+  });
+
+  it('should move element down and maintain focus', () => {
+    const dropList = fixture.debugElement.query(By.css('[cdkDropList]')).nativeElement;
+    component.handleArrowPress(new KeyboardEvent('keydown', { key: 'ArrowDown' }), dropList, 3, 1, 'down');
+    fixture.detectChanges();
+    expect(component.model.groups[2]).toBeDefined();
+    expect(document.activeElement).toBe(dropList.querySelectorAll('[cdkDragHandle]')[2]);
+  });
+
+  it('should wrap around when moving up from the first element', () => {
+    const dropList = fixture.debugElement.query(By.css('[cdkDropList]')).nativeElement;
+    component.handleArrowPress(new KeyboardEvent('keydown', { key: 'ArrowUp' }), dropList, 3, 0, 'up');
+    fixture.detectChanges();
+    expect(component.model.groups[2]).toBeDefined();
+    expect(document.activeElement).toBe(dropList.querySelectorAll('[cdkDragHandle]')[2]);
+  });
+
+  it('should wrap around when moving down from the last element', () => {
+    const dropList = fixture.debugElement.query(By.css('[cdkDropList]')).nativeElement;
+    component.handleArrowPress(new KeyboardEvent('keydown', { key: 'ArrowDown' }), dropList, 3, 2, 'down');
+    fixture.detectChanges();
+    expect(component.model.groups[0]).toBeDefined();
+    expect(document.activeElement).toBe(dropList.querySelectorAll('[cdkDragHandle]')[0]);
+  });
+
+  it('should not move element if keyboard drag is not active', () => {
+    const dropList = fixture.debugElement.query(By.css('[cdkDropList]')).nativeElement;
+    component.elementBeingSorted = null;
+    component.handleArrowPress(new KeyboardEvent('keydown', { key: 'ArrowDown' }), dropList, 3, 1, 'down');
+    fixture.detectChanges();
+    expect(component.model.groups[1]).toBeDefined();
+    expect(document.activeElement).toBe(dropList.querySelectorAll('[cdkDragHandle]')[2]);
+  });
+
+  it('should cancel keyboard drag and drop', () => {
+    const dropList = fixture.debugElement.query(By.css('[cdkDropList]')).nativeElement;
+    component.elementBeingSortedStartingIndex = 2;
+    component.elementBeingSorted = dropList.querySelectorAll('[cdkDragHandle]')[2];
+    component.model.moveGroup(2, 1);
+    fixture.detectChanges();
+    component.cancelKeyboardDragAndDrop(dropList, 1, 3);
+    fixture.detectChanges();
+    expect(component.elementBeingSorted).toBeNull();
+    expect(component.elementBeingSortedStartingIndex).toBeNull();
+  });
+});
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.ts
index 9d48bdac21..fb7ee7ac2e 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.ts
@@ -15,6 +15,8 @@ import {
 import { Relationship } from '../../../../../../core/shared/item-relationships/relationship.model';
 import { hasValue } from '../../../../../empty.util';
 import { DynamicRowArrayModel } from '../ds-dynamic-row-array-model';
+import { LiveRegionService } from '../../../../../live-region/live-region.service';
+import { TranslateService } from '@ngx-translate/core';
 
 @Component({
   selector: 'ds-dynamic-form-array',
@@ -31,6 +33,9 @@ export class DsDynamicFormArrayComponent extends DynamicFormArrayComponent {
   @Input() model: DynamicRowArrayModel;// DynamicRow?
   @Input() templates: QueryList<DynamicTemplateDirective> | undefined;
 
+  elementBeingSorted: HTMLElement;
+  elementBeingSortedStartingIndex: number;
+
   /* eslint-disable @angular-eslint/no-output-rename */
   @Output('dfBlur') blur: EventEmitter<DynamicFormControlEvent> = new EventEmitter<DynamicFormControlEvent>();
   @Output('dfChange') change: EventEmitter<DynamicFormControlEvent> = new EventEmitter<DynamicFormControlEvent>();
@@ -41,6 +46,8 @@ export class DsDynamicFormArrayComponent extends DynamicFormArrayComponent {
 
   constructor(protected layoutService: DynamicFormLayoutService,
               protected validationService: DynamicFormValidationService,
+              protected liveRegionService: LiveRegionService,
+              protected translateService: TranslateService,
   ) {
     super(layoutService, validationService);
   }
@@ -81,4 +88,162 @@ export class DsDynamicFormArrayComponent extends DynamicFormArrayComponent {
   get dragDisabled(): boolean {
     return this.model.groups.length === 1 || !this.model.isDraggable;
   }
+
+  /**
+   * Gets the control of the specified group model. It adds the startingIndex property to the group model if it does not
+   * already have it. This ensures that the controls are always linked to the correct group model.
+   * @param groupModel The group model to get the control for.
+   * @returns The form control of the specified group model.
+   */
+  getControlOfGroup(groupModel: any) {
+    if (!groupModel.hasOwnProperty('startingIndex')) {
+      groupModel.startingIndex = groupModel.index;
+    }
+    return this.control.get([groupModel.startingIndex]);
+  }
+
+  /**
+   * Toggles the keyboard drag and drop feature for the given sortable element.
+   * @param event
+   * @param sortableElement
+   * @param index
+   * @param length
+   */
+  toggleKeyboardDragAndDrop(event: KeyboardEvent, sortableElement: HTMLDivElement, index: number, length: number) {
+    event.preventDefault();
+    if (this.elementBeingSorted) {
+      this.stopKeyboardDragAndDrop(sortableElement, index, length);
+    } else {
+      sortableElement.classList.add('sorting-with-keyboard');
+      this.elementBeingSorted = sortableElement;
+      this.elementBeingSortedStartingIndex = index;
+      this.liveRegionService.clear();
+      this.liveRegionService.addMessage(this.translateService.instant('live-region.ordering.status', {
+        itemName: sortableElement.querySelector('input')?.value,
+        index: index + 1,
+        length,
+      }));
+    }
+  }
+
+  /**
+   * Stops the keyboard drag and drop feature.
+   * @param sortableElement
+   * @param index
+   * @param length
+   */
+  stopKeyboardDragAndDrop(sortableElement: HTMLDivElement, index: number, length: number) {
+    this.elementBeingSorted?.classList.remove('sorting-with-keyboard');
+    this.liveRegionService.clear();
+    if (this.elementBeingSorted) {
+      this.elementBeingSorted = null;
+      this.elementBeingSortedStartingIndex = null;
+      this.liveRegionService.addMessage(this.translateService.instant('live-region.ordering.dropped', {
+        itemName: sortableElement.querySelector('input')?.value,
+        index: index + 1,
+        length,
+      }));
+    }
+  }
+
+  /**
+   * Handles the keyboard arrow press event to move the element up or down.
+   * @param event
+   * @param dropList
+   * @param length
+   * @param idx
+   * @param direction
+   */
+  handleArrowPress(event: KeyboardEvent, dropList: HTMLDivElement, length: number, idx: number, direction: 'up' | 'down') {
+    let newIndex = direction === 'up' ? idx - 1 : idx + 1;
+    if (newIndex < 0) {
+      newIndex = length - 1;
+    } else if (newIndex >= length) {
+      newIndex = 0;
+    }
+
+    if (this.elementBeingSorted) {
+      this.model.moveGroup(idx, newIndex - idx);
+      if (hasValue(this.model.groups[newIndex]) && hasValue((this.control as any).controls[newIndex])) {
+        this.onCustomEvent({
+          previousIndex: idx,
+          newIndex,
+          arrayModel: this.model,
+          model: this.model.groups[newIndex].group[0],
+          control: (this.control as any).controls[newIndex],
+        }, 'move');
+        this.liveRegionService.clear();
+        this.liveRegionService.addMessage(this.translateService.instant('live-region.ordering.moved', {
+          itemName: this.elementBeingSorted.querySelector('input')?.value,
+          index: newIndex + 1,
+          length,
+        }));
+      }
+      event.preventDefault();
+      // Set focus back to the moved element
+      setTimeout(() => {
+        this.setFocusToDropListElementOfIndex(dropList, newIndex, direction);
+      });
+    } else {
+      event.preventDefault();
+      this.setFocusToDropListElementOfIndex(dropList, newIndex, direction);
+    }
+  }
+
+  cancelKeyboardDragAndDrop(sortableElement: HTMLDivElement, index: number, length: number) {
+    this.model.moveGroup(index, this.elementBeingSortedStartingIndex - index);
+    if (hasValue(this.model.groups[this.elementBeingSortedStartingIndex]) && hasValue((this.control as any).controls[this.elementBeingSortedStartingIndex])) {
+      this.onCustomEvent({
+        previousIndex: index,
+        newIndex: this.elementBeingSortedStartingIndex,
+        arrayModel: this.model,
+        model: this.model.groups[this.elementBeingSortedStartingIndex].group[0],
+        control: (this.control as any).controls[this.elementBeingSortedStartingIndex],
+      }, 'move');
+      this.stopKeyboardDragAndDrop(sortableElement, this.elementBeingSortedStartingIndex, length);
+    }
+  }
+
+  /**
+   * Sets focus to the drag handle of the drop list element of the given index.
+   * @param dropList
+   * @param index
+   * @param direction
+   */
+  setFocusToDropListElementOfIndex(dropList: HTMLDivElement, index: number, direction: 'up' | 'down') {
+    const newDragHandle = dropList.querySelectorAll(`[cdkDragHandle]`)[index] as HTMLElement;
+    if (newDragHandle) {
+      newDragHandle.focus();
+      if (!this.isElementInViewport(newDragHandle)) {
+        newDragHandle.scrollIntoView(direction === 'up');
+      }
+    }
+  }
+
+  /**
+   * checks if an element is in the viewport
+   * @param el
+   */
+  isElementInViewport(el: HTMLElement) {
+    const rect = el.getBoundingClientRect();
+    return (
+      rect.top >= 0 &&
+      rect.left >= 0 &&
+      rect.bottom <= (window.innerHeight || document.documentElement.clientHeight) &&
+      rect.right <= (window.innerWidth || document.documentElement.clientWidth)
+    );
+  }
+
+  /**
+   * Adds an instruction message to the live region when the user might want to sort an element.
+   * @param sortableElement
+   */
+  addInstructionMessageToLiveRegion(sortableElement: HTMLDivElement) {
+    if (!this.elementBeingSorted) {
+      this.liveRegionService.clear();
+      this.liveRegionService.addMessage(this.translateService.instant('live-region.ordering.instructions', {
+        itemName: sortableElement.querySelector('input')?.value,
+      }));
+    }
+  }
 }
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker-inline/dynamic-date-picker-inline.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker-inline/dynamic-date-picker-inline.component.html
index 656c350dbb..c0ff290d73 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker-inline/dynamic-date-picker-inline.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker-inline/dynamic-date-picker-inline.component.html
@@ -29,7 +29,7 @@
                 type="button"
                 [attr.aria-labelledby]="'label_' + model.id"
                 [class.disabled]="model.disabled"
-                [disabled]="model.disabled"
+                [dsBtnDisabled]="model.disabled"
                 (click)="datepicker.toggle()">
 
             <i *ngIf="model.toggleIcon" class="{{model.toggleIcon}}" aria-hidden="true"></i>
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.html
index 1046dd6b2d..3dab2d214a 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.html
@@ -1,10 +1,10 @@
 <div>
   <fieldset class="d-flex">
-    <legend [id]="'legend_' + model.id" [ngClass]="[getClass('element', 'label'), getClass('grid', 'label')]">
+    <legend *ngIf="!model.repeatable" [id]="'legend_' + model.id" [ngClass]="[getClass('element', 'label'), getClass('grid', 'label')]">
       {{model.placeholder}} <span *ngIf="model.required">*</span>
     </legend>
     <ds-number-picker
-      tabindex="1"
+      tabindex="0"
       [id]="model.id + '_year'"
       [disabled]="model.disabled"
       [min]="minYear"
@@ -14,14 +14,14 @@
       [(ngModel)]="initialYear"
       [value]="year"
       [invalid]="showErrorMessages"
-      [placeholder]='yearPlaceholder'
+      [placeholder]="'form.date-picker.placeholder.year' | translate"
       (blur)="onBlur($event)"
       (change)="onChange($event)"
       (focus)="onFocus($event)"
     ></ds-number-picker>
 
     <ds-number-picker
-      tabindex="2"
+      tabindex="0"
       [id]="model.id + '_month'"
       [min]="minMonth"
       [max]="maxMonth"
@@ -29,7 +29,7 @@
       [size]="6"
       [(ngModel)]="initialMonth"
       [value]="month"
-      [placeholder]="monthPlaceholder"
+      [placeholder]="'form.date-picker.placeholder.month' | translate"
       [disabled]="!year || model.disabled"
       (blur)="onBlur($event)"
       (change)="onChange($event)"
@@ -37,7 +37,7 @@
     ></ds-number-picker>
 
     <ds-number-picker
-      tabindex="3"
+      tabindex="0"
       [id]="model.id + '_day'"
       [min]="minDay"
       [max]="maxDay"
@@ -45,7 +45,7 @@
       [size]="2"
       [(ngModel)]="initialDay"
       [value]="day"
-      [placeholder]="dayPlaceholder"
+      [placeholder]="'form.date-picker.placeholder.day' | translate"
       [disabled]="!month || model.disabled"
       (blur)="onBlur($event)"
       (change)="onChange($event)"
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.spec.ts
index ffc36008c6..50325e0058 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.spec.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.spec.ts
@@ -1,7 +1,7 @@
 // Load the implementations that should be tested
-import { ChangeDetectorRef, Component, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
-import { ComponentFixture, inject, TestBed, waitForAsync, } from '@angular/core/testing';
 import { UntypedFormControl, UntypedFormGroup } from '@angular/forms';
+import { ChangeDetectorRef, Component, CUSTOM_ELEMENTS_SCHEMA, Renderer2 } from '@angular/core';
+import { ComponentFixture, fakeAsync, inject, TestBed, tick, waitForAsync, } from '@angular/core/testing';
 
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
 import { DynamicFormLayoutService, DynamicFormValidationService } from '@ng-dynamic-forms/core';
@@ -13,6 +13,8 @@ import {
   mockDynamicFormLayoutService,
   mockDynamicFormValidationService
 } from '../../../../../testing/dynamic-form-mock-services';
+import { By } from '@angular/platform-browser';
+import { TranslateModule } from '@ngx-translate/core';
 
 
 export const DATE_TEST_GROUP = new UntypedFormGroup({
@@ -28,6 +30,7 @@ export const DATE_TEST_MODEL_CONFIG = {
   placeholder: 'Date',
   readOnly: false,
   required: true,
+  repeatable: false,
   toggleIcon: 'fas fa-calendar'
 };
 
@@ -39,12 +42,18 @@ describe('DsDatePickerComponent test suite', () => {
   let dateFixture: ComponentFixture<DsDatePickerComponent>;
   let html;
 
+  const renderer2: Renderer2 = {
+    selectRootElement: jasmine.createSpy('selectRootElement'),
+    querySelector: jasmine.createSpy('querySelector'),
+  } as unknown as Renderer2;
+
   // waitForAsync beforeEach
   beforeEach(waitForAsync(() => {
 
     TestBed.configureTestingModule({
       imports: [
-        NgbModule
+        NgbModule,
+        TranslateModule.forRoot(),
       ],
       declarations: [
         DsDatePickerComponent,
@@ -54,7 +63,8 @@ describe('DsDatePickerComponent test suite', () => {
         ChangeDetectorRef,
         DsDatePickerComponent,
         { provide: DynamicFormLayoutService, useValue: mockDynamicFormLayoutService },
-        { provide: DynamicFormValidationService, useValue: mockDynamicFormValidationService }
+        { provide: DynamicFormValidationService, useValue: mockDynamicFormValidationService },
+        { provide: Renderer2, useValue: renderer2 },
       ],
       schemas: [CUSTOM_ELEMENTS_SCHEMA]
     });
@@ -233,6 +243,102 @@ describe('DsDatePickerComponent test suite', () => {
         expect(dateComp.disabledMonth).toBeFalsy();
         expect(dateComp.disabledDay).toBeFalsy();
       });
+
+      it('should move focus on month field when on year field and tab pressed', fakeAsync(() => {
+        const event = {
+          field: 'day',
+          value: null
+        };
+        const event1 = {
+          field: 'month',
+          value: null
+        };
+        dateComp.onChange(event);
+        dateComp.onChange(event1);
+
+        const yearElement = dateFixture.debugElement.query(By.css(`#${dateComp.model.id}_year`));
+        const monthElement = dateFixture.debugElement.query(By.css(`#${dateComp.model.id}_month`));
+
+        yearElement.nativeElement.focus();
+        dateFixture.detectChanges();
+
+        expect(document.activeElement).toBe(yearElement.nativeElement);
+
+        dateFixture.nativeElement.dispatchEvent(new KeyboardEvent('keydown', { key: 'tab' }));
+        dateFixture.detectChanges();
+
+        tick(200);
+        dateFixture.detectChanges();
+
+        expect(document.activeElement).toBe(monthElement.nativeElement);
+      }));
+
+      it('should move focus on day field when on month field and tab pressed', fakeAsync(() => {
+        const event = {
+          field: 'day',
+          value: null
+        };
+        dateComp.onChange(event);
+
+        const monthElement = dateFixture.debugElement.query(By.css(`#${dateComp.model.id}_month`));
+        const dayElement = dateFixture.debugElement.query(By.css(`#${dateComp.model.id}_day`));
+
+        monthElement.nativeElement.focus();
+        dateFixture.detectChanges();
+
+        expect(document.activeElement).toBe(monthElement.nativeElement);
+
+        dateFixture.nativeElement.dispatchEvent(new KeyboardEvent('keydown', { key: 'tab' }));
+        dateFixture.detectChanges();
+
+        tick(200);
+        dateFixture.detectChanges();
+
+        expect(document.activeElement).toBe(dayElement.nativeElement);
+      }));
+
+      it('should move focus on month field when on day field and shift tab pressed', fakeAsync(() => {
+        const event = {
+          field: 'day',
+          value: null
+        };
+        dateComp.onChange(event);
+
+        const monthElement = dateFixture.debugElement.query(By.css(`#${dateComp.model.id}_month`));
+        const dayElement = dateFixture.debugElement.query(By.css(`#${dateComp.model.id}_day`));
+
+        dayElement.nativeElement.focus();
+        dateFixture.detectChanges();
+
+        expect(document.activeElement).toBe(dayElement.nativeElement);
+
+        dateFixture.nativeElement.dispatchEvent(new KeyboardEvent('keydown', { key: 'shift.tab' }));
+        dateFixture.detectChanges();
+
+        tick(200);
+        dateFixture.detectChanges();
+
+        expect(document.activeElement).toBe(monthElement.nativeElement);
+      }));
+
+      it('should move focus on year field when on month field and shift tab pressed', fakeAsync(() => {
+        const yearElement = dateFixture.debugElement.query(By.css(`#${dateComp.model.id}_year`));
+        const monthElement = dateFixture.debugElement.query(By.css(`#${dateComp.model.id}_month`));
+
+        monthElement.nativeElement.focus();
+        dateFixture.detectChanges();
+
+        expect(document.activeElement).toBe(monthElement.nativeElement);
+
+        dateFixture.nativeElement.dispatchEvent(new KeyboardEvent('keydown', { key: 'shift.tab' }));
+        dateFixture.detectChanges();
+
+        tick(200);
+        dateFixture.detectChanges();
+
+        expect(document.activeElement).toBe(yearElement.nativeElement);
+      }));
+
     });
   });
 
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.ts
index 8d5ce5b48e..a3e93a6bb4 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.ts
@@ -1,5 +1,5 @@
-import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
 import { UntypedFormGroup } from '@angular/forms';
+import { Component, EventEmitter, HostListener, Inject, Input, OnInit, Output, Renderer2 } from '@angular/core';
 import { DynamicDsDatePickerModel } from './date-picker.model';
 import { hasValue } from '../../../../../empty.util';
 import {
@@ -7,6 +7,12 @@ import {
   DynamicFormLayoutService,
   DynamicFormValidationService
 } from '@ng-dynamic-forms/core';
+import { DOCUMENT } from '@angular/common';
+import isEqual from 'lodash/isEqual';
+import { TranslateService } from '@ngx-translate/core';
+
+
+export type DatePickerFieldType = '_year' | '_month' | '_day';
 
 export const DS_DATE_PICKER_SEPARATOR = '-';
 
@@ -43,15 +49,16 @@ export class DsDatePickerComponent extends DynamicFormControlComponent implement
   minDay = 1;
   maxDay = 31;
 
-  yearPlaceholder = 'year';
-  monthPlaceholder = 'month';
-  dayPlaceholder = 'day';
-
   disabledMonth = true;
   disabledDay = true;
 
+  private readonly fields: DatePickerFieldType[] = ['_year', '_month', '_day'];
+
   constructor(protected layoutService: DynamicFormLayoutService,
-              protected validationService: DynamicFormValidationService
+              protected validationService: DynamicFormValidationService,
+              protected translateService: TranslateService,
+              private renderer: Renderer2,
+              @Inject(DOCUMENT) private _document: Document
   ) {
     super(layoutService, validationService);
   }
@@ -80,9 +87,8 @@ export class DsDatePickerComponent extends DynamicFormControlComponent implement
       }
     }
 
-    this.maxYear = this.initialYear + 100;
-
-  }
+    this.maxYear = now.getUTCFullYear() + 100;
+    }
 
   onBlur(event) {
     this.blur.emit();
@@ -166,6 +172,67 @@ export class DsDatePickerComponent extends DynamicFormControlComponent implement
     this.change.emit(value);
   }
 
+  /**
+   * Listen to keydown Tab event.
+   * Get the active element and blur it, in order to focus the next input field.
+   */
+  @HostListener('keydown.tab', ['$event'])
+  onTabKeydown(event: KeyboardEvent) {
+    event.preventDefault();
+    const activeElement: Element = this._document.activeElement;
+    (activeElement as any).blur();
+    const index = this.selectedFieldIndex(activeElement);
+    if (index < 0) {
+      return;
+    }
+    let fieldToFocusOn = index + 1;
+    if (fieldToFocusOn < this.fields.length) {
+      this.focusInput(this.fields[fieldToFocusOn]);
+    }
+  }
+
+  @HostListener('keydown.shift.tab', ['$event'])
+  onShiftTabKeyDown(event: KeyboardEvent) {
+    event.preventDefault();
+    const activeElement: Element = this._document.activeElement;
+    (activeElement as any).blur();
+    const index = this.selectedFieldIndex(activeElement);
+    let fieldToFocusOn = index - 1;
+    if (fieldToFocusOn >= 0) {
+      this.focusInput(this.fields[fieldToFocusOn]);
+    }
+  }
+
+  private selectedFieldIndex(activeElement: Element): number {
+    return this.fields.findIndex(field => isEqual(activeElement.id, this.model.id.concat(field)));
+  }
+
+  /**
+   * Focus the input field for the given type
+   * based on the model id.
+   * Used to focus the next input field
+   * in case of a disabled field.
+   * @param type DatePickerFieldType
+   */
+  focusInput(type: DatePickerFieldType) {
+    const field = this._document.getElementById(this.model.id.concat(type));
+    if (field) {
+
+      if (hasValue(this.year) && isEqual(type, '_year')) {
+        this.disabledMonth = true;
+        this.disabledDay = true;
+      }
+      if (hasValue(this.year) && isEqual(type, '_month')) {
+        this.disabledMonth = false;
+      } else if (hasValue(this.month) && isEqual(type, '_day')) {
+        this.disabledDay = false;
+      }
+      setTimeout(() => {
+        this.renderer.selectRootElement(field).focus();
+      }, 100);
+    }
+  }
+
   onFocus(event) {
     this.focus.emit(event);
   }
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.model.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.model.ts
index 5af9b2bd32..88820cdaa3 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.model.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.model.ts
@@ -15,6 +15,7 @@ export const DYNAMIC_FORM_CONTROL_TYPE_DSDATEPICKER = 'DATE';
 export interface DynamicDsDateControlModelConfig extends DynamicDatePickerModelConfig {
   legend?: string;
   typeBindRelations?: DynamicFormControlRelation[];
+  repeatable: boolean;
 }
 
 /**
@@ -37,7 +38,7 @@ export class DynamicDsDatePickerModel extends DynamicDateControlModel {
     this.metadataValue = (config as any).metadataValue;
     this.typeBindRelations = config.typeBindRelations ? config.typeBindRelations : [];
     this.hiddenUpdates = new BehaviorSubject<boolean>(this.hidden);
-
+    this.repeatable = config.repeatable;
     // This was a subscription, then an async setTimeout, but it seems unnecessary
     const parentModel = this.getRootParent(this);
     if (parentModel && isNotUndefined(parentModel.hidden)) {
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list-radio-group.model.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list-radio-group.model.ts
index 0a32498173..2bcf8b5f13 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list-radio-group.model.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list-radio-group.model.ts
@@ -1,5 +1,6 @@
 import {
   DynamicFormControlLayout,
+  DynamicFormControlRelation,
   DynamicRadioGroupModel,
   DynamicRadioGroupModelConfig,
   serializable
@@ -15,12 +16,14 @@ export interface DynamicListModelConfig extends DynamicRadioGroupModelConfig<any
   value?: VocabularyEntry[];
   required: boolean;
   hint?: string;
+  typeBindRelations?: DynamicFormControlRelation[];
 }
 
 export class DynamicListRadioGroupModel extends DynamicRadioGroupModel<any> {
 
   @serializable() vocabularyOptions: VocabularyOptions;
   @serializable() repeatable: boolean;
+  @serializable() typeBindRelations: DynamicFormControlRelation[];
   @serializable() groupLength: number;
   @serializable() required: boolean;
   @serializable() hint: string;
@@ -35,6 +38,7 @@ export class DynamicListRadioGroupModel extends DynamicRadioGroupModel<any> {
     this.required = config.required;
     this.hint = config.hint;
     this.value = config.value;
+    this.typeBindRelations = config.typeBindRelations ? config.typeBindRelations : [];
   }
 
   get hasAuthority(): boolean {
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list.component.html
index 728c59aa46..c2f35861fe 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list.component.html
@@ -28,9 +28,7 @@
           <span [ngClass]="model.layout.element?.label" [innerHTML]="item.label"></span>
         </label>
       </div>
-      <br>
     </div>
-
   </div>
 
   <div *ngIf="!model.repeatable"
@@ -60,8 +58,10 @@
           <span [ngClass]="model.layout.element?.label" [innerHTML]="item.label"></span>
         </label>
       </div>
-      <br>
     </div>
-
   </div>
+  <div class="d-flex justify-content-center" *ngIf="(isLoading$ | async)">
+    <ds-loading></ds-loading>
+  </div>
+
 </div>
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list.component.ts
index aa62e5b40d..cbb70c930e 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list.component.ts
@@ -1,4 +1,4 @@
-import { ChangeDetectorRef, Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
+import { ChangeDetectorRef, Component, EventEmitter, Input, OnDestroy, OnInit, Output } from '@angular/core';
 import { UntypedFormGroup, ValidatorFn, ValidationErrors, AbstractControl } from '@angular/forms';
 import {
   DynamicCheckboxModel,
@@ -17,6 +17,7 @@ import { getFirstSucceededRemoteDataPayload } from '../../../../../../core/share
 import { PaginatedList } from '../../../../../../core/data/paginated-list.model';
 import { VocabularyEntry } from '../../../../../../core/submission/vocabularies/models/vocabulary-entry.model';
 import { PageInfo } from '../../../../../../core/shared/page-info.model';
+import { BehaviorSubject, map, Subscription, tap } from 'rxjs';
 
 export interface ListItem {
   id: string;
@@ -33,7 +34,7 @@ export interface ListItem {
   styleUrls: ['./dynamic-list.component.scss'],
   templateUrl: './dynamic-list.component.html'
 })
-export class DsDynamicListComponent extends DynamicFormControlComponent implements OnInit {
+export class DsDynamicListComponent extends DynamicFormControlComponent implements OnInit, OnDestroy {
 
   @Input() group: UntypedFormGroup;
   @Input() model: any;
@@ -43,7 +44,10 @@ export class DsDynamicListComponent extends DynamicFormControlComponent implemen
   @Output() focus: EventEmitter<any> = new EventEmitter<any>();
 
   public items: ListItem[][] = [];
-  protected optionsList: VocabularyEntry[];
+  public isLoading$: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(true);
+  protected optionsList: VocabularyEntry[] = [];
+  private nextPageInfo: PageInfo;
+  private subs: Subscription[] = [];
 
   constructor(private vocabularyService: VocabularyService,
               private cdr: ChangeDetectorRef,
@@ -59,7 +63,13 @@ export class DsDynamicListComponent extends DynamicFormControlComponent implemen
    */
   ngOnInit() {
     if (this.model.vocabularyOptions && hasValue(this.model.vocabularyOptions.name)) {
-      this.setOptionsFromVocabulary();
+      this.initOptionsFromVocabulary();
+    }
+  }
+
+  ngOnDestroy() {
+    if (this.subs.length > 0) {
+      this.subs.forEach(sub => sub.unsubscribe());
     }
   }
 
@@ -106,55 +116,18 @@ export class DsDynamicListComponent extends DynamicFormControlComponent implemen
   /**
    * Setting up the field options from vocabulary
    */
-  protected setOptionsFromVocabulary() {
+  protected initOptionsFromVocabulary() {
     if (this.model.vocabularyOptions.name && this.model.vocabularyOptions.name.length > 0) {
       const listGroup = this.group.controls[this.model.id] as UntypedFormGroup;
       if (this.model.repeatable && this.model.required) {
         listGroup.addValidators(this.hasAtLeastOneVocabularyEntry());
       }
-      const pageInfo: PageInfo = new PageInfo({
-        elementsPerPage: 9999, currentPage: 1
+
+      this.nextPageInfo = new PageInfo({
+        elementsPerPage: 20, currentPage: 1,
       } as PageInfo);
-      this.vocabularyService.getVocabularyEntries(this.model.vocabularyOptions, pageInfo).pipe(
-        getFirstSucceededRemoteDataPayload()
-      ).subscribe((entries: PaginatedList<VocabularyEntry>) => {
-        let groupCounter = 0;
-        let itemsPerGroup = 0;
-        let tempList: ListItem[] = [];
-        this.optionsList = entries.page;
-        // Make a list of available options (checkbox/radio) and split in groups of 'model.groupLength'
-        entries.page.forEach((option: VocabularyEntry, key: number) => {
-          const value = option.authority || option.value;
-          const checked: boolean = isNotEmpty(findKey(
-            this.model.value,
-            (v) => v.value === option.value));
-
-          const item: ListItem = {
-            id: value,
-            label: option.display,
-            value: checked,
-            index: key
-          };
-          if (this.model.repeatable) {
-            this.formBuilderService.addFormGroupControl(listGroup, (this.model as DynamicListCheckboxGroupModel), new DynamicCheckboxModel(item));
-          } else {
-            (this.model as DynamicListRadioGroupModel).options.push({
-              label: item.label,
-              value: option
-            });
-          }
-          tempList.push(item);
-          itemsPerGroup++;
-          this.items[groupCounter] = tempList;
-          if (itemsPerGroup === this.model.groupLength) {
-            groupCounter++;
-            itemsPerGroup = 0;
-            tempList = [];
-          }
-        });
-        this.cdr.markForCheck();
-      });
 
+      this.loadEntries(listGroup);
     }
   }
 
@@ -167,4 +140,76 @@ export class DsDynamicListComponent extends DynamicFormControlComponent implemen
     };
   }
 
+  /**
+   * Update current page state to keep track of which one to load next
+   * @param response
+   */
+  setPaginationInfo(response: PaginatedList<VocabularyEntry>) {
+    if (response.pageInfo.currentPage < response.pageInfo.totalPages) {
+      this.nextPageInfo = Object.assign(new PageInfo(), response.pageInfo,  { currentPage: response.currentPage + 1 });
+      this.isLoading$.next(true);
+    } else {
+      this.isLoading$.next(false);
+    }
+  }
+
+  /**
+   * Load entries page
+   *
+   * @param listGroup
+   */
+  loadEntries(listGroup?: UntypedFormGroup) {
+    if (!hasValue(listGroup)) {
+      listGroup = this.group.controls[this.model.id] as UntypedFormGroup;
+    }
+
+    this.subs.push(
+      this.vocabularyService.getVocabularyEntries(this.model.vocabularyOptions, this.nextPageInfo).pipe(
+        getFirstSucceededRemoteDataPayload(),
+        tap((response) => this.setPaginationInfo(response)),
+        map(entries => entries.page),
+      ).subscribe((allEntries: VocabularyEntry[]) => {
+        this.optionsList = [...this.optionsList, ...allEntries];
+        let groupCounter = this.items.length;
+        let itemsPerGroup = 0;
+        let tempList: ListItem[] = [];
+
+        // Make a list of available options (checkbox/radio) and split in groups of 'model.groupLength'
+        allEntries.forEach((option: VocabularyEntry) => {
+          const value = option.authority || option.value;
+          const checked: boolean = isNotEmpty(findKey(
+            this.model.value,
+            (v) => v?.value === option.value));
+
+          const item: ListItem = {
+            id: `${this.model.id}_${value}`,
+            label: option.display,
+            value: checked,
+            index: this.optionsList.indexOf(option),
+          };
+          if (this.model.repeatable) {
+            this.formBuilderService.addFormGroupControl(listGroup, (this.model as DynamicListCheckboxGroupModel), new DynamicCheckboxModel(item));
+          } else {
+            (this.model as DynamicListRadioGroupModel).options.push({
+              label: item.label,
+              value: option,
+            });
+          }
+          tempList.push(item);
+          itemsPerGroup++;
+          this.items[groupCounter] = tempList;
+          if (itemsPerGroup === this.model.groupLength) {
+            groupCounter++;
+            itemsPerGroup = 0;
+            tempList = [];
+          }
+        });
+        this.cdr.markForCheck();
+        // If the paginated request did not reach the end keep loading the entries in the background
+        if (this.isLoading$.value) {
+          this.loadEntries();
+        }
+      }),
+    );
+  }
 }
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.html
index c624c46d2d..17f04702ea 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.html
@@ -52,7 +52,7 @@
               type="button"
               ngbTooltip="{{'form.search-help' | translate}}"
               placement="top"
-              [disabled]="model.readOnly || isSearchDisabled()"
+              [dsBtnDisabled]="model.readOnly || isSearchDisabled()"
               [hidden]="isInputDisabled()"
               (click)="sdRef.open(); search(); $event.stopPropagation();">{{'form.search' | translate}}
       </button>
@@ -60,7 +60,7 @@
               type="button"
               ngbTooltip="{{'form.clear-help' | translate}}"
               placement="top"
-              [disabled]="model.readOnly"
+              [dsBtnDisabled]="model.readOnly"
               (click)="remove()">{{'form.clear' | translate}}
       </button>
     </div>
@@ -69,14 +69,14 @@
               type="button"
               ngbTooltip="{{'form.edit-help' | translate}}"
               placement="top"
-              [disabled]="isEditDisabled()"
+              [dsBtnDisabled]="isEditDisabled()"
               (click)="switchEditMode()">{{'form.edit' | translate}}
       </button>
       <button *ngIf="editMode" class="btn btn-secondary"
               type="button"
               ngbTooltip="{{'form.save-help' | translate}}"
               placement="top"
-              [disabled]="!hasEmptyValue()"
+              [dsBtnDisabled]="!hasEmptyValue()"
               (click)="saveChanges()">{{'form.save' | translate}}
       </button>
     </div>
@@ -88,18 +88,17 @@
        aria-expanded="false"
        [attr.aria-labelledby]="'label_' + model.id">
     <div class="scrollable-menu"
-         aria-labelledby="scrollableDropdownMenuButton"
          infiniteScroll
          [infiniteScrollDistance]="2"
          [infiniteScrollThrottle]="50"
          (scrolled)="onScroll()"
          [scrollWindow]="false">
 
-      <button class="dropdown-item disabled"
+      <button class="dropdown-item disabled" type="button"
               *ngIf="optionsList && optionsList.length == 0"
               (click)="$event.stopPropagation(); clearFields(); sdRef.close();">{{'form.no-results' | translate}}
       </button>
-      <button class="dropdown-item lookup-item"
+      <button class="dropdown-item lookup-item" type="button"
               *ngFor="let listEntry of optionsList"
               (click)="$event.stopPropagation(); onSelect(listEntry); sdRef.close();"
               title="{{ listEntry.display }}">
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.spec.ts
index 2fea4fc985..81db85f863 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.spec.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.spec.ts
@@ -26,6 +26,7 @@ import {
   mockDynamicFormLayoutService,
   mockDynamicFormValidationService
 } from '../../../../../testing/dynamic-form-mock-services';
+import {BtnDisabledDirective} from '../../../../../btn-disabled.directive';
 
 let LOOKUP_TEST_MODEL_CONFIG: DynamicLookupModelConfig = {
   vocabularyOptions: {
@@ -153,7 +154,8 @@ describe('Dynamic Lookup component', () => {
         DsDynamicLookupComponent,
         TestComponent,
         AuthorityConfidenceStateDirective,
-        ObjNgFor
+        ObjNgFor,
+        BtnDisabledDirective
       ], // declare the test component
       providers: [
         ChangeDetectorRef,
@@ -235,8 +237,10 @@ describe('Dynamic Lookup component', () => {
           const de = lookupFixture.debugElement.queryAll(By.css('button'));
           const searchBtnEl = de[0].nativeElement;
           const editBtnEl = de[1].nativeElement;
-          expect(searchBtnEl.disabled).toBe(true);
-          expect(editBtnEl.disabled).toBe(true);
+          expect(searchBtnEl.getAttribute('aria-disabled')).toBe('true');
+          expect(searchBtnEl.classList.contains('disabled')).toBeTrue();
+          expect(editBtnEl.getAttribute('aria-disabled')).toBe('true');
+          expect(editBtnEl.classList.contains('disabled')).toBeTrue();
           expect(editBtnEl.textContent.trim()).toBe('form.edit');
         });
 
@@ -334,8 +338,10 @@ describe('Dynamic Lookup component', () => {
           const de = lookupFixture.debugElement.queryAll(By.css('button'));
           const searchBtnEl = de[0].nativeElement;
           const saveBtnEl = de[1].nativeElement;
-          expect(searchBtnEl.disabled).toBe(true);
-          expect(saveBtnEl.disabled).toBe(false);
+          expect(searchBtnEl.getAttribute('aria-disabled')).toBe('true');
+          expect(searchBtnEl.classList.contains('disabled')).toBeTrue();
+          expect(saveBtnEl.getAttribute('aria-disabled')).not.toBe('true');
+          expect(saveBtnEl.classList.contains('disabled')).toBeFalse();
           expect(saveBtnEl.textContent.trim()).toBe('form.save');
 
         });
@@ -375,8 +381,10 @@ describe('Dynamic Lookup component', () => {
           const de = lookupFixture.debugElement.queryAll(By.css('button'));
           const searchBtnEl = de[0].nativeElement;
           const saveBtnEl = de[1].nativeElement;
-          expect(searchBtnEl.disabled).toBe(true);
-          expect(saveBtnEl.disabled).toBe(false);
+          expect(searchBtnEl.getAttribute('aria-disabled')).toBe('true');
+          expect(searchBtnEl.classList.contains('disabled')).toBeTrue();
+          expect(saveBtnEl.getAttribute('aria-disabled')).not.toBe('true');
+          expect(saveBtnEl.classList.contains('disabled')).toBeFalse();
           expect(saveBtnEl.textContent.trim()).toBe('form.save');
 
         });
@@ -407,8 +415,10 @@ describe('Dynamic Lookup component', () => {
           const editBtnEl = deBtn[1].nativeElement;
 
           expect(de.length).toBe(2);
-          expect(searchBtnEl.disabled).toBe(true);
-          expect(editBtnEl.disabled).toBe(true);
+          expect(searchBtnEl.getAttribute('aria-disabled')).toBe('true');
+          expect(searchBtnEl.classList.contains('disabled')).toBeTrue();
+          expect(editBtnEl.getAttribute('aria-disabled')).toBe('true');
+          expect(editBtnEl.classList.contains('disabled')).toBeTrue();
           expect(editBtnEl.textContent.trim()).toBe('form.edit');
         });
 
@@ -504,8 +514,10 @@ describe('Dynamic Lookup component', () => {
           const de = lookupFixture.debugElement.queryAll(By.css('button'));
           const searchBtnEl = de[0].nativeElement;
           const saveBtnEl = de[1].nativeElement;
-          expect(searchBtnEl.disabled).toBe(true);
-          expect(saveBtnEl.disabled).toBe(false);
+          expect(searchBtnEl.getAttribute('aria-disabled')).toBe('true');
+          expect(searchBtnEl.classList.contains('disabled')).toBeTrue();
+          expect(saveBtnEl.getAttribute('aria-disabled')).not.toBe('true');
+          expect(saveBtnEl.classList.contains('disabled')).toBeFalse();
           expect(saveBtnEl.textContent.trim()).toBe('form.save');
 
         });
@@ -547,8 +559,10 @@ describe('Dynamic Lookup component', () => {
           const de = lookupFixture.debugElement.queryAll(By.css('button'));
           const searchBtnEl = de[0].nativeElement;
           const saveBtnEl = de[1].nativeElement;
-          expect(searchBtnEl.disabled).toBe(true);
-          expect(saveBtnEl.disabled).toBe(false);
+          expect(searchBtnEl.getAttribute('aria-disabled')).toBe('true');
+          expect(searchBtnEl.classList.contains('disabled')).toBeTrue();
+          expect(saveBtnEl.getAttribute('aria-disabled')).not.toBe('true');
+          expect(saveBtnEl.classList.contains('disabled')).toBeFalse();
           expect(saveBtnEl.textContent.trim()).toBe('form.save');
 
         });
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.component.html
index 05f443aad5..985d3187a6 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.component.html
@@ -32,21 +32,21 @@
 
         <button type="button"
                 class="btn btn-link"
-                [disabled]="isMandatoryFieldEmpty()"
+                [dsBtnDisabled]="isMandatoryFieldEmpty()"
                 (click)="save()">
           <i class="fas fa-save text-primary fa-2x"
              aria-hidden="true"></i>
         </button>
         <button type="button"
                 class="btn btn-link"
-                [disabled]="!editMode"
+                [dsBtnDisabled]="!editMode"
                 (click)="delete()">
           <i class="fas fa-trash text-danger fa-2x"
              aria-hidden="true"></i>
         </button>
         <button type="button"
                 class="btn btn-link"
-                [disabled]="isMandatoryFieldEmpty()"
+                [dsBtnDisabled]="isMandatoryFieldEmpty()"
                 (click)="clear()">
           <i class="fas fa-undo fa-2x"
              aria-hidden="true"></i>
@@ -62,7 +62,7 @@
       <input type="text"
              class="border-0 form-control-plaintext tag-input mt-1 mb-1 pl-2 text-muted"
              readonly
-             tabindex="-1"
+             tabindex="0"
              value="{{'form.no-value' | translate}}">
     </div>
     <ds-chips
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.component.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.component.spec.ts
index feca7f95c6..39cdd49702 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.component.spec.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.component.spec.ts
@@ -25,6 +25,7 @@ import { VocabularyServiceStub } from '../../../../../testing/vocabulary-service
 import { StoreMock } from '../../../../../testing/store.mock';
 import { FormRowModel } from '../../../../../../core/config/models/config-submission-form.model';
 import { storeModuleConfig } from '../../../../../../app.reducer';
+import { XSRFService } from '../../../../../../core/xsrf/xsrf.service';
 
 export let FORM_GROUP_TEST_MODEL_CONFIG;
 
@@ -129,7 +130,8 @@ describe('DsDynamicRelationGroupComponent test suite', () => {
         FormComponent,
         FormService,
         { provide: VocabularyService, useValue: new VocabularyServiceStub() },
-        { provide: Store, useClass: StoreMock }
+        { provide: Store, useClass: StoreMock },
+        { provide: XSRFService, useValue: {} },
       ],
       schemas: [CUSTOM_ELEMENTS_SCHEMA]
     });
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.html
index 6e2d29b789..f8cdb06dac 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.html
@@ -2,14 +2,15 @@
   <div class="position-relative right-addon"
        role="combobox"
        [attr.aria-label]="model.label"
-       [attr.aria-owns]="'combobox_' + id + '_listbox'">
+       [attr.aria-owns]="'combobox_' + id + '_listbox'"
+       [attr.aria-expanded]="sdRef.isOpen()"
+       [attr.aria-activedescendant]="(currentValue | async) ? 'combobox_' + id + '_selected' : null">
        <i *ngIf="!model.readOnly" ngbDropdownToggle class="position-absolute scrollable-dropdown-toggle"
           aria-hidden="true"></i>
        <i *ngIf="model.readOnly" class="dropdown-toggle position-absolute toggle-icon"
           aria-hidden="true"></i>
     <input class="form-control"
            [attr.aria-controls]="'combobox_' + id + '_listbox'"
-           [attr.aria-activedescendant]="'combobox_' + id + '_selected'"
            [attr.aria-label]="model.placeholder"
            [attr.autoComplete]="model.autoComplete"
            [class.is-invalid]="showErrorMessages"
@@ -26,10 +27,8 @@
            (keydown)="selectOnKeyDown($event, sdRef)">
   </div>
 
-  <div ngbDropdownMenu
+  <div #dropdownMenu ngbDropdownMenu
        class="dropdown-menu scrollable-dropdown-menu w-100"
-       aria-haspopup="true"
-       aria-expanded="false"
        [attr.aria-label]="model.placeholder">
     <div class="scrollable-menu"
          role="listbox"
@@ -41,11 +40,18 @@
          (scrolled)="onScroll()"
          [scrollWindow]="false">
 
-      <button class="dropdown-item disabled" *ngIf="optionsList && optionsList.length == 0">{{'form.no-results' | translate}}</button>
-      <button class="dropdown-item collection-item text-truncate" *ngFor="let listEntry of optionsList"
-              (click)="onSelect(listEntry); sdRef.close()" (mousedown)="onSelect(listEntry); sdRef.close()"
-              title="{{ listEntry.display }}" role="option"
-              [attr.id]="listEntry.display == (currentValue|async) ? ('combobox_' + id + '_selected') : null">
+      <button class="dropdown-item disabled" *ngIf="optionsList && optionsList.length === 0">{{'form.no-results' | translate}}</button>
+      <button class="dropdown-item collection-item text-truncate"
+              (click)="onSelect(undefined); sdRef.close()" (mousedown)="onSelect(undefined); sdRef.close()"
+              title="{{ 'dropdown.clear.tooltip' | translate }}" role="option"
+      >
+        <i>{{ 'dropdown.clear' | translate }}</i>
+      </button>
+      <button class="dropdown-item collection-item text-truncate" *ngFor="let listEntry of optionsList; let i = index"
+              [class.active]="i === selectedIndex"
+              (keydown.enter)="onSelect(listEntry); sdRef.close()" (mousedown)="onSelect(listEntry); sdRef.close()"
+              title="{{ inputFormatter(listEntry) }}" role="option"
+              [attr.id]="inputFormatter(listEntry) === (currentValue|async) ? ('combobox_' + id + '_selected') : null">
         {{inputFormatter(listEntry)}}
       </button>
       <div class="scrollable-dropdown-loading text-center" *ngIf="loading"><p>{{'form.loading' | translate}}</p></div>
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.spec.ts
index 0fe617e231..116e4a0f46 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.spec.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.spec.ts
@@ -159,14 +159,15 @@ describe('Dynamic Dynamic Scrollable Dropdown component', () => {
         let de: any = scrollableDropdownFixture.debugElement.query(By.css('input.form-control'));
         let btnEl = de.nativeElement;
 
-        btnEl.click();
+        const mousedownEvent = new MouseEvent('mousedown');
+
+        btnEl.dispatchEvent(mousedownEvent);
         scrollableDropdownFixture.detectChanges();
 
         de = scrollableDropdownFixture.debugElement.queryAll(By.css('button.dropdown-item'));
-        btnEl = de[0].nativeElement;
-
-        btnEl.click();
+        btnEl = de[1].nativeElement;
 
+        btnEl.dispatchEvent(mousedownEvent);
         scrollableDropdownFixture.detectChanges();
 
         expect((scrollableDropdownComp.model as any).value).toEqual(selectedValue);
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.ts
index a4ca210193..b284fa4fc5 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.ts
@@ -1,4 +1,13 @@
-import { ChangeDetectorRef, Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
+import {
+  ChangeDetectorRef,
+  Component,
+  EventEmitter,
+  Input,
+  OnInit,
+  Output,
+  ViewChild,
+  ElementRef
+} from '@angular/core';
 import { UntypedFormGroup } from '@angular/forms';
 
 import { Observable, of as observableOf } from 'rxjs';
@@ -6,10 +15,9 @@ import { catchError, distinctUntilChanged, map, tap } from 'rxjs/operators';
 import { NgbDropdown } from '@ng-bootstrap/ng-bootstrap';
 import { DynamicFormLayoutService, DynamicFormValidationService } from '@ng-dynamic-forms/core';
 
-import { VocabularyEntry } from '../../../../../../core/submission/vocabularies/models/vocabulary-entry.model';
 import { DynamicScrollableDropdownModel } from './dynamic-scrollable-dropdown.model';
 import { PageInfo } from '../../../../../../core/shared/page-info.model';
-import { isEmpty } from '../../../../../empty.util';
+import { hasValue, isEmpty } from '../../../../../empty.util';
 import { VocabularyService } from '../../../../../../core/submission/vocabularies/vocabulary.service';
 import { getFirstSucceededRemoteDataPayload } from '../../../../../../core/shared/operators';
 import {
@@ -18,6 +26,9 @@ import {
 } from '../../../../../../core/data/paginated-list.model';
 import { DsDynamicVocabularyComponent } from '../dynamic-vocabulary.component';
 import { FormFieldMetadataValueObject } from '../../../models/form-field-metadata-value.model';
+import { FindAllData } from '../../../../../../core/data/base/find-all-data';
+import { CacheableObject } from '../../../../../../core/cache/cacheable-object.model';
+import { RemoteData } from '../../../../../../core/data/remote-data';
 
 /**
  * Component representing a dropdown input field
@@ -28,6 +39,8 @@ import { FormFieldMetadataValueObject } from '../../../models/form-field-metadat
   templateUrl: './dynamic-scrollable-dropdown.component.html'
 })
 export class DsDynamicScrollableDropdownComponent extends DsDynamicVocabularyComponent implements OnInit {
+  @ViewChild('dropdownMenu', { read: ElementRef }) dropdownMenu: ElementRef;
+
   @Input() bindId = true;
   @Input() group: UntypedFormGroup;
   @Input() model: DynamicScrollableDropdownModel;
@@ -40,6 +53,24 @@ export class DsDynamicScrollableDropdownComponent extends DsDynamicVocabularyCom
   public loading = false;
   public pageInfo: PageInfo;
   public optionsList: any;
+  public inputText: string = null;
+  public selectedIndex = 0;
+  public acceptableKeys = ['Space', 'NumpadMultiply', 'NumpadAdd', 'NumpadSubtract', 'NumpadDecimal', 'Semicolon', 'Equal', 'Comma', 'Minus', 'Period', 'Quote', 'Backquote'];
+
+  /**
+   * If true the component can rely on the findAll method for data loading.
+   * This is a behaviour activated by dependency injection through the dropdown config.
+   * If a service that implements findAll is not provided in the config the component falls back on the standard vocabulary service.
+   *
+   * @private
+   */
+  private useFindAllService: boolean;
+  /**
+   * A service that implements FindAllData.
+   * If is provided in the config will be used for data loading in stead of the VocabularyService
+   * @private
+   */
+  private findAllService: FindAllData<CacheableObject>;
 
   constructor(protected vocabularyService: VocabularyService,
               protected cdr: ChangeDetectorRef,
@@ -53,39 +84,55 @@ export class DsDynamicScrollableDropdownComponent extends DsDynamicVocabularyCom
    * Initialize the component, setting up the init form value
    */
   ngOnInit() {
+    this.findAllService = this.model?.findAllFactory();
+    this.useFindAllService = hasValue(this.findAllService?.findAll) && typeof this.findAllService.findAll === 'function';
+
     this.updatePageInfo(this.model.maxOptions, 1);
-    this.vocabularyService.getVocabularyEntries(this.model.vocabularyOptions, this.pageInfo).pipe(
+    this.loadOptions(true);
+    this.group.get(this.model.id).valueChanges.pipe(distinctUntilChanged())
+    .subscribe((value) => {
+      this.setCurrentValue(value);
+    });
+  }
+
+  /**
+   * Get service and method to use to retrieve dropdown options
+   */
+  getDataFromService(): Observable<RemoteData<PaginatedList<CacheableObject>>> {
+    if (this.useFindAllService) {
+      return this.findAllService.findAll({ elementsPerPage: this.pageInfo.elementsPerPage, currentPage: this.pageInfo.currentPage });
+    } else {
+      return this.vocabularyService.getVocabularyEntriesByValue(this.inputText, false, this.model.vocabularyOptions, this.pageInfo);
+    }
+  }
+
+  loadOptions(fromInit: boolean) {
+    this.loading = true;
+    this.getDataFromService().pipe(
       getFirstSucceededRemoteDataPayload(),
-      catchError(() => observableOf(buildPaginatedList(
-        new PageInfo(),
-        []
-        ))
-      ))
-      .subscribe((list: PaginatedList<VocabularyEntry>) => {
-        this.optionsList = list.page;
-        if (this.model.value) {
+      catchError(() => observableOf(buildPaginatedList(new PageInfo(), []))),
+      tap(() => this.loading = false),
+    ).subscribe((list: PaginatedList<CacheableObject>) => {
+      this.optionsList = list.page;
+        if (fromInit && this.model.value) {
           this.setCurrentValue(this.model.value, true);
         }
 
-        this.updatePageInfo(
-          list.pageInfo.elementsPerPage,
-          list.pageInfo.currentPage,
-          list.pageInfo.totalElements,
-          list.pageInfo.totalPages
-        );
-        this.cdr.detectChanges();
-      });
-
-    this.group.get(this.model.id).valueChanges.pipe(distinctUntilChanged())
-      .subscribe((value) => {
-        this.setCurrentValue(value);
-      });
+      this.updatePageInfo(
+        list.pageInfo.elementsPerPage,
+        list.pageInfo.currentPage,
+        list.pageInfo.totalElements,
+        list.pageInfo.totalPages
+      );
+      this.selectedIndex = 0;
+      this.cdr.detectChanges();
+    });
   }
 
   /**
    * Converts an item from the result list to a `string` to display in the `<input>` field.
    */
-  inputFormatter = (x: VocabularyEntry): string => x.display || x.value;
+  inputFormatter = (x: any): string => (this.model.formatFunction ? this.model.formatFunction(x) : (x.display || x.value));
 
   /**
    * Opens dropdown menu
@@ -94,10 +141,30 @@ export class DsDynamicScrollableDropdownComponent extends DsDynamicVocabularyCom
   openDropdown(sdRef: NgbDropdown) {
     if (!this.model.readOnly) {
       this.group.markAsUntouched();
+      this.inputText = null;
+      this.updatePageInfo(this.model.maxOptions, 1);
+      this.loadOptions(false);
       sdRef.open();
     }
   }
 
+  navigateDropdown(event: KeyboardEvent) {
+    if (event.key === 'ArrowDown') {
+      this.selectedIndex = Math.min(this.selectedIndex + 1, this.optionsList.length - 1);
+    } else if (event.key === 'ArrowUp') {
+      this.selectedIndex = Math.max(this.selectedIndex - 1, 0);
+    }
+    this.scrollToSelected();
+  }
+
+  scrollToSelected() {
+    const dropdownItems = this.dropdownMenu.nativeElement.querySelectorAll('.dropdown-item');
+    const selectedItem = dropdownItems[this.selectedIndex];
+    if (selectedItem) {
+      selectedItem.scrollIntoView({ block: 'nearest' });
+    }
+  }
+
   /**
    * KeyDown handler to allow toggling the dropdown via keyboard
    * @param event KeyboardEvent
@@ -106,15 +173,56 @@ export class DsDynamicScrollableDropdownComponent extends DsDynamicVocabularyCom
   selectOnKeyDown(event: KeyboardEvent, sdRef: NgbDropdown) {
     const keyName = event.key;
 
-    if (keyName === ' ' || keyName === 'Enter') {
+    if (keyName === 'Enter') {
       event.preventDefault();
       event.stopPropagation();
-      sdRef.toggle();
+      if (sdRef.isOpen()) {
+        this.onSelect(this.optionsList[this.selectedIndex]);
+        sdRef.close();
+      } else {
+        sdRef.open();
+      }
     } else if (keyName === 'ArrowDown' || keyName === 'ArrowUp') {
-      this.openDropdown(sdRef);
+      event.preventDefault();
+      event.stopPropagation();
+      this.navigateDropdown(event);
+    } else if (keyName === 'Backspace') {
+      this.removeKeyFromInput();
+    } else if (this.isAcceptableKey(keyName)) {
+      this.addKeyToInput(keyName);
     }
   }
 
+  addKeyToInput(keyName: string) {
+    if (this.inputText === null) {
+      this.inputText = '';
+    }
+    this.inputText += keyName;
+    // When a new key is added, we need to reset the page info
+    this.updatePageInfo(this.model.maxOptions, 1);
+    this.loadOptions(false);
+  }
+
+  removeKeyFromInput() {
+    if (this.inputText !== null) {
+      this.inputText = this.inputText.slice(0, -1);
+      if (this.inputText === '') {
+        this.inputText = null;
+      }
+      this.loadOptions(false);
+    }
+  }
+
+
+  isAcceptableKey(keyPress: string): boolean {
+    // allow all letters and numbers
+    if (keyPress.length === 1 && keyPress.match(/^[a-zA-Z0-9]*$/)) {
+      return true;
+    }
+    // Some other characters like space, dash, etc should be allowed as well
+    return this.acceptableKeys.includes(keyPress);
+  }
+
   /**
    * Loads any new entries
    */
@@ -127,7 +235,7 @@ export class DsDynamicScrollableDropdownComponent extends DsDynamicVocabularyCom
         this.pageInfo.totalElements,
         this.pageInfo.totalPages
       );
-      this.vocabularyService.getVocabularyEntries(this.model.vocabularyOptions, this.pageInfo).pipe(
+      this.getDataFromService().pipe(
         getFirstSucceededRemoteDataPayload(),
         catchError(() => observableOf(buildPaginatedList(
           new PageInfo(),
@@ -135,7 +243,7 @@ export class DsDynamicScrollableDropdownComponent extends DsDynamicVocabularyCom
           ))
         ),
         tap(() => this.loading = false))
-        .subscribe((list: PaginatedList<VocabularyEntry>) => {
+        .subscribe((list: PaginatedList<any>) => {
           this.optionsList = this.optionsList.concat(list.page);
           this.updatePageInfo(
             list.pageInfo.elementsPerPage,
@@ -166,7 +274,7 @@ export class DsDynamicScrollableDropdownComponent extends DsDynamicVocabularyCom
   setCurrentValue(value: any, init = false): void {
     let result: Observable<string>;
 
-    if (init) {
+    if (init && !this.useFindAllService) {
       result = this.getInitValueFromModel().pipe(
         map((formValue: FormFieldMetadataValueObject) => formValue.display)
       );
@@ -175,6 +283,8 @@ export class DsDynamicScrollableDropdownComponent extends DsDynamicVocabularyCom
         result = observableOf('');
       } else if (typeof value === 'string') {
         result = observableOf(value);
+      } else if (this.useFindAllService) {
+        result = observableOf(value[this.model.displayKey]);
       } else {
         result = observableOf(value.display);
       }
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.model.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.model.ts
index a9974717e4..e3d74329ad 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.model.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.model.ts
@@ -1,19 +1,33 @@
 import { AUTOCOMPLETE_OFF, DynamicFormControlLayout, serializable } from '@ng-dynamic-forms/core';
 import { DsDynamicInputModel, DsDynamicInputModelConfig } from '../ds-dynamic-input.model';
 import { VocabularyOptions } from '../../../../../../core/submission/vocabularies/models/vocabulary-options.model';
+import { FindAllDataImpl } from '../../../../../../core/data/base/find-all-data';
+import { CacheableObject } from '../../../../../../core/cache/cacheable-object.model';
 
 export const DYNAMIC_FORM_CONTROL_TYPE_SCROLLABLE_DROPDOWN = 'SCROLLABLE_DROPDOWN';
 
 export interface DynamicScrollableDropdownModelConfig extends DsDynamicInputModelConfig {
-  vocabularyOptions: VocabularyOptions;
+  vocabularyOptions?: VocabularyOptions;
   maxOptions?: number;
   value?: any;
+  displayKey?: string;
+  formatFunction?: (value: any) => string;
+  findAllFactory?: () =>  FindAllDataImpl<CacheableObject>;
 }
 
 export class DynamicScrollableDropdownModel extends DsDynamicInputModel {
 
   @serializable() maxOptions: number;
   @serializable() readonly type: string = DYNAMIC_FORM_CONTROL_TYPE_SCROLLABLE_DROPDOWN;
+  @serializable() displayKey: string;
+  /**
+   * Configurable function for display value formatting in input
+   */
+  formatFunction: (value: any) => string;
+  /**
+   * Factory for a service that implements FindAllData
+   */
+  findAllFactory: () =>  FindAllDataImpl<CacheableObject>;
 
   constructor(config: DynamicScrollableDropdownModelConfig, layout?: DynamicFormControlLayout) {
 
@@ -22,6 +36,9 @@ export class DynamicScrollableDropdownModel extends DsDynamicInputModel {
     this.autoComplete = AUTOCOMPLETE_OFF;
     this.vocabularyOptions = config.vocabularyOptions;
     this.maxOptions = config.maxOptions || 10;
+    this.displayKey = config.displayKey || 'display';
+    this.formatFunction = config.formatFunction;
+    this.findAllFactory = config.findAllFactory || (() => null);
   }
 
 }
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/tag/dynamic-tag.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/tag/dynamic-tag.component.ts
index 4abb68a53b..7c3d8982e1 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/tag/dynamic-tag.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/tag/dynamic-tag.component.ts
@@ -89,6 +89,18 @@ export class DsDynamicTagComponent extends DsDynamicVocabularyComponent implemen
         }
       }),
       map((list: PaginatedList<VocabularyEntry>) => list.page),
+      // Add user input as last item of the list
+      map((list: VocabularyEntry[]) => {
+        if (list && list.length > 0) {
+          if (isNotEmpty(this.currentValue)) {
+            let vocEntry = new VocabularyEntry();
+            vocEntry.display = this.currentValue;
+            vocEntry.value = this.currentValue;
+            list.push(vocEntry);
+        }
+        }
+        return list;
+      }),
       tap(() => this.changeSearchingStatus(false)),
       merge(this.hideSearchingWhenUnsubscribed));
 
@@ -139,7 +151,7 @@ export class DsDynamicTagComponent extends DsDynamicVocabularyComponent implemen
    * @param event The value to emit.
    */
   onBlur(event: Event) {
-    if (isNotEmpty(this.currentValue) && !this.instance.isPopupOpen()) {
+    if (isNotEmpty(this.currentValue) && (!this.model.hasAuthority || !this.instance.isPopupOpen())) {
       this.addTagsToChips();
     }
     this.blur.emit(event);
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.html
index b72a8722ae..1d2a244840 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.html
@@ -1,6 +1,6 @@
 <div class="modal-header">
     <h4 class="modal-title" id="modal-title">{{ ('submission.sections.describe.relationship-lookup.title.' + relationshipOptions.relationshipType) | translate }}</h4>
-    <button type="button" [disabled]="isPending" class="close" aria-label="Close button" aria-describedby="modal-title"
+    <button type="button" [dsBtnDisabled]="isPending" class="close" aria-label="Close button" aria-describedby="modal-title"
             (click)="close()">
         <span aria-hidden="true">&times;</span>
     </button>
@@ -9,7 +9,7 @@
     <ds-themed-loading *ngIf="!item || !collection"></ds-themed-loading>
     <ng-container *ngIf="item && collection">
         <ul ngbNav #nav="ngbNav" class="nav-tabs">
-            <li ngbNavItem>
+            <li ngbNavItem role="presentation">
                 <a ngbNavLink>{{'submission.sections.describe.relationship-lookup.search-tab.tab-title.' + relationshipOptions.relationshipType | translate  : { count: (totalInternal$ | async)} }}</a>
                 <ng-template ngbNavContent>
                     <ds-themed-dynamic-lookup-relation-search-tab
@@ -19,6 +19,7 @@
                             [repeatable]="repeatable"
                             [context]="context"
                             [query]="query"
+                            [hiddenQuery]="hiddenQuery"
                             [relationshipType]="relationshipType"
                             [isLeft]="isLeft"
                             [item]="item"
@@ -31,8 +32,8 @@
                     </ds-themed-dynamic-lookup-relation-search-tab>
                 </ng-template>
             </li>
-            <li ngbNavItem *ngFor="let source of (externalSourcesRD$ | async); let idx = index">
-                <a ngbNavLink>{{'submission.sections.describe.relationship-lookup.search-tab.tab-title.' + source.id | translate  : { count: (totalExternal$ | async)[idx] } }}</a>
+            <li ngbNavItem *ngFor="let source of (externalSourcesRD$ | async); let idx = index" role="presentation">
+                <a ngbNavLink>{{'submission.sections.describe.relationship-lookup.search-tab.tab-title.' + source.id | translate  : { count: (totalExternal$ | async)?.[idx] } }}</a>
                 <ng-template ngbNavContent>
                     <ds-themed-dynamic-lookup-relation-external-source-tab
                             [label]="label"
@@ -42,13 +43,14 @@
                             [collection]="collection"
                             [relationship]="relationshipOptions"
                             [context]="context"
+                            [query]="query"
                             [externalSource]="source"
                             (importedObject)="imported($event)"
                             class="d-block pt-3">
                     </ds-themed-dynamic-lookup-relation-external-source-tab>
                 </ng-template>
             </li>
-            <li ngbNavItem *ngIf="!isEditRelationship">
+            <li ngbNavItem *ngIf="!isEditRelationship" role="presentation">
                 <a ngbNavLink>{{'submission.sections.describe.relationship-lookup.selection-tab.tab-title' | translate : { count: (selection$ | async)?.length } }}</a>
                 <ng-template ngbNavContent>
                     <ds-dynamic-lookup-relation-selection-tab
@@ -71,22 +73,22 @@
   <small>{{ ('submission.sections.describe.relationship-lookup.selected' | translate: {size: (selection$ | async)?.length || 0}) }}</small>
   <div class="d-flex float-right space-children-mr">
     <div class="close-button">
-        <button type="button" [disabled]="isPending" class="btn btn-outline-secondary" (click)="close()">
+        <button type="button" [dsBtnDisabled]="isPending" class="btn btn-outline-secondary" (click)="close()">
             {{ ('submission.sections.describe.relationship-lookup.close' | translate) }}</button>
     </div>
     <ng-container *ngIf="isEditRelationship">
       <button class="btn btn-danger discard"
-              [disabled]="(toAdd.length == 0 && toRemove.length == 0) || isPending"
+              [dsBtnDisabled]="(toAdd.length == 0 && toRemove.length == 0) || isPending"
               (click)="discardEv()">
               <i class="fas fa-times"></i>
         <span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.discard-button" | translate}}</span>
       </button>
       <button class="btn btn-primary submit"
-            [disabled]="(toAdd.length == 0 && toRemove.length == 0) || isPending"
+            [dsBtnDisabled]="(toAdd.length == 0 && toRemove.length == 0) || isPending"
               (click)="submitEv()">
-              <span *ngIf="isPending" class="spinner-border spinner-border-sm" role="status"
+              <span *ngIf="isPending" class="spinner-border spinner-border-sm mr-1" role="status"
                               aria-hidden="true"></span>
-              <i class="fas fa-save"></i>
+              <i *ngIf="!isPending" class="fas fa-save"></i>
         <span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.save-button" | translate}}</span>
       </button>
     </ng-container>
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.spec.ts
index 9d57296f82..991858c263 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.spec.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.spec.ts
@@ -7,7 +7,6 @@ import { DsDynamicLookupRelationModalComponent } from './dynamic-lookup-relation
 import { NgbActiveModal, NgbModule } from '@ng-bootstrap/ng-bootstrap';
 import { SelectableListService } from '../../../../object-list/selectable-list/selectable-list.service';
 import { RelationshipDataService } from '../../../../../core/data/relationship-data.service';
-import { RelationshipTypeDataService } from '../../../../../core/data/relationship-type-data.service';
 import { Store } from '@ngrx/store';
 import { Item } from '../../../../../core/shared/item.model';
 import { ItemSearchResult } from '../../../../object-collection/shared/item-search-result.model';
@@ -24,6 +23,8 @@ import { RemoteDataBuildService } from '../../../../../core/cache/builders/remot
 import { WorkspaceItem } from '../../../../../core/submission/models/workspaceitem.model';
 import { Collection } from '../../../../../core/shared/collection.model';
 import { By } from '@angular/platform-browser';
+import { XSRFService } from '../../../../../core/xsrf/xsrf.service';
+import {BtnDisabledDirective} from '../../../../btn-disabled.directive';
 
 describe('DsDynamicLookupRelationModalComponent', () => {
   let component: DsDynamicLookupRelationModalComponent;
@@ -103,7 +104,7 @@ describe('DsDynamicLookupRelationModalComponent', () => {
   beforeEach(waitForAsync(() => {
     init();
     TestBed.configureTestingModule({
-      declarations: [DsDynamicLookupRelationModalComponent],
+      declarations: [DsDynamicLookupRelationModalComponent, BtnDisabledDirective],
       imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([]), NgbModule],
       providers: [
         {
@@ -119,7 +120,6 @@ describe('DsDynamicLookupRelationModalComponent', () => {
         {
           provide: RelationshipDataService, useValue: { getNameVariant: () => observableOf(nameVariant) }
         },
-        { provide: RelationshipTypeDataService, useValue: {} },
         { provide: RemoteDataBuildService, useValue: rdbService },
         {
           provide: Store, useValue: {
@@ -128,6 +128,7 @@ describe('DsDynamicLookupRelationModalComponent', () => {
             }
           }
         },
+        { provide: XSRFService, useValue: {} },
         { provide: NgZone, useValue: new NgZone({}) },
         NgbActiveModal
       ],
@@ -202,10 +203,12 @@ describe('DsDynamicLookupRelationModalComponent', () => {
 
   describe('when initialized and is relationship show the list of buttons', () => {
     it('submit button should be disabled', () => {
-      expect(debugElement.query(By.css('.submit')).nativeElement?.disabled).toBeTrue();
+      expect(debugElement.query(By.css('.submit')).nativeElement.getAttribute('aria-disabled')).toBe('true');
+      expect(debugElement.query(By.css('.submit')).nativeElement.classList.contains('disabled')).toBeTrue();
     });
     it('discard button should be disabled', () => {
-      expect(debugElement.query(By.css('.discard')).nativeElement?.disabled).toBeTrue();
+      expect(debugElement.query(By.css('.discard')).nativeElement.getAttribute('aria-disabled')).toBe('true');
+      expect(debugElement.query(By.css('.discard')).nativeElement.classList.contains('disabled')).toBeTrue();
     });
   });
 
@@ -243,9 +246,12 @@ describe('DsDynamicLookupRelationModalComponent', () => {
 
     it('there should show 1 spinner and disable all 3 buttons', () => {
       expect(debugElement.queryAll(By.css('.spinner-border')).length).toEqual(1);
-      expect(debugElement.query(By.css('.submit')).nativeElement?.disabled).toBeTrue();
-      expect(debugElement.query(By.css('.discard')).nativeElement?.disabled).toBeTrue();
-      expect(debugElement.query(By.css('.close')).nativeElement?.disabled).toBeTrue();
+      expect(debugElement.query(By.css('.submit')).nativeElement?.getAttribute('aria-disabled')).toBe('true');
+      expect(debugElement.query(By.css('.submit')).nativeElement?.classList.contains('disabled')).toBeTrue();
+      expect(debugElement.query(By.css('.discard')).nativeElement?.getAttribute('aria-disabled')).toBe('true');
+      expect(debugElement.query(By.css('.discard')).nativeElement?.classList.contains('disabled')).toBeTrue();
+      expect(debugElement.query(By.css('.close')).nativeElement?.getAttribute('aria-disabled')).toBe('true');
+      expect(debugElement.query(By.css('.close')).nativeElement?.classList.contains('disabled')).toBeTrue();
     });
 
   });
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.ts
index 446497a74f..a61432170a 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.ts
@@ -17,7 +17,6 @@ import {
   UpdateRelationshipNameVariantAction,
 } from './relationship.actions';
 import { RelationshipDataService } from '../../../../../core/data/relationship-data.service';
-import { RelationshipTypeDataService } from '../../../../../core/data/relationship-type-data.service';
 import { Store } from '@ngrx/store';
 import { AppState } from '../../../../../app.reducer';
 import { Context } from '../../../../../core/shared/context.model';
@@ -29,6 +28,8 @@ import { RemoteDataBuildService } from '../../../../../core/cache/builders/remot
 import { getAllSucceededRemoteDataPayload } from '../../../../../core/shared/operators';
 import { followLink } from '../../../../utils/follow-link-config.model';
 import { RelationshipType } from '../../../../../core/shared/item-relationships/relationship-type.model';
+import { ItemSearchResult } from '../../../../object-collection/shared/item-search-result.model';
+import { DSpaceObject } from '../../../../../core/shared/dspace-object.model';
 
 @Component({
   selector: 'ds-dynamic-lookup-relation-modal',
@@ -95,6 +96,11 @@ export class DsDynamicLookupRelationModalComponent implements OnInit, OnDestroy
 
   query: string;
 
+  /**
+   * A hidden query that will be used but not displayed in the url/searchbar
+   */
+  hiddenQuery: string;
+
   /**
    * A map of subscriptions within this component
    */
@@ -141,12 +147,12 @@ export class DsDynamicLookupRelationModalComponent implements OnInit, OnDestroy
   /**
    * Maintain the list of the related items to be added
    */
-  toAdd = [];
+  toAdd: ItemSearchResult[] = [];
 
   /**
    * Maintain the list of the related items to be removed
    */
-  toRemove = [];
+  toRemove: ItemSearchResult[] = [];
 
   /**
    * Disable buttons while the submit button is pressed
@@ -157,7 +163,6 @@ export class DsDynamicLookupRelationModalComponent implements OnInit, OnDestroy
     public modal: NgbActiveModal,
     private selectableListService: SelectableListService,
     private relationshipService: RelationshipDataService,
-    private relationshipTypeService: RelationshipTypeDataService,
     private externalSourceService: ExternalSourceDataService,
     private lookupRelationService: LookupRelationService,
     private searchConfigService: SearchConfigurationService,
@@ -210,13 +215,14 @@ export class DsDynamicLookupRelationModalComponent implements OnInit, OnDestroy
     this.toAdd = [];
     this.toRemove = [];
     this.modal.close();
+    this.closeEv();
   }
 
   /**
    * Select (a list of) objects and add them to the store
    * @param selectableObjects
    */
-  select(...selectableObjects: SearchResult<Item>[]) {
+  select(...selectableObjects: SearchResult<DSpaceObject>[]) {
     this.zone.runOutsideAngular(
       () => {
         const obs: Observable<any[]> = observableCombineLatest([...selectableObjects.map((sri: SearchResult<Item>) => {
@@ -259,11 +265,11 @@ export class DsDynamicLookupRelationModalComponent implements OnInit, OnDestroy
    * Deselect (a list of) objects and remove them from the store
    * @param selectableObjects
    */
-  deselect(...selectableObjects: SearchResult<Item>[]) {
+  deselect(...selectableObjects: SearchResult<DSpaceObject>[]) {
     this.zone.runOutsideAngular(
       () => selectableObjects.forEach((object) => {
         this.subMap[object.indexableObject.uuid].unsubscribe();
-        this.store.dispatch(new RemoveRelationshipAction(this.item, object.indexableObject, this.relationshipOptions.relationshipType, this.submissionId));
+        this.store.dispatch(new RemoveRelationshipAction(this.item, object.indexableObject as Item, this.relationshipOptions.relationshipType, this.submissionId));
       })
     );
   }
@@ -304,13 +310,19 @@ export class DsDynamicLookupRelationModalComponent implements OnInit, OnDestroy
 
   /* eslint-disable no-empty,@typescript-eslint/no-empty-function */
   /**
-   * Called when discard button is clicked, emit discard event to parent to conclude functionality
+   * Called when close button is clicked
+   */
+  closeEv(): void {
+  }
+
+  /**
+   * Called when discard button is clicked
    */
   discardEv(): void {
   }
 
   /**
-   * Called when submit button is clicked, emit submit event to parent to conclude functionality
+   * Called when submit button is clicked
    */
   submitEv(): void {
   }
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.ts
index 601bd8cce8..08ff5378ab 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.ts
@@ -75,6 +75,12 @@ export class DsDynamicLookupRelationExternalSourceTabComponent implements OnInit
    * The context to displaying lists for
    */
   @Input() context: Context;
+
+  /**
+   * The search query
+   */
+  @Input() query: string;
+
   @Input() repeatable: boolean;
   /**
    * Emit an event when an object has been imported (or selected from similar local entries)
@@ -149,8 +155,12 @@ export class DsDynamicLookupRelationExternalSourceTabComponent implements OnInit
 
     this.resetRoute();
     this.entriesRD$ = this.searchConfigService.paginatedSearchOptions.pipe(
-      switchMap((searchOptions: PaginatedSearchOptions) =>
-        this.externalSourceService.getExternalSourceEntries(this.externalSource.id, searchOptions).pipe(startWith(undefined)))
+      switchMap((searchOptions: PaginatedSearchOptions) => {
+        if (searchOptions.query === '') {
+          searchOptions.query = this.query;
+        }
+        return this.externalSourceService.getExternalSourceEntries(this.externalSource.id, searchOptions).pipe(startWith(undefined));
+      })
     );
     this.currentPagination$ = this.paginationService.getCurrentPagination(this.searchConfigService.paginationID, this.initialPagination);
     this.importConfig = {
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component.html
index 44f21fb4b4..7d233fe0b7 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component.html
@@ -49,6 +49,6 @@
     <button type="button" class="btn btn-outline-secondary" (click)="close()">{{ (labelPrefix + 'cancel' | translate) }}</button>
   </div>
   <div>
-    <button type="button" class="btn btn-primary" [disabled]="selectedImportType === importType.None" (click)="import()">{{ (labelPrefix + 'import' | translate) }}</button>
+    <button type="button" class="btn btn-primary" [dsBtnDisabled]="selectedImportType === importType.None" (click)="import()">{{ (labelPrefix + 'import' | translate) }}</button>
   </div>
 </div>
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/themed-dynamic-lookup-relation-external-source-tab.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/themed-dynamic-lookup-relation-external-source-tab.component.ts
index 637941ce5b..113d902c3d 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/themed-dynamic-lookup-relation-external-source-tab.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/themed-dynamic-lookup-relation-external-source-tab.component.ts
@@ -15,7 +15,7 @@ import { DsDynamicLookupRelationExternalSourceTabComponent } from './dynamic-loo
 })
 export class ThemedDynamicLookupRelationExternalSourceTabComponent extends ThemedComponent<DsDynamicLookupRelationExternalSourceTabComponent> {
   protected inAndOutputNames: (keyof DsDynamicLookupRelationExternalSourceTabComponent & keyof this)[] = ['label', 'listId',
-    'item', 'collection', 'relationship', 'context', 'repeatable', 'importedObject', 'externalSource'];
+    'item', 'collection', 'relationship', 'context', 'query', 'repeatable', 'importedObject', 'externalSource'];
 
   @Input() label: string;
 
@@ -29,6 +29,8 @@ export class ThemedDynamicLookupRelationExternalSourceTabComponent extends Theme
 
   @Input() context: Context;
 
+  @Input() query: string;
+
   @Input() repeatable: boolean;
 
   @Output() importedObject: EventEmitter<ListableObject> = new EventEmitter();
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/relationship.effects.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/relationship.effects.spec.ts
index a5b1b00d75..ef28b3ec2f 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/relationship.effects.spec.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/relationship.effects.spec.ts
@@ -182,6 +182,8 @@ describe('RelationshipEffects', () => {
         let action;
         describe('When the last value in the debounceMap is also an ADD_RELATIONSHIP action', () => {
           beforeEach(() => {
+            jasmine.getEnv().allowRespy(true);
+            spyOn((relationEffects as any), 'addRelationship').and.returnValue(createSuccessfulRemoteDataObject$(relationship));
             (relationEffects as any).initialActionMap[identifier] = RelationshipActionTypes.ADD_RELATIONSHIP;
             ((relationEffects as any).debounceTime as jasmine.Spy).and.returnValue((v) => v);
           });
@@ -247,6 +249,8 @@ describe('RelationshipEffects', () => {
         let action;
         describe('When the last value in the debounceMap is also an REMOVE_RELATIONSHIP action', () => {
           beforeEach(() => {
+            jasmine.getEnv().allowRespy(true);
+            spyOn((relationEffects as any), 'removeRelationship').and.returnValue(createSuccessfulRemoteDataObject$(undefined));
             ((relationEffects as any).debounceTime as jasmine.Spy).and.returnValue((v) => v);
             (relationEffects as any).initialActionMap[identifier] = RelationshipActionTypes.REMOVE_RELATIONSHIP;
           });
@@ -256,7 +260,7 @@ describe('RelationshipEffects', () => {
             actions = hot('--a-|', { a: action });
             const expected = cold('--b-|', { b: undefined });
             expect(relationEffects.mapLastActions$).toBeObservable(expected);
-            expect((relationEffects as any).removeRelationship).toHaveBeenCalledWith(leftItem, rightItem, relationshipType.leftwardType, '1234',);
+            expect((relationEffects as any).removeRelationship).toHaveBeenCalledWith(leftItem, rightItem, relationshipType.leftwardType);
           });
         });
 
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/relationship.effects.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/relationship.effects.ts
index 2b9c1c2973..cb9cdace07 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/relationship.effects.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/relationship.effects.ts
@@ -1,7 +1,7 @@
 import { Inject, Injectable } from '@angular/core';
 import { Actions, createEffect, ofType } from '@ngrx/effects';
-import { filter, map, mergeMap, switchMap, take } from 'rxjs/operators';
-import { BehaviorSubject, Observable } from 'rxjs';
+import { filter, map, mergeMap, switchMap, take, tap, concatMap } from 'rxjs/operators';
+import { BehaviorSubject, Observable, Subject } from 'rxjs';
 import { RelationshipDataService } from '../../../../../core/data/relationship-data.service';
 import {
   getRemoteDataPayload,
@@ -36,11 +36,31 @@ import { TranslateService } from '@ngx-translate/core';
 
 const DEBOUNCE_TIME = 500;
 
+enum RelationOperationType {
+  Add,
+  Remove,
+}
+
+interface RelationOperation {
+  type: RelationOperationType
+  item1: Item
+  item2: Item
+  relationshipType: string
+  submissionId: string
+  nameVariant?: string
+}
+
 /**
  * NGRX effects for RelationshipEffects
  */
 @Injectable()
 export class RelationshipEffects {
+
+  /**
+   * Queue to hold all requests, so we can ensure they get sent one at a time
+   */
+  private requestQueue: Subject<RelationOperation> = new Subject();
+
   /**
    * Map that keeps track of the latest RelationshipEffects for each relationship's composed identifier
    */
@@ -82,9 +102,22 @@ export class RelationshipEffects {
                       nameVariant = this.nameVariantUpdates[identifier];
                       delete this.nameVariantUpdates[identifier];
                     }
-                    this.addRelationship(item1, item2, relationshipType, submissionId, nameVariant);
+                    this.requestQueue.next({
+                      type: RelationOperationType.Add,
+                      item1,
+                      item2,
+                      relationshipType,
+                      submissionId,
+                      nameVariant
+                    });
                   } else {
-                    this.removeRelationship(item1, item2, relationshipType, submissionId);
+                    this.requestQueue.next({
+                      type: RelationOperationType.Remove,
+                      item1,
+                      item2,
+                      relationshipType,
+                      submissionId,
+                    });
                   }
                 }
                 delete this.debounceMap[identifier];
@@ -161,8 +194,41 @@ export class RelationshipEffects {
               private selectableListService: SelectableListService,
               @Inject(DEBOUNCE_TIME_OPERATOR) private debounceTime: <T>(dueTime: number) => (source: Observable<T>) => Observable<T>,
   ) {
+    this.executeRequestsInQueue();
   }
 
+  /**
+   * Subscribe to the request queue, execute the requests inside. Wait for each request to complete
+   * before sending the next one
+   * @private
+   */
+  private executeRequestsInQueue() {
+    this.requestQueue.pipe(
+      // concatMap ensures the next request in the queue will only start after the previous one has emitted
+      concatMap((next: RelationOperation) => {
+        switch (next.type) {
+          case RelationOperationType.Add:
+            return this.addRelationship(next.item1, next.item2, next.relationshipType, next.submissionId, next.nameVariant).pipe(
+              map(() => next)
+            );
+          case RelationOperationType.Remove:
+            return this.removeRelationship(next.item1, next.item2, next.relationshipType).pipe(
+              map(() => next)
+            );
+          default:
+            return [next];
+        }
+      }),
+      // refresh the workspaceitem after each request. It would be great if we could find a way to
+      // optimize this so it only happens when the queue is empty.
+      switchMap((next: RelationOperation) => this.refreshWorkspaceItemInCache(next.submissionId))
+      // update the form after the workspaceitem is refreshed
+    ).subscribe((next: SubmissionObject) => {
+      this.store.dispatch(new SaveSubmissionSectionFormSuccessAction(next.id, [next], false));
+    });
+  }
+
+
   private createIdentifier(item1: Item, item2: Item, relationshipType: string): string {
     return `${item1.uuid}-${item2.uuid}-${relationshipType}`;
   }
@@ -185,7 +251,7 @@ export class RelationshipEffects {
           }
         }),
         take(1),
-        switchMap((rd: RemoteData<Relationship>) => {
+        tap((rd: RemoteData<Relationship>) => {
           if (hasNoValue(rd) || rd.hasFailed) {
             // An error occurred, deselect the object from the selectable list and display an error notification
             const listId = `list-${submissionId}-${relationshipType}`;
@@ -203,19 +269,15 @@ export class RelationshipEffects {
             }
             this.notificationsService.error(this.translateService.instant('relationships.add.error.title'), errorContent);
           }
-          return this.refreshWorkspaceItemInCache(submissionId);
-        }),
-      ).subscribe((submissionObject: SubmissionObject) => this.store.dispatch(new SaveSubmissionSectionFormSuccessAction(submissionId, [submissionObject], false)));
+        })
+      );
   }
 
-  private removeRelationship(item1: Item, item2: Item, relationshipType: string, submissionId: string) {
-    this.relationshipService.getRelationshipByItemsAndLabel(item1, item2, relationshipType).pipe(
+  private removeRelationship(item1: Item, item2: Item, relationshipType: string) {
+    return this.relationshipService.getRelationshipByItemsAndLabel(item1, item2, relationshipType).pipe(
       mergeMap((relationship: Relationship) => this.relationshipService.deleteRelationship(relationship.id, 'none')),
       take(1),
-      switchMap(() => this.refreshWorkspaceItemInCache(submissionId)),
-    ).subscribe((submissionObject: SubmissionObject) => {
-      this.store.dispatch(new SaveSubmissionSectionFormSuccessAction(submissionId, [submissionObject], false));
-    });
+    );
   }
 
   /**
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.html
index 17aafae5eb..caf3116a53 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.html
@@ -2,6 +2,7 @@
            [configuration]="this.relationship.searchConfiguration"
            [context]="context"
            [fixedFilterQuery]="this.relationship.filter"
+           [hiddenQuery]="hiddenQuery"
            [inPlaceSearch]="true"
            [linkType]="linkTypes.ExternalLink"
            [searchFormPlaceholder]="'submission.sections.describe.relationship-lookup.search-tab.search-form.placeholder'"
@@ -15,27 +16,7 @@
            (selectObject)="selectObject.emit($event)">
   <div additionalSearchOptions *ngIf="repeatable" class="position-absolute">
     <div class="input-group mb-3">
-      <div class="input-group-prepend">
-        <div class="input-group-text">
-          <!-- In theory we don't need separate checkboxes for this,
-               but I wasn't able to get this to work correctly without them.
-               Checkboxes that are in the indeterminate state always switch to checked when clicked
-               This seemed like the cleanest and clearest solution to solve this issue for now. -->
-
-          <input *ngIf="!allSelected && !(someSelected$ | async)"
-                 type="checkbox"
-                 [indeterminate]="false"
-                 (change)="selectAll()">
-          <input *ngIf="!allSelected && (someSelected$ | async)"
-                 type="checkbox"
-                 [indeterminate]="true"
-                 (change)="deselectAll()">
-          <input *ngIf="allSelected" type="checkbox"
-                 [checked]="true"
-                 (change)="deselectAll()">
-        </div>
-      </div>
-      <div ngbDropdown class="input-group-append">
+      <div ngbDropdown class="input-group dropdown-button">
         <button *ngIf="selectAllLoading" type="button"
                 class="btn btn-outline-secondary rounded-right">
                             <span class="spinner-border spinner-border-sm" role="status"
@@ -55,8 +36,6 @@
                   (click)="selectPage(resultsRD?.page)">{{ ('submission.sections.describe.relationship-lookup.search-tab.select-page' | translate) }}</button>
           <button class="dropdown-item"
                   (click)="deselectPage(resultsRD?.page)">{{ ('submission.sections.describe.relationship-lookup.search-tab.deselect-page' | translate) }}</button>
-          <button class="dropdown-item" (click)="selectAll()">{{ ('submission.sections.describe.relationship-lookup.search-tab.select-all' | translate) }}</button>
-          <button class="dropdown-item" (click)="deselectAll()">{{ ('submission.sections.describe.relationship-lookup.search-tab.deselect-all' | translate) }}</button>
         </div>
       </div>
     </div>
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.scss b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.scss
index f73f8b8c34..b4bda36e16 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.scss
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.scss
@@ -1,3 +1,7 @@
 .position-absolute {
     right: var(--bs-spacer);
 }
+
+.dropdown-button {
+  z-index: 3;
+}
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.spec.ts
index f689743156..61cf8274e4 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.spec.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.spec.ts
@@ -155,18 +155,6 @@ describe('DsDynamicLookupRelationSearchTabComponent', () => {
     });
   });
 
-  describe('selectAll', () => {
-    beforeEach(() => {
-      spyOn(component.selectObject, 'emit');
-      component.selectAll();
-    });
-
-    it('should emit the page filtered from already selected objects and call select on the service for all objects', () => {
-      expect(component.selectObject.emit).toHaveBeenCalledWith(searchResult3);
-      expect(selectableListService.select).toHaveBeenCalledWith(listID, [searchResult1, searchResult2, searchResult3]);
-    });
-  });
-
   describe('deselectAll', () => {
     beforeEach(() => {
       spyOn(component.deselectObject, 'emit');
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.ts
index 9452918a97..2600f8c16e 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.ts
@@ -6,12 +6,11 @@ import { SearchResult } from '../../../../../search/models/search-result.model';
 import { PaginatedList } from '../../../../../../core/data/paginated-list.model';
 import { Observable, BehaviorSubject } from 'rxjs';
 import { RelationshipOptions } from '../../../models/relationship-options.model';
-import { PaginationComponentOptions } from '../../../../../pagination/pagination-component-options.model';
 import { ListableObject } from '../../../../../object-collection/shared/listable-object.model';
 import { SearchService } from '../../../../../../core/shared/search/search.service';
 import { SelectableListService } from '../../../../../object-list/selectable-list/selectable-list.service';
 import { hasValue } from '../../../../../empty.util';
-import { map, mapTo, switchMap, take, tap } from 'rxjs/operators';
+import { take} from 'rxjs/operators';
 import { getFirstSucceededRemoteData, getRemoteDataPayload } from '../../../../../../core/shared/operators';
 import { CollectionElementLinkType } from '../../../../../object-collection/collection-element-link.type';
 import { Context } from '../../../../../../core/shared/context.model';
@@ -93,15 +92,20 @@ export class DsDynamicLookupRelationSearchTabComponent implements OnInit, OnDest
    */
   @Input() isEditRelationship: boolean;
 
+  /**
+   * A hidden query that will be used but not displayed in the url/searchbar
+   */
+  @Input() hiddenQuery: string;
+
   /**
    * Send an event to deselect an object from the list
    */
-  @Output() deselectObject: EventEmitter<ListableObject> = new EventEmitter<ListableObject>();
+  @Output() deselectObject: EventEmitter<SearchResult<DSpaceObject>> = new EventEmitter();
 
   /**
    * Send an event to select an object from the list
    */
-  @Output() selectObject: EventEmitter<ListableObject> = new EventEmitter<ListableObject>();
+  @Output() selectObject: EventEmitter<SearchResult<DSpaceObject>> = new EventEmitter();
 
   /**
    * Search results
@@ -178,7 +182,7 @@ export class DsDynamicLookupRelationSearchTabComponent implements OnInit, OnDest
     this.selection$
       .pipe(take(1))
       .subscribe((selection: SearchResult<Item>[]) => {
-        const filteredPage = page.filter((pageItem) => selection.findIndex((selected) => selected.equals(pageItem)) < 0);
+        const filteredPage: SearchResult<DSpaceObject>[] = page.filter((pageItem: SearchResult<DSpaceObject>) => selection.findIndex((selected: SearchResult<Item>) => selected.equals(pageItem)) < 0);
         this.selectObject.emit(...filteredPage);
       });
     this.selectableListService.select(this.listId, page);
@@ -199,35 +203,6 @@ export class DsDynamicLookupRelationSearchTabComponent implements OnInit, OnDest
     this.selectableListService.deselect(this.listId, page);
   }
 
-  /**
-   * Select all items that were found using the current search query
-   */
-  selectAll() {
-    this.allSelected = true;
-    this.selectAllLoading = true;
-    const fullPagination = Object.assign(new PaginationComponentOptions(), {
-      currentPage: 1,
-      pageSize: 9999
-    });
-    const fullSearchConfig = Object.assign(this.lookupRelationService.searchConfig, { pagination: fullPagination });
-    const results$ = this.searchService.search<Item>(fullSearchConfig);
-    results$.pipe(
-      getFirstSucceededRemoteData(),
-      map((resultsRD) => resultsRD.payload.page),
-      tap(() => this.selectAllLoading = false),
-      switchMap((results) => this.selection$.pipe(
-        take(1),
-        tap((selection: SearchResult<Item>[]) => {
-          const filteredResults = results.filter((pageItem) => selection.findIndex((selected) => selected.equals(pageItem)) < 0);
-          this.selectObject.emit(...filteredResults);
-        }),
-        mapTo(results)
-      ))
-    ).subscribe((results) => {
-        this.selectableListService.select(this.listId, results);
-    });
-  }
-
   /**
    * setSelectedIds select all the items from the results that have relationship
    * @param idOfItems the uuid of items that are being checked
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/themed-dynamic-lookup-relation-search-tab.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/themed-dynamic-lookup-relation-search-tab.component.ts
index d44f8f84a0..9770de9745 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/themed-dynamic-lookup-relation-search-tab.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/themed-dynamic-lookup-relation-search-tab.component.ts
@@ -18,7 +18,7 @@ import { DSpaceObject } from '../../../../../../core/shared/dspace-object.model'
 })
 export class ThemedDynamicLookupRelationSearchTabComponent extends ThemedComponent<DsDynamicLookupRelationSearchTabComponent> {
   protected inAndOutputNames: (keyof DsDynamicLookupRelationSearchTabComponent & keyof this)[] = ['relationship', 'listId',
-    'query', 'repeatable', 'selection$', 'context', 'relationshipType', 'item', 'isLeft', 'toRemove', 'isEditRelationship',
+    'query', 'hiddenQuery', 'repeatable', 'selection$', 'context', 'relationshipType', 'item', 'isLeft', 'toRemove', 'isEditRelationship',
     'deselectObject', 'selectObject', 'resultFound'];
 
   @Input() relationship: RelationshipOptions;
@@ -27,6 +27,8 @@ export class ThemedDynamicLookupRelationSearchTabComponent extends ThemedCompone
 
   @Input() query: string;
 
+  @Input() hiddenQuery: string;
+
   @Input() repeatable: boolean;
 
   @Input() selection$: Observable<ListableObject[]>;
@@ -43,9 +45,9 @@ export class ThemedDynamicLookupRelationSearchTabComponent extends ThemedCompone
 
   @Input() isEditRelationship: boolean;
 
-  @Output() deselectObject: EventEmitter<ListableObject> = new EventEmitter();
+  @Output() deselectObject: EventEmitter<SearchResult<DSpaceObject>> = new EventEmitter();
 
-  @Output() selectObject: EventEmitter<ListableObject> = new EventEmitter();
+  @Output() selectObject: EventEmitter<SearchResult<DSpaceObject>> = new EventEmitter();
 
   @Output() resultFound: EventEmitter<SearchObjects<DSpaceObject>> = new EventEmitter();
 
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/selection-tab/dynamic-lookup-relation-selection-tab.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/selection-tab/dynamic-lookup-relation-selection-tab.component.ts
index a78bf8896c..3c3422ce16 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/selection-tab/dynamic-lookup-relation-selection-tab.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/selection-tab/dynamic-lookup-relation-selection-tab.component.ts
@@ -13,6 +13,8 @@ import { PageInfo } from '../../../../../../core/shared/page-info.model';
 import { Context } from '../../../../../../core/shared/context.model';
 import { createSuccessfulRemoteDataObject } from '../../../../../remote-data.utils';
 import { PaginationService } from '../../../../../../core/pagination/pagination.service';
+import { SearchResult } from '../../../../../search/models/search-result.model';
+import { DSpaceObject } from '../../../../../../core/shared/dspace-object.model';
 
 @Component({
   selector: 'ds-dynamic-lookup-relation-selection-tab',
@@ -63,12 +65,12 @@ export class DsDynamicLookupRelationSelectionTabComponent {
   /**
    * Send an event to deselect an object from the list
    */
-  @Output() deselectObject: EventEmitter<ListableObject> = new EventEmitter<ListableObject>();
+  @Output() deselectObject: EventEmitter<SearchResult<DSpaceObject>> = new EventEmitter();
 
   /**
    * Send an event to select an object from the list
    */
-  @Output() selectObject: EventEmitter<ListableObject> = new EventEmitter<ListableObject>();
+  @Output() selectObject: EventEmitter<SearchResult<DSpaceObject>> = new EventEmitter();
 
   /**
    * The initial pagination to use
diff --git a/src/app/shared/form/builder/form-builder.service.spec.ts b/src/app/shared/form/builder/form-builder.service.spec.ts
index fd3588e73e..f15fbc4238 100644
--- a/src/app/shared/form/builder/form-builder.service.spec.ts
+++ b/src/app/shared/form/builder/form-builder.service.spec.ts
@@ -51,6 +51,8 @@ import { FormRowModel } from '../../../core/config/models/config-submission-form
 import {ConfigurationDataService} from '../../../core/data/configuration-data.service';
 import {createSuccessfulRemoteDataObject$} from '../../remote-data.utils';
 import {ConfigurationProperty} from '../../../core/shared/configuration-property.model';
+import { getMockTranslateService } from '../../mocks/translate.service.mock';
+import { TranslateService } from '@ngx-translate/core';
 
 describe('FormBuilderService test suite', () => {
 
@@ -81,6 +83,7 @@ describe('FormBuilderService test suite', () => {
 
   beforeEach(() => {
     configSpy = createConfigSuccessSpy(typeFieldTestValue);
+    let translateService = getMockTranslateService();
     TestBed.configureTestingModule({
       imports: [ReactiveFormsModule],
       providers: [
@@ -88,7 +91,8 @@ describe('FormBuilderService test suite', () => {
         { provide: DynamicFormValidationService, useValue: {} },
         { provide: NG_VALIDATORS, useValue: testValidator, multi: true },
         { provide: NG_ASYNC_VALIDATORS, useValue: testAsyncValidator, multi: true },
-        { provide: ConfigurationDataService, useValue: configSpy }
+        { provide: ConfigurationDataService, useValue: configSpy },
+        { provide: TranslateService, useValue: translateService },
       ]
     });
 
@@ -290,7 +294,7 @@ describe('FormBuilderService test suite', () => {
         hasSelectableMetadata: true
       }),
 
-      new DynamicDsDatePickerModel({ id: 'testDate' }),
+      new DynamicDsDatePickerModel({ id: 'testDate', repeatable: false}),
 
       new DynamicLookupModel({
         id: 'testLookup',
diff --git a/src/app/shared/form/builder/parsers/concat-field-parser.ts b/src/app/shared/form/builder/parsers/concat-field-parser.ts
index e86de70c81..c18fa8234e 100644
--- a/src/app/shared/form/builder/parsers/concat-field-parser.ts
+++ b/src/app/shared/form/builder/parsers/concat-field-parser.ts
@@ -19,6 +19,7 @@ import {
   SUBMISSION_ID
 } from './field-parser';
 import { DsDynamicInputModel, DsDynamicInputModelConfig } from '../ds-dynamic-form-ui/models/ds-dynamic-input.model';
+import { TranslateService } from '@ngx-translate/core';
 
 export class ConcatFieldParser extends FieldParser {
 
@@ -27,10 +28,11 @@ export class ConcatFieldParser extends FieldParser {
     @Inject(CONFIG_DATA) configData: FormFieldModel,
     @Inject(INIT_FORM_VALUES) initFormValues,
     @Inject(PARSER_OPTIONS) parserOptions: ParserOptions,
+    translate: TranslateService,
     protected separator: string,
     protected firstPlaceholder: string = null,
     protected secondPlaceholder: string = null) {
-    super(submissionId, configData, initFormValues, parserOptions);
+    super(submissionId, configData, initFormValues, parserOptions, translate);
 
     this.separator = separator;
     this.firstPlaceholder = firstPlaceholder;
diff --git a/src/app/shared/form/builder/parsers/date-field-parser.spec.ts b/src/app/shared/form/builder/parsers/date-field-parser.spec.ts
index 9ab43709ad..891bb1d9d4 100644
--- a/src/app/shared/form/builder/parsers/date-field-parser.spec.ts
+++ b/src/app/shared/form/builder/parsers/date-field-parser.spec.ts
@@ -3,10 +3,14 @@ import { DateFieldParser } from './date-field-parser';
 import { DynamicDsDatePickerModel } from '../ds-dynamic-form-ui/models/date-picker/date-picker.model';
 import { FormFieldMetadataValueObject } from '../models/form-field-metadata-value.model';
 import { ParserOptions } from './parser-options';
+import { getMockTranslateService } from 'src/app/shared/mocks/translate.service.mock';
+
+
 
 describe('DateFieldParser test suite', () => {
   let field: FormFieldModel;
   let initFormValues: any = {};
+  let translateService = getMockTranslateService();
 
   const submissionId = '1234';
   const parserOptions: ParserOptions = {
@@ -37,13 +41,13 @@ describe('DateFieldParser test suite', () => {
   });
 
   it('should init parser properly', () => {
-    const parser = new DateFieldParser(submissionId, field, initFormValues, parserOptions);
+    const parser = new DateFieldParser(submissionId, field, initFormValues, parserOptions, translateService);
 
     expect(parser instanceof DateFieldParser).toBe(true);
   });
 
   it('should return a DynamicDsDatePickerModel object when repeatable option is false', () => {
-    const parser = new DateFieldParser(submissionId, field, initFormValues, parserOptions);
+    const parser = new DateFieldParser(submissionId, field, initFormValues, parserOptions, translateService);
 
     const fieldModel = parser.parse();
 
@@ -56,7 +60,7 @@ describe('DateFieldParser test suite', () => {
     };
     const expectedValue = '1983-11-18';
 
-    const parser = new DateFieldParser(submissionId, field, initFormValues, parserOptions);
+    const parser = new DateFieldParser(submissionId, field, initFormValues, parserOptions, translateService);
 
     const fieldModel = parser.parse();
 
diff --git a/src/app/shared/form/builder/parsers/disabled-field-parser.spec.ts b/src/app/shared/form/builder/parsers/disabled-field-parser.spec.ts
index d69f0e48e9..2168d7e2bf 100644
--- a/src/app/shared/form/builder/parsers/disabled-field-parser.spec.ts
+++ b/src/app/shared/form/builder/parsers/disabled-field-parser.spec.ts
@@ -2,10 +2,12 @@ import { FormFieldModel } from '../models/form-field.model';
 import { ParserOptions } from './parser-options';
 import { DisabledFieldParser } from './disabled-field-parser';
 import { DynamicDisabledModel } from '../ds-dynamic-form-ui/models/disabled/dynamic-disabled.model';
+import { getMockTranslateService } from 'src/app/shared/mocks/translate.service.mock';
 
 describe('DisabledFieldParser test suite', () => {
   let field: FormFieldModel;
   let initFormValues: any = {};
+  let translateService = getMockTranslateService();
 
   const submissionId = '1234';
   const parserOptions: ParserOptions = {
@@ -35,13 +37,13 @@ describe('DisabledFieldParser test suite', () => {
   });
 
   it('should init parser properly', () => {
-    const parser = new DisabledFieldParser(submissionId, field, initFormValues, parserOptions);
+    const parser = new DisabledFieldParser(submissionId, field, initFormValues, parserOptions, translateService);
 
     expect(parser instanceof DisabledFieldParser).toBe(true);
   });
 
   it('should return a DynamicDisabledModel object when repeatable option is false', () => {
-    const parser = new DisabledFieldParser(submissionId, field, initFormValues, parserOptions);
+    const parser = new DisabledFieldParser(submissionId, field, initFormValues, parserOptions, translateService);
 
     const fieldModel = parser.parse();
 
@@ -56,7 +58,7 @@ describe('DisabledFieldParser test suite', () => {
     };
     const expectedValue = 'test description';
 
-    const parser = new DisabledFieldParser(submissionId, field, initFormValues, parserOptions);
+    const parser = new DisabledFieldParser(submissionId, field, initFormValues, parserOptions, translateService);
 
     const fieldModel = parser.parse();
     expect(fieldModel.value.value).toEqual(expectedValue);
diff --git a/src/app/shared/form/builder/parsers/dropdown-field-parser.spec.ts b/src/app/shared/form/builder/parsers/dropdown-field-parser.spec.ts
index 3dca7558b3..08a93f76d3 100644
--- a/src/app/shared/form/builder/parsers/dropdown-field-parser.spec.ts
+++ b/src/app/shared/form/builder/parsers/dropdown-field-parser.spec.ts
@@ -2,9 +2,11 @@ import { FormFieldModel } from '../models/form-field.model';
 import { DropdownFieldParser } from './dropdown-field-parser';
 import { DynamicScrollableDropdownModel } from '../ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.model';
 import { ParserOptions } from './parser-options';
+import { getMockTranslateService } from 'src/app/shared/mocks/translate.service.mock';
 
 describe('DropdownFieldParser test suite', () => {
   let field: FormFieldModel;
+  let translateService = getMockTranslateService();
 
   const submissionId = '1234';
   const initFormValues = {};
@@ -37,13 +39,13 @@ describe('DropdownFieldParser test suite', () => {
   });
 
   it('should init parser properly', () => {
-    const parser = new DropdownFieldParser(submissionId, field, initFormValues, parserOptions);
+    const parser = new DropdownFieldParser(submissionId, field, initFormValues, parserOptions, translateService);
 
     expect(parser instanceof DropdownFieldParser).toBe(true);
   });
 
   it('should return a DynamicScrollableDropdownModel object when repeatable option is false', () => {
-    const parser = new DropdownFieldParser(submissionId, field, initFormValues, parserOptions);
+    const parser = new DropdownFieldParser(submissionId, field, initFormValues, parserOptions, translateService);
 
     const fieldModel = parser.parse();
 
@@ -52,7 +54,7 @@ describe('DropdownFieldParser test suite', () => {
 
   it('should throw when authority is not passed', () => {
     field.selectableMetadata[0].controlledVocabulary = null;
-    const parser = new DropdownFieldParser(submissionId, field, initFormValues, parserOptions);
+    const parser = new DropdownFieldParser(submissionId, field, initFormValues, parserOptions, translateService);
 
     expect(() => parser.parse())
       .toThrow();
diff --git a/src/app/shared/form/builder/parsers/dropdown-field-parser.ts b/src/app/shared/form/builder/parsers/dropdown-field-parser.ts
index 3e5ec0b9da..a4bfb810f3 100644
--- a/src/app/shared/form/builder/parsers/dropdown-field-parser.ts
+++ b/src/app/shared/form/builder/parsers/dropdown-field-parser.ts
@@ -15,6 +15,7 @@ import {
 import { isNotEmpty } from '../../../empty.util';
 import { FormFieldMetadataValueObject } from '../models/form-field-metadata-value.model';
 import { ParserOptions } from './parser-options';
+import { TranslateService } from '@ngx-translate/core';
 
 export class DropdownFieldParser extends FieldParser {
 
@@ -23,8 +24,9 @@ export class DropdownFieldParser extends FieldParser {
     @Inject(CONFIG_DATA) configData: FormFieldModel,
     @Inject(INIT_FORM_VALUES) initFormValues,
     @Inject(PARSER_OPTIONS) parserOptions: ParserOptions,
+    translate: TranslateService
   ) {
-    super(submissionId, configData, initFormValues, parserOptions);
+    super(submissionId, configData, initFormValues, parserOptions, translate);
   }
 
   public modelFactory(fieldValue?: FormFieldMetadataValueObject | any, label?: boolean): any {
diff --git a/src/app/shared/form/builder/parsers/field-parser.ts b/src/app/shared/form/builder/parsers/field-parser.ts
index 7ea55d4454..3c4d425df3 100644
--- a/src/app/shared/form/builder/parsers/field-parser.ts
+++ b/src/app/shared/form/builder/parsers/field-parser.ts
@@ -25,6 +25,7 @@ import { VocabularyOptions } from '../../../../core/submission/vocabularies/mode
 import { ParserType } from './parser-type';
 import { isNgbDateStruct } from '../../../date.util';
 import { SubmissionScopeType } from '../../../../core/submission/submission-scope-type';
+import { TranslateService } from '@ngx-translate/core';
 
 export const SUBMISSION_ID: InjectionToken<string> = new InjectionToken<string>('submissionId');
 export const CONFIG_DATA: InjectionToken<FormFieldModel> = new InjectionToken<FormFieldModel>('configData');
@@ -50,7 +51,8 @@ export abstract class FieldParser {
     @Inject(SUBMISSION_ID) protected submissionId: string,
     @Inject(CONFIG_DATA) protected configData: FormFieldModel,
     @Inject(INIT_FORM_VALUES) protected initFormValues: any,
-    @Inject(PARSER_OPTIONS) protected parserOptions: ParserOptions
+    @Inject(PARSER_OPTIONS) protected parserOptions: ParserOptions,
+    protected translate: TranslateService
   ) {
   }
 
@@ -395,11 +397,14 @@ export abstract class FieldParser {
     } else {
       regex = new RegExp(this.configData.input.regex);
     }
+    const baseTranslationKey = 'error.validation.pattern';
+    const fieldranslationKey = `${baseTranslationKey}.${controlModel.id}`;
+    const fieldTranslationExists = this.translate.instant(fieldranslationKey) !== fieldranslationKey;
     controlModel.validators = Object.assign({}, controlModel.validators, { pattern: regex });
     controlModel.errorMessages = Object.assign(
       {},
       controlModel.errorMessages,
-      { pattern: 'error.validation.pattern' });
+      { pattern: fieldTranslationExists ? fieldranslationKey : baseTranslationKey });
   }
 
   protected markAsRequired(controlModel) {
diff --git a/src/app/shared/form/builder/parsers/list-field-parser.spec.ts b/src/app/shared/form/builder/parsers/list-field-parser.spec.ts
index 30d1913a51..ba9f9291cf 100644
--- a/src/app/shared/form/builder/parsers/list-field-parser.spec.ts
+++ b/src/app/shared/form/builder/parsers/list-field-parser.spec.ts
@@ -4,10 +4,12 @@ import { ListFieldParser } from './list-field-parser';
 import { DynamicListCheckboxGroupModel } from '../ds-dynamic-form-ui/models/list/dynamic-list-checkbox-group.model';
 import { DynamicListRadioGroupModel } from '../ds-dynamic-form-ui/models/list/dynamic-list-radio-group.model';
 import { ParserOptions } from './parser-options';
+import { getMockTranslateService } from 'src/app/shared/mocks/translate.service.mock';
 
 describe('ListFieldParser test suite', () => {
   let field: FormFieldModel;
   let initFormValues = {};
+  let translateService = getMockTranslateService();
 
   const submissionId = '1234';
   const parserOptions: ParserOptions = {
@@ -39,13 +41,13 @@ describe('ListFieldParser test suite', () => {
   });
 
   it('should init parser properly', () => {
-    const parser = new ListFieldParser(submissionId, field, initFormValues, parserOptions);
+    const parser = new ListFieldParser(submissionId, field, initFormValues, parserOptions, translateService);
 
     expect(parser instanceof ListFieldParser).toBe(true);
   });
 
   it('should return a DynamicListCheckboxGroupModel object when repeatable option is true', () => {
-    const parser = new ListFieldParser(submissionId, field, initFormValues, parserOptions);
+    const parser = new ListFieldParser(submissionId, field, initFormValues, parserOptions, translateService);
 
     const fieldModel = parser.parse();
 
@@ -54,7 +56,7 @@ describe('ListFieldParser test suite', () => {
 
   it('should return a DynamicListRadioGroupModel object when repeatable option is false', () => {
     field.repeatable = false;
-    const parser = new ListFieldParser(submissionId, field, initFormValues, parserOptions);
+    const parser = new ListFieldParser(submissionId, field, initFormValues, parserOptions, translateService);
 
     const fieldModel = parser.parse();
 
@@ -67,7 +69,7 @@ describe('ListFieldParser test suite', () => {
     };
     const expectedValue = [new FormFieldMetadataValueObject('test type')];
 
-    const parser = new ListFieldParser(submissionId, field, initFormValues, parserOptions);
+    const parser = new ListFieldParser(submissionId, field, initFormValues, parserOptions, translateService);
 
     const fieldModel = parser.parse();
 
diff --git a/src/app/shared/form/builder/parsers/lookup-field-parser.spec.ts b/src/app/shared/form/builder/parsers/lookup-field-parser.spec.ts
index 24efcf3462..a932dc637c 100644
--- a/src/app/shared/form/builder/parsers/lookup-field-parser.spec.ts
+++ b/src/app/shared/form/builder/parsers/lookup-field-parser.spec.ts
@@ -3,10 +3,12 @@ import { FormFieldMetadataValueObject } from '../models/form-field-metadata-valu
 import { LookupFieldParser } from './lookup-field-parser';
 import { DynamicLookupModel } from '../ds-dynamic-form-ui/models/lookup/dynamic-lookup.model';
 import { ParserOptions } from './parser-options';
+import { getMockTranslateService } from 'src/app/shared/mocks/translate.service.mock';
 
 describe('LookupFieldParser test suite', () => {
   let field: FormFieldModel;
   let initFormValues = {};
+  let translateService = getMockTranslateService();
 
   const submissionId = '1234';
   const parserOptions: ParserOptions = {
@@ -38,13 +40,13 @@ describe('LookupFieldParser test suite', () => {
   });
 
   it('should init parser properly', () => {
-    const parser = new LookupFieldParser(submissionId, field, initFormValues, parserOptions);
+    const parser = new LookupFieldParser(submissionId, field, initFormValues, parserOptions, translateService);
 
     expect(parser instanceof LookupFieldParser).toBe(true);
   });
 
   it('should return a DynamicLookupModel object when repeatable option is false', () => {
-    const parser = new LookupFieldParser(submissionId, field, initFormValues, parserOptions);
+    const parser = new LookupFieldParser(submissionId, field, initFormValues, parserOptions, translateService);
 
     const fieldModel = parser.parse();
 
@@ -57,7 +59,7 @@ describe('LookupFieldParser test suite', () => {
     };
     const expectedValue = new FormFieldMetadataValueObject('test journal');
 
-    const parser = new LookupFieldParser(submissionId, field, initFormValues, parserOptions);
+    const parser = new LookupFieldParser(submissionId, field, initFormValues, parserOptions, translateService);
 
     const fieldModel = parser.parse();
 
diff --git a/src/app/shared/form/builder/parsers/lookup-name-field-parser.spec.ts b/src/app/shared/form/builder/parsers/lookup-name-field-parser.spec.ts
index d0281681ef..6220a6e74c 100644
--- a/src/app/shared/form/builder/parsers/lookup-name-field-parser.spec.ts
+++ b/src/app/shared/form/builder/parsers/lookup-name-field-parser.spec.ts
@@ -3,10 +3,12 @@ import { FormFieldMetadataValueObject } from '../models/form-field-metadata-valu
 import { LookupNameFieldParser } from './lookup-name-field-parser';
 import { DynamicLookupNameModel } from '../ds-dynamic-form-ui/models/lookup/dynamic-lookup-name.model';
 import { ParserOptions } from './parser-options';
+import { getMockTranslateService } from 'src/app/shared/mocks/translate.service.mock';
 
 describe('LookupNameFieldParser test suite', () => {
   let field: FormFieldModel;
   let initFormValues = {};
+  let translateService = getMockTranslateService();
 
   const submissionId = '1234';
   const parserOptions: ParserOptions = {
@@ -38,13 +40,13 @@ describe('LookupNameFieldParser test suite', () => {
   });
 
   it('should init parser properly', () => {
-    const parser = new LookupNameFieldParser(submissionId, field, initFormValues, parserOptions);
+    const parser = new LookupNameFieldParser(submissionId, field, initFormValues, parserOptions, translateService);
 
     expect(parser instanceof LookupNameFieldParser).toBe(true);
   });
 
   it('should return a DynamicLookupNameModel object when repeatable option is false', () => {
-    const parser = new LookupNameFieldParser(submissionId, field, initFormValues, parserOptions);
+    const parser = new LookupNameFieldParser(submissionId, field, initFormValues, parserOptions, translateService);
 
     const fieldModel = parser.parse();
 
@@ -57,7 +59,7 @@ describe('LookupNameFieldParser test suite', () => {
     };
     const expectedValue = new FormFieldMetadataValueObject('test author');
 
-    const parser = new LookupNameFieldParser(submissionId, field, initFormValues, parserOptions);
+    const parser = new LookupNameFieldParser(submissionId, field, initFormValues, parserOptions, translateService);
 
     const fieldModel = parser.parse();
 
diff --git a/src/app/shared/form/builder/parsers/name-field-parser.spec.ts b/src/app/shared/form/builder/parsers/name-field-parser.spec.ts
index 6b520142cc..e124181b24 100644
--- a/src/app/shared/form/builder/parsers/name-field-parser.spec.ts
+++ b/src/app/shared/form/builder/parsers/name-field-parser.spec.ts
@@ -3,12 +3,14 @@ import { NameFieldParser } from './name-field-parser';
 import { DynamicConcatModel } from '../ds-dynamic-form-ui/models/ds-dynamic-concat.model';
 import { FormFieldMetadataValueObject } from '../models/form-field-metadata-value.model';
 import { ParserOptions } from './parser-options';
+import { getMockTranslateService } from 'src/app/shared/mocks/translate.service.mock';
 
 describe('NameFieldParser test suite', () => {
   let field1: FormFieldModel;
   let field2: FormFieldModel;
   let field3: FormFieldModel;
   let initFormValues: any = {};
+  let translateService = getMockTranslateService();
 
   const submissionId = '1234';
   const parserOptions: ParserOptions = {
@@ -71,13 +73,13 @@ describe('NameFieldParser test suite', () => {
   });
 
   it('should init parser properly', () => {
-    const parser = new NameFieldParser(submissionId, field1, initFormValues, parserOptions);
+    const parser = new NameFieldParser(submissionId, field1, initFormValues, parserOptions, translateService);
 
     expect(parser instanceof NameFieldParser).toBe(true);
   });
 
   it('should return a DynamicConcatModel object when repeatable option is false', () => {
-    const parser = new NameFieldParser(submissionId, field2, initFormValues, parserOptions);
+    const parser = new NameFieldParser(submissionId, field2, initFormValues, parserOptions, translateService);
 
     const fieldModel = parser.parse();
 
@@ -85,7 +87,7 @@ describe('NameFieldParser test suite', () => {
   });
 
   it('should return a DynamicConcatModel object with the correct separator', () => {
-    const parser = new NameFieldParser(submissionId, field2, initFormValues, parserOptions);
+    const parser = new NameFieldParser(submissionId, field2, initFormValues, parserOptions, translateService);
 
     const fieldModel = parser.parse();
 
@@ -98,7 +100,7 @@ describe('NameFieldParser test suite', () => {
     };
     const expectedValue = new FormFieldMetadataValueObject('test, name', undefined, undefined, 'test');
 
-    const parser = new NameFieldParser(submissionId, field1, initFormValues, parserOptions);
+    const parser = new NameFieldParser(submissionId, field1, initFormValues, parserOptions, translateService);
 
     const fieldModel = parser.parse();
 
diff --git a/src/app/shared/form/builder/parsers/name-field-parser.ts b/src/app/shared/form/builder/parsers/name-field-parser.ts
index e5ecb034ea..469b32be92 100644
--- a/src/app/shared/form/builder/parsers/name-field-parser.ts
+++ b/src/app/shared/form/builder/parsers/name-field-parser.ts
@@ -1,4 +1,5 @@
 import { Inject } from '@angular/core';
+import { TranslateService } from '@ngx-translate/core';
 import { FormFieldModel } from '../models/form-field.model';
 import { ConcatFieldParser } from './concat-field-parser';
 import { CONFIG_DATA, INIT_FORM_VALUES, PARSER_OPTIONS, SUBMISSION_ID } from './field-parser';
@@ -10,8 +11,9 @@ export class NameFieldParser extends ConcatFieldParser {
     @Inject(SUBMISSION_ID) submissionId: string,
     @Inject(CONFIG_DATA) configData: FormFieldModel,
     @Inject(INIT_FORM_VALUES) initFormValues,
-    @Inject(PARSER_OPTIONS) parserOptions: ParserOptions
+    @Inject(PARSER_OPTIONS) parserOptions: ParserOptions,
+    translate: TranslateService
   ) {
-    super(submissionId, configData, initFormValues, parserOptions, ',', 'form.last-name', 'form.first-name');
+    super(submissionId, configData, initFormValues, parserOptions, translate, ',', 'form.last-name', 'form.first-name');
   }
 }
diff --git a/src/app/shared/form/builder/parsers/onebox-field-parser.spec.ts b/src/app/shared/form/builder/parsers/onebox-field-parser.spec.ts
index a4c71d1f42..6b7ac65a58 100644
--- a/src/app/shared/form/builder/parsers/onebox-field-parser.spec.ts
+++ b/src/app/shared/form/builder/parsers/onebox-field-parser.spec.ts
@@ -5,11 +5,13 @@ import { DynamicOneboxModel } from '../ds-dynamic-form-ui/models/onebox/dynamic-
 import { DsDynamicInputModel } from '../ds-dynamic-form-ui/models/ds-dynamic-input.model';
 import { ParserOptions } from './parser-options';
 import { FieldParser } from './field-parser';
+import { getMockTranslateService } from 'src/app/shared/mocks/translate.service.mock';
 
 describe('OneboxFieldParser test suite', () => {
   let field1: FormFieldModel;
   let field2: FormFieldModel;
   let field3: FormFieldModel;
+  let translateService = getMockTranslateService();
 
   const submissionId = '1234';
   const initFormValues = {};
@@ -73,13 +75,13 @@ describe('OneboxFieldParser test suite', () => {
   });
 
   it('should init parser properly', () => {
-    const parser = new OneboxFieldParser(submissionId, field1, initFormValues, parserOptions);
+    const parser = new OneboxFieldParser(submissionId, field1, initFormValues, parserOptions, translateService);
 
     expect(parser instanceof OneboxFieldParser).toBe(true);
   });
 
   it('should return a DynamicQualdropModel object when selectableMetadata is multiple', () => {
-    const parser = new OneboxFieldParser(submissionId, field2, initFormValues, parserOptions);
+    const parser = new OneboxFieldParser(submissionId, field2, initFormValues, parserOptions, translateService);
 
     const fieldModel = parser.parse();
 
@@ -87,7 +89,7 @@ describe('OneboxFieldParser test suite', () => {
   });
 
   it('should return a DsDynamicInputModel object when selectableMetadata is not multiple', () => {
-    const parser = new OneboxFieldParser(submissionId, field3, initFormValues, parserOptions);
+    const parser = new OneboxFieldParser(submissionId, field3, initFormValues, parserOptions, translateService);
 
     const fieldModel = parser.parse();
 
@@ -95,7 +97,7 @@ describe('OneboxFieldParser test suite', () => {
   });
 
   it('should return a DynamicOneboxModel object when selectableMetadata has authority', () => {
-    const parser = new OneboxFieldParser(submissionId, field1, initFormValues, parserOptions);
+    const parser = new OneboxFieldParser(submissionId, field1, initFormValues, parserOptions, translateService);
 
     const fieldModel = parser.parse();
 
@@ -124,7 +126,7 @@ describe('OneboxFieldParser test suite', () => {
         languageCodes: []
       } as FormFieldModel;
 
-      parser = new OneboxFieldParser(submissionId, regexField, initFormValues, parserOptions);
+      parser = new OneboxFieldParser(submissionId, regexField, initFormValues, parserOptions, translateService);
       fieldModel = parser.parse();
     });
 
diff --git a/src/app/shared/form/builder/parsers/parser-factory.ts b/src/app/shared/form/builder/parsers/parser-factory.ts
index 26a9cb0f28..97fc36cbb4 100644
--- a/src/app/shared/form/builder/parsers/parser-factory.ts
+++ b/src/app/shared/form/builder/parsers/parser-factory.ts
@@ -19,12 +19,14 @@ import { SeriesFieldParser } from './series-field-parser';
 import { TagFieldParser } from './tag-field-parser';
 import { TextareaFieldParser } from './textarea-field-parser';
 import { DisabledFieldParser } from './disabled-field-parser';
+import { TranslateService } from '@ngx-translate/core';
 
 const fieldParserDeps = [
   SUBMISSION_ID,
   CONFIG_DATA,
   INIT_FORM_VALUES,
   PARSER_OPTIONS,
+  TranslateService
 ];
 
 /**
diff --git a/src/app/shared/form/builder/parsers/relation-group-field-parser.spec.ts b/src/app/shared/form/builder/parsers/relation-group-field-parser.spec.ts
index 7d48ad2d00..8ae0ccfedf 100644
--- a/src/app/shared/form/builder/parsers/relation-group-field-parser.spec.ts
+++ b/src/app/shared/form/builder/parsers/relation-group-field-parser.spec.ts
@@ -3,10 +3,12 @@ import { RelationGroupFieldParser } from './relation-group-field-parser';
 import { DynamicRelationGroupModel } from '../ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.model';
 import { FormFieldMetadataValueObject } from '../models/form-field-metadata-value.model';
 import { ParserOptions } from './parser-options';
+import { getMockTranslateService } from 'src/app/shared/mocks/translate.service.mock';
 
 describe('RelationGroupFieldParser test suite', () => {
   let field: FormFieldModel;
   let initFormValues = {};
+  let translateService = getMockTranslateService();
 
   const submissionId = '1234';
   const parserOptions: ParserOptions = {
@@ -73,13 +75,13 @@ describe('RelationGroupFieldParser test suite', () => {
   });
 
   it('should init parser properly', () => {
-    const parser = new RelationGroupFieldParser(submissionId, field, initFormValues, parserOptions);
+    const parser = new RelationGroupFieldParser(submissionId, field, initFormValues, parserOptions, translateService);
 
     expect(parser instanceof RelationGroupFieldParser).toBe(true);
   });
 
   it('should return a DynamicRelationGroupModel object', () => {
-    const parser = new RelationGroupFieldParser(submissionId, field, initFormValues, parserOptions);
+    const parser = new RelationGroupFieldParser(submissionId, field, initFormValues, parserOptions, translateService);
 
     const fieldModel = parser.parse();
 
@@ -88,7 +90,7 @@ describe('RelationGroupFieldParser test suite', () => {
 
   it('should throw when rows configuration is empty', () => {
     field.rows = null;
-    const parser = new RelationGroupFieldParser(submissionId, field, initFormValues, parserOptions);
+    const parser = new RelationGroupFieldParser(submissionId, field, initFormValues, parserOptions, translateService);
 
     expect(() => parser.parse())
       .toThrow();
@@ -99,7 +101,7 @@ describe('RelationGroupFieldParser test suite', () => {
       author: [new FormFieldMetadataValueObject('test author')],
       affiliation: [new FormFieldMetadataValueObject('test affiliation')]
     };
-    const parser = new RelationGroupFieldParser(submissionId, field, initFormValues, parserOptions);
+    const parser = new RelationGroupFieldParser(submissionId, field, initFormValues, parserOptions, translateService);
 
     const fieldModel = parser.parse();
     const expectedValue = [{
diff --git a/src/app/shared/form/builder/parsers/row-parser.spec.ts b/src/app/shared/form/builder/parsers/row-parser.spec.ts
index 1f9bde8a7f..f414715f5b 100644
--- a/src/app/shared/form/builder/parsers/row-parser.spec.ts
+++ b/src/app/shared/form/builder/parsers/row-parser.spec.ts
@@ -3,6 +3,9 @@ import { RowParser } from './row-parser';
 import { DynamicRowGroupModel } from '../ds-dynamic-form-ui/models/ds-dynamic-row-group-model';
 import { DynamicRowArrayModel } from '../ds-dynamic-form-ui/models/ds-dynamic-row-array-model';
 import { FormRowModel } from '../../../../core/config/models/config-submission-form.model';
+import { getMockTranslateService } from 'src/app/shared/mocks/translate.service.mock';
+import { TranslateService } from '@ngx-translate/core';
+import { Injector } from '@angular/core';
 
 describe('RowParser test suite', () => {
 
@@ -16,6 +19,7 @@ describe('RowParser test suite', () => {
   let row8: FormRowModel;
   let row9: FormRowModel;
   let row10: FormRowModel;
+  let injector: Injector;
 
   const submissionId = '1234';
   const scopeUUID = 'testScopeUUID';
@@ -25,6 +29,12 @@ describe('RowParser test suite', () => {
   const typeField = 'dc_type';
 
   beforeEach(() => {
+    let translateService = getMockTranslateService();
+    injector = Injector.create({
+      providers: [
+        { provide: TranslateService, useValue: translateService },
+      ],
+    });
     row1 = {
       fields: [
         {
@@ -330,14 +340,14 @@ describe('RowParser test suite', () => {
   });
 
   it('should init parser properly', () => {
-    const parser = new RowParser(undefined);
+    const parser = new RowParser(injector);
 
     expect(parser instanceof RowParser).toBe(true);
   });
 
   describe('parse', () => {
     it('should return a DynamicRowGroupModel object', () => {
-      const parser = new RowParser(undefined);
+      const parser = new RowParser(injector);
 
       const rowModel = parser.parse(submissionId, row1, scopeUUID, initFormValues, submissionScope, readOnly, typeField);
 
@@ -345,7 +355,7 @@ describe('RowParser test suite', () => {
     });
 
     it('should return a row with three fields', () => {
-      const parser = new RowParser(undefined);
+      const parser = new RowParser(injector);
 
       const rowModel = parser.parse(submissionId, row1, scopeUUID, initFormValues, submissionScope, readOnly, typeField);
 
@@ -353,7 +363,7 @@ describe('RowParser test suite', () => {
     });
 
     it('should return a DynamicRowArrayModel object', () => {
-      const parser = new RowParser(undefined);
+      const parser = new RowParser(injector);
 
       const rowModel = parser.parse(submissionId, row2, scopeUUID, initFormValues, submissionScope, readOnly, typeField);
 
@@ -361,7 +371,7 @@ describe('RowParser test suite', () => {
     });
 
     it('should return a row that contains only scoped fields', () => {
-      const parser = new RowParser(undefined);
+      const parser = new RowParser(injector);
 
       const rowModel = parser.parse(submissionId, row3, scopeUUID, initFormValues, submissionScope, readOnly, typeField);
 
@@ -369,7 +379,7 @@ describe('RowParser test suite', () => {
     });
 
     it('should be able to parse a dropdown combo field', () => {
-      const parser = new RowParser(undefined);
+      const parser = new RowParser(injector);
 
       const rowModel = parser.parse(submissionId, row4, scopeUUID, initFormValues, submissionScope, readOnly, typeField);
 
@@ -377,7 +387,7 @@ describe('RowParser test suite', () => {
     });
 
     it('should be able to parse a lookup-name field', () => {
-      const parser = new RowParser(undefined);
+      const parser = new RowParser(injector);
 
       const rowModel = parser.parse(submissionId, row5, scopeUUID, initFormValues, submissionScope, readOnly, typeField);
 
@@ -385,7 +395,7 @@ describe('RowParser test suite', () => {
     });
 
     it('should be able to parse a list field', () => {
-      const parser = new RowParser(undefined);
+      const parser = new RowParser(injector);
 
       const rowModel = parser.parse(submissionId, row6, scopeUUID, initFormValues, submissionScope, readOnly, typeField);
 
@@ -393,7 +403,7 @@ describe('RowParser test suite', () => {
     });
 
     it('should be able to parse a date field', () => {
-      const parser = new RowParser(undefined);
+      const parser = new RowParser(injector);
 
       const rowModel = parser.parse(submissionId, row7, scopeUUID, initFormValues, submissionScope, readOnly, typeField);
 
@@ -401,7 +411,7 @@ describe('RowParser test suite', () => {
     });
 
     it('should be able to parse a tag field', () => {
-      const parser = new RowParser(undefined);
+      const parser = new RowParser(injector);
 
       const rowModel = parser.parse(submissionId, row8, scopeUUID, initFormValues, submissionScope, readOnly, typeField);
 
@@ -409,7 +419,7 @@ describe('RowParser test suite', () => {
     });
 
     it('should be able to parse a textarea field', () => {
-      const parser = new RowParser(undefined);
+      const parser = new RowParser(injector);
 
       const rowModel = parser.parse(submissionId, row9, scopeUUID, initFormValues, submissionScope, readOnly, typeField);
 
@@ -417,7 +427,7 @@ describe('RowParser test suite', () => {
     });
 
     it('should be able to parse a group field', () => {
-      const parser = new RowParser(undefined);
+      const parser = new RowParser(injector);
 
       const rowModel = parser.parse(submissionId, row10, scopeUUID, initFormValues, submissionScope, readOnly, typeField);
 
diff --git a/src/app/shared/form/builder/parsers/series-field-parser.spec.ts b/src/app/shared/form/builder/parsers/series-field-parser.spec.ts
index 0761cfe60e..0ce50081e4 100644
--- a/src/app/shared/form/builder/parsers/series-field-parser.spec.ts
+++ b/src/app/shared/form/builder/parsers/series-field-parser.spec.ts
@@ -3,10 +3,12 @@ import { DynamicConcatModel } from '../ds-dynamic-form-ui/models/ds-dynamic-conc
 import { SeriesFieldParser } from './series-field-parser';
 import { FormFieldMetadataValueObject } from '../models/form-field-metadata-value.model';
 import { ParserOptions } from './parser-options';
+import { getMockTranslateService } from 'src/app/shared/mocks/translate.service.mock';
 
 describe('SeriesFieldParser test suite', () => {
   let field: FormFieldModel;
   let initFormValues: any = {};
+  let translateService = getMockTranslateService();
 
   const submissionId = '1234';
   const parserOptions: ParserOptions = {
@@ -34,13 +36,13 @@ describe('SeriesFieldParser test suite', () => {
   });
 
   it('should init parser properly', () => {
-    const parser = new SeriesFieldParser(submissionId, field, initFormValues, parserOptions);
+    const parser = new SeriesFieldParser(submissionId, field, initFormValues, parserOptions, translateService);
 
     expect(parser instanceof SeriesFieldParser).toBe(true);
   });
 
   it('should return a DynamicConcatModel object when repeatable option is false', () => {
-    const parser = new SeriesFieldParser(submissionId, field, initFormValues, parserOptions);
+    const parser = new SeriesFieldParser(submissionId, field, initFormValues, parserOptions, translateService);
 
     const fieldModel = parser.parse();
 
@@ -48,7 +50,7 @@ describe('SeriesFieldParser test suite', () => {
   });
 
   it('should return a DynamicConcatModel object with the correct separator', () => {
-    const parser = new SeriesFieldParser(submissionId, field, initFormValues, parserOptions);
+    const parser = new SeriesFieldParser(submissionId, field, initFormValues, parserOptions, translateService);
 
     const fieldModel = parser.parse();
 
@@ -61,7 +63,7 @@ describe('SeriesFieldParser test suite', () => {
     };
     const expectedValue = new FormFieldMetadataValueObject('test; series', undefined, undefined, 'test');
 
-    const parser = new SeriesFieldParser(submissionId, field, initFormValues, parserOptions);
+    const parser = new SeriesFieldParser(submissionId, field, initFormValues, parserOptions, translateService);
 
     const fieldModel = parser.parse();
 
diff --git a/src/app/shared/form/builder/parsers/series-field-parser.ts b/src/app/shared/form/builder/parsers/series-field-parser.ts
index 36ee9c36c1..589a6dc04c 100644
--- a/src/app/shared/form/builder/parsers/series-field-parser.ts
+++ b/src/app/shared/form/builder/parsers/series-field-parser.ts
@@ -1,4 +1,5 @@
 import { Inject } from '@angular/core';
+import { TranslateService } from '@ngx-translate/core';
 import { FormFieldModel } from '../models/form-field.model';
 import { ConcatFieldParser } from './concat-field-parser';
 import { CONFIG_DATA, INIT_FORM_VALUES, PARSER_OPTIONS, SUBMISSION_ID } from './field-parser';
@@ -10,8 +11,9 @@ export class SeriesFieldParser extends ConcatFieldParser {
     @Inject(SUBMISSION_ID) submissionId: string,
     @Inject(CONFIG_DATA) configData: FormFieldModel,
     @Inject(INIT_FORM_VALUES) initFormValues,
-    @Inject(PARSER_OPTIONS) parserOptions: ParserOptions
+    @Inject(PARSER_OPTIONS) parserOptions: ParserOptions,
+    translate: TranslateService
   ) {
-    super(submissionId, configData, initFormValues, parserOptions, ';');
+    super(submissionId, configData, initFormValues, parserOptions, translate, ';');
   }
 }
diff --git a/src/app/shared/form/builder/parsers/tag-field-parser.spec.ts b/src/app/shared/form/builder/parsers/tag-field-parser.spec.ts
index 115829f8d3..ae10dbd386 100644
--- a/src/app/shared/form/builder/parsers/tag-field-parser.spec.ts
+++ b/src/app/shared/form/builder/parsers/tag-field-parser.spec.ts
@@ -3,10 +3,12 @@ import { FormFieldMetadataValueObject } from '../models/form-field-metadata-valu
 import { TagFieldParser } from './tag-field-parser';
 import { DynamicTagModel } from '../ds-dynamic-form-ui/models/tag/dynamic-tag.model';
 import { ParserOptions } from './parser-options';
+import { getMockTranslateService } from 'src/app/shared/mocks/translate.service.mock';
 
 describe('TagFieldParser test suite', () => {
   let field: FormFieldModel;
   let initFormValues: any = {};
+  let translateService = getMockTranslateService();
 
   const submissionId = '1234';
   const parserOptions: ParserOptions = {
@@ -38,13 +40,13 @@ describe('TagFieldParser test suite', () => {
   });
 
   it('should init parser properly', () => {
-    const parser = new TagFieldParser(submissionId, field, initFormValues, parserOptions);
+    const parser = new TagFieldParser(submissionId, field, initFormValues, parserOptions, translateService);
 
     expect(parser instanceof TagFieldParser).toBe(true);
   });
 
   it('should return a DynamicTagModel object when repeatable option is false', () => {
-    const parser = new TagFieldParser(submissionId, field, initFormValues, parserOptions);
+    const parser = new TagFieldParser(submissionId, field, initFormValues, parserOptions, translateService);
 
     const fieldModel = parser.parse();
 
@@ -59,7 +61,7 @@ describe('TagFieldParser test suite', () => {
       ],
     };
 
-    const parser = new TagFieldParser(submissionId, field, initFormValues, parserOptions);
+    const parser = new TagFieldParser(submissionId, field, initFormValues, parserOptions, translateService);
 
     const fieldModel = parser.parse();
 
diff --git a/src/app/shared/form/builder/parsers/textarea-field-parser.spec.ts b/src/app/shared/form/builder/parsers/textarea-field-parser.spec.ts
index 855e464f21..259f8a60e1 100644
--- a/src/app/shared/form/builder/parsers/textarea-field-parser.spec.ts
+++ b/src/app/shared/form/builder/parsers/textarea-field-parser.spec.ts
@@ -3,10 +3,12 @@ import { FormFieldMetadataValueObject } from '../models/form-field-metadata-valu
 import { TextareaFieldParser } from './textarea-field-parser';
 import { DsDynamicTextAreaModel } from '../ds-dynamic-form-ui/models/ds-dynamic-textarea.model';
 import { ParserOptions } from './parser-options';
+import { getMockTranslateService } from 'src/app/shared/mocks/translate.service.mock';
 
 describe('TextareaFieldParser test suite', () => {
   let field: FormFieldModel;
   let initFormValues: any = {};
+  let translateService = getMockTranslateService();
 
   const submissionId = '1234';
   const parserOptions: ParserOptions = {
@@ -36,13 +38,13 @@ describe('TextareaFieldParser test suite', () => {
   });
 
   it('should init parser properly', () => {
-    const parser = new TextareaFieldParser(submissionId, field, initFormValues, parserOptions);
+    const parser = new TextareaFieldParser(submissionId, field, initFormValues, parserOptions, translateService);
 
     expect(parser instanceof TextareaFieldParser).toBe(true);
   });
 
   it('should return a DsDynamicTextAreaModel object when repeatable option is false', () => {
-    const parser = new TextareaFieldParser(submissionId, field, initFormValues, parserOptions);
+    const parser = new TextareaFieldParser(submissionId, field, initFormValues, parserOptions, translateService);
 
     const fieldModel = parser.parse();
 
@@ -57,7 +59,7 @@ describe('TextareaFieldParser test suite', () => {
     };
     const expectedValue = 'test description';
 
-    const parser = new TextareaFieldParser(submissionId, field, initFormValues, parserOptions);
+    const parser = new TextareaFieldParser(submissionId, field, initFormValues, parserOptions, translateService);
 
     const fieldModel = parser.parse();
 
diff --git a/src/app/shared/form/form.component.html b/src/app/shared/form/form.component.html
index 1b27c9d308..fca41bc252 100644
--- a/src/app/shared/form/form.component.html
+++ b/src/app/shared/form/form.component.html
@@ -41,7 +41,7 @@
                     title="{{'form.discard' | translate}}"
                     attr.aria-label="{{'form.discard' | translate}}"
                     (click)="removeItem($event, context, index)"
-                    [disabled]="group.context.groups.length === 1 || isItemReadOnly(context, index)">
+                    [dsBtnDisabled]="group.context.groups.length === 1 || isItemReadOnly(context, index)">
               <span>{{'form.discard' | translate}}</span>
             </button>
           </div>
@@ -58,11 +58,12 @@
         <div class="col text-right space-children-mr">
           <ng-content select="[before]"></ng-content>
             <button *ngIf="displayCancel" type="reset" class="btn btn-outline-secondary" (click)="reset()">
-              <i class="fa fa-times"></i> {{cancelLabel | translate}}
+              <i class="fa fa-times" aria-hidden="true"></i> {{cancelLabel | translate}}
             </button>
             <ng-content select="[between]"></ng-content>
             <button *ngIf="displaySubmit" type="submit" class="btn btn-primary" (click)="onSubmit()"
-                    [disabled]="!(isValid() | async)"><i class="fas fa-save"></i> {{submitLabel | translate}}
+                    [dsBtnDisabled]="!(isValid() | async)">
+              <i class="fas fa-save" aria-hidden="true"></i> {{submitLabel | translate}}
             </button>
             <ng-content select="[after]"></ng-content>
         </div>
diff --git a/src/app/shared/form/form.component.spec.ts b/src/app/shared/form/form.component.spec.ts
index 2f3be3fded..5369f669f9 100644
--- a/src/app/shared/form/form.component.spec.ts
+++ b/src/app/shared/form/form.component.spec.ts
@@ -24,6 +24,7 @@ import { FormFieldMetadataValueObject } from './builder/models/form-field-metada
 import { createTestComponent } from '../testing/utils.test';
 import { BehaviorSubject } from 'rxjs';
 import { storeModuleConfig } from '../../app.reducer';
+import { XSRFService } from '../../core/xsrf/xsrf.service';
 
 let TEST_FORM_MODEL;
 
@@ -156,7 +157,8 @@ describe('FormComponent test suite', () => {
         FormBuilderService,
         FormComponent,
         FormService,
-        { provide: Store, useClass: StoreMock }
+        { provide: Store, useClass: StoreMock },
+        { provide: XSRFService, useValue: {} },
       ],
       schemas: [CUSTOM_ELEMENTS_SCHEMA]
     });
diff --git a/src/app/shared/form/form.component.ts b/src/app/shared/form/form.component.ts
index 79cf8ad2c7..662cd3b4ae 100644
--- a/src/app/shared/form/form.component.ts
+++ b/src/app/shared/form/form.component.ts
@@ -316,7 +316,7 @@ export class FormComponent implements OnDestroy, OnInit {
   removeItem($event, arrayContext: DynamicFormArrayModel, index: number): void {
     const formArrayControl = this.formGroup.get(this.formBuilderService.getPath(arrayContext)) as UntypedFormArray;
     const event = this.getEvent($event, arrayContext, index, 'remove');
-    if (this.formBuilderService.isQualdropGroup(event.model as DynamicFormControlModel)) {
+    if (this.formBuilderService.isQualdropGroup(event.model as DynamicFormControlModel) && hasValue((event.model as any)?.value)) {
       // In case of qualdrop value remove event must be dispatched before removing the control from array
       this.removeArrayItem.emit(event);
     }
diff --git a/src/app/shared/form/form.service.ts b/src/app/shared/form/form.service.ts
index bf316daaed..e6c3776a42 100644
--- a/src/app/shared/form/form.service.ts
+++ b/src/app/shared/form/form.service.ts
@@ -130,6 +130,9 @@ export class FormService {
   }
 
   public addControlErrors(field: AbstractControl, formId: string, fieldId: string, fieldIndex: number) {
+    if (field.errors === null) {
+      return;
+    }
     const errors: string[] = Object.keys(field.errors)
       .filter((errorKey) => field.errors[errorKey] === true)
       .map((errorKey) => `error.validation.${errorKey}`);
diff --git a/src/app/shared/form/number-picker/number-picker.component.html b/src/app/shared/form/number-picker/number-picker.component.html
index 9b2ef98925..9b9d038e86 100644
--- a/src/app/shared/form/number-picker/number-picker.component.html
+++ b/src/app/shared/form/number-picker/number-picker.component.html
@@ -3,10 +3,10 @@
       class="btn btn-link-focus"
       type="button"
       tabindex="0"
-      [disabled]="disabled"
+      [dsBtnDisabled]="disabled"
       (click)="toggleUp()">
       <span class="chevron"></span>
-      <span class="sr-only">Increment</span>
+      <span class="sr-only">{{'form.number-picker.increment' | translate: {field: name} }}</span>
     </button>
     <input
       id="{{id}}"
@@ -24,14 +24,15 @@
       [disabled]="disabled"
       [ngClass]="{'is-invalid': invalid}"
       title="{{placeholder}}"
+      [attr.aria-label]="placeholder"
     >
     <button
       class="btn btn-link-focus"
       type="button"
       tabindex="0"
-      [disabled]="disabled"
+      [dsBtnDisabled]="disabled"
       (click)="toggleDown()">
       <span class="chevron bottom"></span>
-      <span class="sr-only">Decrement</span>
+      <span class="sr-only">{{'form.number-picker.decrement' | translate: {field: name} }}</span>
     </button>
 </div>
diff --git a/src/app/shared/form/number-picker/number-picker.component.spec.ts b/src/app/shared/form/number-picker/number-picker.component.spec.ts
index d4484dbfa3..b6d623d70b 100644
--- a/src/app/shared/form/number-picker/number-picker.component.spec.ts
+++ b/src/app/shared/form/number-picker/number-picker.component.spec.ts
@@ -7,6 +7,7 @@ import { By } from '@angular/platform-browser';
 import { NumberPickerComponent } from './number-picker.component';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { createTestComponent } from '../../testing/utils.test';
+import { TranslateModule } from '@ngx-translate/core';
 
 describe('NumberPickerComponent test suite', () => {
 
@@ -23,7 +24,8 @@ describe('NumberPickerComponent test suite', () => {
       imports: [
         FormsModule,
         ReactiveFormsModule,
-        NgbModule
+        NgbModule,
+        TranslateModule.forRoot()
       ],
       declarations: [
         NumberPickerComponent,
@@ -42,7 +44,6 @@ describe('NumberPickerComponent test suite', () => {
   beforeEach(() => {
     html = `
       <ds-number-picker
-        tabindex="1"
         [disabled]="disabled"
         [min]="min"
         [max]="max"
diff --git a/src/app/shared/form/number-picker/number-picker.component.ts b/src/app/shared/form/number-picker/number-picker.component.ts
index 82240c41d1..8f2de5ee54 100644
--- a/src/app/shared/form/number-picker/number-picker.component.ts
+++ b/src/app/shared/form/number-picker/number-picker.component.ts
@@ -1,5 +1,6 @@
 import { ChangeDetectorRef, Component, EventEmitter, Input, OnInit, Output, SimpleChanges, } from '@angular/core';
 import { ControlValueAccessor, UntypedFormBuilder, NG_VALUE_ACCESSOR } from '@angular/forms';
+import { TranslateService } from '@ngx-translate/core';
 import { isEmpty } from '../../empty.util';
 
 @Component({
@@ -31,7 +32,9 @@ export class NumberPickerComponent implements OnInit, ControlValueAccessor {
 
   startValue: number;
 
-  constructor(private fb: UntypedFormBuilder, private cd: ChangeDetectorRef) {
+  constructor(private fb: UntypedFormBuilder,
+              private cd: ChangeDetectorRef,
+              private translate: TranslateService) {
   }
 
   ngOnInit() {
@@ -103,13 +106,12 @@ export class NumberPickerComponent implements OnInit, ControlValueAccessor {
 
       if (i >= this.min && i <= this.max) {
         this.value = i;
-        this.emitChange();
       } else if (event.target.value === null || event.target.value === '') {
         this.value = null;
-        this.emitChange();
       } else {
         this.value = undefined;
       }
+      this.emitChange();
     } catch (e) {
       this.value = undefined;
     }
diff --git a/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.html b/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.html
index fb7d162008..0f4b436cfb 100644
--- a/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.html
+++ b/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.html
@@ -1,30 +1,40 @@
-<ds-alert *ngIf="description | async" [content]="description | async" [type]="'alert-info'"></ds-alert>
-<div class="treeview-header row">
+<ds-alert [content]="'vocabulary-treeview.info' | translate" [type]="AlertType.Info"></ds-alert>
+<div class="treeview-header row mb-1">
   <div class="col-12">
     <div class="input-group">
-      <input type="text" class="form-control" [(ngModel)]="searchText" (keyup.enter)="search()">
+      <input #searchInput type="text" class="form-control" [(ngModel)]="searchText" (keyup.enter)="search()"
+             [attr.aria-label]="'vocabulary-treeview.search.form.search-placeholder' | translate"
+             [placeholder]="'vocabulary-treeview.search.form.search-placeholder' | translate">
       <div class="input-group-append" id="button-addon4">
-        <button class="btn btn-outline-primary" type="button" (click)="search()" [disabled]="!isSearchEnabled()">
+        <button class="btn btn-outline-primary" type="button" (click)="search()" [dsBtnDisabled]="!isSearchEnabled()"
+                [attr.aria-label]="'vocabulary-treeview.search.form.search' | translate" role="button" tabindex="0">
           {{'vocabulary-treeview.search.form.search' | translate}}
         </button>
-        <button class="btn btn-outline-secondary" type="button" (click)="reset()">
+        <button class="btn btn-outline-secondary" type="button" (click)="reset()"
+                [attr.aria-label]="'vocabulary-treeview.search.form.reset' | translate" role="button" tabindex="0">
           {{'vocabulary-treeview.search.form.reset' | translate}}
         </button>
+        <button class="btn btn-outline-primary" type="button" (click)="add()" [dsBtnDisabled]="this.vocabularyOptions.closed"
+                [attr.aria-label]="'vocabulary-treeview.search.form.add' | translate" role="button" tabindex="0">
+          {{'vocabulary-treeview.search.form.add' | translate}}
+        </button>
       </div>
     </div>
   </div>
 </div>
 <div class="treeview-container">
   <ds-themed-loading *ngIf="loading | async" [showMessage]="false"></ds-themed-loading>
-  <h4 *ngIf="!(loading | async) && dataSource.data.length === 0" class="text-center text-muted mt-4" >
-    <span>{{'vocabulary-treeview.search.no-result' | translate}}</span>
-  </h4>
+  <div aria-live="polite">
+    <h2 *ngIf="!(loading | async) && dataSource.data.length === 0" class="h4 text-center text-muted mt-4" >
+      <span>{{'vocabulary-treeview.search.no-result' | translate}}</span>
+    </h2>
+  </div>
   <cdk-tree [dataSource]="dataSource" [treeControl]="treeControl">
     <!-- Leaf node -->
     <cdk-tree-node *cdkTreeNodeDef="let node" cdkTreeNodePadding class="d-flex">
-        <button type="button" class="btn btn-default" cdkTreeNodeToggle>
-          <span class="fas fa-angle-right invisible" aria-hidden="true"></span>
-        </button>
+      <span aria-hidden="true" type="button" class="btn btn-default px-2 mr-1" cdkTreeNodeToggle>
+        <i class="fas fa-fw fa-angle-right invisible"></i>
+      </span>
           <label *ngIf="multiSelect" class="d-flex align-items-center m-0 p-0 form-check"
                  [class.text-success]="node.isSelected"
                  [ngbTooltip]="node.item?.otherInformation?.note"
@@ -36,27 +46,32 @@
                    [(ngModel)]="node.isSelected"
                    [checked]="node.isSelected"
                    (change)="onSelect(node.item)"
+                   role="checkbox"
+                   tabindex="0"
             >
             <span>{{node.item.display}}</span>
           </label>
           <button *ngIf="!multiSelect" class="btn btn-outline-link btn-sm text-left"
                   [class.text-success]="node.isSelected"
-                  [disabled]="!node.item?.selectable"
+                  [dsBtnDisabled]="!node.item?.selectable"
                   [ngbTooltip]="node.item?.otherInformation?.note"
                   [openDelay]="500"
                   container="body"
-                  (click)="onSelect(node.item)">
+                  (click)="onSelect(node.item)"
+                  role="button"
+                  tabindex="0">
           <span>{{node.item.display}}</span>
         </button>
     </cdk-tree-node>
 
     <!-- expandable node -->
     <cdk-tree-node *cdkTreeNodeDef="let node; when: hasChildren" cdkTreeNodePadding class="d-flex">
-        <button type="button" class="btn btn-default" cdkTreeNodeToggle
+        <button type="button" class="btn btn-default px-2 mr-1" cdkTreeNodeToggle
                 [attr.aria-label]="'toggle ' + node.name"
-                (click)="loadChildren(node)">
-          <span class="fas {{treeControl.isExpanded(node) ? 'fa-angle-down' : 'fa-angle-right'}}"
-                aria-hidden="true"></span>
+                (click)="loadChildren(node)"
+                role="button"
+                tabindex="0">
+          <i class="fas fa-fw {{treeControl.isExpanded(node) ? 'fa-angle-down' : 'fa-angle-right'}}"></i>
         </button>
 
           <label *ngIf="multiSelect" class="d-flex align-items-center m-0 p-0 form-check"
@@ -69,28 +84,34 @@
                    [(ngModel)]="node.isSelected"
                    [checked]="node.isSelected"
                    (change)="onSelect(node.item)"
+                   role="checkbox"
+                   tabindex="0"
             >
             <span>{{node.item.display}}</span>
           </label>
           <button *ngIf="!multiSelect" class="btn btn-outline-link btn-sm text-left"
                   [class.text-success]="node.isSelected"
-                  [disabled]="!node.item?.selectable"
+                  [dsBtnDisabled]="!node.item?.selectable"
                   [ngbTooltip]="node.item?.otherInformation?.note"
                   [openDelay]="500"
                   container="body"
-                  (click)="onSelect(node.item)">
+                  (click)="onSelect(node.item)"
+                  role="button"
+                  tabindex="0">
             <span>{{node.item.display}}</span>
           </button>
     </cdk-tree-node>
 
     <cdk-tree-node *cdkTreeNodeDef="let node; when: isLoadMore" cdkTreeNodePadding>
-      <button class="btn btn-outline-secondary btn-sm" (click)="loadMore(node.loadMoreParentItem)">
+      <button class="btn btn-outline-secondary btn-sm" (click)="loadMore(node.loadMoreParentItem)"
+              [attr.aria-label]="'vocabulary-treeview.load-more' | translate" role="button" tabindex="0">
         {{'vocabulary-treeview.load-more' | translate}}...
       </button>
     </cdk-tree-node>
 
     <cdk-tree-node *cdkTreeNodeDef="let node; when: isLoadMoreRoot">
-      <button class="btn btn-outline-secondary btn-sm" (click)="loadMoreRoot(node)">
+      <button class="btn btn-outline-secondary btn-sm" (click)="loadMoreRoot(node)"
+              [attr.aria-label]="'vocabulary-treeview.load-more' | translate" role="button" tabindex="0">
         {{'vocabulary-treeview.load-more' | translate}}...
       </button>
     </cdk-tree-node>
diff --git a/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.scss b/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.scss
index 3f0cea10d2..3d32acac5b 100644
--- a/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.scss
+++ b/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.scss
@@ -2,10 +2,6 @@
   text-align:left;
 }
 
-cdk-tree .btn:focus {
-  box-shadow: none !important;
-}
-
 label {
   cursor: pointer;
 }
diff --git a/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.ts b/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.ts
index 017416e8c2..5695644040 100644
--- a/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.ts
+++ b/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.ts
@@ -1,7 +1,6 @@
 import { FlatTreeControl } from '@angular/cdk/tree';
-import { Component, EventEmitter, Input, OnDestroy, OnInit, Output } from '@angular/core';
+import { Component, ElementRef, EventEmitter, Input, OnDestroy, OnInit, Output, OnChanges, SimpleChanges, ViewChild } from '@angular/core';
 
-import { map } from 'rxjs/operators';
 import { Observable, Subscription } from 'rxjs';
 import { Store } from '@ngrx/store';
 import { TranslateService } from '@ngx-translate/core';
@@ -16,9 +15,9 @@ import { VocabularyEntry } from '../../../core/submission/vocabularies/models/vo
 import { VocabularyTreeFlattener } from './vocabulary-tree-flattener';
 import { VocabularyTreeFlatDataSource } from './vocabulary-tree-flat-data-source';
 import { CoreState } from '../../../core/core-state.model';
-import { lowerCase } from 'lodash/string';
 import { VocabularyService } from '../../../core/submission/vocabularies/vocabulary.service';
 import { getFirstSucceededRemoteDataPayload } from '../../../core/shared/operators';
+import { AlertType } from '../../alert/alert-type';
 
 /**
  * Component that shows a hierarchical vocabulary in a tree view
@@ -28,7 +27,12 @@ import { getFirstSucceededRemoteDataPayload } from '../../../core/shared/operato
   templateUrl: './vocabulary-treeview.component.html',
   styleUrls: ['./vocabulary-treeview.component.scss']
 })
-export class VocabularyTreeviewComponent implements OnDestroy, OnInit {
+export class VocabularyTreeviewComponent implements OnDestroy, OnInit, OnChanges {
+
+  /**
+   * Implemented to manage focus on input
+   */
+  @ViewChild('searchInput') searchInput!: ElementRef;
 
   /**
    * The {@link VocabularyOptions} object
@@ -50,11 +54,6 @@ export class VocabularyTreeviewComponent implements OnDestroy, OnInit {
    */
   @Input() multiSelect = false;
 
-  /**
-   * Contain a descriptive message for this vocabulary retrieved from i18n files
-   */
-  description: Observable<string>;
-
   /**
    * A map containing the current node showed by the tree
    */
@@ -112,6 +111,8 @@ export class VocabularyTreeviewComponent implements OnDestroy, OnInit {
    */
   private subs: Subscription[] = [];
 
+  readonly AlertType = AlertType;
+
   /**
    * Initialize instance variables
    *
@@ -216,12 +217,6 @@ export class VocabularyTreeviewComponent implements OnDestroy, OnInit {
       })
     );
 
-    this.translate.get(`search.filters.filter.${this.vocabularyOptions.name}.head`).pipe(
-      map((type) => lowerCase(type)),
-    ).subscribe(
-      (type) => this.description = this.translate.get('vocabulary-treeview.info', { type })
-    );
-
     this.loading = this.vocabularyTreeviewService.isLoading();
 
     this.vocabularyTreeviewService.initialize(this.vocabularyOptions, new PageInfo(), this.selectedItems, null);
@@ -304,8 +299,20 @@ export class VocabularyTreeviewComponent implements OnDestroy, OnInit {
       this.storedNodeMap = new Map<string, TreeviewFlatNode>();
       this.vocabularyTreeviewService.restoreNodes();
     }
+    if (this.searchInput) {
+      this.searchInput.nativeElement.focus();
+    }
   }
 
+  add() {
+    const userVocabularyEntry = {
+      value: this.searchText,
+      display: this.searchText,
+    } as VocabularyEntryDetail;
+    this.select.emit(userVocabularyEntry);
+  }
+
+
   /**
    * Unsubscribe from all subscriptions
    */
@@ -322,4 +329,9 @@ export class VocabularyTreeviewComponent implements OnDestroy, OnInit {
   private getEntryId(entry: VocabularyEntry): string {
     return entry.authority || entry.otherInformation.id || undefined;
   }
+
+  ngOnChanges(changes: SimpleChanges): void {
+    this.reset();
+    this.vocabularyTreeviewService.initialize(this.vocabularyOptions, new PageInfo(), this.selectedItems, null);
+  }
 }
diff --git a/src/app/shared/handle.service.spec.ts b/src/app/shared/handle.service.spec.ts
index b326eb0416..8203940c6a 100644
--- a/src/app/shared/handle.service.spec.ts
+++ b/src/app/shared/handle.service.spec.ts
@@ -1,47 +1,88 @@
-import { HandleService } from './handle.service';
+import { HandleService, CANONICAL_PREFIX_KEY } from './handle.service';
+import { TestBed } from '@angular/core/testing';
+import { ConfigurationDataServiceStub } from './testing/configuration-data.service.stub';
+import { ConfigurationDataService } from '../core/data/configuration-data.service';
+import { createSuccessfulRemoteDataObject$ } from './remote-data.utils';
+import { ConfigurationProperty } from '../core/shared/configuration-property.model';
 
 describe('HandleService', () => {
   let service: HandleService;
 
+  let configurationService: ConfigurationDataServiceStub;
+
   beforeEach(() => {
-    service = new HandleService();
+    configurationService = new ConfigurationDataServiceStub();
+
+    TestBed.configureTestingModule({
+      providers: [
+        { provide: ConfigurationDataService, useValue: configurationService },
+      ],
+    });
+    service = TestBed.inject(HandleService);
   });
 
   describe(`normalizeHandle`, () => {
-    it(`should simply return an already normalized handle`, () => {
-      let input, output;
+    it('should normalize a handle url with custom conical prefix with trailing slash', (done: DoneFn) => {
+      spyOn(configurationService, 'findByPropertyName').and.returnValue(createSuccessfulRemoteDataObject$({
+        ... new ConfigurationProperty(),
+        name: CANONICAL_PREFIX_KEY,
+        values: ['https://hdl.handle.net/'],
+      }));
 
-      input = '123456789/123456';
-      output = service.normalizeHandle(input);
-      expect(output).toEqual(input);
-
-      input = '12.3456.789/123456';
-      output = service.normalizeHandle(input);
-      expect(output).toEqual(input);
+      service.normalizeHandle('https://hdl.handle.net/123456789/123456').subscribe((handle: string | null) => {
+        expect(handle).toBe('123456789/123456');
+        done();
+      });
     });
 
-    it(`should normalize a handle url`, () => {
-      let input, output;
+    it('should normalize a handle url with custom conical prefix without trailing slash', (done: DoneFn) => {
+      spyOn(configurationService, 'findByPropertyName').and.returnValue(createSuccessfulRemoteDataObject$({
+        ... new ConfigurationProperty(),
+        name: CANONICAL_PREFIX_KEY,
+        values: ['https://hdl.handle.net/'],
+      }));
 
-      input = 'https://hdl.handle.net/handle/123456789/123456';
-      output = service.normalizeHandle(input);
-      expect(output).toEqual('123456789/123456');
-
-      input = 'https://rest.api/server/handle/123456789/123456';
-      output = service.normalizeHandle(input);
-      expect(output).toEqual('123456789/123456');
+      service.normalizeHandle('https://hdl.handle.net/123456789/123456').subscribe((handle: string | null) => {
+        expect(handle).toBe('123456789/123456');
+        done();
+      });
     });
 
-    it(`should return null if the input doesn't contain a handle`, () => {
-      let input, output;
+    describe('should simply return an already normalized handle', () => {
+      it('123456789/123456', (done: DoneFn) => {
+        service.normalizeHandle('123456789/123456').subscribe((handle: string | null) => {
+          expect(handle).toBe('123456789/123456');
+          done();
+        });
+      });
 
-      input = 'https://hdl.handle.net/handle/123456789';
-      output = service.normalizeHandle(input);
-      expect(output).toBeNull();
+      it('12.3456.789/123456', (done: DoneFn) => {
+        service.normalizeHandle('12.3456.789/123456').subscribe((handle: string | null) => {
+          expect(handle).toBe('12.3456.789/123456');
+          done();
+        });
+      });
+    });
 
-      input = 'something completely different';
-      output = service.normalizeHandle(input);
-      expect(output).toBeNull();
+    it('should normalize handle urls starting with handle', (done: DoneFn) => {
+      service.normalizeHandle('https://rest.api/server/handle/123456789/123456').subscribe((handle: string | null) => {
+        expect(handle).toBe('123456789/123456');
+        done();
+      });
+    });
+
+    it('should return null if the input doesn\'t contain a valid handle', (done: DoneFn) => {
+      service.normalizeHandle('https://hdl.handle.net/123456789').subscribe((handle: string | null) => {
+        expect(handle).toBeNull();
+        done();
+      });
+    });
+
+    it('should return null if the input doesn\'t contain a handle', (done: DoneFn) => {
+      service.normalizeHandle('something completely different').subscribe((handle: string | null) => {
+        expect(handle).toBeNull();
+        done();
+      });
     });
   });
 });
diff --git a/src/app/shared/handle.service.ts b/src/app/shared/handle.service.ts
index da0f17f7de..1f22c7d304 100644
--- a/src/app/shared/handle.service.ts
+++ b/src/app/shared/handle.service.ts
@@ -1,7 +1,18 @@
 import { Injectable } from '@angular/core';
-import { isNotEmpty, isEmpty } from './empty.util';
+import { isEmpty, hasNoValue } from './empty.util';
+import { ConfigurationDataService } from '../core/data/configuration-data.service';
+import { getFirstCompletedRemoteData } from '../core/shared/operators';
+import { map, take } from 'rxjs/operators';
+import { ConfigurationProperty } from '../core/shared/configuration-property.model';
+import { Observable, of as observableOf } from 'rxjs';
+import { RemoteData } from '../core/data/remote-data';
 
-const PREFIX_REGEX = /handle\/([^\/]+\/[^\/]+)$/;
+export const CANONICAL_PREFIX_KEY = 'handle.canonical.prefix';
+
+const PREFIX_REGEX = (prefix: string | undefined) => {
+  const formattedPrefix: string = prefix?.replace(/\/$/, '');
+  return new RegExp(`(${formattedPrefix ? formattedPrefix  + '|' : '' }handle)\/([^\/]+\/[^\/]+)$`);
+};
 const NO_PREFIX_REGEX = /^([^\/]+\/[^\/]+)$/;
 
 @Injectable({
@@ -9,33 +20,57 @@ const NO_PREFIX_REGEX = /^([^\/]+\/[^\/]+)$/;
 })
 export class HandleService {
 
+  constructor(
+    protected configurationService: ConfigurationDataService,
+  ) {
+  }
 
   /**
    * Turns a handle string into the default 123456789/12345 format
    *
-   * @param handle the input handle
+   * When the <b>handle.canonical.prefix</b> doesn't end with handle, be sure to expose the variable so that the
+   * frontend can find the handle
    *
-   * normalizeHandle('123456789/123456')                                 // '123456789/123456'
-   * normalizeHandle('12.3456.789/123456')                               // '12.3456.789/123456'
-   * normalizeHandle('https://hdl.handle.net/handle/123456789/123456')   // '123456789/123456'
-   * normalizeHandle('https://rest.api/server/handle/123456789/123456')  // '123456789/123456'
-   * normalizeHandle('https://rest.api/server/handle/123456789')         // null
+   * @param handle the input handle
+   * @return
+   * <ul>
+   *   <li>normalizeHandle('123456789/123456')                                 // '123456789/123456'</li>
+   *   <li>normalizeHandle('12.3456.789/123456')                               // '12.3456.789/123456'</li>
+   *   <li>normalizeHandle('https://hdl.handle.net/123456789/123456')          // '123456789/123456'</li>
+   *   <li>normalizeHandle('https://rest.api/server/handle/123456789/123456')  // '123456789/123456'</li>
+   *   <li>normalizeHandle('https://rest.api/server/handle/123456789')         // null</li>
+   * </ul>
    */
-  normalizeHandle(handle: string): string {
-    let matches: string[];
-    if (isNotEmpty(handle)) {
-      matches = handle.match(PREFIX_REGEX);
+  normalizeHandle(handle: string): Observable<string | null> {
+    if (hasNoValue(handle)) {
+      return observableOf(null);
     }
+    return this.configurationService.findByPropertyName(CANONICAL_PREFIX_KEY).pipe(
+      getFirstCompletedRemoteData(),
+      map((configurationPropertyRD: RemoteData<ConfigurationProperty>) => {
+        if (configurationPropertyRD.hasSucceeded) {
+          return configurationPropertyRD.payload.values.length >= 1 ? configurationPropertyRD.payload.values[0] : undefined;
+        } else {
+          return undefined;
+        }
+      }),
+      map((prefix: string | undefined) => {
+        let matches: string[];
 
-    if (isEmpty(matches) || matches.length < 2) {
-      matches = handle.match(NO_PREFIX_REGEX);
-    }
+        matches = handle.match(PREFIX_REGEX(prefix));
 
-    if (isEmpty(matches) || matches.length < 2) {
-      return null;
-    } else {
-      return matches[1];
-    }
+        if (isEmpty(matches) || matches.length < 3) {
+          matches = handle.match(NO_PREFIX_REGEX);
+        }
+
+        if (isEmpty(matches) || matches.length < 2) {
+          return null;
+        } else {
+          return matches[matches.length - 1];
+        }
+      }),
+      take(1),
+    );
   }
 
 }
diff --git a/src/app/shared/host-window.service.ts b/src/app/shared/host-window.service.ts
index 6d13d921e0..1c71bf5075 100644
--- a/src/app/shared/host-window.service.ts
+++ b/src/app/shared/host-window.service.ts
@@ -10,13 +10,15 @@ import { AppState } from '../app.reducer';
 import { CSSVariableService } from './sass-helper/css-variable.service';
 
 export enum WidthCategory {
-  XS,
-  SM,
-  MD,
-  LG,
-  XL
+  XS = 0,
+  SM = 1,
+  MD = 2,
+  LG = 3,
+  XL = 4,
 }
 
+export const maxMobileWidth = WidthCategory.SM;
+
 const hostWindowStateSelector = (state: AppState) => state.hostWindow;
 const widthSelector = createSelector(hostWindowStateSelector, (hostWindow: HostWindowState) => hostWindow.width);
 
@@ -31,11 +33,11 @@ export class HostWindowService {
     /* See _exposed_variables.scss */
     variableService.getAllVariables()
       .subscribe((variables) => {
-      this.breakPoints.XL_MIN = parseInt(variables['--bs-xl-min'], 10);
-      this.breakPoints.LG_MIN = parseInt(variables['--bs-lg-min'], 10);
-      this.breakPoints.MD_MIN = parseInt(variables['--bs-md-min'], 10);
-      this.breakPoints.SM_MIN = parseInt(variables['--bs-sm-min'], 10);
-    });
+        this.breakPoints.XL_MIN = parseInt(variables['--bs-xl-min'], 10);
+        this.breakPoints.LG_MIN = parseInt(variables['--bs-lg-min'], 10);
+        this.breakPoints.MD_MIN = parseInt(variables['--bs-md-min'], 10);
+        this.breakPoints.SM_MIN = parseInt(variables['--bs-sm-min'], 10);
+      });
   }
 
   private getWidthObs(): Observable<number> {
@@ -99,6 +101,41 @@ export class HostWindowService {
     );
   }
 
+  is(exactWidthCat: WidthCategory): Observable<boolean> {
+    return this.widthCategory.pipe(
+      map((widthCat: WidthCategory) => widthCat === exactWidthCat),
+      distinctUntilChanged()
+    );
+  }
+
+  isIn(widthCatArray: [WidthCategory]): Observable<boolean> {
+    return this.widthCategory.pipe(
+      map((widthCat: WidthCategory) => widthCatArray.includes(widthCat)),
+      distinctUntilChanged()
+    );
+  }
+
+  isUpTo(maxWidthCat: WidthCategory): Observable<boolean> {
+    return this.widthCategory.pipe(
+      map((widthCat: WidthCategory) => widthCat <= maxWidthCat),
+      distinctUntilChanged()
+    );
+  }
+
+  isMobile(): Observable<boolean> {
+    return this.widthCategory.pipe(
+      map((widthCat: WidthCategory) => widthCat <= maxMobileWidth),
+      distinctUntilChanged()
+    );
+  }
+
+  isDesktop(): Observable<boolean> {
+    return this.widthCategory.pipe(
+      map((widthCat: WidthCategory) => widthCat > maxMobileWidth),
+      distinctUntilChanged()
+    );
+  }
+
   isXsOrSm(): Observable<boolean> {
     return observableCombineLatest(
       this.isXs(),
diff --git a/src/app/shared/impersonate-navbar/impersonate-navbar.component.html b/src/app/shared/impersonate-navbar/impersonate-navbar.component.html
index 9f2b66694b..9581ba8ea8 100644
--- a/src/app/shared/impersonate-navbar/impersonate-navbar.component.html
+++ b/src/app/shared/impersonate-navbar/impersonate-navbar.component.html
@@ -1,4 +1,4 @@
-<ul class="navbar-nav" *ngIf="(isAuthenticated$ | async) && isImpersonating">
+<ul class="navbar-nav" *ngIf="isImpersonating$ | async">
   <li class="nav-item">
     <button class="btn btn-sm btn-dark" ngbTooltip="{{'nav.stop-impersonating' | translate}}" (click)="stopImpersonating()">
       <i class="fa fa-user-secret"></i>
diff --git a/src/app/shared/impersonate-navbar/impersonate-navbar.component.spec.ts b/src/app/shared/impersonate-navbar/impersonate-navbar.component.spec.ts
index af03afc05f..0e78a5d68a 100644
--- a/src/app/shared/impersonate-navbar/impersonate-navbar.component.spec.ts
+++ b/src/app/shared/impersonate-navbar/impersonate-navbar.component.spec.ts
@@ -14,6 +14,7 @@ import { authReducer } from '../../core/auth/auth.reducer';
 import { AuthTokenInfo } from '../../core/auth/models/auth-token-info.model';
 import { EPersonMock } from '../testing/eperson.mock';
 import { AppState, storeModuleConfig } from '../../app.reducer';
+import { of as observableOf } from 'rxjs';
 
 describe('ImpersonateNavbarComponent', () => {
   let component: ImpersonateNavbarComponent;
@@ -65,7 +66,7 @@ describe('ImpersonateNavbarComponent', () => {
 
   describe('when the user is impersonating another user', () => {
     beforeEach(() => {
-      component.isImpersonating = true;
+      component.isImpersonating$ = observableOf(true);
       fixture.detectChanges();
     });
 
diff --git a/src/app/shared/impersonate-navbar/impersonate-navbar.component.ts b/src/app/shared/impersonate-navbar/impersonate-navbar.component.ts
index 6166ee950d..485492b1a7 100644
--- a/src/app/shared/impersonate-navbar/impersonate-navbar.component.ts
+++ b/src/app/shared/impersonate-navbar/impersonate-navbar.component.ts
@@ -1,8 +1,9 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit, ElementRef } from '@angular/core';
 import { select, Store } from '@ngrx/store';
 import { AppState } from '../../app.reducer';
 import { AuthService } from '../../core/auth/auth.service';
-import { Observable } from 'rxjs';
+import { Observable, Subscription } from 'rxjs';
+import { map } from 'rxjs/operators';
 import { isAuthenticated } from '../../core/auth/selectors';
 
 @Component({
@@ -13,24 +14,32 @@ import { isAuthenticated } from '../../core/auth/selectors';
  * Navbar component for actions to take concerning impersonating users
  */
 export class ImpersonateNavbarComponent implements OnInit {
-  /**
-   * Whether or not the user is authenticated.
-   * @type {Observable<string>}
-   */
-  isAuthenticated$: Observable<boolean>;
 
   /**
    * Is the user currently impersonating another user?
    */
-  isImpersonating: boolean;
+  isImpersonating$: Observable<boolean>;
 
-  constructor(private store: Store<AppState>,
-              private authService: AuthService) {
+  subscriptions: Subscription[] = [];
+
+  constructor(
+    protected elRef: ElementRef,
+    protected store: Store<AppState>,
+    protected authService: AuthService,
+  ) {
   }
 
   ngOnInit(): void {
-    this.isAuthenticated$ = this.store.pipe(select(isAuthenticated));
-    this.isImpersonating = this.authService.isImpersonating();
+    this.isImpersonating$ = this.store.pipe(select(isAuthenticated)).pipe(
+      map((isUserAuthenticated: boolean) => isUserAuthenticated && this.authService.isImpersonating()),
+    );
+    this.subscriptions.push(this.isImpersonating$.subscribe((isImpersonating: boolean) => {
+      if (isImpersonating) {
+        this.elRef.nativeElement.classList.remove('d-none');
+      } else {
+        this.elRef.nativeElement.classList.add('d-none');
+      }
+    }));
   }
 
   /**
diff --git a/src/app/shared/input-suggestions/dso-input-suggestions/dso-input-suggestions.component.html b/src/app/shared/input-suggestions/dso-input-suggestions/dso-input-suggestions.component.html
index 7515b830b9..17e7197261 100644
--- a/src/app/shared/input-suggestions/dso-input-suggestions/dso-input-suggestions.component.html
+++ b/src/app/shared/input-suggestions/dso-input-suggestions/dso-input-suggestions.component.html
@@ -9,7 +9,9 @@
            [dsDebounce]="debounceTime" (onDebounce)="find($event)"
            [placeholder]="placeholder"
            [ngModelOptions]="{standalone: true}" autocomplete="off"/>
-    <input type="submit" class="d-none"/>
+    <button class="sr-only" type="submit">
+        {{'search.filters.search.submit' | translate}}
+    </button>
     <div class="autocomplete dropdown-menu" [ngClass]="{'show': (show | async) && isNotEmpty(suggestions)}">
         <div class="dropdown-list">
             <div *ngFor="let suggestionOption of suggestions">
diff --git a/src/app/shared/input-suggestions/filter-suggestions/filter-input-suggestions.component.html b/src/app/shared/input-suggestions/filter-suggestions/filter-input-suggestions.component.html
index 726dc9ca0e..d29163e09a 100644
--- a/src/app/shared/input-suggestions/filter-suggestions/filter-input-suggestions.component.html
+++ b/src/app/shared/input-suggestions/filter-suggestions/filter-input-suggestions.component.html
@@ -20,10 +20,9 @@
            [ngModelOptions]="{standalone: true}" autocomplete="off"
     />
   </ng-template>
-  <label class="d-none">
-    <input type="submit"/>
-    <span>{{'search.filters.search.submit' | translate}}</span>
-  </label>
+  <button class="sr-only" type="submit">
+    {{'search.filters.search.submit' | translate}}
+  </button>
   <div class="autocomplete dropdown-menu" [ngClass]="{'show': (show | async) && isNotEmpty(suggestions)}">
     <div class="dropdown-list">
       <div *ngFor="let suggestionOption of suggestions">
diff --git a/src/app/shared/input-suggestions/input-suggestions.component.html b/src/app/shared/input-suggestions/input-suggestions.component.html
index f137982fee..188dcbcb6a 100644
--- a/src/app/shared/input-suggestions/input-suggestions.component.html
+++ b/src/app/shared/input-suggestions/input-suggestions.component.html
@@ -9,7 +9,9 @@
            [dsDebounce]="debounceTime" (onDebounce)="find($event)"
            [placeholder]="placeholder"
            [ngModelOptions]="{standalone: true}" autocomplete="off"/>
-    <input type="submit" class="d-none"/>
+    <button class="sr-only" type="submit">
+        {{'search.filters.search.submit' | translate}}
+    </button>
     <div class="autocomplete dropdown-menu" [ngClass]="{'show': (show | async) && isNotEmpty(suggestions)}">
         <div class="dropdown-list">
             <div *ngFor="let suggestionOption of suggestions">
diff --git a/src/app/shared/input-suggestions/validation-suggestions/validation-suggestions.component.html b/src/app/shared/input-suggestions/validation-suggestions/validation-suggestions.component.html
index d6e2ead6ea..c5d71e33fd 100644
--- a/src/app/shared/input-suggestions/validation-suggestions/validation-suggestions.component.html
+++ b/src/app/shared/input-suggestions/validation-suggestions/validation-suggestions.component.html
@@ -10,7 +10,9 @@
          [placeholder]="placeholder"
          ng-model-options="{standalone: true}"
          autocomplete="off">
-  <input type="submit" class="d-none"/>
+  <button class="sr-only" type="submit">
+    {{'search.filters.search.submit' | translate}}
+  </button>
   <div class="autocomplete dropdown-menu" [ngClass]="{'show': (show | async) && isNotEmpty(suggestions)}">
     <div class="dropdown-list">
       <div *ngFor="let suggestionOption of suggestions">
diff --git a/src/app/shared/lang-switch/lang-switch.component.html b/src/app/shared/lang-switch/lang-switch.component.html
index d9a5efaa81..6d1727cfe7 100644
--- a/src/app/shared/lang-switch/lang-switch.component.html
+++ b/src/app/shared/lang-switch/lang-switch.component.html
@@ -1,13 +1,17 @@
 <div ngbDropdown class="navbar-nav" *ngIf="moreThanOneLanguage" display="dynamic" placement="bottom-right">
-  <a href="javascript:void(0);" role="button"
+  <a href="javascript:void(0);" role="menuitem"
      [attr.aria-label]="'nav.language' |translate"
-     [title]="'nav.language' | translate" class="px-1"
+     aria-controls="language-menu-list"
+     aria-haspopup="menu"
+     [title]="'nav.language' | translate"
      (click)="$event.preventDefault()" data-toggle="dropdown" ngbDropdownToggle
+     data-test="lang-switch"
      tabindex="0">
     <i class="fas fa-globe-asia fa-lg fa-fw"></i>
   </a>
-  <ul ngbDropdownMenu class="dropdown-menu" [attr.aria-label]="'nav.language' |translate">
+  <ul ngbDropdownMenu class="dropdown-menu" [attr.aria-label]="'nav.language' |translate" id="language-menu-list" role="menu">
     <li class="dropdown-item" tabindex="0" #langSelect *ngFor="let lang of translate.getLangs()"
+        role="menuitem"
             (keyup.enter)="useLang(lang)"
             (click)="useLang(lang)"
             [class.active]="lang === translate.currentLang">
diff --git a/src/app/shared/lang-switch/lang-switch.component.scss b/src/app/shared/lang-switch/lang-switch.component.scss
index 7b593a9bb5..ea099435a8 100644
--- a/src/app/shared/lang-switch/lang-switch.component.scss
+++ b/src/app/shared/lang-switch/lang-switch.component.scss
@@ -9,3 +9,7 @@
     color: var(--ds-header-icon-color-hover);
   }
 }
+
+.dropdown-item {
+  cursor: pointer;
+}
diff --git a/src/app/shared/lang-switch/lang-switch.component.ts b/src/app/shared/lang-switch/lang-switch.component.ts
index 41d707a056..e3c5e919ca 100644
--- a/src/app/shared/lang-switch/lang-switch.component.ts
+++ b/src/app/shared/lang-switch/lang-switch.component.ts
@@ -1,7 +1,5 @@
-import { Component, OnInit } from '@angular/core';
-
+import { Component, OnInit, ElementRef } from '@angular/core';
 import { TranslateService } from '@ngx-translate/core';
-
 import { LangConfig } from '../../../config/lang-config.interface';
 import { environment } from '../../../environments/environment';
 import { LocaleService } from '../../core/locale/locale.service';
@@ -25,6 +23,7 @@ export class LangSwitchComponent implements OnInit {
   moreThanOneLanguage: boolean;
 
   constructor(
+    public el: ElementRef,
     public translate: TranslateService,
     private localeService: LocaleService
   ) {
@@ -33,6 +32,9 @@ export class LangSwitchComponent implements OnInit {
   ngOnInit(): void {
     this.activeLangs = environment.languages.filter((MyLangConfig) => MyLangConfig.active === true);
     this.moreThanOneLanguage = (this.activeLangs.length > 1);
+    if (!this.moreThanOneLanguage) {
+      this.el.nativeElement.parentElement.classList.add('d-none');
+    }
   }
 
   /**
diff --git a/src/app/shared/lang-switch/themed-lang-switch.component.ts b/src/app/shared/lang-switch/themed-lang-switch.component.ts
new file mode 100644
index 0000000000..8be3447426
--- /dev/null
+++ b/src/app/shared/lang-switch/themed-lang-switch.component.ts
@@ -0,0 +1,27 @@
+import { Component } from '@angular/core';
+import { ThemedComponent } from '../theme-support/themed.component';
+import { LangSwitchComponent } from './lang-switch.component';
+
+/**
+ * Themed wrapper for {@link LangSwitchComponent}
+ */
+@Component({
+  selector: 'ds-themed-lang-switch',
+  styleUrls: [],
+  templateUrl: '../theme-support/themed.component.html',
+})
+export class ThemedLangSwitchComponent extends ThemedComponent<LangSwitchComponent> {
+
+  protected getComponentName(): string {
+    return 'LangSwitchComponent';
+  }
+
+  protected importThemedComponent(themeName: string): Promise<any> {
+    return import(`../../../themes/${themeName}/app/shared/lang-switch/lang-switch.component`);
+  }
+
+  protected importUnthemedComponent(): Promise<any> {
+    return import(`./lang-switch.component`);
+  }
+
+}
diff --git a/src/app/shared/live-region/live-region.component.html b/src/app/shared/live-region/live-region.component.html
new file mode 100644
index 0000000000..a48f3ad52e
--- /dev/null
+++ b/src/app/shared/live-region/live-region.component.html
@@ -0,0 +1,3 @@
+<div class="live-region" [ngClass]="{'visually-hidden': !isVisible }" aria-live="assertive" role="log" aria-relevant="additions" aria-atomic="true">
+  <div class="live-region-message" *ngFor="let message of (messages$ | async)">{{ message }}</div>
+</div>
diff --git a/src/app/shared/live-region/live-region.component.scss b/src/app/shared/live-region/live-region.component.scss
new file mode 100644
index 0000000000..69844a93e1
--- /dev/null
+++ b/src/app/shared/live-region/live-region.component.scss
@@ -0,0 +1,13 @@
+.live-region {
+  position: fixed;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  padding-left: 60px;
+  height: 90px;
+  line-height: 18px;
+  color: var(--bs-white);
+  background-color: var(--bs-dark);
+  opacity: 0.94;
+  z-index: var(--ds-live-region-z-index);
+}
diff --git a/src/app/shared/live-region/live-region.component.spec.ts b/src/app/shared/live-region/live-region.component.spec.ts
new file mode 100644
index 0000000000..2e9797f9c3
--- /dev/null
+++ b/src/app/shared/live-region/live-region.component.spec.ts
@@ -0,0 +1,57 @@
+import { LiveRegionComponent } from './live-region.component';
+import { ComponentFixture, waitForAsync, TestBed } from '@angular/core/testing';
+import { TranslateModule } from '@ngx-translate/core';
+import { LiveRegionService } from './live-region.service';
+import { of } from 'rxjs';
+import { By } from '@angular/platform-browser';
+
+describe('liveRegionComponent', () => {
+  let fixture: ComponentFixture<LiveRegionComponent>;
+  let liveRegionService: LiveRegionService;
+
+  beforeEach(waitForAsync(() => {
+    liveRegionService = jasmine.createSpyObj('liveRegionService', {
+      getMessages$: of(['message1', 'message2']),
+      getLiveRegionVisibility: false,
+      setLiveRegionVisibility: undefined,
+    });
+
+    void TestBed.configureTestingModule({
+      imports: [
+        TranslateModule.forRoot(),
+      ],
+      declarations: [LiveRegionComponent],
+      providers: [
+        { provide: LiveRegionService, useValue: liveRegionService },
+      ],
+    }).compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(LiveRegionComponent);
+    fixture.detectChanges();
+  });
+
+  it('should contain the current live region messages', () => {
+    const messages = fixture.debugElement.queryAll(By.css('.live-region-message'));
+
+    expect(messages.length).toEqual(2);
+    expect(messages[0].nativeElement.textContent).toEqual('message1');
+    expect(messages[1].nativeElement.textContent).toEqual('message2');
+  });
+
+  it('should respect the live region visibility', () => {
+    const liveRegion = fixture.debugElement.query(By.css('.live-region'));
+    expect(liveRegion).toBeDefined();
+
+    const liveRegionHidden = fixture.debugElement.query(By.css('.visually-hidden'));
+    expect(liveRegionHidden).toBeDefined();
+
+    liveRegionService.getLiveRegionVisibility = jasmine.createSpy('getLiveRegionVisibility').and.returnValue(true);
+    fixture = TestBed.createComponent(LiveRegionComponent);
+    fixture.detectChanges();
+
+    const liveRegionVisible  = fixture.debugElement.query(By.css('.visually-hidden'));
+    expect(liveRegionVisible).toBeNull();
+  });
+});
diff --git a/src/app/shared/live-region/live-region.component.ts b/src/app/shared/live-region/live-region.component.ts
new file mode 100644
index 0000000000..8a25c4657c
--- /dev/null
+++ b/src/app/shared/live-region/live-region.component.ts
@@ -0,0 +1,31 @@
+import { Component, OnInit } from '@angular/core';
+import { LiveRegionService } from './live-region.service';
+import { Observable } from 'rxjs';
+
+/**
+ * The Live Region Component is an accessibility tool for screenreaders. When a change occurs on a page when the changed
+ * section is not in focus, a message should be displayed by this component so it can be announced by a screen reader.
+ *
+ * This component should not be used directly. Use the {@link LiveRegionService} to add messages.
+ */
+@Component({
+  selector: `ds-live-region`,
+  templateUrl: './live-region.component.html',
+  styleUrls: ['./live-region.component.scss'],
+})
+export class LiveRegionComponent implements OnInit {
+
+  protected isVisible: boolean;
+
+  protected messages$: Observable<string[]>;
+
+  constructor(
+    protected liveRegionService: LiveRegionService,
+  ) {
+  }
+
+  ngOnInit() {
+    this.isVisible = this.liveRegionService.getLiveRegionVisibility();
+    this.messages$ = this.liveRegionService.getMessages$();
+  }
+}
diff --git a/src/app/shared/live-region/live-region.config.ts b/src/app/shared/live-region/live-region.config.ts
new file mode 100644
index 0000000000..e545bfd254
--- /dev/null
+++ b/src/app/shared/live-region/live-region.config.ts
@@ -0,0 +1,9 @@
+import { Config } from '../../../config/config.interface';
+
+/**
+ * Configuration interface used by the LiveRegionService
+ */
+export class LiveRegionConfig implements Config {
+  messageTimeOutDurationMs: number;
+  isVisible: boolean;
+}
diff --git a/src/app/shared/live-region/live-region.service.spec.ts b/src/app/shared/live-region/live-region.service.spec.ts
new file mode 100644
index 0000000000..858ef88313
--- /dev/null
+++ b/src/app/shared/live-region/live-region.service.spec.ts
@@ -0,0 +1,170 @@
+import { LiveRegionService } from './live-region.service';
+import { fakeAsync, tick, flush } from '@angular/core/testing';
+import { UUIDService } from '../../core/shared/uuid.service';
+
+describe('liveRegionService', () => {
+  let service: LiveRegionService;
+
+  beforeEach(() => {
+    service = new LiveRegionService(
+      new UUIDService(),
+    );
+  });
+
+  describe('addMessage', () => {
+    it('should correctly add messages', () => {
+      expect(service.getMessages().length).toEqual(0);
+
+      service.addMessage('Message One');
+      expect(service.getMessages().length).toEqual(1);
+      expect(service.getMessages()[0]).toEqual('Message One');
+
+      service.addMessage('Message Two');
+      expect(service.getMessages().length).toEqual(2);
+      expect(service.getMessages()[1]).toEqual('Message Two');
+    });
+  });
+
+  describe('clearMessages', () => {
+    it('should clear the messages', () => {
+      expect(service.getMessages().length).toEqual(0);
+
+      service.addMessage('Message One');
+      service.addMessage('Message Two');
+      expect(service.getMessages().length).toEqual(2);
+
+      service.clear();
+      expect(service.getMessages().length).toEqual(0);
+    });
+  });
+
+  describe('messages$', () => {
+    it('should emit when a message is added and when a message is removed after the timeOut', fakeAsync(() => {
+      const results: string[][] = [];
+
+      service.getMessages$().subscribe((messages) => {
+        results.push(messages);
+      });
+
+      expect(results.length).toEqual(1);
+      expect(results[0]).toEqual([]);
+
+      service.addMessage('message');
+
+      tick();
+
+      expect(results.length).toEqual(2);
+      expect(results[1]).toEqual(['message']);
+
+      tick(service.getMessageTimeOutMs());
+
+      expect(results.length).toEqual(3);
+      expect(results[2]).toEqual([]);
+    }));
+
+    it('should only emit once when the messages are cleared', fakeAsync(() => {
+      const results: string[][] = [];
+
+      service.getMessages$().subscribe((messages) => {
+        results.push(messages);
+      });
+
+      expect(results.length).toEqual(1);
+      expect(results[0]).toEqual([]);
+
+      service.addMessage('Message One');
+      service.addMessage('Message Two');
+
+      tick();
+
+      expect(results.length).toEqual(3);
+      expect(results[2]).toEqual(['Message One', 'Message Two']);
+
+      service.clear();
+      flush();
+
+      expect(results.length).toEqual(4);
+      expect(results[3]).toEqual([]);
+    }));
+
+    it('should not pop messages added after clearing within timeOut period', fakeAsync(() => {
+      const results: string[][] = [];
+
+      service.getMessages$().subscribe((messages) => {
+        results.push(messages);
+      });
+
+      expect(results.length).toEqual(1);
+      expect(results[0]).toEqual([]);
+
+      service.addMessage('Message One');
+      tick(10000);
+      service.clear();
+      tick(15000);
+      service.addMessage('Message Two');
+
+      // Message Two should not be cleared after 5 more seconds
+      tick(5000);
+
+      expect(results.length).toEqual(4);
+      expect(results[3]).toEqual(['Message Two']);
+
+      // But should be cleared 30 seconds after it was added
+      tick(25000);
+      expect(results.length).toEqual(5);
+      expect(results[4]).toEqual([]);
+    }));
+
+    it('should respect configured timeOut', fakeAsync(() => {
+      const results: string[][] = [];
+
+      service.getMessages$().subscribe((messages) => {
+        results.push(messages);
+      });
+
+      expect(results.length).toEqual(1);
+      expect(results[0]).toEqual([]);
+
+      const timeOutMs = 500;
+      service.setMessageTimeOutMs(timeOutMs);
+
+      service.addMessage('Message One');
+      tick(timeOutMs - 1);
+
+      expect(results.length).toEqual(2);
+      expect(results[1]).toEqual(['Message One']);
+
+      tick(1);
+
+      expect(results.length).toEqual(3);
+      expect(results[2]).toEqual([]);
+
+      const timeOutMsTwo = 50000;
+      service.setMessageTimeOutMs(timeOutMsTwo);
+
+      service.addMessage('Message Two');
+      tick(timeOutMsTwo - 1);
+
+      expect(results.length).toEqual(4);
+      expect(results[3]).toEqual(['Message Two']);
+
+      tick(1);
+
+      expect(results.length).toEqual(5);
+      expect(results[4]).toEqual([]);
+    }));
+  });
+
+  describe('liveRegionVisibility', () => {
+    it('should be false by default', () => {
+      expect(service.getLiveRegionVisibility()).toBeFalse();
+    });
+
+    it('should correctly update', () => {
+      service.setLiveRegionVisibility(true);
+      expect(service.getLiveRegionVisibility()).toBeTrue();
+      service.setLiveRegionVisibility(false);
+      expect(service.getLiveRegionVisibility()).toBeFalse();
+    });
+  });
+});
diff --git a/src/app/shared/live-region/live-region.service.stub.ts b/src/app/shared/live-region/live-region.service.stub.ts
new file mode 100644
index 0000000000..4f10b46a4c
--- /dev/null
+++ b/src/app/shared/live-region/live-region.service.stub.ts
@@ -0,0 +1,30 @@
+import { of } from 'rxjs';
+import { LiveRegionService } from './live-region.service';
+
+export function getLiveRegionServiceStub(): LiveRegionService {
+  return new LiveRegionServiceStub() as unknown as LiveRegionService;
+}
+
+export class LiveRegionServiceStub {
+  getMessages = jasmine.createSpy('getMessages').and.returnValue(
+    ['Message One', 'Message Two']
+  );
+
+  getMessages$ = jasmine.createSpy('getMessages$').and.returnValue(
+    of(['Message One', 'Message Two'])
+  );
+
+  addMessage = jasmine.createSpy('addMessage').and.returnValue('messageId');
+
+  clear = jasmine.createSpy('clear');
+
+  clearMessageByUUID = jasmine.createSpy('clearMessageByUUID');
+
+  getLiveRegionVisibility = jasmine.createSpy('getLiveRegionVisibility').and.returnValue(false);
+
+  setLiveRegionVisibility = jasmine.createSpy('setLiveRegionVisibility');
+
+  getMessageTimeOutMs = jasmine.createSpy('getMessageTimeOutMs').and.returnValue(30000);
+
+  setMessageTimeOutMs = jasmine.createSpy('setMessageTimeOutMs');
+}
diff --git a/src/app/shared/live-region/live-region.service.ts b/src/app/shared/live-region/live-region.service.ts
new file mode 100644
index 0000000000..72940c1a0e
--- /dev/null
+++ b/src/app/shared/live-region/live-region.service.ts
@@ -0,0 +1,132 @@
+import { Injectable } from '@angular/core';
+import { BehaviorSubject } from 'rxjs';
+import { environment } from '../../../environments/environment';
+import { UUIDService } from '../../core/shared/uuid.service';
+
+/**
+ * The LiveRegionService is responsible for handling the messages that are shown by the {@link LiveRegionComponent}.
+ * Use this service to add or remove messages to the Live Region.
+ */
+@Injectable({
+  providedIn: 'root',
+})
+export class LiveRegionService {
+
+  constructor(
+    protected uuidService: UUIDService,
+  ) {
+  }
+
+  /**
+   * The duration after which the messages disappear in milliseconds
+   * @protected
+   */
+  protected messageTimeOutDurationMs: number = environment.liveRegion.messageTimeOutDurationMs;
+
+  /**
+   * Array containing the messages that should be shown in the live region,
+   * together with a uuid, so they can be uniquely identified
+   * @protected
+   */
+  protected messages: { message: string, uuid: string }[] = [];
+
+  /**
+   * BehaviorSubject emitting the array with messages every time the array updates
+   * @protected
+   */
+  protected messages$: BehaviorSubject<string[]> = new BehaviorSubject([]);
+
+  /**
+   * Whether the live region should be visible
+   * @protected
+   */
+  protected liveRegionIsVisible: boolean = environment.liveRegion.isVisible;
+
+  /**
+   * Returns a copy of the array with the current live region messages
+   */
+  getMessages(): string[] {
+    return this.messages.map(messageObj => messageObj.message);
+  }
+
+  /**
+   * Returns the BehaviorSubject emitting the array with messages every time the array updates
+   */
+  getMessages$(): BehaviorSubject<string[]> {
+    return this.messages$;
+  }
+
+  /**
+   * Adds a message to the live-region messages array
+   * @param message
+   * @return The uuid of the message
+   */
+  addMessage(message: string): string {
+    const uuid = this.uuidService.generate();
+    this.messages.push({ message, uuid });
+    setTimeout(() => this.clearMessageByUUID(uuid), this.messageTimeOutDurationMs);
+    this.emitCurrentMessages();
+    return uuid;
+  }
+
+  /**
+   * Clears the live-region messages array
+   */
+  clear() {
+    this.messages = [];
+    this.emitCurrentMessages();
+  }
+
+  /**
+   * Removes the message with the given UUID from the messages array
+   * @param uuid The uuid of the message to clear
+   */
+  clearMessageByUUID(uuid: string) {
+    const index = this.messages.findIndex(messageObj => messageObj.uuid === uuid);
+
+    if (index !== -1) {
+      this.messages.splice(index, 1);
+      this.emitCurrentMessages();
+    }
+  }
+
+  /**
+   * Makes the messages$ BehaviorSubject emit the current messages array
+   * @protected
+   */
+  protected emitCurrentMessages() {
+    this.messages$.next(this.getMessages());
+  }
+
+  /**
+   * Returns a boolean specifying whether the live region should be visible.
+   * Returns 'true' if the region should be visible and false otherwise.
+   */
+  getLiveRegionVisibility(): boolean {
+    return this.liveRegionIsVisible;
+  }
+
+  /**
+   * Sets the visibility of the live region.
+   * Setting this to true will make the live region visible which is useful for debugging purposes.
+   * @param isVisible
+   */
+  setLiveRegionVisibility(isVisible: boolean) {
+    this.liveRegionIsVisible = isVisible;
+  }
+
+  /**
+   * Gets the current message timeOut duration in milliseconds
+   */
+  getMessageTimeOutMs(): number {
+    return this.messageTimeOutDurationMs;
+  }
+
+  /**
+   * Sets the message timeOut duration
+   * @param timeOutMs the message timeOut duration in milliseconds
+   */
+  setMessageTimeOutMs(timeOutMs: number) {
+    this.messageTimeOutDurationMs = timeOutMs;
+  }
+}
diff --git a/src/app/shared/loading/loading.component.html b/src/app/shared/loading/loading.component.html
index bb407098d7..e391cedbea 100644
--- a/src/app/shared/loading/loading.component.html
+++ b/src/app/shared/loading/loading.component.html
@@ -1,6 +1,6 @@
 <div *ngIf="!spinner">
-  <label *ngIf="showMessage && message">{{ message }}</label>
-  <div class="loader">
+  <label *ngIf="showMessage && message" aria-live="polite">{{ message }}</label>
+  <div class="loader" aria-hidden="true">
     <span class="l-1"></span>
     <span class="l-2"></span>
     <span class="l-3"></span>
@@ -13,6 +13,6 @@
     <span class="l-10"></span>
   </div>
 </div>
-<div *ngIf='spinner' class="spinner spinner-border" role="status">
+<div *ngIf='spinner' class="spinner spinner-border" role="status" aria-live="polite">
   <span class="sr-only">{{ message }}</span>
 </div>
diff --git a/src/app/shared/loading/themed-loading.component.ts b/src/app/shared/loading/themed-loading.component.ts
index 48773d75c8..de2d602fc4 100644
--- a/src/app/shared/loading/themed-loading.component.ts
+++ b/src/app/shared/loading/themed-loading.component.ts
@@ -1,4 +1,4 @@
-import { Component, Input, ComponentFactoryResolver, ChangeDetectorRef } from '@angular/core';
+import { Component, Input, ChangeDetectorRef } from '@angular/core';
 import { ThemedComponent } from '../theme-support/themed.component';
 import { LoadingComponent } from './loading.component';
 import { ThemeService } from '../theme-support/theme.service';
@@ -20,11 +20,10 @@ export class ThemedLoadingComponent extends ThemedComponent<LoadingComponent> {
   protected inAndOutputNames: (keyof LoadingComponent & keyof this)[] = ['message', 'showMessage', 'spinner'];
 
   constructor(
-    protected resolver: ComponentFactoryResolver,
     protected cdr: ChangeDetectorRef,
     protected themeService: ThemeService
   ) {
-    super(resolver, cdr, themeService);
+    super(cdr, themeService);
   }
 
   protected getComponentName(): string {
diff --git a/src/app/shared/log-in/container/log-in-container.component.spec.ts b/src/app/shared/log-in/container/log-in-container.component.spec.ts
index 29598e422e..4700cf9307 100644
--- a/src/app/shared/log-in/container/log-in-container.component.spec.ts
+++ b/src/app/shared/log-in/container/log-in-container.component.spec.ts
@@ -13,13 +13,17 @@ import { AuthMethod } from '../../../core/auth/models/auth.method';
 import { AuthServiceStub } from '../../testing/auth-service.stub';
 import { createTestComponent } from '../../testing/utils.test';
 import { HardRedirectService } from '../../../core/services/hard-redirect.service';
+import { AuthMethodType } from '../../../core/auth/models/auth.method-type';
+import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
+import { AuthorizationDataServiceStub } from '../../testing/authorization-service.stub';
+import { RouterTestingModule } from '@angular/router/testing';
 
 describe('LogInContainerComponent', () => {
 
   let component: LogInContainerComponent;
   let fixture: ComponentFixture<LogInContainerComponent>;
 
-  const authMethod = new AuthMethod('password');
+  const authMethod = new AuthMethod(AuthMethodType.Password, 0);
 
   let hardRedirectService: HardRedirectService;
 
@@ -35,13 +39,15 @@ describe('LogInContainerComponent', () => {
         ReactiveFormsModule,
         StoreModule.forRoot(authReducer),
         SharedModule,
-        TranslateModule.forRoot()
+        TranslateModule.forRoot(),
+        RouterTestingModule,
       ],
       declarations: [
         TestComponent
       ],
       providers: [
         { provide: AuthService, useClass: AuthServiceStub },
+        { provide: AuthorizationDataService, useClass: AuthorizationDataServiceStub },
         { provide: HardRedirectService, useValue: hardRedirectService },
         LogInContainerComponent
       ],
@@ -113,6 +119,6 @@ describe('LogInContainerComponent', () => {
 class TestComponent {
 
   isStandalonePage = true;
-  authMethod = new AuthMethod('password');
+  authMethod = new AuthMethod(AuthMethodType.Password, 0);
 
 }
diff --git a/src/app/shared/log-in/container/log-in-container.component.ts b/src/app/shared/log-in/container/log-in-container.component.ts
index f6a08a1e1e..28e9f2f7e1 100644
--- a/src/app/shared/log-in/container/log-in-container.component.ts
+++ b/src/app/shared/log-in/container/log-in-container.component.ts
@@ -1,5 +1,4 @@
-import { Component, Injector, Input, OnInit } from '@angular/core';
-
+import { Component, Injector, Input, OnInit, Type } from '@angular/core';
 import { rendersAuthMethodType } from '../methods/log-in.methods-decorator';
 import { AuthMethod } from '../../../core/auth/models/auth.method';
 
@@ -27,12 +26,9 @@ export class LogInContainerComponent implements OnInit {
    */
   public objectInjector: Injector;
 
-  /**
-   * Initialize instance variables
-   *
-   * @param {Injector} injector
-   */
-  constructor(private injector: Injector) {
+  constructor(
+    protected injector: Injector,
+  ) {
   }
 
   /**
@@ -51,8 +47,8 @@ export class LogInContainerComponent implements OnInit {
   /**
    * Find the correct component based on the AuthMethod's type
    */
-  getAuthMethodContent(): string {
-      return rendersAuthMethodType(this.authMethod.authMethodType);
+  getAuthMethodContent(): Type<Component> {
+    return rendersAuthMethodType(this.authMethod.authMethodType);
   }
 
 }
diff --git a/src/app/shared/log-in/log-in.component.html b/src/app/shared/log-in/log-in.component.html
index 6b1fdb9ff6..030d1a8176 100644
--- a/src/app/shared/log-in/log-in.component.html
+++ b/src/app/shared/log-in/log-in.component.html
@@ -1,13 +1,7 @@
 <ds-themed-loading *ngIf="(loading | async) || (isAuthenticated | async)" class="m-5"></ds-themed-loading>
 <div *ngIf="!(loading | async) && !(isAuthenticated | async)" class="px-4 py-3 mx-auto login-container">
-  <ng-container *ngFor="let authMethod of (authMethods); let i = index">
-    <div *ngIf="i === 1" class="text-center mt-2">
-      <span class="align-middle">{{"login.form.or-divider" | translate}}</span>
-    </div>
+  <ng-container *ngFor="let authMethod of (authMethods | async); let last = last">
     <ds-log-in-container [authMethod]="authMethod" [isStandalonePage]="isStandalonePage"></ds-log-in-container>
+    <div *ngIf="!last" class="dropdown-divider my-2"></div>
   </ng-container>
-
-  <div class="dropdown-divider"></div>
-  <a class="dropdown-item" *ngIf="canRegister$ | async" [routerLink]="[getRegisterRoute()]" [attr.data-test]="'register' | dsBrowserOnly">{{"login.form.new-user" | translate}}</a>
-  <a class="dropdown-item" [routerLink]="[getForgotRoute()]" [attr.data-test]="'forgot' | dsBrowserOnly">{{"login.form.forgot-password" | translate}}</a>
 </div>
diff --git a/src/app/shared/log-in/log-in.component.spec.ts b/src/app/shared/log-in/log-in.component.spec.ts
index 0a13e8b701..e44aa1aa71 100644
--- a/src/app/shared/log-in/log-in.component.spec.ts
+++ b/src/app/shared/log-in/log-in.component.spec.ts
@@ -21,6 +21,8 @@ import { RouterTestingModule } from '@angular/router/testing';
 import { HardRedirectService } from '../../core/services/hard-redirect.service';
 import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
 import { of } from 'rxjs';
+import { ThemeService } from '../theme-support/theme.service';
+import { getMockThemeService } from '../mocks/theme-service.mock';
 
 describe('LogInComponent', () => {
 
@@ -50,7 +52,7 @@ describe('LogInComponent', () => {
     });
 
     // refine the test module by declaring the test component
-    TestBed.configureTestingModule({
+    void TestBed.configureTestingModule({
       imports: [
         FormsModule,
         ReactiveFormsModule,
@@ -75,6 +77,7 @@ describe('LogInComponent', () => {
         { provide: HardRedirectService, useValue: hardRedirectService },
         { provide: AuthorizationDataService, useValue: authorizationService },
         provideMockStore({ initialState }),
+        { provide: ThemeService, useValue: getMockThemeService() },
         LogInComponent
       ],
       schemas: [
@@ -91,7 +94,7 @@ describe('LogInComponent', () => {
 
     // synchronous beforeEach
     beforeEach(() => {
-      const html = `<ds-log-in [isStandalonePage]="isStandalonePage"> </ds-log-in>`;
+      const html = `<ds-themed-log-in [isStandalonePage]="isStandalonePage"> </ds-themed-log-in>`;
 
       testFixture = createTestComponent(html, TestComponent) as ComponentFixture<TestComponent>;
       testComp = testFixture.componentInstance;
diff --git a/src/app/shared/log-in/log-in.component.ts b/src/app/shared/log-in/log-in.component.ts
index e6b2ba9dcf..0fdc029cb4 100644
--- a/src/app/shared/log-in/log-in.component.ts
+++ b/src/app/shared/log-in/log-in.component.ts
@@ -1,5 +1,5 @@
-import { Component, Input, OnInit } from '@angular/core';
-import { Observable } from 'rxjs';
+import { ChangeDetectionStrategy, Component, Input, OnInit } from '@angular/core';
+import { map, Observable } from 'rxjs';
 import { select, Store } from '@ngrx/store';
 import { AuthMethod } from '../../core/auth/models/auth.method';
 import {
@@ -8,22 +8,16 @@ import {
   isAuthenticated,
   isAuthenticationLoading
 } from '../../core/auth/selectors';
-import { getForgotPasswordRoute, getRegisterRoute } from '../../app-routing-paths';
 import { hasValue } from '../empty.util';
 import { AuthService } from '../../core/auth/auth.service';
-import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
-import { FeatureID } from '../../core/data/feature-authorization/feature-id';
 import { CoreState } from '../../core/core-state.model';
-import { AuthMethodType } from '../../core/auth/models/auth.method-type';
+import { rendersAuthMethodType } from './methods/log-in.methods-decorator';
 
-/**
- * /users/sign-in
- * @class LogInComponent
- */
 @Component({
   selector: 'ds-log-in',
   templateUrl: './log-in.component.html',
-  styleUrls: ['./log-in.component.scss']
+  styleUrls: ['./log-in.component.scss'],
+  changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class LogInComponent implements OnInit {
 
@@ -37,7 +31,7 @@ export class LogInComponent implements OnInit {
    * The list of authentication methods available
    * @type {AuthMethod[]}
    */
-  public authMethods: AuthMethod[];
+  public authMethods: Observable<AuthMethod[]>;
 
   /**
    * Whether user is authenticated.
@@ -51,24 +45,19 @@ export class LogInComponent implements OnInit {
    */
   public loading: Observable<boolean>;
 
-  /**
-   * Whether or not the current user (or anonymous) is authorized to register an account
-   */
-  canRegister$: Observable<boolean>;
-
   constructor(private store: Store<CoreState>,
               private authService: AuthService,
-              private authorizationService: AuthorizationDataService) {
+  ) {
   }
 
   ngOnInit(): void {
-
-    this.store.pipe(
+    this.authMethods = this.store.pipe(
       select(getAuthenticationMethods),
-    ).subscribe(methods => {
-      // ignore the ip authentication method when it's returned by the backend
-      this.authMethods = methods.filter(a => a.authMethodType !== AuthMethodType.Ip);
-    });
+      map((methods: AuthMethod[]) => methods
+        .filter((authMethod: AuthMethod) => rendersAuthMethodType(authMethod.authMethodType) !== undefined)
+        .sort((method1: AuthMethod, method2: AuthMethod) => method1.position - method2.position)
+      ),
+    );
 
     // set loading
     this.loading = this.store.pipe(select(isAuthenticationLoading));
@@ -82,15 +71,6 @@ export class LogInComponent implements OnInit {
         this.authService.clearRedirectUrl();
       }
     });
-
-    this.canRegister$ = this.authorizationService.isAuthorized(FeatureID.EPersonRegistration);
   }
 
-  getRegisterRoute() {
-    return getRegisterRoute();
-  }
-
-  getForgotRoute() {
-    return getForgotPasswordRoute();
-  }
 }
diff --git a/src/app/shared/log-in/methods/log-in-external-provider/log-in-external-provider.component.html b/src/app/shared/log-in/methods/log-in-external-provider/log-in-external-provider.component.html
index 6046aec725..5c780d5c3d 100644
--- a/src/app/shared/log-in/methods/log-in-external-provider/log-in-external-provider.component.html
+++ b/src/app/shared/log-in/methods/log-in-external-provider/log-in-external-provider.component.html
@@ -1,3 +1,3 @@
-<button class="btn btn-lg btn-primary btn-block mt-2 text-white" (click)="redirectToExternalProvider()">
+<button class="btn btn-lg btn-primary btn-block text-white" (click)="redirectToExternalProvider()" role="button" tabindex="0">
   <i class="fas fa-sign-in-alt"></i> {{getButtonLabel() | translate}}
 </button>
diff --git a/src/app/shared/log-in/methods/log-in-external-provider/log-in-external-provider.component.spec.ts b/src/app/shared/log-in/methods/log-in-external-provider/log-in-external-provider.component.spec.ts
index de4f62eb9e..5d7a175973 100644
--- a/src/app/shared/log-in/methods/log-in-external-provider/log-in-external-provider.component.spec.ts
+++ b/src/app/shared/log-in/methods/log-in-external-provider/log-in-external-provider.component.spec.ts
@@ -3,11 +3,8 @@ import { ActivatedRoute, Router } from '@angular/router';
 import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
 
 import { provideMockStore } from '@ngrx/store/testing';
-import { Store, StoreModule } from '@ngrx/store';
+import { StoreModule } from '@ngrx/store';
 import { TranslateModule } from '@ngx-translate/core';
-
-import { EPerson } from '../../../../core/eperson/models/eperson.model';
-import { EPersonMock } from '../../../testing/eperson.mock';
 import { authReducer } from '../../../../core/auth/auth.reducer';
 import { AuthService } from '../../../../core/auth/auth.service';
 import { AuthServiceStub } from '../../../testing/auth-service.stub';
@@ -25,17 +22,14 @@ describe('LogInExternalProviderComponent', () => {
 
   let component: LogInExternalProviderComponent;
   let fixture: ComponentFixture<LogInExternalProviderComponent>;
-  let page: Page;
-  let user: EPerson;
   let componentAsAny: any;
   let setHrefSpy;
-  let orcidBaseUrl;
-  let location;
+  let orcidBaseUrl: string;
+  let location: string;
   let initialState: any;
   let hardRedirectService: HardRedirectService;
 
   beforeEach(() => {
-    user = EPersonMock;
     orcidBaseUrl = 'dspace-rest.test/orcid?redirectUrl=';
     location = orcidBaseUrl + 'http://dspace-angular.test/home';
 
@@ -59,7 +53,7 @@ describe('LogInExternalProviderComponent', () => {
 
   beforeEach(waitForAsync(() => {
     // refine the test module by declaring the test component
-    TestBed.configureTestingModule({
+    void TestBed.configureTestingModule({
       imports: [
         StoreModule.forRoot({ auth: authReducer }, storeModuleConfig),
         TranslateModule.forRoot()
@@ -69,7 +63,7 @@ describe('LogInExternalProviderComponent', () => {
       ],
       providers: [
         { provide: AuthService, useClass: AuthServiceStub },
-        { provide: 'authMethodProvider', useValue: new AuthMethod(AuthMethodType.Orcid, location) },
+        { provide: 'authMethodProvider', useValue: new AuthMethod(AuthMethodType.Orcid, 0, location) },
         { provide: 'isStandalonePage', useValue: true },
         { provide: NativeWindowService, useFactory: NativeWindowMockFactory },
         { provide: Router, useValue: new RouterStub() },
@@ -94,7 +88,6 @@ describe('LogInExternalProviderComponent', () => {
     componentAsAny = component;
 
     // create page
-    page = new Page(component, fixture);
     setHrefSpy = spyOnProperty(componentAsAny._window.nativeWindow.location, 'href', 'set').and.callThrough();
 
   });
@@ -130,25 +123,3 @@ describe('LogInExternalProviderComponent', () => {
   });
 
 });
-
-/**
- * I represent the DOM elements and attach spies.
- *
- * @class Page
- */
-class Page {
-
-  public emailInput: HTMLInputElement;
-  public navigateSpy: jasmine.Spy;
-  public passwordInput: HTMLInputElement;
-
-  constructor(private component: LogInExternalProviderComponent, private fixture: ComponentFixture<LogInExternalProviderComponent>) {
-    // use injector to get services
-    const injector = fixture.debugElement.injector;
-    const store = injector.get(Store);
-
-    // add spies
-    this.navigateSpy = spyOn(store, 'dispatch');
-  }
-
-}
diff --git a/src/app/shared/log-in/methods/log-in.methods-decorator.ts b/src/app/shared/log-in/methods/log-in.methods-decorator.ts
index 0614bdeb51..e30a4813dd 100644
--- a/src/app/shared/log-in/methods/log-in.methods-decorator.ts
+++ b/src/app/shared/log-in/methods/log-in.methods-decorator.ts
@@ -1,6 +1,7 @@
+import { Component, Type } from '@angular/core';
 import { AuthMethodType } from '../../../core/auth/models/auth.method-type';
 
-const authMethodsMap = new Map();
+const authMethodsMap: Map<AuthMethodType, Type<Component>> = new Map();
 
 export function renderAuthMethodFor(authMethodType: AuthMethodType) {
   return function decorator(objectElement: any) {
@@ -11,6 +12,6 @@ export function renderAuthMethodFor(authMethodType: AuthMethodType) {
   };
 }
 
-export function rendersAuthMethodType(authMethodType: AuthMethodType) {
+export function rendersAuthMethodType(authMethodType: AuthMethodType): Type<Component> | undefined {
   return authMethodsMap.get(authMethodType);
 }
diff --git a/src/app/shared/log-in/methods/password/log-in-password.component.html b/src/app/shared/log-in/methods/password/log-in-password.component.html
index c1f1016cb8..28a4400470 100644
--- a/src/app/shared/log-in/methods/password/log-in-password.component.html
+++ b/src/app/shared/log-in/methods/password/log-in-password.component.html
@@ -1,9 +1,8 @@
 <form class="form-login"
       (ngSubmit)="submit()"
       [formGroup]="form" novalidate>
-  <label class="sr-only">{{"login.form.email" | translate}}</label>
   <input [attr.aria-label]="'login.form.email' |translate"
-         autocomplete="off"
+         autocomplete="username"
          autofocus
          class="form-control form-control-lg position-relative"
          formControlName="email"
@@ -11,9 +10,8 @@
          required
          type="email"
          [attr.data-test]="'email' | dsBrowserOnly">
-  <label class="sr-only">{{"login.form.password" | translate}}</label>
   <input [attr.aria-label]="'login.form.password' |translate"
-         autocomplete="off"
+         autocomplete="current-password"
          class="form-control form-control-lg position-relative mb-3"
          placeholder="{{'login.form.password' | translate}}"
          formControlName="password"
@@ -26,5 +24,14 @@
        @fadeOut>{{ (message | async) | translate }}</div>
 
   <button class="btn btn-lg btn-primary btn-block mt-3" type="submit" [attr.data-test]="'login-button' | dsBrowserOnly"
-          [disabled]="!form.valid"><i class="fas fa-sign-in-alt"></i> {{"login.form.submit" | translate}}</button>
+          [dsBtnDisabled]="!form.valid" role="button" tabindex="0"><i class="fas fa-sign-in-alt"></i> {{"login.form.submit" | translate}}</button>
 </form>
+
+<div class="mt-2">
+  <a class="dropdown-item" *ngIf="canRegister$ | async" [routerLink]="[getRegisterRoute()]" [attr.data-test]="'register' | dsBrowserOnly" role="menuitem" tabindex="0">
+    {{ 'login.form.new-user' | translate }}
+  </a>
+  <a class="dropdown-item" [routerLink]="[getForgotRoute()]" [attr.data-test]="'forgot' | dsBrowserOnly" role="menuitem" tabindex="0">
+    {{ 'login.form.forgot-password' | translate }}
+  </a>
+</div>
diff --git a/src/app/shared/log-in/methods/password/log-in-password.component.scss b/src/app/shared/log-in/methods/password/log-in-password.component.scss
index 0eda382c0a..955252b51e 100644
--- a/src/app/shared/log-in/methods/password/log-in-password.component.scss
+++ b/src/app/shared/log-in/methods/password/log-in-password.component.scss
@@ -11,3 +11,7 @@
   border-top-right-radius: 0;
 }
 
+.dropdown-item {
+  white-space: normal;
+  padding: .25rem .75rem;
+}
diff --git a/src/app/shared/log-in/methods/password/log-in-password.component.spec.ts b/src/app/shared/log-in/methods/password/log-in-password.component.spec.ts
index 5d9370f204..2c9081d1c3 100644
--- a/src/app/shared/log-in/methods/password/log-in-password.component.spec.ts
+++ b/src/app/shared/log-in/methods/password/log-in-password.component.spec.ts
@@ -8,8 +8,6 @@ import { Store, StoreModule } from '@ngrx/store';
 import { TranslateModule } from '@ngx-translate/core';
 
 import { LogInPasswordComponent } from './log-in-password.component';
-import { EPerson } from '../../../../core/eperson/models/eperson.model';
-import { EPersonMock } from '../../../testing/eperson.mock';
 import { authReducer } from '../../../../core/auth/auth.reducer';
 import { AuthService } from '../../../../core/auth/auth.service';
 import { AuthServiceStub } from '../../../testing/auth-service.stub';
@@ -18,19 +16,18 @@ import { AuthMethod } from '../../../../core/auth/models/auth.method';
 import { AuthMethodType } from '../../../../core/auth/models/auth.method-type';
 import { HardRedirectService } from '../../../../core/services/hard-redirect.service';
 import { BrowserOnlyMockPipe } from '../../../testing/browser-only-mock.pipe';
+import { AuthorizationDataService } from '../../../../core/data/feature-authorization/authorization-data.service';
+import { AuthorizationDataServiceStub } from '../../../testing/authorization-service.stub';
 
 describe('LogInPasswordComponent', () => {
 
   let component: LogInPasswordComponent;
   let fixture: ComponentFixture<LogInPasswordComponent>;
   let page: Page;
-  let user: EPerson;
   let initialState: any;
   let hardRedirectService: HardRedirectService;
 
   beforeEach(() => {
-    user = EPersonMock;
-
     hardRedirectService = jasmine.createSpyObj('hardRedirectService', {
       getCurrentRoute: {}
     });
@@ -50,7 +47,7 @@ describe('LogInPasswordComponent', () => {
 
   beforeEach(waitForAsync(() => {
     // refine the test module by declaring the test component
-    TestBed.configureTestingModule({
+    void TestBed.configureTestingModule({
       imports: [
         FormsModule,
         ReactiveFormsModule,
@@ -63,7 +60,8 @@ describe('LogInPasswordComponent', () => {
       ],
       providers: [
         { provide: AuthService, useClass: AuthServiceStub },
-        { provide: 'authMethodProvider', useValue: new AuthMethod(AuthMethodType.Password) },
+        { provide: AuthorizationDataService, useClass: AuthorizationDataServiceStub },
+        { provide: 'authMethodProvider', useValue: new AuthMethod(AuthMethodType.Password, 0) },
         { provide: 'isStandalonePage', useValue: true },
         { provide: HardRedirectService, useValue: hardRedirectService },
         provideMockStore({ initialState }),
@@ -76,7 +74,7 @@ describe('LogInPasswordComponent', () => {
 
   }));
 
-  beforeEach(() => {
+  beforeEach(async () => {
     // create component and test fixture
     fixture = TestBed.createComponent(LogInPasswordComponent);
 
@@ -87,10 +85,8 @@ describe('LogInPasswordComponent', () => {
     page = new Page(component, fixture);
 
     // verify the fixture is stable (no pending tasks)
-    fixture.whenStable().then(() => {
-      page.addPageElements();
-    });
-
+    await fixture.whenStable();
+    page.addPageElements();
   });
 
   it('should create a FormGroup comprised of FormControls', () => {
diff --git a/src/app/shared/log-in/methods/password/log-in-password.component.ts b/src/app/shared/log-in/methods/password/log-in-password.component.ts
index 22b3b13130..6132394019 100644
--- a/src/app/shared/log-in/methods/password/log-in-password.component.ts
+++ b/src/app/shared/log-in/methods/password/log-in-password.component.ts
@@ -15,6 +15,9 @@ import { AuthMethod } from '../../../../core/auth/models/auth.method';
 import { AuthService } from '../../../../core/auth/auth.service';
 import { HardRedirectService } from '../../../../core/services/hard-redirect.service';
 import { CoreState } from '../../../../core/core-state.model';
+import { getForgotPasswordRoute, getRegisterRoute } from '../../../../app-routing-paths';
+import { FeatureID } from '../../../../core/data/feature-authorization/feature-id';
+import { AuthorizationDataService } from '../../../../core/data/feature-authorization/authorization-data.service';
 
 /**
  * /users/sign-in
@@ -66,21 +69,18 @@ export class LogInPasswordComponent implements OnInit {
   public form: UntypedFormGroup;
 
   /**
-   * @constructor
-   * @param {AuthMethod} injectedAuthMethodModel
-   * @param {boolean} isStandalonePage
-   * @param {AuthService} authService
-   * @param {HardRedirectService} hardRedirectService
-   * @param {FormBuilder} formBuilder
-   * @param {Store<State>} store
+   * Whether the current user (or anonymous) is authorized to register an account
    */
+  public canRegister$: Observable<boolean>;
+
   constructor(
     @Inject('authMethodProvider') public injectedAuthMethodModel: AuthMethod,
     @Inject('isStandalonePage') public isStandalonePage: boolean,
     private authService: AuthService,
     private hardRedirectService: HardRedirectService,
     private formBuilder: UntypedFormBuilder,
-    private store: Store<CoreState>
+    protected store: Store<CoreState>,
+    protected authorizationService: AuthorizationDataService,
   ) {
     this.authMethod = injectedAuthMethodModel;
   }
@@ -115,6 +115,15 @@ export class LogInPasswordComponent implements OnInit {
       })
     );
 
+    this.canRegister$ = this.authorizationService.isAuthorized(FeatureID.EPersonRegistration);
+  }
+
+  getRegisterRoute() {
+    return getRegisterRoute();
+  }
+
+  getForgotRoute() {
+    return getForgotPasswordRoute();
   }
 
   /**
diff --git a/src/app/shared/log-in/themed-log-in.component.ts b/src/app/shared/log-in/themed-log-in.component.ts
new file mode 100644
index 0000000000..cc18274646
--- /dev/null
+++ b/src/app/shared/log-in/themed-log-in.component.ts
@@ -0,0 +1,33 @@
+import { Component, Input } from '@angular/core';
+import { ThemedComponent } from '../theme-support/themed.component';
+import { LogInComponent } from './log-in.component';
+
+/**
+ * Themed wrapper for {@link LogInComponent}
+ */
+@Component({
+  selector: 'ds-themed-log-in',
+  styleUrls: [],
+  templateUrl: './../theme-support/themed.component.html'
+})
+export class ThemedLogInComponent extends ThemedComponent<LogInComponent> {
+
+  @Input() isStandalonePage: boolean;
+
+  protected inAndOutputNames: (keyof LogInComponent & keyof this)[] = [
+    'isStandalonePage',
+  ];
+
+  protected getComponentName(): string {
+    return 'LogInComponent';
+  }
+
+  protected importThemedComponent(themeName: string): Promise<any> {
+    return import(`../../../themes/${themeName}/app/shared/log-in/log-in.component`);
+  }
+
+  protected importUnthemedComponent(): Promise<any> {
+    return import('./log-in.component');
+  }
+
+}
diff --git a/src/app/shared/log-out/log-out.component.html b/src/app/shared/log-out/log-out.component.html
index 83e58b3841..26f03b95a4 100644
--- a/src/app/shared/log-out/log-out.component.html
+++ b/src/app/shared/log-out/log-out.component.html
@@ -2,5 +2,5 @@
 
   <div *ngIf="(error | async)" class="alert alert-danger" role="alert" @fadeOut>{{ error | async }}</div>
 
-  <button class="btn btn-lg btn-primary btn-block mt-3" (click)="logOut()" [attr.data-test]="'logout-button' | dsBrowserOnly"><i class="fas fa-sign-out-alt"></i> {{"logout.form.submit" | translate}}</button>
+  <button role="menuitem" class="btn btn-lg btn-primary btn-block mt-3" (click)="logOut()" [attr.data-test]="'logout-button' | dsBrowserOnly"><i class="fas fa-sign-out-alt"></i> {{"logout.form.submit" | translate}}</button>
 </div>
diff --git a/src/app/shared/menu/menu-item/external-link-menu-item.component.html b/src/app/shared/menu/menu-item/external-link-menu-item.component.html
index dc602cc572..c95c63fdf5 100644
--- a/src/app/shared/menu/menu-item/external-link-menu-item.component.html
+++ b/src/app/shared/menu/menu-item/external-link-menu-item.component.html
@@ -1,4 +1,5 @@
-<a class="nav-item nav-link"
+<a class="ds-menu-item" role="menuitem"
+   routerLinkActive="active"
    [ngClass]="{'disabled': !hasLink }"
    [attr.aria-disabled]="!hasLink"
    [href]="href"
diff --git a/src/app/shared/menu/menu-item/external-link-menu-item.component.ts b/src/app/shared/menu/menu-item/external-link-menu-item.component.ts
index 5fbbe608db..4567876fad 100644
--- a/src/app/shared/menu/menu-item/external-link-menu-item.component.ts
+++ b/src/app/shared/menu/menu-item/external-link-menu-item.component.ts
@@ -9,7 +9,8 @@ import { MenuItemType } from '../menu-item-type.model';
  */
 @Component({
   selector: 'ds-external-link-menu-item',
-  templateUrl: './external-link-menu-item.component.html'
+  styleUrls: ['./menu-item.component.scss'],
+  templateUrl: './external-link-menu-item.component.html',
 })
 @rendersMenuItemForType(MenuItemType.EXTERNAL)
 export class ExternalLinkMenuItemComponent implements OnInit {
diff --git a/src/app/shared/menu/menu-item/link-menu-item.component.html b/src/app/shared/menu/menu-item/link-menu-item.component.html
index 91e23ad886..f96084e6e1 100644
--- a/src/app/shared/menu/menu-item/link-menu-item.component.html
+++ b/src/app/shared/menu/menu-item/link-menu-item.component.html
@@ -1,12 +1,12 @@
-
-<a class="nav-item nav-link"
+<a class="ds-menu-item" role="menuitem"
    [ngClass]="{ 'disabled': !hasLink || item.disabled }"
    [attr.aria-disabled]="!hasLink || item.disabled"
-   [title]="item.text | translate"
+   [attr.data-test]="'link-menu-item.'+item.text"
    [routerLink]="getRouterLink()"
    [queryParams]="item.queryParams"
    (click)="$event.stopPropagation()"
    (keyup.space)="navigate($event)"
-   (keyup.enter)="navigate($event)"
+   (keydown.enter)="navigate($event)"
    href="javascript:void(0);"
+   tabindex="0"
 >{{item.text | translate}}</a>
diff --git a/src/app/shared/menu/menu-item/link-menu-item.component.ts b/src/app/shared/menu/menu-item/link-menu-item.component.ts
index 39f9006987..2cc7e1ae85 100644
--- a/src/app/shared/menu/menu-item/link-menu-item.component.ts
+++ b/src/app/shared/menu/menu-item/link-menu-item.component.ts
@@ -10,7 +10,8 @@ import { Router } from '@angular/router';
  */
 @Component({
   selector: 'ds-link-menu-item',
-  templateUrl: './link-menu-item.component.html'
+  styleUrls: ['./menu-item.component.scss'],
+  templateUrl: './link-menu-item.component.html',
 })
 @rendersMenuItemForType(MenuItemType.LINK)
 export class LinkMenuItemComponent implements OnInit {
diff --git a/src/app/shared/menu/menu-item/menu-item.component.scss b/src/app/shared/menu/menu-item/menu-item.component.scss
new file mode 100644
index 0000000000..ca7546d79a
--- /dev/null
+++ b/src/app/shared/menu/menu-item/menu-item.component.scss
@@ -0,0 +1,5 @@
+:host {
+  .ds-menu-item {
+    display: inline-block;
+  }
+}
diff --git a/src/app/shared/menu/menu-item/onclick-menu-item.component.html b/src/app/shared/menu/menu-item/onclick-menu-item.component.html
index 5e8aecbd44..b8ee6ebe17 100644
--- a/src/app/shared/menu/menu-item/onclick-menu-item.component.html
+++ b/src/app/shared/menu/menu-item/onclick-menu-item.component.html
@@ -1,10 +1,11 @@
 <a *ngIf="!item.disabled"
+   class="ds-menu-item" role="menuitem"
+   routerLinkActive="active"
    href="javascript:void(0);"
-   class="nav-item nav-link"
-   role="button"
    [title]="item.text | translate"
    (click)="activate($event)"
    (keyup.space)="activate($event)"
    (keyup.enter)="activate($event)"
+   [attr.data-test]="item.text"
 >{{item.text | translate}}</a>
-<span *ngIf="item.disabled"   class="nav-item nav-link disabled">{{item.text | translate}}</span>
+<span *ngIf="item.disabled" [attr.data-test]="item.text" class="nav-item nav-link disabled">{{item.text | translate}}</span>
diff --git a/src/app/shared/menu/menu-item/onclick-menu-item.component.spec.ts b/src/app/shared/menu/menu-item/onclick-menu-item.component.spec.ts
index 18ae66b23d..342fb58455 100644
--- a/src/app/shared/menu/menu-item/onclick-menu-item.component.spec.ts
+++ b/src/app/shared/menu/menu-item/onclick-menu-item.component.spec.ts
@@ -45,7 +45,7 @@ describe('OnClickMenuItemComponent', () => {
   });
 
   it('should call the function on the item when clicked', () => {
-    debugElement.query(By.css('a.nav-link')).triggerEventHandler('click', new Event(('click')));
+    debugElement.query(By.css('a.ds-menu-item')).triggerEventHandler('click', new Event(('click')));
     expect(item.function).toHaveBeenCalled();
   });
 });
diff --git a/src/app/shared/menu/menu-item/onclick-menu-item.component.ts b/src/app/shared/menu/menu-item/onclick-menu-item.component.ts
index 68e477b1fb..8bc03717d7 100644
--- a/src/app/shared/menu/menu-item/onclick-menu-item.component.ts
+++ b/src/app/shared/menu/menu-item/onclick-menu-item.component.ts
@@ -8,7 +8,7 @@ import { MenuItemType } from '../menu-item-type.model';
  */
 @Component({
   selector: 'ds-onclick-menu-item',
-  styleUrls: ['./onclick-menu-item.component.scss'],
+  styleUrls: ['./menu-item.component.scss', './onclick-menu-item.component.scss'],
   templateUrl: './onclick-menu-item.component.html'
 })
 @rendersMenuItemForType(MenuItemType.ONCLICK)
diff --git a/src/app/shared/menu/menu-item/text-menu-item.component.html b/src/app/shared/menu/menu-item/text-menu-item.component.html
index 11c4420402..e2dd334caf 100644
--- a/src/app/shared/menu/menu-item/text-menu-item.component.html
+++ b/src/app/shared/menu/menu-item/text-menu-item.component.html
@@ -1 +1 @@
-<span [class.disabled]="item.disabled">{{item.text | translate}}</span>
+<span class="ds-menu-item" [class.disabled]="item.disabled" tabindex="0" role="button">{{item.text | translate}}</span>
diff --git a/src/app/shared/menu/menu-item/text-menu-item.component.ts b/src/app/shared/menu/menu-item/text-menu-item.component.ts
index 25549f53a8..badaeff738 100644
--- a/src/app/shared/menu/menu-item/text-menu-item.component.ts
+++ b/src/app/shared/menu/menu-item/text-menu-item.component.ts
@@ -8,6 +8,7 @@ import { MenuItemType } from '../menu-item-type.model';
  */
 @Component({
   selector: 'ds-text-menu-item',
+  styleUrls: ['./menu-item.component.scss'],
   templateUrl: './text-menu-item.component.html',
 })
 @rendersMenuItemForType(MenuItemType.TEXT)
diff --git a/src/app/shared/menu/menu-section/menu-section.component.ts b/src/app/shared/menu/menu-section/menu-section.component.ts
index 9b5bd499e1..8988d53fe1 100644
--- a/src/app/shared/menu/menu-section/menu-section.component.ts
+++ b/src/app/shared/menu/menu-section/menu-section.component.ts
@@ -20,9 +20,9 @@ import { MenuItemType } from '../menu-item-type.model';
 export class MenuSectionComponent implements OnInit, OnDestroy {
 
   /**
-   * Observable that emits whether or not this section is currently active
+   * {@link BehaviorSubject} containing the current state to whether this section is currently active
    */
-  active: Observable<boolean>;
+  active$: BehaviorSubject<boolean> = new BehaviorSubject(false);
 
   /**
    * The ID of the menu this section resides in
@@ -55,7 +55,11 @@ export class MenuSectionComponent implements OnInit, OnDestroy {
    * Set initial values for instance variables
    */
   ngOnInit(): void {
-    this.active = this.menuService.isSectionActive(this.menuID, this.section.id).pipe(distinctUntilChanged());
+    this.subs.push(this.menuService.isSectionActive(this.menuID, this.section.id).pipe(distinctUntilChanged()).subscribe((isActive: boolean) => {
+      if (this.active$.value !== isActive) {
+        this.active$.next(isActive);
+      }
+    }));
     this.initializeInjectorData();
   }
 
@@ -73,9 +77,12 @@ export class MenuSectionComponent implements OnInit, OnDestroy {
   /**
    * Activate this section
    * @param {Event} event The user event that triggered this method
+   * @param skipEvent Weather the event should still be triggered after deactivating the section or not
    */
-  activateSection(event: Event) {
-    event.preventDefault();
+  activateSection(event: Event, skipEvent = true): void {
+    if (skipEvent) {
+      event.preventDefault();
+    }
     if (!this.section.model?.disabled) {
       this.menuService.activateSection(this.menuID, this.section.id);
     }
@@ -83,10 +90,14 @@ export class MenuSectionComponent implements OnInit, OnDestroy {
 
   /**
    * Deactivate this section
+   *
    * @param {Event} event The user event that triggered this method
+   * @param skipEvent Weather the event should still be triggered after deactivating the section or not
    */
-  deactivateSection(event: Event) {
-    event.preventDefault();
+  deactivateSection(event: Event, skipEvent = true): void {
+    if (skipEvent) {
+      event.preventDefault();
+    }
     this.menuService.deactivateSection(this.menuID, this.section.id);
   }
 
diff --git a/src/app/shared/menu/menu.actions.ts b/src/app/shared/menu/menu.actions.ts
index f02fd73292..268c149c5b 100644
--- a/src/app/shared/menu/menu.actions.ts
+++ b/src/app/shared/menu/menu.actions.ts
@@ -18,6 +18,7 @@ export const MenuActionTypes = {
   EXPAND_MENU: type('dspace/menu/EXPAND_MENU'),
   SHOW_MENU: type('dspace/menu/SHOW_MENU'),
   HIDE_MENU: type('dspace/menu/HIDE_MENU'),
+  REINIT_MENUS: type('dspace/menu/REINIT_MENUS'),
   COLLAPSE_MENU_PREVIEW: type('dspace/menu/COLLAPSE_MENU_PREVIEW'),
   EXPAND_MENU_PREVIEW: type('dspace/menu/EXPAND_MENU_PREVIEW'),
   ADD_SECTION: type('dspace/menu-section/ADD_SECTION'),
@@ -115,6 +116,13 @@ export class ExpandMenuPreviewAction implements Action {
   }
 }
 
+/**
+ * Action used to re-initialise the menus
+ */
+export class ReinitMenuAction implements Action {
+  type = MenuActionTypes.REINIT_MENUS;
+}
+
 // MENU SECTION ACTIONS
 /**
  * Action used to perform state changes for a section of a certain menu
@@ -224,4 +232,5 @@ export type MenuAction =
   | DeactivateMenuSectionAction
   | ToggleActiveMenuSectionAction
   | CollapseMenuPreviewAction
-  | ExpandMenuPreviewAction;
+  | ExpandMenuPreviewAction
+  | ReinitMenuAction;
diff --git a/src/app/shared/menu/menu.component.spec.ts b/src/app/shared/menu/menu.component.spec.ts
index f0660fab4a..e6566d97c3 100644
--- a/src/app/shared/menu/menu.component.spec.ts
+++ b/src/app/shared/menu/menu.component.spec.ts
@@ -1,12 +1,12 @@
+// eslint-disable-next-line max-classes-per-file
 import { ComponentFixture, fakeAsync, TestBed, tick, waitForAsync } from '@angular/core/testing';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { TranslateModule } from '@ngx-translate/core';
-import { ChangeDetectionStrategy, Injector, NO_ERRORS_SCHEMA } from '@angular/core';
+import { ChangeDetectionStrategy, Injector, NO_ERRORS_SCHEMA, Component } from '@angular/core';
 import { MenuService } from './menu.service';
 import { MenuComponent } from './menu.component';
-import { MenuServiceStub } from '../testing/menu-service.stub';
-import { of as observableOf } from 'rxjs';
-import { Router, ActivatedRoute } from '@angular/router';
+import { of as observableOf, BehaviorSubject } from 'rxjs';
+import { ActivatedRoute } from '@angular/router';
 import { RouterTestingModule } from '@angular/router/testing';
 import { MenuSection } from './menu-section.model';
 import { MenuID } from './menu-id.model';
@@ -15,14 +15,39 @@ import { AuthorizationDataService } from '../../core/data/feature-authorization/
 import { createSuccessfulRemoteDataObject } from '../remote-data.utils';
 import { ThemeService } from '../theme-support/theme.service';
 import { getMockThemeService } from '../mocks/theme-service.mock';
+import { MenuItemType } from './menu-item-type.model';
+import { LinkMenuItemModel } from './menu-item/models/link.model';
+import { provideMockStore, MockStore } from '@ngrx/store/testing';
+import { StoreModule, Store } from '@ngrx/store';
+import { authReducer } from '../../core/auth/auth.reducer';
+import { storeModuleConfig, AppState } from '../../app.reducer';
+import { rendersSectionForMenu } from './menu-section.decorator';
+
+const mockMenuID = 'mock-menuID' as MenuID;
+
+@Component({
+  // eslint-disable-next-line @angular-eslint/component-selector
+  selector: '',
+  template: '',
+})
+@rendersSectionForMenu(mockMenuID, true)
+class TestExpandableMenuComponent {
+}
+
+@Component({
+  // eslint-disable-next-line @angular-eslint/component-selector
+  selector: '',
+  template: '',
+})
+@rendersSectionForMenu(mockMenuID, false)
+class TestMenuComponent {
+}
 
 describe('MenuComponent', () => {
   let comp: MenuComponent;
   let fixture: ComponentFixture<MenuComponent>;
   let menuService: MenuService;
-  let router: any;
-
-  const mockMenuID = 'mock-menuID' as MenuID;
+  let store: MockStore;
 
   const mockStatisticSection = { 'id': 'statistics_site', 'active': true, 'visible': true, 'index': 2, 'type': 'statistics', 'model': { 'type': 1, 'text': 'menu.section.statistics', 'link': 'statistics' } };
 
@@ -48,21 +73,55 @@ describe('MenuComponent', () => {
     children: []
   };
 
+  const initialState = {
+    menus: {
+      [mockMenuID]: {
+        collapsed: true,
+        id: mockMenuID,
+        previewCollapsed: true,
+        sectionToSubsectionIndex: {
+          section1: [],
+        },
+        sections: {
+          section1: {
+            id: 'section1',
+            active: false,
+            visible: true,
+            model: {
+              type: MenuItemType.LINK,
+              text: 'test',
+              link: '/test',
+            } as LinkMenuItemModel,
+          },
+        },
+        visible: true,
+      },
+    },
+  };
+
   beforeEach(waitForAsync(() => {
 
     authorizationService = jasmine.createSpyObj('authorizationService', {
       isAuthorized: observableOf(false)
     });
 
-    TestBed.configureTestingModule({
-      imports: [TranslateModule.forRoot(), NoopAnimationsModule, RouterTestingModule],
+    void TestBed.configureTestingModule({
+      imports: [
+        TranslateModule.forRoot(),
+        NoopAnimationsModule,
+        RouterTestingModule,
+        StoreModule.forRoot(authReducer, storeModuleConfig),
+      ],
       declarations: [MenuComponent],
       providers: [
         Injector,
         { provide: ThemeService, useValue: getMockThemeService() },
-        { provide: MenuService, useClass: MenuServiceStub },
+        MenuService,
+        provideMockStore({ initialState }),
         { provide: AuthorizationDataService, useValue: authorizationService },
         { provide: ActivatedRoute, useValue: routeStub },
+        TestExpandableMenuComponent,
+        TestMenuComponent,
       ],
       schemas: [NO_ERRORS_SCHEMA]
     }).overrideComponent(MenuComponent, {
@@ -74,13 +133,62 @@ describe('MenuComponent', () => {
     fixture = TestBed.createComponent(MenuComponent);
     comp = fixture.componentInstance; // SearchPageComponent test instance
     comp.menuID = mockMenuID;
-    menuService = (comp as any).menuService;
-    router = TestBed.inject(Router);
+    menuService = TestBed.inject(MenuService);
+    store = TestBed.inject(Store) as MockStore<AppState>;
     spyOn(comp as any, 'getSectionDataInjector').and.returnValue(MenuSection);
-    spyOn(comp as any, 'getSectionComponent').and.returnValue(observableOf({}));
     fixture.detectChanges();
   });
 
+  describe('ngOnInit', () => {
+    it('should trigger the section observable again when a new sub section has been added', () => {
+      spyOn(comp.sectionMap$, 'next').and.callThrough();
+      const hasSubSections = new BehaviorSubject(false);
+      spyOn(menuService, 'hasSubSections').and.returnValue(hasSubSections.asObservable());
+      spyOn(store, 'dispatch').and.callThrough();
+
+      store.setState({
+        menus: {
+          [mockMenuID]: {
+            collapsed: true,
+            id: mockMenuID,
+            previewCollapsed: true,
+            sectionToSubsectionIndex: {
+              section1: ['test'],
+            },
+            sections: {
+              section1: {
+                id: 'section1',
+                active: false,
+                visible: true,
+                model: {
+                  type: MenuItemType.LINK,
+                  text: 'test',
+                  link: '/test',
+                } as LinkMenuItemModel,
+              },
+              test: {
+                id: 'test',
+                parentID: 'section1',
+                active: false,
+                visible: true,
+                model: {
+                  type: MenuItemType.LINK,
+                  text: 'test',
+                  link: '/test',
+                } as LinkMenuItemModel,
+              }
+            },
+            visible: true,
+          },
+        },
+      });
+      expect(menuService.hasSubSections).toHaveBeenCalled();
+      hasSubSections.next(true);
+
+      expect(comp.sectionMap$.next).toHaveBeenCalled();
+    });
+  });
+
   describe('toggle', () => {
     beforeEach(() => {
       spyOn(menuService, 'toggleMenu');
diff --git a/src/app/shared/menu/menu.component.ts b/src/app/shared/menu/menu.component.ts
index 35e180b476..7b1394ddd2 100644
--- a/src/app/shared/menu/menu.component.ts
+++ b/src/app/shared/menu/menu.component.ts
@@ -6,7 +6,6 @@ import { GenericConstructor } from '../../core/shared/generic-constructor';
 import { hasValue, isNotEmptyOperator } from '../empty.util';
 import { MenuSectionComponent } from './menu-section/menu-section.component';
 import { getComponentForMenu } from './menu-section.decorator';
-import { compareArraysUsingIds } from '../../item-page/simple/item-types/shared/item-relationships-utils';
 import { MenuSection } from './menu-section.model';
 import { MenuID } from './menu-id.model';
 import { ActivatedRoute } from '@angular/router';
@@ -86,7 +85,7 @@ export class MenuComponent implements OnInit, OnDestroy {
     this.menuCollapsed = this.menuService.isMenuCollapsed(this.menuID);
     this.menuPreviewCollapsed = this.menuService.isMenuPreviewCollapsed(this.menuID);
     this.menuVisible = this.menuService.isMenuVisible(this.menuID);
-    this.sections = this.menuService.getMenuTopSections(this.menuID).pipe(distinctUntilChanged(compareArraysUsingIds()));
+    this.sections = this.menuService.getMenuTopSections(this.menuID);
 
     this.subs.push(
       this.sections.pipe(
@@ -103,7 +102,7 @@ export class MenuComponent implements OnInit, OnDestroy {
         switchMap((section: MenuSection) => this.getSectionComponent(section).pipe(
           map((component: GenericConstructor<MenuSectionComponent>) => ({ section, component }))
         )),
-        distinctUntilChanged((x, y) => x.section.id === y.section.id)
+        distinctUntilChanged((x, y) => x.section.id === y.section.id && x.component.prototype === y.component.prototype),
       ).subscribe(({ section, component }) => {
         const nextMap = this.sectionMap$.getValue();
         nextMap.set(section.id, {
diff --git a/src/app/shared/menu/menu.effects.spec.ts b/src/app/shared/menu/menu.effects.spec.ts
new file mode 100644
index 0000000000..5da5328674
--- /dev/null
+++ b/src/app/shared/menu/menu.effects.spec.ts
@@ -0,0 +1,41 @@
+import { Observable } from 'rxjs';
+import { TestBed, waitForAsync } from '@angular/core/testing';
+import { provideMockActions } from '@ngrx/effects/testing';
+import { cold, hot } from 'jasmine-marbles';
+import { MenuEffects } from './menu.effects';
+import { ReinitMenuAction } from './menu.actions';
+import { StoreAction, StoreActionTypes } from '../../store.actions';
+
+describe('MenuEffects', () => {
+  let menuEffects: MenuEffects;
+  let actions: Observable<any>;
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      providers: [
+        MenuEffects,
+        provideMockActions(() => actions),
+      ],
+    });
+  }));
+
+  beforeEach(() => {
+    menuEffects = TestBed.inject(MenuEffects);
+  });
+
+  describe('reinitDSOMenus', () => {
+    describe('When a REHYDRATE action is triggered', () => {
+      let action;
+      beforeEach(() => {
+        action = new StoreAction(StoreActionTypes.REHYDRATE, null);
+      });
+      it('should return a ReinitMenuAction', () => {
+        actions = hot('--a-', {a: action});
+        const expected = cold('--b-', {b: new ReinitMenuAction});
+
+        expect(menuEffects.reinitDSOMenus).toBeObservable(expected);
+      });
+    });
+  });
+
+
+});
diff --git a/src/app/shared/menu/menu.effects.ts b/src/app/shared/menu/menu.effects.ts
new file mode 100644
index 0000000000..2787f80b78
--- /dev/null
+++ b/src/app/shared/menu/menu.effects.ts
@@ -0,0 +1,23 @@
+import { map } from 'rxjs/operators';
+import { Injectable } from '@angular/core';
+import { Actions, createEffect, ofType } from '@ngrx/effects';
+
+import { StoreActionTypes } from '../../store.actions';
+import { ReinitMenuAction } from './menu.actions';
+
+@Injectable()
+export class MenuEffects {
+
+  /**
+   * When the store is rehydrated in the browser, re-initialise the menus to ensure
+   * the menus with functions are loaded correctly.
+   */
+  reinitDSOMenus = createEffect(() => this.actions$
+    .pipe(ofType(StoreActionTypes.REHYDRATE),
+      map(() => new ReinitMenuAction())
+    ));
+
+  constructor(private actions$: Actions) {
+  }
+
+}
diff --git a/src/app/shared/menu/menu.reducer.spec.ts b/src/app/shared/menu/menu.reducer.spec.ts
index 2865e887fc..8f540c016d 100644
--- a/src/app/shared/menu/menu.reducer.spec.ts
+++ b/src/app/shared/menu/menu.reducer.spec.ts
@@ -9,7 +9,7 @@ import {
   ExpandMenuAction,
   ExpandMenuPreviewAction,
   HideMenuAction,
-  HideMenuSectionAction,
+  HideMenuSectionAction, ReinitMenuAction,
   RemoveMenuSectionAction,
   ShowMenuAction,
   ShowMenuSectionAction,
@@ -317,6 +317,17 @@ describe('menusReducer', () => {
     // is mutated, and any uncaught exception will cause the test to fail
   });
 
+  it('should reset the menu state to the initial state when performing the REINIT_MENUS action without affecting the previous state', () => {
+    dummyState[MenuID.ADMIN].visible = true;
+    const state = dummyState;
+    deepFreeze([state]);
+
+    const action = new ReinitMenuAction();
+    const menusState = menusReducer(state, action);
+    expect(menusState).toEqual(initialMenusState);
+
+  });
+
   it('should set add a new section for the correct menu in response to the ADD_SECTION action', () => {
     const state = dummyState;
     const action = new AddMenuSectionAction(menuID, visibleSection1);
diff --git a/src/app/shared/menu/menu.reducer.ts b/src/app/shared/menu/menu.reducer.ts
index c7ea017cc2..4c9ee31403 100644
--- a/src/app/shared/menu/menu.reducer.ts
+++ b/src/app/shared/menu/menu.reducer.ts
@@ -26,36 +26,39 @@ import { MenuID } from './menu-id.model';
  * @returns {MenusState} The new, reducer MenusState
  */
 export function menusReducer(state: MenusState = initialMenusState, action: MenuAction): MenusState {
-  const menuState: MenuState = state[action.menuID];
   switch (action.type) {
     case MenuActionTypes.COLLAPSE_MENU: {
-      const newMenuState = Object.assign({}, menuState, { collapsed: true });
+      const newMenuState = Object.assign({}, state[action.menuID], { collapsed: true });
       return Object.assign({}, state, { [action.menuID]: newMenuState });
     }
     case MenuActionTypes.EXPAND_MENU: {
-      const newMenuState = Object.assign({}, menuState, { collapsed: false });
+      const newMenuState = Object.assign({}, state[action.menuID], { collapsed: false });
       return Object.assign({}, state, { [action.menuID]: newMenuState });
     }
     case MenuActionTypes.COLLAPSE_MENU_PREVIEW: {
-      const newMenuState = Object.assign({}, menuState, { previewCollapsed: true });
+      const newMenuState = Object.assign({}, state[action.menuID], { previewCollapsed: true });
       return Object.assign({}, state, { [action.menuID]: newMenuState });
     }
     case MenuActionTypes.EXPAND_MENU_PREVIEW: {
-      const newMenuState = Object.assign({}, menuState, { previewCollapsed: false });
+      const newMenuState = Object.assign({}, state[action.menuID], { previewCollapsed: false });
       return Object.assign({}, state, { [action.menuID]: newMenuState });
     }
     case MenuActionTypes.TOGGLE_MENU: {
+      const menuState = state[action.menuID];
       const newMenuState = Object.assign({}, menuState, { collapsed: !menuState.collapsed });
       return Object.assign({}, state, { [action.menuID]: newMenuState });
     }
     case MenuActionTypes.SHOW_MENU: {
-      const newMenuState = Object.assign({}, menuState, { visible: true });
+      const newMenuState = Object.assign({}, state[action.menuID], { visible: true });
       return Object.assign({}, state, { [action.menuID]: newMenuState });
     }
     case MenuActionTypes.HIDE_MENU: {
-      const newMenuState = Object.assign({}, menuState, { visible: false });
+      const newMenuState = Object.assign({}, state[action.menuID], { visible: false });
       return Object.assign({}, state, { [action.menuID]: newMenuState });
     }
+    case MenuActionTypes.REINIT_MENUS: {
+      return Object.assign({}, initialMenusState);
+    }
     case MenuActionTypes.ADD_SECTION: {
       return addSection(state, action as AddMenuSectionAction);
     }
@@ -230,7 +233,7 @@ function toggleActiveSection(state: MenusState, action: ToggleActiveMenuSectionA
  * @param {MenuSection} section The section that will be added or replaced in the state
  * @returns {MenusState} The new reduced state
  */
-function putSectionState(state: MenusState, action: MenuAction, section: MenuSection): MenusState {
+function putSectionState(state: MenusState, action: MenuSectionAction, section: MenuSection): MenusState {
   const menuState: MenuState = state[action.menuID];
   const newSections = Object.assign({}, menuState.sections, {
     [section.id]: section
diff --git a/src/app/shared/menu/menu.service.spec.ts b/src/app/shared/menu/menu.service.spec.ts
index 0d8d669a0a..6af7c54d58 100644
--- a/src/app/shared/menu/menu.service.spec.ts
+++ b/src/app/shared/menu/menu.service.spec.ts
@@ -41,6 +41,7 @@ describe('MenuService', () => {
   let routeDataMenuSection: MenuSection;
   let routeDataMenuSectionResolved: MenuSection;
   let routeDataMenuChildSection: MenuSection;
+  let routeDataMenuOverwrittenChildSection: MenuSection;
   let toBeRemovedMenuSection: MenuSection;
   let alreadyPresentMenuSection: MenuSection;
   let route;
@@ -127,6 +128,17 @@ describe('MenuService', () => {
         link: ''
       } as LinkMenuItemModel
     };
+    routeDataMenuOverwrittenChildSection = {
+      id: 'mockChildSection',
+      parentID: 'mockSection',
+      active: false,
+      visible: true,
+      model: {
+        type: MenuItemType.LINK,
+        text: 'menu.section.mockChildOverwrittenSection',
+        link: ''
+      } as LinkMenuItemModel
+    };
     toBeRemovedMenuSection = {
       id: 'toBeRemovedSection',
       active: false,
@@ -167,7 +179,17 @@ describe('MenuService', () => {
                 [MenuID.PUBLIC]: routeDataMenuChildSection
               }
             }
+          },
+          firstChild: {
+            snapshot: {
+              data: {
+                menu: {
+                  [MenuID.PUBLIC]: routeDataMenuOverwrittenChildSection
+                }
+              }
+            }
           }
+
         }
       }
     };
@@ -541,7 +563,7 @@ describe('MenuService', () => {
   });
 
   describe('buildRouteMenuSections', () => {
-    it('should add and remove menu sections depending on the current route', () => {
+    it('should add and remove menu sections depending on the current route and overwrite menu sections when they have the same ID with the child route version', () => {
       spyOn(service, 'addSection');
       spyOn(service, 'removeSection');
 
@@ -550,7 +572,8 @@ describe('MenuService', () => {
       service.buildRouteMenuSections(MenuID.PUBLIC);
 
       expect(service.addSection).toHaveBeenCalledWith(MenuID.PUBLIC, routeDataMenuSectionResolved);
-      expect(service.addSection).toHaveBeenCalledWith(MenuID.PUBLIC, routeDataMenuChildSection);
+      expect(service.addSection).not.toHaveBeenCalledWith(MenuID.PUBLIC, routeDataMenuChildSection);
+      expect(service.addSection).toHaveBeenCalledWith(MenuID.PUBLIC, routeDataMenuOverwrittenChildSection);
       expect(service.addSection).not.toHaveBeenCalledWith(MenuID.PUBLIC, alreadyPresentMenuSection);
       expect(service.removeSection).toHaveBeenCalledWith(MenuID.PUBLIC, toBeRemovedMenuSection.id);
     });
diff --git a/src/app/shared/menu/menu.service.ts b/src/app/shared/menu/menu.service.ts
index fac3b3fba7..f6f09be876 100644
--- a/src/app/shared/menu/menu.service.ts
+++ b/src/app/shared/menu/menu.service.ts
@@ -2,7 +2,7 @@ import { Injectable } from '@angular/core';
 import { createSelector, MemoizedSelector, select, Store } from '@ngrx/store';
 import { AppState, keySelector } from '../../app.reducer';
 import { combineLatest as observableCombineLatest, Observable } from 'rxjs';
-import { filter, map, switchMap, take } from 'rxjs/operators';
+import { distinctUntilChanged, filter, map, switchMap, take } from 'rxjs/operators';
 import {
   ActivateMenuSectionAction,
   AddMenuSectionAction,
@@ -23,6 +23,7 @@ import { MenuSections } from './menu-sections.model';
 import { MenuSection } from './menu-section.model';
 import { MenuID } from './menu-id.model';
 import { ActivatedRoute, NavigationEnd, Router } from '@angular/router';
+import { compareArraysUsingIds } from '../../item-page/simple/item-types/shared/item-relationships-utils';
 
 export function menuKeySelector<T>(key: string, selector): MemoizedSelector<MenuState, T> {
   return createSelector(selector, (state) => {
@@ -81,8 +82,10 @@ export class MenuService {
     return this.store.pipe(
       select(menuByIDSelector(menuID)),
       select(menuSectionStateSelector),
-      map((sections: MenuSections) => {
-          return Object.values(sections)
+      map((sections: MenuSections) => Object.values(sections)),
+      distinctUntilChanged(compareArraysUsingIds()),
+      map((sections: MenuSection[]) => {
+          return sections
             .filter((section: MenuSection) => hasNoValue(section.parentID))
             .filter((section: MenuSection) => !mustBeVisible || section.visible);
         }
@@ -399,7 +402,8 @@ export class MenuService {
       }
 
       if (!last) {
-        return [...menuSections, ...this.resolveRouteMenuSections(route.firstChild, menuID)];
+        const childMenuSections = this.resolveRouteMenuSections(route.firstChild, menuID);
+        return [...menuSections.filter(menu => !(childMenuSections).map(childMenu => childMenu.id).includes(menu.id)), ...childMenuSections];
       } else {
         return [...menuSections];
       }
diff --git a/src/app/shared/metadata-field-wrapper/metadata-field-wrapper.component.html b/src/app/shared/metadata-field-wrapper/metadata-field-wrapper.component.html
index d69f87883b..7748e385ca 100644
--- a/src/app/shared/metadata-field-wrapper/metadata-field-wrapper.component.html
+++ b/src/app/shared/metadata-field-wrapper/metadata-field-wrapper.component.html
@@ -1,5 +1,5 @@
 <div class="simple-view-element" [class.d-none]="hideIfNoTextContent && content.textContent.trim().length === 0">
-  <h5 class="simple-view-element-header" *ngIf="label">{{ label }}</h5>
+  <h2 class="simple-view-element-header" *ngIf="label">{{ label }}</h2>
   <div #content class="simple-view-element-body">
     <ng-content></ng-content>
   </div>
diff --git a/src/app/shared/metadata-field-wrapper/metadata-field-wrapper.component.scss b/src/app/shared/metadata-field-wrapper/metadata-field-wrapper.component.scss
index 75dfd09d0d..bf17d63d6c 100644
--- a/src/app/shared/metadata-field-wrapper/metadata-field-wrapper.component.scss
+++ b/src/app/shared/metadata-field-wrapper/metadata-field-wrapper.component.scss
@@ -2,4 +2,7 @@
   .simple-view-element {
     margin-bottom: 15px;
   }
+  .simple-view-element-header {
+    font-size: 1.25rem;
+  }
 }
diff --git a/src/app/shared/metadata-representation/metadata-representation-loader.component.ts b/src/app/shared/metadata-representation/metadata-representation-loader.component.ts
index 42ee093278..a72177e328 100644
--- a/src/app/shared/metadata-representation/metadata-representation-loader.component.ts
+++ b/src/app/shared/metadata-representation/metadata-representation-loader.component.ts
@@ -1,4 +1,4 @@
-import { Component, ComponentFactoryResolver, Inject, Input, OnInit, ViewChild, OnChanges, SimpleChanges, ComponentRef, ViewContainerRef, ComponentFactory } from '@angular/core';
+import { Component, Inject, Input, OnInit, ViewChild, OnChanges, OnDestroy, SimpleChanges, ComponentRef, ViewContainerRef } from '@angular/core';
 import {
   MetadataRepresentation,
   MetadataRepresentationType
@@ -18,8 +18,7 @@ import { ThemeService } from '../theme-support/theme.service';
 /**
  * Component for determining what component to use depending on the item's entity type (dspace.entity.type), its metadata representation and, optionally, its context
  */
-export class MetadataRepresentationLoaderComponent implements OnInit, OnChanges {
-
+export class MetadataRepresentationLoaderComponent implements OnDestroy, OnInit, OnChanges {
   /**
    * The item or metadata to determine the component for
    */
@@ -55,7 +54,6 @@ export class MetadataRepresentationLoaderComponent implements OnInit, OnChanges
   ];
 
   constructor(
-    private componentFactoryResolver: ComponentFactoryResolver,
     private themeService: ThemeService,
     @Inject(METADATA_REPRESENTATION_COMPONENT_FACTORY) private getMetadataRepresentationComponent: (entityType: string, mdRepresentationType: MetadataRepresentationType, context: Context, theme: string) => GenericConstructor<any>,
   ) {
@@ -65,7 +63,9 @@ export class MetadataRepresentationLoaderComponent implements OnInit, OnChanges
    * Set up the dynamic child component
    */
   ngOnInit(): void {
-    this.instantiateComponent();
+    if (hasNoValue(this.compRef)) {
+      this.instantiateComponent();
+    }
   }
 
   /**
@@ -88,12 +88,12 @@ export class MetadataRepresentationLoaderComponent implements OnInit, OnChanges
   }
 
   private instantiateComponent(changes?: SimpleChanges): void {
-    const componentFactory: ComponentFactory<MetadataRepresentationListElementComponent> = this.componentFactoryResolver.resolveComponentFactory(this.getComponent());
+    const component: GenericConstructor<MetadataRepresentationListElementComponent> = this.getComponent();
 
     const viewContainerRef: ViewContainerRef = this.mdRepDirective.viewContainerRef;
     viewContainerRef.clear();
 
-    this.compRef = viewContainerRef.createComponent(componentFactory);
+    this.compRef = viewContainerRef.createComponent(component);
 
     if (hasValue(changes)) {
       this.ngOnChanges(changes);
@@ -102,6 +102,13 @@ export class MetadataRepresentationLoaderComponent implements OnInit, OnChanges
     }
   }
 
+  ngOnDestroy(): void {
+    if (hasValue(this.compRef)) {
+      this.compRef.destroy();
+      this.compRef = undefined;
+    }
+  }
+
   /**
    * Fetch the component depending on the item's entity type, metadata representation type and context
    * @returns {string}
diff --git a/src/app/shared/mocks/theme-service.mock.ts b/src/app/shared/mocks/theme-service.mock.ts
index e3c2960e51..3997d17504 100644
--- a/src/app/shared/mocks/theme-service.mock.ts
+++ b/src/app/shared/mocks/theme-service.mock.ts
@@ -1,6 +1,6 @@
 import { ThemeService } from '../theme-support/theme.service';
 import { of as observableOf } from 'rxjs';
-import { ThemeConfig } from '../../../config/theme.model';
+import { ThemeConfig } from '../../../config/theme.config';
 import { isNotEmpty } from '../empty.util';
 
 export function getMockThemeService(themeName = 'base', themes?: ThemeConfig[]): ThemeService {
diff --git a/src/app/shared/mydspace-actions/claimed-task/approve/claimed-task-actions-approve.component.html b/src/app/shared/mydspace-actions/claimed-task/approve/claimed-task-actions-approve.component.html
index 7944d24d96..9785715ee8 100644
--- a/src/app/shared/mydspace-actions/claimed-task/approve/claimed-task-actions-approve.component.html
+++ b/src/app/shared/mydspace-actions/claimed-task/approve/claimed-task-actions-approve.component.html
@@ -1,7 +1,7 @@
 <button type="button"
         [className]="'btn btn-success'"
         ngbTooltip="{{'submission.workflow.tasks.claimed.approve_help' | translate}}"
-        [disabled]="processing$ | async"
+        [dsBtnDisabled]="processing$ | async"
         (click)="submitTask()">
   <span *ngIf="processing$ | async"><i class='fas fa-circle-notch fa-spin'></i> {{'submission.workflow.tasks.generic.processing' | translate}}</span>
   <span *ngIf="!(processing$ | async)"><i class="fa fa-thumbs-up"></i> {{'submission.workflow.tasks.claimed.approve' | translate}}</span>
diff --git a/src/app/shared/mydspace-actions/claimed-task/approve/claimed-task-actions-approve.component.spec.ts b/src/app/shared/mydspace-actions/claimed-task/approve/claimed-task-actions-approve.component.spec.ts
index b79040fb12..617fd95b04 100644
--- a/src/app/shared/mydspace-actions/claimed-task/approve/claimed-task-actions-approve.component.spec.ts
+++ b/src/app/shared/mydspace-actions/claimed-task/approve/claimed-task-actions-approve.component.spec.ts
@@ -2,7 +2,7 @@ import { ChangeDetectionStrategy, Injector, NO_ERRORS_SCHEMA } from '@angular/co
 import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
 import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
-import { of, of as observableOf } from 'rxjs';
+import { of as observableOf } from 'rxjs';
 
 import { ClaimedTaskActionsApproveComponent } from './claimed-task-actions-approve.component';
 import { TranslateLoaderMock } from '../../../mocks/translate-loader.mock';
@@ -18,6 +18,7 @@ import { Router } from '@angular/router';
 import { RouterStub } from '../../../testing/router.stub';
 import { SearchService } from '../../../../core/shared/search/search.service';
 import { RequestService } from '../../../../core/data/request.service';
+import { WorkflowItemDataService } from '../../../../core/submission/workflowitem-data.service';
 
 let component: ClaimedTaskActionsApproveComponent;
 let fixture: ComponentFixture<ClaimedTaskActionsApproveComponent>;
@@ -27,6 +28,7 @@ const searchService = getMockSearchService();
 const requestService = getMockRequestService();
 
 let mockPoolTaskDataService: PoolTaskDataService;
+let mockWorkflowItemDataService: WorkflowItemDataService;
 
 describe('ClaimedTaskActionsApproveComponent', () => {
   const object = Object.assign(new ClaimedTask(), { id: 'claimed-task-1' });
@@ -36,6 +38,10 @@ describe('ClaimedTaskActionsApproveComponent', () => {
 
   beforeEach(waitForAsync(() => {
     mockPoolTaskDataService = new PoolTaskDataService(null, null, null, null);
+    mockWorkflowItemDataService = jasmine.createSpyObj('WorkflowItemDataService', {
+      'invalidateByHref': observableOf(false),
+    });
+
     TestBed.configureTestingModule({
       imports: [
         TranslateModule.forRoot({
@@ -53,6 +59,7 @@ describe('ClaimedTaskActionsApproveComponent', () => {
         { provide: SearchService, useValue: searchService },
         { provide: RequestService, useValue: requestService },
         { provide: PoolTaskDataService, useValue: mockPoolTaskDataService },
+        { provide: WorkflowItemDataService, useValue: mockWorkflowItemDataService },
       ],
       declarations: [ClaimedTaskActionsApproveComponent],
       schemas: [NO_ERRORS_SCHEMA]
@@ -89,7 +96,7 @@ describe('ClaimedTaskActionsApproveComponent', () => {
 
     beforeEach(() => {
       spyOn(component.processCompleted, 'emit');
-      spyOn(component, 'startActionExecution').and.returnValue(of(null));
+      spyOn(component, 'startActionExecution').and.returnValue(observableOf(null));
 
       expectedBody = {
         [component.option]: 'true'
diff --git a/src/app/shared/mydspace-actions/claimed-task/approve/claimed-task-actions-approve.component.ts b/src/app/shared/mydspace-actions/claimed-task/approve/claimed-task-actions-approve.component.ts
index 467d1514c9..ebee0f0108 100644
--- a/src/app/shared/mydspace-actions/claimed-task/approve/claimed-task-actions-approve.component.ts
+++ b/src/app/shared/mydspace-actions/claimed-task/approve/claimed-task-actions-approve.component.ts
@@ -10,6 +10,7 @@ import { TranslateService } from '@ngx-translate/core';
 import { SearchService } from '../../../../core/shared/search/search.service';
 import { RequestService } from '../../../../core/data/request.service';
 import { ClaimedApprovedTaskSearchResult } from '../../../object-collection/shared/claimed-approved-task-search-result.model';
+import { WorkflowItemDataService } from '../../../../core/submission/workflowitem-data.service';
 
 export const WORKFLOW_TASK_OPTION_APPROVE = 'submit_approve';
 
@@ -28,12 +29,15 @@ export class ClaimedTaskActionsApproveComponent extends ClaimedTaskActionsAbstra
    */
   option = WORKFLOW_TASK_OPTION_APPROVE;
 
-  constructor(protected injector: Injector,
-              protected router: Router,
-              protected notificationsService: NotificationsService,
-              protected translate: TranslateService,
-              protected searchService: SearchService,
-              protected requestService: RequestService) {
+  constructor(
+    protected injector: Injector,
+    protected router: Router,
+    protected notificationsService: NotificationsService,
+    protected translate: TranslateService,
+    protected searchService: SearchService,
+    protected requestService: RequestService,
+    protected workflowItemDataService: WorkflowItemDataService,
+  ) {
     super(injector, router, notificationsService, translate, searchService, requestService);
   }
 
@@ -48,4 +52,13 @@ export class ClaimedTaskActionsApproveComponent extends ClaimedTaskActionsAbstra
     return reloadedObject;
   }
 
+  public handleReloadableActionResponse(result: boolean, dso: DSpaceObject): void {
+    super.handleReloadableActionResponse(result, dso);
+
+    // Item page version table includes labels for workflow Items, determined
+    // based on the result of /workflowitems/search/item?uuid=...
+    // In order for this label to be in sync with the workflow state, we should
+    // invalidate WFIs as they are approved.
+    this.workflowItemDataService.invalidateByHref(this.object?._links.workflowitem?.href);
+  }
 }
diff --git a/src/app/shared/mydspace-actions/claimed-task/decline-task/claimed-task-actions-decline-task.component.html b/src/app/shared/mydspace-actions/claimed-task/decline-task/claimed-task-actions-decline-task.component.html
index 38ed36c0f1..28c96e3825 100644
--- a/src/app/shared/mydspace-actions/claimed-task/decline-task/claimed-task-actions-decline-task.component.html
+++ b/src/app/shared/mydspace-actions/claimed-task/decline-task/claimed-task-actions-decline-task.component.html
@@ -1,5 +1,5 @@
 <button (click)="submitTask()"
-        [disabled]="processing$ | async"
+        [dsBtnDisabled]="processing$ | async"
         class="declineTaskAction btn btn-warning"
         ngbTooltip="{{'submission.workflow.tasks.claimed.decline_help' | translate}}"
         type="button">
diff --git a/src/app/shared/mydspace-actions/claimed-task/reject/claimed-task-actions-reject.component.html b/src/app/shared/mydspace-actions/claimed-task/reject/claimed-task-actions-reject.component.html
index 0cb2871bf5..02d8a37dbb 100644
--- a/src/app/shared/mydspace-actions/claimed-task/reject/claimed-task-actions-reject.component.html
+++ b/src/app/shared/mydspace-actions/claimed-task/reject/claimed-task-actions-reject.component.html
@@ -1,7 +1,7 @@
 <ng-template #rejectTipContent><p [innerHTML]="'submission.workflow.tasks.claimed.reject_help' | translate"></p></ng-template>
 <button [className]="'btn btn-danger'"
         [ngbTooltip]="rejectTipContent"
-        [disabled]="processing$ | async"
+        [dsBtnDisabled]="processing$ | async"
         (click)="openRejectModal(rejectModal)" >
   <span *ngIf="processing$ | async"><i class='fas fa-circle-notch fa-spin'></i> {{'submission.workflow.tasks.generic.processing' | translate}}</span>
   <span *ngIf="!(processing$ | async)"><i class="fa fa-trash"></i> {{'submission.workflow.tasks.claimed.reject.submit' | translate}}</span>
@@ -28,7 +28,7 @@
                 placeholder="{{'submission.workflow.tasks.claimed.reject.reason.placeholder' | translate}}"></textarea>
       <button id="btn-chat"
               class="btn btn-danger btn-lg btn-block mt-3"
-              [disabled]="!rejectForm.valid || (processing$ | async)"
+              [dsBtnDisabled]="!rejectForm.valid || (processing$ | async)"
               type="submit">
         <span *ngIf="processing$ | async"><i class='fas fa-circle-notch fa-spin'></i> {{'submission.workflow.tasks.generic.processing' | translate}}</span>
         <span *ngIf="!(processing$ | async)">{{'submission.workflow.tasks.claimed.reject.reason.submit' | translate}}</span>
diff --git a/src/app/shared/mydspace-actions/claimed-task/return-to-pool/claimed-task-actions-return-to-pool.component.html b/src/app/shared/mydspace-actions/claimed-task/return-to-pool/claimed-task-actions-return-to-pool.component.html
index 66f8e2a058..52c7df0736 100644
--- a/src/app/shared/mydspace-actions/claimed-task/return-to-pool/claimed-task-actions-return-to-pool.component.html
+++ b/src/app/shared/mydspace-actions/claimed-task/return-to-pool/claimed-task-actions-return-to-pool.component.html
@@ -1,7 +1,7 @@
 <button type="button"
         [className]="'btn btn-secondary'"
         ngbTooltip="{{'submission.workflow.tasks.claimed.return_help' | translate}}"
-        [disabled]="processing$ | async"
+        [dsBtnDisabled]="processing$ | async"
         (click)="submitTask()">
   <span *ngIf="processing$ | async"><i class='fas fa-circle-notch fa-spin'></i> {{'submission.workflow.tasks.generic.processing' | translate}}</span>
   <span *ngIf="!(processing$ | async)"><i class="fa fa-undo"></i> {{'submission.workflow.tasks.claimed.return' | translate}}</span>
diff --git a/src/app/shared/mydspace-actions/claimed-task/switcher/claimed-task-actions-loader.component.ts b/src/app/shared/mydspace-actions/claimed-task/switcher/claimed-task-actions-loader.component.ts
index c0dc1cad02..d33516fcb8 100644
--- a/src/app/shared/mydspace-actions/claimed-task/switcher/claimed-task-actions-loader.component.ts
+++ b/src/app/shared/mydspace-actions/claimed-task/switcher/claimed-task-actions-loader.component.ts
@@ -1,8 +1,8 @@
 import {
   Component,
-  ComponentFactoryResolver,
   EventEmitter,
   Input,
+  OnDestroy,
   OnInit,
   Output,
   ViewChild,
@@ -27,7 +27,7 @@ import { ClaimedTaskActionsAbstractComponent } from '../abstract/claimed-task-ac
  * Component for loading a ClaimedTaskAction component depending on the "option" input
  * Passes on the ClaimedTask to the component and subscribes to the processCompleted output
  */
-export class ClaimedTaskActionsLoaderComponent implements OnInit, OnChanges {
+export class ClaimedTaskActionsLoaderComponent implements OnInit, OnChanges, OnDestroy {
   /**
    * The item object that belonging to the ClaimedTask object
    */
@@ -68,19 +68,20 @@ export class ClaimedTaskActionsLoaderComponent implements OnInit, OnChanges {
    * The list of input and output names for the dynamic component
    */
   protected inAndOutputNames: (keyof ClaimedTaskActionsAbstractComponent & keyof this)[] = [
+    'item',
     'object',
     'option',
+    'workflowitem',
     'processCompleted',
   ];
 
-  constructor(private componentFactoryResolver: ComponentFactoryResolver) {
-  }
-
   /**
    * Fetch, create and initialize the relevant component
    */
   ngOnInit(): void {
-    this.instantiateComponent();
+    if (hasNoValue(this.compRef)) {
+      this.instantiateComponent();
+    }
   }
 
   /**
@@ -105,12 +106,10 @@ export class ClaimedTaskActionsLoaderComponent implements OnInit, OnChanges {
   private instantiateComponent(changes?: SimpleChanges): void {
     const comp = this.getComponentByWorkflowTaskOption(this.option);
     if (hasValue(comp)) {
-      const componentFactory = this.componentFactoryResolver.resolveComponentFactory(comp);
-
       const viewContainerRef = this.claimedTaskActionsDirective.viewContainerRef;
       viewContainerRef.clear();
 
-      this.compRef = viewContainerRef.createComponent(componentFactory);
+      this.compRef = viewContainerRef.createComponent(comp);
 
       if (hasValue(changes)) {
         this.ngOnChanges(changes);
@@ -135,4 +134,11 @@ export class ClaimedTaskActionsLoaderComponent implements OnInit, OnChanges {
       });
     }
   }
+
+  ngOnDestroy(): void {
+    if (hasValue(this.compRef)) {
+      this.compRef.destroy();
+      this.compRef = undefined;
+    }
+  }
 }
diff --git a/src/app/shared/mydspace-actions/pool-task/pool-task-actions.component.html b/src/app/shared/mydspace-actions/pool-task/pool-task-actions.component.html
index 9d63a42d03..27aa30a4b6 100644
--- a/src/app/shared/mydspace-actions/pool-task/pool-task-actions.component.html
+++ b/src/app/shared/mydspace-actions/pool-task/pool-task-actions.component.html
@@ -1,5 +1,5 @@
 <button type="button" class="btn btn-info mt-1 mb-3"
-  ngbTooltip="{{'submission.workflow.tasks.pool.claim_help' | translate}}" [disabled]="(processing$ | async)"
+  ngbTooltip="{{'submission.workflow.tasks.pool.claim_help' | translate}}" [dsBtnDisabled]="(processing$ | async)"
   (click)="claim()">
   <span *ngIf="(processing$ | async)"><i class='fas fa-circle-notch fa-spin'></i>
     {{'submission.workflow.tasks.generic.processing' | translate}}</span>
diff --git a/src/app/shared/mydspace-actions/workspaceitem/workspaceitem-actions.component.html b/src/app/shared/mydspace-actions/workspaceitem/workspaceitem-actions.component.html
index 6e958c7a8b..26066df4b5 100644
--- a/src/app/shared/mydspace-actions/workspaceitem/workspaceitem-actions.component.html
+++ b/src/app/shared/mydspace-actions/workspaceitem/workspaceitem-actions.component.html
@@ -30,7 +30,7 @@
 
 <ng-template #content let-c="close" let-d="dismiss">
   <div class="modal-header">
-    <h4 class="modal-title text-danger">{{'submission.general.discard.confirm.title' | translate}}</h4>
+    <div class="modal-title text-danger h4">{{'submission.general.discard.confirm.title' | translate}}</div>
     <button type="button" id="delete_close" class="close" aria-label="Close" (click)="d('cancel')">
       <span aria-hidden="true">&times;</span>
     </button>
diff --git a/src/app/shared/notifications/models/notification-options.model.ts b/src/app/shared/notifications/models/notification-options.model.ts
index 65011496b3..c891781d9d 100644
--- a/src/app/shared/notifications/models/notification-options.model.ts
+++ b/src/app/shared/notifications/models/notification-options.model.ts
@@ -4,19 +4,25 @@ export interface INotificationOptions {
   timeOut: number;
   clickToClose: boolean;
   animate: NotificationAnimationsType | string;
+  announceContentInLiveRegion: boolean;
 }
 
 export class NotificationOptions implements INotificationOptions {
   public timeOut: number;
   public clickToClose: boolean;
   public animate: any;
+  public announceContentInLiveRegion: boolean;
 
-  constructor(timeOut = 5000,
-              clickToClose = true,
-              animate: NotificationAnimationsType | string = NotificationAnimationsType.Scale) {
 
+  constructor(
+    timeOut = 5000,
+    clickToClose = true,
+    animate: NotificationAnimationsType | string = NotificationAnimationsType.Scale,
+    announceContentInLiveRegion: boolean = true,
+  ) {
     this.timeOut = timeOut;
     this.clickToClose = clickToClose;
     this.animate = animate;
+    this.announceContentInLiveRegion = announceContentInLiveRegion;
   }
 }
diff --git a/src/app/shared/notifications/notification/notification.component.scss b/src/app/shared/notifications/notification/notification.component.scss
index 06c46b0f5d..ecfc25fee0 100644
--- a/src/app/shared/notifications/notification/notification.component.scss
+++ b/src/app/shared/notifications/notification/notification.component.scss
@@ -5,7 +5,8 @@
 }
 
 .close {
-  outline: none !important
+  outline: none !important;
+  opacity: 0.8;
 }
 
 .notification-icon {
diff --git a/src/app/shared/notifications/notifications-board/notifications-board.component.spec.ts b/src/app/shared/notifications/notifications-board/notifications-board.component.spec.ts
index 08b9585a8c..73f4e6b1b1 100644
--- a/src/app/shared/notifications/notifications-board/notifications-board.component.spec.ts
+++ b/src/app/shared/notifications/notifications-board/notifications-board.component.spec.ts
@@ -1,4 +1,4 @@
-import { ComponentFixture, inject, TestBed, waitForAsync } from '@angular/core/testing';
+import { ComponentFixture, inject, TestBed, waitForAsync, fakeAsync, flush } from '@angular/core/testing';
 import { BrowserModule, By } from '@angular/platform-browser';
 import { ChangeDetectorRef } from '@angular/core';
 
@@ -15,14 +15,20 @@ import uniqueId from 'lodash/uniqueId';
 import { INotificationBoardOptions } from '../../../../config/notifications-config.interfaces';
 import { NotificationsServiceStub } from '../../testing/notifications-service.stub';
 import { cold } from 'jasmine-marbles';
+import { LiveRegionService } from '../../live-region/live-region.service';
+import { LiveRegionServiceStub } from '../../live-region/live-region.service.stub';
+import { NotificationOptions } from '../models/notification-options.model';
 
 export const bools = { f: false, t: true };
 
 describe('NotificationsBoardComponent', () => {
   let comp: NotificationsBoardComponent;
   let fixture: ComponentFixture<NotificationsBoardComponent>;
+  let liveRegionService: LiveRegionServiceStub;
 
   beforeEach(waitForAsync(() => {
+    liveRegionService = new LiveRegionServiceStub();
+
     TestBed.configureTestingModule({
       imports: [
         BrowserModule,
@@ -36,7 +42,9 @@ describe('NotificationsBoardComponent', () => {
       declarations: [NotificationsBoardComponent, NotificationComponent], // declare the test component
       providers: [
         { provide: NotificationsService, useClass: NotificationsServiceStub },
-        ChangeDetectorRef]
+        { provide: LiveRegionService, useValue: liveRegionService },
+        ChangeDetectorRef,
+      ]
     }).compileComponents();  // compile template and css
   }));
 
@@ -106,5 +114,42 @@ describe('NotificationsBoardComponent', () => {
     });
   });
 
+  describe('add', () => {
+    beforeEach(() => {
+      liveRegionService.addMessage.calls.reset();
+    });
+
+    it('should announce content to the live region', fakeAsync(() => {
+      const notification = new Notification('id', NotificationType.Info, 'title', 'content');
+      comp.add(notification);
+
+      flush();
+
+      expect(liveRegionService.addMessage).toHaveBeenCalledWith('content');
+    }));
+
+    it('should not announce anything if there is no content', fakeAsync(() => {
+      const notification = new Notification('id', NotificationType.Info, 'title');
+      comp.add(notification);
+
+      flush();
+
+      expect(liveRegionService.addMessage).not.toHaveBeenCalled();
+    }));
+
+    it('should not announce the content if disabled', fakeAsync(() => {
+      const options = new NotificationOptions();
+      options.announceContentInLiveRegion = false;
+
+      const notification = new Notification('id', NotificationType.Info, 'title', 'content');
+      notification.options = options;
+      comp.add(notification);
+
+      flush();
+
+      expect(liveRegionService.addMessage).not.toHaveBeenCalled();
+    }));
+  });
+
 })
 ;
diff --git a/src/app/shared/notifications/notifications-board/notifications-board.component.ts b/src/app/shared/notifications/notifications-board/notifications-board.component.ts
index 97ae09c1a6..eaba659678 100644
--- a/src/app/shared/notifications/notifications-board/notifications-board.component.ts
+++ b/src/app/shared/notifications/notifications-board/notifications-board.component.ts
@@ -9,7 +9,7 @@ import {
 } from '@angular/core';
 
 import { select, Store } from '@ngrx/store';
-import { BehaviorSubject, Subscription } from 'rxjs';
+import { BehaviorSubject, Subscription, of as observableOf } from 'rxjs';
 import difference from 'lodash/difference';
 
 import { NotificationsService } from '../notifications.service';
@@ -18,6 +18,9 @@ import { notificationsStateSelector } from '../selectors';
 import { INotification } from '../models/notification.model';
 import { NotificationsState } from '../notifications.reducers';
 import { INotificationBoardOptions } from '../../../../config/notifications-config.interfaces';
+import { LiveRegionService } from '../../live-region/live-region.service';
+import { hasNoValue, isNotEmptyOperator } from '../../empty.util';
+import { take } from 'rxjs/operators';
 
 @Component({
   selector: 'ds-notifications-board',
@@ -49,9 +52,12 @@ export class NotificationsBoardComponent implements OnInit, OnDestroy {
    */
   public isPaused$: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(false);
 
-  constructor(private service: NotificationsService,
-              private store: Store<AppState>,
-              private cdr: ChangeDetectorRef) {
+  constructor(
+    private service: NotificationsService,
+    private store: Store<AppState>,
+    private cdr: ChangeDetectorRef,
+    protected liveRegionService: LiveRegionService,
+  ) {
   }
 
   ngOnInit(): void {
@@ -85,6 +91,7 @@ export class NotificationsBoardComponent implements OnInit, OnDestroy {
         this.notifications.splice(this.notifications.length - 1, 1);
       }
       this.notifications.splice(0, 0, item);
+      this.addContentToLiveRegion(item);
     } else {
       // Remove the notification from the store
       // This notification was in the store, but not in this.notifications
@@ -93,29 +100,44 @@ export class NotificationsBoardComponent implements OnInit, OnDestroy {
     }
   }
 
+  /**
+   * Adds the content of the notification (if any) to the live region, so it can be announced by screen readers.
+   */
+  private addContentToLiveRegion(item: INotification) {
+    let content = item.content;
+
+    if (!item.options.announceContentInLiveRegion || hasNoValue(content)) {
+      return;
+    }
+
+    if (typeof content === 'string') {
+      content = observableOf(content);
+    }
+
+    content.pipe(
+      isNotEmptyOperator(),
+      take(1),
+    ).subscribe(contentStr => this.liveRegionService.addMessage(contentStr));
+  }
+
+  /**
+   * Whether to block the provided item because a duplicate notification with the exact same information already
+   * exists within the notifications array.
+   * @param item The item to check
+   * @return true if the notifications array already contains a notification with the exact same information as the
+   * provided item. false otherwise.
+   * @private
+   */
   private block(item: INotification): boolean {
     const toCheck = item.html ? this.checkHtml : this.checkStandard;
+
     this.notifications.forEach((notification) => {
       if (toCheck(notification, item)) {
         return true;
       }
     });
 
-    if (this.notifications.length > 0) {
-      this.notifications.forEach((notification) => {
-        if (toCheck(notification, item)) {
-          return true;
-        }
-      });
-    }
-
-    let comp: INotification;
-    if (this.notifications.length > 0) {
-      comp = this.notifications[0];
-    } else {
-      return false;
-    }
-    return toCheck(comp, item);
+    return false;
   }
 
   private checkStandard(checker: INotification, item: INotification): boolean {
diff --git a/src/app/shared/object-collection/shared/badges/access-status-badge/access-status-badge.component.html b/src/app/shared/object-collection/shared/badges/access-status-badge/access-status-badge.component.html
index a0180a761a..5b20860684 100644
--- a/src/app/shared/object-collection/shared/badges/access-status-badge/access-status-badge.component.html
+++ b/src/app/shared/object-collection/shared/badges/access-status-badge/access-status-badge.component.html
@@ -1,5 +1,5 @@
 <ng-container *ngIf="showAccessStatus">
   <span *ngIf="accessStatus$ | async as accessStatus">
-    <span class="badge badge-secondary">{{ accessStatus | translate }}</span>
+    <span [class]="'badge badge-secondary access-status-list-element-badge ' + accessStatusClass">{{ accessStatus | translate }}</span>
   </span>
 </ng-container>
diff --git a/src/app/shared/object-collection/shared/badges/access-status-badge/access-status-badge.component.scss b/src/app/shared/object-collection/shared/badges/access-status-badge/access-status-badge.component.scss
new file mode 100644
index 0000000000..8b13789179
--- /dev/null
+++ b/src/app/shared/object-collection/shared/badges/access-status-badge/access-status-badge.component.scss
@@ -0,0 +1 @@
+
diff --git a/src/app/shared/object-collection/shared/badges/access-status-badge/access-status-badge.component.ts b/src/app/shared/object-collection/shared/badges/access-status-badge/access-status-badge.component.ts
index 2be44669b0..5f27ba4f65 100644
--- a/src/app/shared/object-collection/shared/badges/access-status-badge/access-status-badge.component.ts
+++ b/src/app/shared/object-collection/shared/badges/access-status-badge/access-status-badge.component.ts
@@ -1,6 +1,6 @@
 import { Component, Input } from '@angular/core';
 import { catchError, map } from 'rxjs/operators';
-import { Observable, of as observableOf } from 'rxjs';
+import { Observable, of as observableOf, Subscription } from 'rxjs';
 import { AccessStatusObject } from './access-status.model';
 import { hasValue } from '../../../../empty.util';
 import { environment } from 'src/environments/environment';
@@ -11,7 +11,8 @@ import { ITEM } from '../../../../../core/shared/item.resource-type';
 
 @Component({
   selector: 'ds-access-status-badge',
-  templateUrl: './access-status-badge.component.html'
+  templateUrl: './access-status-badge.component.html',
+  styleUrls: ['./access-status-badge.component.scss']
 })
 /**
  * Component rendering the access status of an item as a badge
@@ -26,6 +27,16 @@ export class AccessStatusBadgeComponent {
    */
   showAccessStatus: boolean;
 
+  /**
+   * Value based stylesheet class for access status badge
+   */
+  accessStatusClass: string;
+
+  /**
+   * List of subscriptions
+   */
+  subs: Subscription[] = [];
+
   /**
    * Initialize instance variables
    *
@@ -57,5 +68,18 @@ export class AccessStatusBadgeComponent {
       map((status: string) => `access-status.${status.toLowerCase()}.listelement.badge`),
       catchError(() => observableOf('access-status.unknown.listelement.badge'))
     );
+
+    // stylesheet based on the access status value
+    this.subs.push(
+      this.accessStatus$.pipe(
+        map((accessStatusClass: string) => accessStatusClass.replace(/\./g, '-'))
+      ).subscribe((accessStatusClass: string) => {
+        this.accessStatusClass = accessStatusClass;
+      })
+    );
+  }
+
+  ngOnDestroy(): void {
+    this.subs.filter((sub) => hasValue(sub)).forEach((sub) => sub.unsubscribe());
   }
 }
diff --git a/src/app/shared/object-collection/shared/listable-object/listable-object-component-loader.component.spec.ts b/src/app/shared/object-collection/shared/listable-object/listable-object-component-loader.component.spec.ts
index e893fe807b..dcaa061bad 100644
--- a/src/app/shared/object-collection/shared/listable-object/listable-object-component-loader.component.spec.ts
+++ b/src/app/shared/object-collection/shared/listable-object/listable-object-component-loader.component.spec.ts
@@ -1,18 +1,32 @@
 import { ComponentFixture, fakeAsync, TestBed, tick, waitForAsync } from '@angular/core/testing';
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
 import { ListableObjectComponentLoaderComponent } from './listable-object-component-loader.component';
 import { ListableObject } from '../listable-object.model';
 import { GenericConstructor } from '../../../../core/shared/generic-constructor';
 import { Context } from '../../../../core/shared/context.model';
 import { ViewMode } from '../../../../core/shared/view-mode.model';
-import {
-  ItemListElementComponent
-} from '../../../object-list/item-list-element/item-types/item/item-list-element.component';
 import { ListableObjectDirective } from './listable-object.directive';
 import { TranslateModule } from '@ngx-translate/core';
 import { By } from '@angular/platform-browser';
-import { provideMockStore } from '@ngrx/store/testing';
 import { ThemeService } from '../../../theme-support/theme.service';
+import { ItemSearchResultListElementComponent } from '../../../object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component';
+import { ActivatedRouteStub } from '../../../testing/active-router.stub';
+import { AuthServiceStub } from '../../../testing/auth-service.stub';
+import { AuthorizationDataServiceStub } from '../../../testing/authorization-service.stub';
+import { FileServiceStub } from '../../../testing/file-service.stub';
+import { TruncatableServiceStub } from '../../../testing/truncatable-service.stub';
+import { getMockThemeService } from '../../../mocks/theme-service.mock';
+import { APP_CONFIG } from '../../../../../config/app-config.interface';
+import { environment } from '../../../../../environments/environment.test';
+import { ActivatedRoute } from '@angular/router';
+import { AuthService } from '../../../../core/auth/auth.service';
+import { AuthorizationDataService } from '../../../../core/data/feature-authorization/authorization-data.service';
+import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
+import { DSONameServiceMock } from '../../../mocks/dso-name.service.mock';
+import { FileService } from '../../../../core/shared/file.service';
+import { TruncatableService } from '../../../truncatable/truncatable.service';
+import { ChangeDetectionStrategy } from '@angular/core';
+import { SearchResultListElementComponent } from '../../../object-list/search-result-list-element/search-result-list-element.component';
+import { XSRFService } from 'src/app/core/xsrf/xsrf.service';
 
 const testType = 'TestType';
 const testContext = Context.Search;
@@ -28,24 +42,42 @@ describe('ListableObjectComponentLoaderComponent', () => {
   let comp: ListableObjectComponentLoaderComponent;
   let fixture: ComponentFixture<ListableObjectComponentLoaderComponent>;
 
+  let activatedRoute: ActivatedRouteStub;
+  let authService: AuthServiceStub;
+  let authorizationService: AuthorizationDataServiceStub;
+  let fileService: FileServiceStub;
   let themeService: ThemeService;
+  let truncatableService: TruncatableServiceStub;
 
   beforeEach(waitForAsync(() => {
-    themeService = jasmine.createSpyObj('themeService', {
-      getThemeName: 'dspace',
-    });
-    TestBed.configureTestingModule({
+    activatedRoute = new ActivatedRouteStub();
+    authService = new AuthServiceStub();
+    authorizationService = new AuthorizationDataServiceStub();
+    fileService = new FileServiceStub();
+    themeService = getMockThemeService();
+    truncatableService = new TruncatableServiceStub();
+
+    void TestBed.configureTestingModule({
       imports: [TranslateModule.forRoot()],
-      declarations: [ListableObjectComponentLoaderComponent, ItemListElementComponent, ListableObjectDirective],
-      schemas: [NO_ERRORS_SCHEMA],
+      declarations: [
+        ItemSearchResultListElementComponent,
+        ListableObjectComponentLoaderComponent,
+        ListableObjectDirective,
+      ],
       providers: [
-        provideMockStore({}),
+        { provide: APP_CONFIG, useValue: environment },
+        { provide: ActivatedRoute, useValue: activatedRoute },
+        { provide: AuthService, useValue: authService },
+        { provide: AuthorizationDataService, useValue: authorizationService },
+        { provide: DSONameService, useValue: new DSONameServiceMock() },
+        { provide: FileService, useValue: fileService },
         { provide: ThemeService, useValue: themeService },
+        { provide: TruncatableService, useValue: truncatableService },
+        { provide: XSRFService, useValue: {} },
       ]
     }).overrideComponent(ListableObjectComponentLoaderComponent, {
       set: {
         changeDetection: ChangeDetectionStrategy.Default,
-        entryComponents: [ItemListElementComponent]
       }
     }).compileComponents();
   }));
@@ -57,7 +89,7 @@ describe('ListableObjectComponentLoaderComponent', () => {
     comp.object = new TestType();
     comp.viewMode = testViewMode;
     comp.context = testContext;
-    spyOn(comp, 'getComponent').and.returnValue(ItemListElementComponent as any);
+    spyOn(comp, 'getComponent').and.returnValue(SearchResultListElementComponent as any);
     spyOn(comp as any, 'connectInputsAndOutputs').and.callThrough();
     fixture.detectChanges();
 
@@ -81,7 +113,7 @@ describe('ListableObjectComponentLoaderComponent', () => {
       spyOn((comp as any), 'instantiateComponent').and.returnValue(null);
       spyOn((comp as any).contentChange, 'emit').and.returnValue(null);
 
-      listableComponent = fixture.debugElement.query(By.css('ds-item-list-element')).componentInstance;
+      listableComponent = fixture.debugElement.query(By.css('ds-search-result-list-element')).componentInstance;
       reloadedObject = 'object';
     });
 
diff --git a/src/app/shared/object-collection/shared/listable-object/listable-object-component-loader.component.ts b/src/app/shared/object-collection/shared/listable-object/listable-object-component-loader.component.ts
index 7a3cc42bf5..3152f5c7b3 100644
--- a/src/app/shared/object-collection/shared/listable-object/listable-object-component-loader.component.ts
+++ b/src/app/shared/object-collection/shared/listable-object/listable-object-component-loader.component.ts
@@ -125,7 +125,9 @@ export class ListableObjectComponentLoaderComponent implements OnInit, OnChanges
    * Setup the dynamic child component
    */
   ngOnInit(): void {
-    this.instantiateComponent(this.object);
+    if (hasNoValue(this.compRef)) {
+      this.instantiateComponent(this.object);
+    }
   }
 
   /**
@@ -147,7 +149,11 @@ export class ListableObjectComponentLoaderComponent implements OnInit, OnChanges
     }
   }
 
-  ngOnDestroy() {
+  ngOnDestroy(): void {
+    if (hasValue(this.compRef)) {
+      this.compRef.destroy();
+      this.compRef = undefined;
+    }
     this.subs
       .filter((subscription) => hasValue(subscription))
       .forEach((subscription) => subscription.unsubscribe());
diff --git a/src/app/shared/object-collection/shared/listable-object/listable-object.decorator.ts b/src/app/shared/object-collection/shared/listable-object/listable-object.decorator.ts
index e5654e63e0..470bcfcdaf 100644
--- a/src/app/shared/object-collection/shared/listable-object/listable-object.decorator.ts
+++ b/src/app/shared/object-collection/shared/listable-object/listable-object.decorator.ts
@@ -4,7 +4,7 @@ import { hasNoValue, hasValue, isNotEmpty } from '../../../empty.util';
 import { GenericConstructor } from '../../../../core/shared/generic-constructor';
 import { ListableObject } from '../listable-object.model';
 import { environment } from '../../../../../environments/environment';
-import { ThemeConfig } from '../../../../../config/theme.model';
+import { ThemeConfig } from '../../../../../config/theme.config';
 import { InjectionToken } from '@angular/core';
 
 export const DEFAULT_VIEW_MODE = ViewMode.ListElement;
diff --git a/src/app/shared/object-collection/shared/selectable-list-item-control/selectable-list-item-control.component.html b/src/app/shared/object-collection/shared/selectable-list-item-control/selectable-list-item-control.component.html
index 56a83913a7..a90f375c6a 100644
--- a/src/app/shared/object-collection/shared/selectable-list-item-control/selectable-list-item-control.component.html
+++ b/src/app/shared/object-collection/shared/selectable-list-item-control/selectable-list-item-control.component.html
@@ -1,10 +1,12 @@
 <ng-container *ngVar="selectionService?.isObjectSelected(selectionConfig?.listId, object) | async as checked">
-    <input *ngIf="selectionConfig.repeatable" class="form-check-input" type="checkbox"
+    <input #selectListItemCheckbox *ngIf="selectionConfig.repeatable" class="form-check-input" type="checkbox"
+           [attr.aria-label]="(selectListItemCheckbox.checked ? 'selectable-list-item-control.deselect' : 'selectable-list-item-control.select') | translate"
            [name]="'checkbox' + index"
            [id]="'object' + index"
            [ngModel]="selected$ | async"
            (ngModelChange)="selectCheckbox($event)">
     <input *ngIf="!selectionConfig.repeatable" class="form-check-input mt-2" type="radio"
+           [attr.aria-label]="'selectable-list-item-control.select' | translate"
            [name]="'radio' + index"
            [id]="'object' + index"
            [checked]="selected$ | async"
diff --git a/src/app/shared/object-collection/shared/selectable-list-item-control/selectable-list-item-control.component.spec.ts b/src/app/shared/object-collection/shared/selectable-list-item-control/selectable-list-item-control.component.spec.ts
index c8756567b8..73d70bfa7a 100644
--- a/src/app/shared/object-collection/shared/selectable-list-item-control/selectable-list-item-control.component.spec.ts
+++ b/src/app/shared/object-collection/shared/selectable-list-item-control/selectable-list-item-control.component.spec.ts
@@ -7,6 +7,7 @@ import { FormsModule } from '@angular/forms';
 import { VarDirective } from '../../../utils/var.directive';
 import { of as observableOf } from 'rxjs';
 import { ListableObject } from '../listable-object.model';
+import { TranslateModule } from '@ngx-translate/core';
 
 describe('SelectableListItemControlComponent', () => {
   let comp: SelectableListItemControlComponent;
@@ -45,7 +46,10 @@ describe('SelectableListItemControlComponent', () => {
     init();
     TestBed.configureTestingModule({
       declarations: [SelectableListItemControlComponent, VarDirective],
-      imports: [FormsModule],
+      imports: [
+        FormsModule,
+        TranslateModule.forRoot(),
+      ],
       providers: [
         {
           provide: SelectableListService,
diff --git a/src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview.component.html b/src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview.component.html
index bd00c9411f..c2f5299d4b 100644
--- a/src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview.component.html
+++ b/src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview.component.html
@@ -8,7 +8,7 @@
         <ds-metadata-field-wrapper [hideIfNoTextContent]="false">
           <ds-themed-thumbnail [thumbnail]="item?.thumbnail | async"></ds-themed-thumbnail>
         </ds-metadata-field-wrapper>
-        <ng-container *ngVar="(getFiles() | async) as bitstreams">
+        <ng-container *ngIf="(bitstreams$ | async) as bitstreams">
           <ds-metadata-field-wrapper [label]="('item.page.files' | translate)">
             <div *ngIf="bitstreams?.length > 0" class="file-section">
               <button class="btn btn-link" *ngFor="let file of bitstreams; let last=last;" (click)="downloadBitstreamFile(file?.uuid)">
diff --git a/src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview.component.spec.ts b/src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview.component.spec.ts
index 0b5acd343b..99facd9829 100644
--- a/src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview.component.spec.ts
+++ b/src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview.component.spec.ts
@@ -20,6 +20,7 @@ import { FileService } from '../../../../core/shared/file.service';
 import { HALEndpointService } from '../../../../core/shared/hal-endpoint.service';
 import { Item } from '../../../../core/shared/item.model';
 import { UUIDService } from '../../../../core/shared/uuid.service';
+import { XSRFService } from '../../../../core/xsrf/xsrf.service';
 import { TranslateLoaderMock } from '../../../mocks/translate-loader.mock';
 import { NotificationsService } from '../../../notifications/notifications.service';
 import { HALEndpointServiceStub } from '../../../testing/hal-endpoint-service.stub';
@@ -99,6 +100,7 @@ describe('ItemDetailPreviewComponent', () => {
         { provide: HALEndpointService, useValue: new HALEndpointServiceStub('workspaceitems') },
         { provide: ObjectCacheService, useValue: {} },
         { provide: UUIDService, useValue: {} },
+        { provide: XSRFService, useValue: {} },
         { provide: Store, useValue: {} },
         { provide: RemoteDataBuildService, useValue: {} },
         { provide: CommunityDataService, useValue: {} },
diff --git a/src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview.component.ts b/src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview.component.ts
index 2e290bfffa..b881590f4b 100644
--- a/src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview.component.ts
+++ b/src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview.component.ts
@@ -1,4 +1,4 @@
-import { Component, Input } from '@angular/core';
+import { Component, Input, OnChanges, SimpleChanges } from '@angular/core';
 
 import { Observable } from 'rxjs';
 import { first } from 'rxjs/operators';
@@ -13,6 +13,7 @@ import { HALEndpointService } from '../../../../core/shared/hal-endpoint.service
 import { SearchResult } from '../../../search/models/search-result.model';
 import { Context } from '../../../../core/shared/context.model';
 import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
+import { hasValue } from '../../../empty.util';
 
 /**
  * This component show metadata for the given item object in the detail view.
@@ -23,7 +24,7 @@ import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
   templateUrl: './item-detail-preview.component.html',
   animations: [fadeInOut]
 })
-export class ItemDetailPreviewComponent {
+export class ItemDetailPreviewComponent implements OnChanges {
   /**
    * The item to display
    */
@@ -62,6 +63,12 @@ export class ItemDetailPreviewComponent {
   ) {
   }
 
+  ngOnChanges(changes: SimpleChanges): void {
+    if (hasValue(changes.item)) {
+      this.bitstreams$ = this.getFiles();
+    }
+  }
+
   /**
    * Perform bitstream download
    */
diff --git a/src/app/shared/object-detail/object-detail.component.html b/src/app/shared/object-detail/object-detail.component.html
index d077e2fd2b..98034ca621 100644
--- a/src/app/shared/object-detail/object-detail.component.html
+++ b/src/app/shared/object-detail/object-detail.component.html
@@ -1,6 +1,5 @@
 <ds-pagination
   [paginationOptions]="config"
-  [pageInfoState]="objects?.payload"
   [collectionSize]="objects?.payload?.totalElements"
   [sortOptions]="sortConfig"
   [objects]="objects"
diff --git a/src/app/shared/object-grid/object-grid.component.html b/src/app/shared/object-grid/object-grid.component.html
index 59fe18820d..f949a9c3df 100644
--- a/src/app/shared/object-grid/object-grid.component.html
+++ b/src/app/shared/object-grid/object-grid.component.html
@@ -1,6 +1,5 @@
 <ds-pagination
   [paginationOptions]="config"
-  [pageInfoState]="objects?.payload"
   [collectionSize]="objects?.payload?.totalElements"
   [sortOptions]="sortConfig"
   [hideGear]="hideGear"
diff --git a/src/app/shared/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component.spec.ts b/src/app/shared/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component.spec.ts
index 15548d6608..0be0d12e22 100644
--- a/src/app/shared/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component.spec.ts
+++ b/src/app/shared/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component.spec.ts
@@ -13,6 +13,7 @@ import { DSOChangeAnalyzer } from '../../../../core/data/dso-change-analyzer.ser
 import { Collection } from '../../../../core/shared/collection.model';
 import { HALEndpointService } from '../../../../core/shared/hal-endpoint.service';
 import { UUIDService } from '../../../../core/shared/uuid.service';
+import { XSRFService } from '../../../../core/xsrf/xsrf.service';
 import { NotificationsService } from '../../../notifications/notifications.service';
 import { CollectionSearchResult } from '../../../object-collection/shared/collection-search-result.model';
 import { TruncatableService } from '../../../truncatable/truncatable.service';
@@ -80,6 +81,7 @@ describe('CollectionSearchResultGridElementComponent', () => {
         { provide: DSOChangeAnalyzer, useValue: {} },
         { provide: DefaultChangeAnalyzer, useValue: {} },
         { provide: BitstreamFormatDataService, useValue: {} },
+        { provide: XSRFService, useValue: {} },
         { provide: LinkService, useValue: linkService }
       ],
 
diff --git a/src/app/shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.spec.ts b/src/app/shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.spec.ts
index 710fbf3f67..f98bb36d17 100644
--- a/src/app/shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.spec.ts
+++ b/src/app/shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.spec.ts
@@ -13,6 +13,7 @@ import { DSOChangeAnalyzer } from '../../../../core/data/dso-change-analyzer.ser
 import { Community } from '../../../../core/shared/community.model';
 import { HALEndpointService } from '../../../../core/shared/hal-endpoint.service';
 import { UUIDService } from '../../../../core/shared/uuid.service';
+import { XSRFService } from '../../../../core/xsrf/xsrf.service';
 import { NotificationsService } from '../../../notifications/notifications.service';
 import { CommunitySearchResult } from '../../../object-collection/shared/community-search-result.model';
 import { TruncatableService } from '../../../truncatable/truncatable.service';
@@ -80,7 +81,8 @@ describe('CommunitySearchResultGridElementComponent', () => {
         { provide: DSOChangeAnalyzer, useValue: {} },
         { provide: DefaultChangeAnalyzer, useValue: {} },
         { provide: BitstreamFormatDataService, useValue: {} },
-        { provide: LinkService, useValue: linkService }
+        { provide: LinkService, useValue: linkService },
+        { provide: XSRFService, useValue: {} },
       ],
 
       schemas: [NO_ERRORS_SCHEMA]
diff --git a/src/app/shared/object-list/browse-entry-list-element/browse-entry-list-element.component.html b/src/app/shared/object-list/browse-entry-list-element/browse-entry-list-element.component.html
index ff7efcc309..539ce77939 100644
--- a/src/app/shared/object-list/browse-entry-list-element/browse-entry-list-element.component.html
+++ b/src/app/shared/object-list/browse-entry-list-element/browse-entry-list-element.component.html
@@ -1,5 +1,5 @@
 <div class="d-flex flex-row">
-    <a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType == linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="[]" [queryParams]="queryParams$ | async" [queryParamsHandling]="'merge'" class="lead">
+    <a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType == linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="[]" [queryParams]="queryParams$ | async" [queryParamsHandling]="'merge'" class="lead" role="link" tabindex="0">
         {{object.value}}
     </a>
     <span *ngIf="linkType == linkTypes.None" class="lead">
diff --git a/src/app/shared/object-list/collection-list-element/collection-list-element.component.html b/src/app/shared/object-list/collection-list-element/collection-list-element.component.html
index c50b382495..f8c8a39125 100644
--- a/src/app/shared/object-list/collection-list-element/collection-list-element.component.html
+++ b/src/app/shared/object-list/collection-list-element/collection-list-element.component.html
@@ -1,5 +1,5 @@
 <div class="d-flex flex-row">
-  <a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType == linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="['/collections/' + object.id]" class="lead">
+  <a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType == linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="['/collections/' + object.id]" class="lead" role="link" tabindex="0">
     {{ dsoNameService.getName(object) }}
   </a>
   <span *ngIf="linkType == linkTypes.None" class="lead">
diff --git a/src/app/shared/object-list/community-list-element/community-list-element.component.html b/src/app/shared/object-list/community-list-element/community-list-element.component.html
index 2101261bdc..e00121c666 100644
--- a/src/app/shared/object-list/community-list-element/community-list-element.component.html
+++ b/src/app/shared/object-list/community-list-element/community-list-element.component.html
@@ -1,5 +1,5 @@
 <div class="d-flex flex-row">
-  <a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType == linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="['/communities/' + object.id]" class="lead">
+  <a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType == linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="['/communities/' + object.id]" class="lead" role="link" tabindex="0">
     {{ dsoNameService.getName(object) }}
   </a>
   <span *ngIf="linkType == linkTypes.None" class="lead">
diff --git a/src/app/shared/object-list/item-list-element/item-types/item/item-list-element.component.html b/src/app/shared/object-list/item-list-element/item-types/item/item-list-element.component.html
index 3877e2f335..8ab6fae9e6 100644
--- a/src/app/shared/object-list/item-list-element/item-types/item/item-list-element.component.html
+++ b/src/app/shared/object-list/item-list-element/item-types/item/item-list-element.component.html
@@ -1 +1,5 @@
-<ds-item-search-result-list-element [showLabel]="showLabel" [object]="{ indexableObject: object, hitHighlights: {} }" [linkType]="linkType"></ds-item-search-result-list-element>
+<ds-listable-object-component-loader
+  [object]="itemSearchResult"
+  [viewMode]="viewMode"
+  [linkType]="linkType">
+</ds-listable-object-component-loader>
diff --git a/src/app/shared/object-list/item-list-element/item-types/item/item-list-element.component.spec.ts b/src/app/shared/object-list/item-list-element/item-types/item/item-list-element.component.spec.ts
index d75576e8eb..60231c5d27 100644
--- a/src/app/shared/object-list/item-list-element/item-types/item/item-list-element.component.spec.ts
+++ b/src/app/shared/object-list/item-list-element/item-types/item/item-list-element.component.spec.ts
@@ -1,13 +1,27 @@
-import { TestBed, waitForAsync } from '@angular/core/testing';
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
+import { TestBed, waitForAsync, ComponentFixture } from '@angular/core/testing';
+import { ChangeDetectionStrategy } from '@angular/core';
 import { By } from '@angular/platform-browser';
 import { ItemListElementComponent } from './item-list-element.component';
 import { Item } from '../../../../../core/shared/item.model';
-import { TruncatePipe } from '../../../../utils/truncate.pipe';
+import { XSRFService } from '../../../../../core/xsrf/xsrf.service';
 import { TruncatableService } from '../../../../truncatable/truncatable.service';
 import { of as observableOf } from 'rxjs';
-import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
-import { DSONameServiceMock } from '../../../../mocks/dso-name.service.mock';
+import { ListableObjectComponentLoaderComponent } from '../../../../object-collection/shared/listable-object/listable-object-component-loader.component';
+import { getMockThemeService } from '../../../../mocks/theme-service.mock';
+import { ThemeService } from '../../../../theme-support/theme.service';
+import { ListableObjectDirective } from '../../../../object-collection/shared/listable-object/listable-object.directive';
+import { APP_CONFIG } from '../../../../../../config/app-config.interface';
+import { environment } from '../../../../../../environments/environment.test';
+import { TranslateModule } from '@ngx-translate/core';
+import { ActivatedRouteStub } from '../../../../testing/active-router.stub';
+import { ActivatedRoute } from '@angular/router';
+import { AuthService } from '../../../../../core/auth/auth.service';
+import { AuthServiceStub } from '../../../../testing/auth-service.stub';
+import { AuthorizationDataService } from '../../../../../core/data/feature-authorization/authorization-data.service';
+import { AuthorizationDataServiceStub } from '../../../../testing/authorization-service.stub';
+import { FileService } from '../../../../../core/shared/file.service';
+import { FileServiceStub } from '../../../../testing/file-service.stub';
+import { TruncatableServiceStub } from '../../../../testing/truncatable-service.stub';
 
 const mockItem: Item = Object.assign(new Item(), {
   bundles: observableOf({}),
@@ -46,21 +60,43 @@ const mockItem: Item = Object.assign(new Item(), {
 });
 
 describe('ItemListElementComponent', () => {
-  let comp;
-  let fixture;
+  let comp: ItemListElementComponent;
+  let fixture: ComponentFixture<ItemListElementComponent>;
 
-  const truncatableServiceStub: any = {
-    isCollapsed: (id: number) => observableOf(true),
-  };
+  let activatedRoute: ActivatedRouteStub;
+  let authService: AuthServiceStub;
+  let authorizationService: AuthorizationDataServiceStub;
+  let fileService: FileServiceStub;
+  let themeService: ThemeService;
+  let truncatableService: TruncatableServiceStub;
 
   beforeEach(waitForAsync(() => {
-    TestBed.configureTestingModule({
-      declarations: [ItemListElementComponent, TruncatePipe],
-      providers: [
-        { provide: DSONameService, useValue: new DSONameServiceMock() },
-        { provide: TruncatableService, useValue: truncatableServiceStub },
+    activatedRoute = new ActivatedRouteStub();
+    authService = new AuthServiceStub();
+    authorizationService = new AuthorizationDataServiceStub();
+    fileService = new FileServiceStub();
+    themeService = getMockThemeService();
+    truncatableService = new TruncatableServiceStub();
+
+    void TestBed.configureTestingModule({
+      imports: [
+        TranslateModule.forRoot(),
+      ],
+      declarations: [
+        ItemListElementComponent,
+        ListableObjectComponentLoaderComponent,
+        ListableObjectDirective,
+      ],
+      providers: [
+        { provide: APP_CONFIG, useValue: environment },
+        { provide: ActivatedRoute, useValue: activatedRoute },
+        { provide: AuthService, useValue: authService },
+        { provide: AuthorizationDataService, useValue: authorizationService },
+        { provide: XSRFService, useValue: {} },
+        { provide: FileService, useValue: fileService },
+        { provide: ThemeService, useValue: themeService },
+        { provide: TruncatableService, useValue: truncatableService },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
     }).overrideComponent(ItemListElementComponent, {
       set: { changeDetection: ChangeDetectionStrategy.Default }
     }).compileComponents();
@@ -74,6 +110,7 @@ describe('ItemListElementComponent', () => {
   describe(`when the publication is rendered`, () => {
     beforeEach(() => {
       comp.object = mockItem;
+      comp.ngOnChanges();
       fixture.detectChanges();
     });
 
diff --git a/src/app/shared/object-list/item-list-element/item-types/item/item-list-element.component.ts b/src/app/shared/object-list/item-list-element/item-types/item/item-list-element.component.ts
index a3bd2a1ce0..f338c5de68 100644
--- a/src/app/shared/object-list/item-list-element/item-types/item/item-list-element.component.ts
+++ b/src/app/shared/object-list/item-list-element/item-types/item/item-list-element.component.ts
@@ -1,8 +1,14 @@
-import { Component } from '@angular/core';
+import {
+  Component,
+  OnChanges,
+} from '@angular/core';
+
 import { ViewMode } from '../../../../../core/shared/view-mode.model';
 import { listableObjectComponent } from '../../../../object-collection/shared/listable-object/listable-object.decorator';
 import { AbstractListableElementComponent } from '../../../../object-collection/shared/object-collection-element/abstract-listable-element.component';
 import { Item } from '../../../../../core/shared/item.model';
+import { ItemSearchResult } from '../../../../object-collection/shared/item-search-result.model';
+import { hasValue } from '../../../../empty.util';
 
 @listableObjectComponent('Publication', ViewMode.ListElement)
 @listableObjectComponent(Item, ViewMode.ListElement)
@@ -14,5 +20,16 @@ import { Item } from '../../../../../core/shared/item.model';
 /**
  * The component for displaying a list element for an item of the type Publication
  */
-export class ItemListElementComponent extends AbstractListableElementComponent<Item> {
+export class ItemListElementComponent extends AbstractListableElementComponent<Item> implements OnChanges {
+
+  itemSearchResult: ItemSearchResult;
+
+  ngOnChanges(): void {
+    if (hasValue(this.object)) {
+      this.itemSearchResult = Object.assign(new ItemSearchResult(), {
+        indexableObject: this.object,
+      });
+    }
+  }
+
 }
diff --git a/src/app/shared/object-list/metadata-representation-list-element/plain-text/plain-text-metadata-list-element.component.html b/src/app/shared/object-list/metadata-representation-list-element/plain-text/plain-text-metadata-list-element.component.html
index 7d416e9f3e..e94427a6fd 100644
--- a/src/app/shared/object-list/metadata-representation-list-element/plain-text/plain-text-metadata-list-element.component.html
+++ b/src/app/shared/object-list/metadata-representation-list-element/plain-text/plain-text-metadata-list-element.component.html
@@ -4,14 +4,16 @@
     {{mdRepresentation.getValue()}}
   </span>
   <a *ngIf="(mdRepresentation.representationType=='plain_text') && isLink()" class="dont-break-out"
-  target="_blank" [href]="mdRepresentation.getValue()">
+  target="_blank" [href]="mdRepresentation.getValue()" role="link" tabindex="0">
     {{mdRepresentation.getValue()}}
   </a>
   <span *ngIf="(mdRepresentation.representationType=='authority_controlled')" class="dont-break-out">{{mdRepresentation.getValue()}}</span>
   <a *ngIf="(mdRepresentation.representationType=='browse_link')"
      class="dont-break-out ds-browse-link"
      [routerLink]="['/browse/', mdRepresentation.browseDefinition.id]"
-     [queryParams]="getQueryParams()">
+     [queryParams]="getQueryParams()"
+     role="link"
+     tabindex="0">
     {{mdRepresentation.getValue()}}
   </a>
 </div>
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.html b/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.html
index c8ef730faf..b4fade662b 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.html
+++ b/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.html
@@ -9,7 +9,7 @@
         <ds-themed-badges [object]="item" [context]="badgeContext" [showAccessStatus]="true"></ds-themed-badges>
       </div>
       <ds-truncatable [id]="item.id">
-        <h3 [innerHTML]="dsoTitle" [ngClass]="{'lead': true,'text-muted': !item.firstMetadataValue('dc.title')}"></h3>
+        <h2 [innerHTML]="dsoTitle" [ngClass]="{'lead': true,'text-muted': !item.firstMetadataValue('dc.title')}"></h2>
         <div>
           <span class="text-muted">
             <ds-truncatable-part [id]="item.id" [minLines]="1">
diff --git a/src/app/shared/object-list/object-list.component.html b/src/app/shared/object-list/object-list.component.html
index b8712b85c5..5580c541f9 100644
--- a/src/app/shared/object-list/object-list.component.html
+++ b/src/app/shared/object-list/object-list.component.html
@@ -1,6 +1,5 @@
 <ds-pagination
         [paginationOptions]="config"
-        [pageInfoState]="objects?.payload"
         [collectionSize]="objects?.payload?.totalElements"
         [objects]="objects"
         [sortOptions]="sortConfig"
diff --git a/src/app/shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.html b/src/app/shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.html
index d38170e863..f4a0aa917f 100644
--- a/src/app/shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.html
+++ b/src/app/shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.html
@@ -1,5 +1,5 @@
 <div class="row">
-  <div *ngIf="showThumbnails" class="offset-md-2"></div>
+  <div *ngIf="showThumbnails" class="offset-3 offset-md-2"></div>
   <div [ngClass]="showThumbnails ? 'col-9' : 'col-md-12'">
     <ds-themed-badges *ngIf="showLabel" [object]="dso" [context]="context"></ds-themed-badges>
     <a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType == linkTypes.ExternalLink) ? 'noopener noreferrer' : null"  [routerLink]="['/communities/' + dso.id]" class="lead" [innerHTML]="dsoTitle"></a>
diff --git a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.html b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.html
index f7a687048a..f2ec34b4ef 100644
--- a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.html
+++ b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.html
@@ -1,7 +1,7 @@
 <div class="row">
   <div *ngIf="showThumbnails" class="col-3 col-md-2">
     <a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType == linkTypes.ExternalLink) ? 'noopener noreferrer' : null"
-       [routerLink]="[itemPageRoute]" class="dont-break-out">
+       [routerLink]="[itemPageRoute]" class="dont-break-out" role="link" tabindex="0">
     <ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="true">
     </ds-thumbnail>
     </a>
@@ -18,7 +18,7 @@
     <ds-truncatable [id]="dso.id" *ngIf="object !== undefined && object !== null">
       <a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType == linkTypes.ExternalLink) ? 'noopener noreferrer' : null"
          [routerLink]="[itemPageRoute]" class="lead item-list-title dont-break-out"
-         [innerHTML]="dsoTitle"></a>
+         [innerHTML]="dsoTitle" role="link" tabindex="0"></a>
       <span *ngIf="linkType == linkTypes.None" class="lead item-list-title dont-break-out"
             [innerHTML]="dsoTitle"></span>
       <span class="text-muted">
diff --git a/src/app/shared/object-list/search-result-list-element/search-result-list-element.component.ts b/src/app/shared/object-list/search-result-list-element/search-result-list-element.component.ts
index e13be91e63..1d65dd8b12 100644
--- a/src/app/shared/object-list/search-result-list-element/search-result-list-element.component.ts
+++ b/src/app/shared/object-list/search-result-list-element/search-result-list-element.component.ts
@@ -38,13 +38,22 @@ export class SearchResultListElementComponent<T extends SearchResult<K>, K exten
   }
 
   /**
-   * Gets all matching metadata string values from hitHighlights or dso metadata, preferring hitHighlights.
+   * Gets all matching metadata string values from hitHighlights or dso metadata.
    *
    * @param {string|string[]} keyOrKeys The metadata key(s) in scope. Wildcards are supported; see [[Metadata]].
    * @returns {string[]} the matching string values or an empty array.
    */
   allMetadataValues(keyOrKeys: string | string[]): string[] {
-    return Metadata.allValues([this.object.hitHighlights, this.dso.metadata], keyOrKeys);
+    let dsoMetadata: string[] = Metadata.allValues([this.dso.metadata], keyOrKeys);
+    let highlights: string[] = Metadata.allValues([this.object.hitHighlights], keyOrKeys);
+    let removedHighlights: string[] = highlights.map(str => str.replace(/<\/?em>/g, ''));
+    for (let i = 0; i < removedHighlights.length; i++) {
+        let index = dsoMetadata.indexOf(removedHighlights[i]);
+        if (index !== -1) {
+          dsoMetadata[index] = highlights[i];
+        }
+    }
+    return dsoMetadata;
   }
 
   /**
diff --git a/src/app/shared/object-list/sidebar-search-list-element/community/community-sidebar-search-list-element.component.ts b/src/app/shared/object-list/sidebar-search-list-element/community/community-sidebar-search-list-element.component.ts
index 14c8ec09cd..fb0f69f9a9 100644
--- a/src/app/shared/object-list/sidebar-search-list-element/community/community-sidebar-search-list-element.component.ts
+++ b/src/app/shared/object-list/sidebar-search-list-element/community/community-sidebar-search-list-element.component.ts
@@ -9,7 +9,7 @@ import { Community } from '../../../../core/shared/community.model';
 @listableObjectComponent(CommunitySearchResult, ViewMode.ListElement, Context.SideBarSearchModal)
 @listableObjectComponent(CommunitySearchResult, ViewMode.ListElement, Context.SideBarSearchModalCurrent)
 @Component({
-  selector: 'ds-collection-sidebar-search-list-element',
+  selector: 'ds-community-sidebar-search-list-element',
   templateUrl: '../sidebar-search-list-element.component.html'
 })
 /**
diff --git a/src/app/shared/object-select/collection-select/collection-select.component.html b/src/app/shared/object-select/collection-select/collection-select.component.html
index 9b87f69c04..c51ebf9723 100644
--- a/src/app/shared/object-select/collection-select/collection-select.component.html
+++ b/src/app/shared/object-select/collection-select/collection-select.component.html
@@ -3,7 +3,6 @@
     *ngIf="collectionsRD?.payload?.totalElements > 0 || collectionsRD?.payload?.page?.length > 0"
     [paginationOptions]="paginationOptions"
     [sortOptions]="sortOptions"
-    [pageInfoState]="collectionsRD?.payload"
     [collectionSize]="collectionsRD?.payload?.totalElements"
     [hidePagerWhenSinglePage]="true"
     [hideGear]="true">
@@ -11,14 +10,14 @@
       <table id="collection-select" class="table table-striped table-hover">
         <thead>
           <tr>
-            <th></th>
+            <th><span class="sr-only">{{'collection.select.table.selected' | translate}}</span></th>
             <th scope="col">{{'collection.select.table.title' | translate}}</th>
           </tr>
         </thead>
         <tbody>
-          <tr *ngFor="let collection of collectionsRD?.payload?.page">
-            <td><input class="collection-checkbox" [ngModel]="getSelected(collection.id) | async" (change)="switch(collection.id)" type="checkbox" name="{{collection.id}}"></td>
-            <td><a [routerLink]="['/collections', collection.id]">{{ dsoNameService.getName(collection) }}</a></td>
+          <tr *ngFor="let selectCollection of selectCollections$ | async">
+            <td><input #selectCollectionBtn [attr.aria-label]="(selectCollectionBtn.checked ? 'collection.select.table.deselect' : 'collection.select.table.select') | translate" [disabled]="(selectCollection.canSelect$ | async) === false" class="collection-checkbox" [ngModel]="selectCollection.selected$ | async" (change)="switch(selectCollection.dso.id)" type="checkbox" name="{{selectCollection.dso.id}}"></td>
+            <td><a [routerLink]="selectCollection.route">{{ dsoNameService.getName(selectCollection.dso) }}</a></td>
           </tr>
         </tbody>
       </table>
@@ -35,7 +34,7 @@
     </button>
     <button class="btn collection-confirm"
             [ngClass]="{'btn-danger': dangerConfirm, 'btn-primary': !dangerConfirm}"
-            [disabled]="selectedIds?.length === 0"
+            [dsBtnDisabled]="selectedIds?.length === 0"
             (click)="confirmSelected()">
       <i class="fas fa-trash"></i> {{confirmButton | translate}}
     </button>
diff --git a/src/app/shared/object-select/collection-select/collection-select.component.ts b/src/app/shared/object-select/collection-select/collection-select.component.ts
index 2d36f80274..e9edf19304 100644
--- a/src/app/shared/object-select/collection-select/collection-select.component.ts
+++ b/src/app/shared/object-select/collection-select/collection-select.component.ts
@@ -1,10 +1,13 @@
-import { Component } from '@angular/core';
+import { Component, OnInit } from '@angular/core';
 import { Collection } from '../../../core/shared/collection.model';
 import { ObjectSelectComponent } from '../object-select/object-select.component';
-import { isNotEmpty } from '../../empty.util';
-import { ObjectSelectService } from '../object-select.service';
-import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
-import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
+import { isNotEmpty, hasValueOperator } from '../../empty.util';
+import { Observable } from 'rxjs';
+import { DSpaceObjectSelect } from '../object-select.model';
+import { getAllSucceededRemoteDataPayload } from '../../../core/shared/operators';
+import { map } from 'rxjs/operators';
+import { PaginatedList } from '../../../core/data/paginated-list.model';
+import { getCollectionPageRoute } from '../../../collection-page/collection-page-routing-paths';
 
 @Component({
   selector: 'ds-collection-select',
@@ -15,21 +18,29 @@ import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
 /**
  * A component used to select collections from a specific list and returning the UUIDs of the selected collections
  */
-export class CollectionSelectComponent extends ObjectSelectComponent<Collection> {
+export class CollectionSelectComponent extends ObjectSelectComponent<Collection> implements OnInit {
 
-  constructor(
-    protected objectSelectService: ObjectSelectService,
-    protected authorizationService: AuthorizationDataService,
-    public dsoNameService: DSONameService,
-  ) {
-    super(objectSelectService, authorizationService);
-  }
+  /**
+   * Collection of all the data that is used to display the {@link Collection} in the HTML.
+   * By collecting this data here it doesn't need to be recalculated on evey change detection.
+   */
+  selectCollections$: Observable<DSpaceObjectSelect<Collection>[]>;
 
   ngOnInit(): void {
     super.ngOnInit();
     if (!isNotEmpty(this.confirmButton)) {
       this.confirmButton = 'collection.select.confirm';
     }
+    this.selectCollections$ = this.dsoRD$.pipe(
+      hasValueOperator(),
+      getAllSucceededRemoteDataPayload(),
+      map((collections: PaginatedList<Collection>) => collections.page.map((collection: Collection) => Object.assign(new DSpaceObjectSelect<Collection>(), {
+        dso: collection,
+        canSelect$: this.canSelect(collection),
+        selected$: this.getSelected(collection.id),
+        route: getCollectionPageRoute(collection.id),
+      } as DSpaceObjectSelect<Collection>))),
+    );
   }
 
 }
diff --git a/src/app/shared/object-select/item-select/item-select.component.html b/src/app/shared/object-select/item-select/item-select.component.html
index 7f8ff943a3..d1c2986076 100644
--- a/src/app/shared/object-select/item-select/item-select.component.html
+++ b/src/app/shared/object-select/item-select/item-select.component.html
@@ -3,7 +3,6 @@
     *ngIf="itemsRD?.payload?.totalElements > 0"
     [paginationOptions]="paginationOptions"
     [sortOptions]="sortOptions"
-    [pageInfoState]="itemsRD?.payload"
     [collectionSize]="itemsRD?.payload?.totalElements"
     [hidePagerWhenSinglePage]="true"
     [hideGear]="true">
@@ -11,24 +10,24 @@
       <table id="item-select" class="table table-striped table-hover">
         <thead>
         <tr>
-          <th></th>
+          <th><span class="sr-only">{{'item.select.table.selected' | translate}}</span></th>
           <th *ngIf="!hideCollection" scope="col">{{'item.select.table.collection' | translate}}</th>
           <th scope="col">{{'item.select.table.author' | translate}}</th>
           <th scope="col">{{'item.select.table.title' | translate}}</th>
         </tr>
         </thead>
         <tbody>
-        <tr *ngFor="let item of itemsRD?.payload?.page">
-          <td><input [disabled]="!(canSelect(item) | async)" class="item-checkbox" [ngModel]="getSelected(item.id) | async" (change)="switch(item.id)" type="checkbox" name="{{item.id}}"></td>
+        <tr *ngFor="let selectItem of selectItems$ | async">
+          <td><input #selectItemBtn [attr.aria-label]="(selectItemBtn.checked ? 'item.select.table.deselect' : 'item.select.table.select') | translate" [disabled]="(selectItem.canSelect$ | async) === false" class="item-checkbox" [ngModel]="selectItem.selected$ | async" (change)="switch(selectItem.dso.id)" type="checkbox" name="{{selectItem.dso.id}}"></td>
           <td *ngIf="!hideCollection">
-            <span *ngVar="(item.owningCollection | async)?.payload as collection">
+            <span *ngVar="(selectItem.dso.owningCollection | async)?.payload as collection">
               <a *ngIf="collection" [routerLink]="['/collections', collection?.id]">
                 {{ dsoNameService.getName(collection) }}
               </a>
             </span>
           </td>
-          <td><span *ngIf="item.hasMetadata(['dc.contributor.author', 'dc.creator', 'dc.contributor.*'])">{{item.firstMetadataValue(['dc.contributor.author', 'dc.creator', 'dc.contributor.*'])}}</span></td>
-          <td><a [routerLink]="[(itemPageRoutes$ | async)[item.id]]">{{ dsoNameService.getName(item) }}</a></td>
+          <td><span *ngIf="selectItem.dso.hasMetadata(['dc.contributor.author', 'dc.creator', 'dc.contributor.*'])">{{selectItem.dso.firstMetadataValue(['dc.contributor.author', 'dc.creator', 'dc.contributor.*'])}}</span></td>
+          <td><a [routerLink]="selectItem.route">{{ dsoNameService.getName(selectItem.dso) }}</a></td>
         </tr>
         </tbody>
       </table>
@@ -43,7 +42,7 @@
     <button class="btn btn-outline-secondary item-cancel float-left" (click)="onCancel()">{{cancelButton | translate}}</button>
     <button class="btn item-confirm float-right"
             [ngClass]="{'btn-danger': dangerConfirm, 'btn-primary': !dangerConfirm}"
-            [disabled]="selectedIds?.length === 0"
+            [dsBtnDisabled]="selectedIds?.length === 0"
             (click)="confirmSelected()">
       {{confirmButton | translate}}
     </button>
diff --git a/src/app/shared/object-select/item-select/item-select.component.spec.ts b/src/app/shared/object-select/item-select/item-select.component.spec.ts
index 5131060cb2..9fb9a0260a 100644
--- a/src/app/shared/object-select/item-select/item-select.component.spec.ts
+++ b/src/app/shared/object-select/item-select/item-select.component.spec.ts
@@ -24,6 +24,7 @@ import { LinkHeadService } from '../../../core/services/link-head.service';
 import { GroupDataService } from '../../../core/eperson/group-data.service';
 import { SearchConfigurationServiceStub } from '../../testing/search-configuration-service.stub';
 import { ConfigurationProperty } from '../../../core/shared/configuration-property.model';
+import {BtnDisabledDirective} from '../../btn-disabled.directive';
 
 describe('ItemSelectComponent', () => {
   let comp: ItemSelectComponent;
@@ -98,7 +99,7 @@ describe('ItemSelectComponent', () => {
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
       imports: [TranslateModule.forRoot(), SharedModule, RouterTestingModule.withRoutes([])],
-      declarations: [],
+      declarations: [BtnDisabledDirective],
       providers: [
         { provide: ObjectSelectService, useValue: new ObjectSelectServiceStub([mockItemList[1].id]) },
         { provide: HostWindowService, useValue: new HostWindowServiceStub(0) },
@@ -184,15 +185,16 @@ describe('ItemSelectComponent', () => {
     beforeEach(() => {
       comp.featureId = FeatureID.CanManageMappings;
       spyOn(authorizationDataService, 'isAuthorized').and.returnValue(of(false));
+      comp.ngOnInit();
     });
 
-    it('should disable the checkbox', waitForAsync(() => {
+    it('should disable the checkbox', waitForAsync(async () => {
       fixture.detectChanges();
-      fixture.whenStable().then(() => {
-        const checkbox = fixture.debugElement.query(By.css('input.item-checkbox')).nativeElement;
-        expect(authorizationDataService.isAuthorized).toHaveBeenCalled();
-        expect(checkbox.disabled).toBeTrue();
-      });
+      await fixture.whenStable();
+
+      const checkbox = fixture.debugElement.query(By.css('input.item-checkbox')).nativeElement;
+      expect(authorizationDataService.isAuthorized).toHaveBeenCalled();
+      expect(checkbox.disabled).toBeTrue();
     }));
   });
 });
diff --git a/src/app/shared/object-select/item-select/item-select.component.ts b/src/app/shared/object-select/item-select/item-select.component.ts
index dd0266ff83..e9ec817cf0 100644
--- a/src/app/shared/object-select/item-select/item-select.component.ts
+++ b/src/app/shared/object-select/item-select/item-select.component.ts
@@ -1,14 +1,13 @@
-import { Component, Input } from '@angular/core';
+import { Component, Input, OnInit } from '@angular/core';
 import { Item } from '../../../core/shared/item.model';
-import { ObjectSelectService } from '../object-select.service';
 import { ObjectSelectComponent } from '../object-select/object-select.component';
 import { hasValueOperator, isNotEmpty } from '../../empty.util';
 import { Observable } from 'rxjs';
 import { getAllSucceededRemoteDataPayload } from '../../../core/shared/operators';
 import { map } from 'rxjs/operators';
 import { getItemPageRoute } from '../../../item-page/item-page-routing-paths';
-import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
-import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
+import { PaginatedList } from '../../../core/data/paginated-list.model';
+import { DSpaceObjectSelect } from '../object-select.model';
 
 @Component({
   selector: 'ds-item-select',
@@ -18,7 +17,7 @@ import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
 /**
  * A component used to select items from a specific list and returning the UUIDs of the selected items
  */
-export class ItemSelectComponent extends ObjectSelectComponent<Item> {
+export class ItemSelectComponent extends ObjectSelectComponent<Item> implements OnInit {
 
   /**
    * Whether or not to hide the collection column
@@ -27,35 +26,25 @@ export class ItemSelectComponent extends ObjectSelectComponent<Item> {
   hideCollection = false;
 
   /**
-   * The routes to the items their pages
-   * Key: Item ID
-   * Value: Route to item page
+   * Collection of all the data that is used to display the {@link Item} in the HTML.
+   * By collecting this data here it doesn't need to be recalculated on evey change detection.
    */
-  itemPageRoutes$: Observable<{
-    [itemId: string]: string
-  }>;
-
-  constructor(
-    protected objectSelectService: ObjectSelectService,
-    protected authorizationService: AuthorizationDataService,
-    public dsoNameService: DSONameService,
-  ) {
-    super(objectSelectService, authorizationService);
-  }
+  selectItems$: Observable<DSpaceObjectSelect<Item>[]>;
 
   ngOnInit(): void {
     super.ngOnInit();
     if (!isNotEmpty(this.confirmButton)) {
       this.confirmButton = 'item.select.confirm';
     }
-    this.itemPageRoutes$ = this.dsoRD$.pipe(
+    this.selectItems$ = this.dsoRD$.pipe(
       hasValueOperator(),
       getAllSucceededRemoteDataPayload(),
-      map((items) => {
-        const itemPageRoutes = {};
-        items.page.forEach((item) => itemPageRoutes[item.uuid] = getItemPageRoute(item));
-        return itemPageRoutes;
-      })
+      map((items: PaginatedList<Item>) => items.page.map((item: Item) => Object.assign(new DSpaceObjectSelect<Item>(), {
+        dso: item,
+        canSelect$: this.canSelect(item),
+        selected$: this.getSelected(item.id),
+        route: getItemPageRoute(item),
+      } as DSpaceObjectSelect<Item>))),
     );
   }
 
diff --git a/src/app/shared/object-select/object-select.model.ts b/src/app/shared/object-select/object-select.model.ts
new file mode 100644
index 0000000000..329b419f46
--- /dev/null
+++ b/src/app/shared/object-select/object-select.model.ts
@@ -0,0 +1,29 @@
+import { Observable } from 'rxjs';
+import { DSpaceObject } from '../../core/shared/dspace-object.model';
+
+/**
+ * Class used to collect all the data that that is used by the {@link ObjectSelectComponent} in the HTML.
+ */
+export class DSpaceObjectSelect<T extends DSpaceObject> {
+
+  /**
+   * The {@link DSpaceObject} to display
+   */
+  dso: T;
+
+  /**
+   * Whether the {@link DSpaceObject} can be selected
+   */
+  canSelect$: Observable<boolean>;
+
+  /**
+   * Whether the {@link DSpaceObject} is selected
+   */
+  selected$: Observable<boolean>;
+
+  /**
+   * The {@link DSpaceObject}'s route
+   */
+  route: string;
+
+}
diff --git a/src/app/shared/object-select/object-select/object-select.component.ts b/src/app/shared/object-select/object-select/object-select.component.ts
index 6fb795690d..cc38941fd9 100644
--- a/src/app/shared/object-select/object-select/object-select.component.ts
+++ b/src/app/shared/object-select/object-select/object-select.component.ts
@@ -9,6 +9,7 @@ import { SortOptions } from '../../../core/cache/models/sort-options.model';
 import { FeatureID } from '../../../core/data/feature-authorization/feature-id';
 import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
 import { DSpaceObject } from '../../../core/shared/dspace-object.model';
+import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
 
 /**
  * An abstract component used to select DSpaceObjects from a specific list and returning the UUIDs of the selected DSpaceObjects
@@ -17,7 +18,7 @@ import { DSpaceObject } from '../../../core/shared/dspace-object.model';
   selector: 'ds-object-select-abstract',
   template: ''
 })
-export abstract class ObjectSelectComponent<TDomain> implements OnInit, OnDestroy {
+export abstract class ObjectSelectComponent<TDomain extends DSpaceObject> implements OnInit, OnDestroy {
 
   /**
    * A unique key used for the object select service
@@ -88,8 +89,11 @@ export abstract class ObjectSelectComponent<TDomain> implements OnInit, OnDestro
    */
   selectedIds$: Observable<string[]>;
 
-  constructor(protected objectSelectService: ObjectSelectService,
-              protected authorizationService: AuthorizationDataService) {
+  constructor(
+    protected objectSelectService: ObjectSelectService,
+    protected authorizationService: AuthorizationDataService,
+    public dsoNameService: DSONameService,
+  ) {
   }
 
   ngOnInit(): void {
diff --git a/src/app/shared/orcid-badge-and-tooltip/orcid-badge-and-tooltip.component.html b/src/app/shared/orcid-badge-and-tooltip/orcid-badge-and-tooltip.component.html
new file mode 100644
index 0000000000..9f4821e780
--- /dev/null
+++ b/src/app/shared/orcid-badge-and-tooltip/orcid-badge-and-tooltip.component.html
@@ -0,0 +1,11 @@
+<img placement="top"
+     [ngbTooltip]="orcidTooltipTemplate"
+     class="orcid-icon"
+     [ngClass]="{'not-authenticated': !authenticatedTimestamp}"
+     alt="ORCID {{ orcidTooltip }}"
+     src="assets/images/orcid.logo.icon.svg"
+     data-test="orcidIcon"/>
+
+<ng-template #orcidTooltipTemplate>
+    <span class="text-muted">{{ orcidTooltip }}</span>
+</ng-template>
diff --git a/src/app/shared/orcid-badge-and-tooltip/orcid-badge-and-tooltip.component.scss b/src/app/shared/orcid-badge-and-tooltip/orcid-badge-and-tooltip.component.scss
new file mode 100644
index 0000000000..6a1c259e18
--- /dev/null
+++ b/src/app/shared/orcid-badge-and-tooltip/orcid-badge-and-tooltip.component.scss
@@ -0,0 +1,11 @@
+:host {
+  display: inline-block;
+}
+
+.orcid-icon {
+  height: 1.2rem;
+
+  &.not-authenticated {
+    filter: grayscale(100%);
+  }
+}
diff --git a/src/app/shared/orcid-badge-and-tooltip/orcid-badge-and-tooltip.component.spec.ts b/src/app/shared/orcid-badge-and-tooltip/orcid-badge-and-tooltip.component.spec.ts
new file mode 100644
index 0000000000..adb3c91f94
--- /dev/null
+++ b/src/app/shared/orcid-badge-and-tooltip/orcid-badge-and-tooltip.component.spec.ts
@@ -0,0 +1,71 @@
+import {
+  NgClass,
+  NgIf,
+} from '@angular/common';
+import {
+  ComponentFixture,
+  TestBed,
+} from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap';
+import { TranslateService } from '@ngx-translate/core';
+
+import { MetadataValue } from '../../core/shared/metadata.models';
+import { OrcidBadgeAndTooltipComponent } from './orcid-badge-and-tooltip.component';
+
+describe('OrcidBadgeAndTooltipComponent', () => {
+  let component: OrcidBadgeAndTooltipComponent;
+  let fixture: ComponentFixture<OrcidBadgeAndTooltipComponent>;
+  let translateService: TranslateService;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [OrcidBadgeAndTooltipComponent],
+      imports: [
+        NgbTooltipModule,
+        NgClass,
+        NgIf,
+      ],
+      providers: [
+        { provide: TranslateService, useValue: { instant: (key: string) => key } },
+      ],
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(OrcidBadgeAndTooltipComponent);
+    component = fixture.componentInstance;
+    translateService = TestBed.inject(TranslateService);
+
+    component.orcid = { value: '0000-0002-1825-0097' } as MetadataValue;
+    component.authenticatedTimestamp = { value: '2023-10-01' } as MetadataValue;
+
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+
+  it('should set orcidTooltip when authenticatedTimestamp is provided', () => {
+    component.ngOnInit();
+    expect(component.orcidTooltip).toBe('person.orcid-tooltip.authenticated');
+  });
+
+  it('should set orcidTooltip when authenticatedTimestamp is not provided', () => {
+    component.authenticatedTimestamp = null;
+    component.ngOnInit();
+    expect(component.orcidTooltip).toBe('person.orcid-tooltip.not-authenticated');
+  });
+
+  it('should display the ORCID icon', () => {
+    const badgeIcon = fixture.debugElement.query(By.css('img[data-test="orcidIcon"]'));
+    expect(badgeIcon).toBeTruthy();
+  });
+
+  it('should display the ORCID icon in greyscale if there is no authenticated timestamp', () => {
+    component.authenticatedTimestamp = null;
+    fixture.detectChanges();
+    const badgeIcon = fixture.debugElement.query(By.css('img[data-test="orcidIcon"]'));
+    expect(badgeIcon.nativeElement.classList).toContain('not-authenticated');
+  });
+
+});
diff --git a/src/app/shared/orcid-badge-and-tooltip/orcid-badge-and-tooltip.component.ts b/src/app/shared/orcid-badge-and-tooltip/orcid-badge-and-tooltip.component.ts
new file mode 100644
index 0000000000..1939bad57f
--- /dev/null
+++ b/src/app/shared/orcid-badge-and-tooltip/orcid-badge-and-tooltip.component.ts
@@ -0,0 +1,56 @@
+
+
+import {
+  Component,
+  Input,
+  OnInit,
+} from '@angular/core';
+import { TranslateService } from '@ngx-translate/core';
+
+import { MetadataValue } from '../../core/shared/metadata.models';
+
+/**
+ * Component to display an ORCID badge with a tooltip.
+ * The tooltip text changes based on whether the ORCID is authenticated.
+ */
+@Component({
+  selector: 'ds-orcid-badge-and-tooltip',
+  templateUrl: './orcid-badge-and-tooltip.component.html',
+  styleUrls: ['./orcid-badge-and-tooltip.component.scss'],
+})
+export class OrcidBadgeAndTooltipComponent implements OnInit {
+
+  /**
+   * The ORCID value to be displayed.
+   */
+  @Input() orcid: MetadataValue;
+
+  /**
+   * The timestamp indicating when the ORCID was authenticated.
+   */
+  @Input() authenticatedTimestamp: MetadataValue;
+
+  /**
+   * The tooltip text to be displayed.
+   */
+  orcidTooltip: string;
+
+  /**
+   * Constructor to inject the TranslateService.
+   * @param translateService - Service for translation.
+   */
+  constructor(
+    private translateService: TranslateService,
+  ) { }
+
+  /**
+   * Initializes the component.
+   * Sets the tooltip text based on the presence of the authenticated timestamp.
+   */
+  ngOnInit() {
+    this.orcidTooltip = this.authenticatedTimestamp ?
+      this.translateService.instant('person.orcid-tooltip.authenticated', { orcid: this.orcid.value }) :
+      this.translateService.instant('person.orcid-tooltip.not-authenticated', { orcid: this.orcid.value });
+  }
+
+}
diff --git a/src/app/shared/page-size-selector/page-size-selector.component.html b/src/app/shared/page-size-selector/page-size-selector.component.html
index d7db450d7b..de7cb34967 100644
--- a/src/app/shared/page-size-selector/page-size-selector.component.html
+++ b/src/app/shared/page-size-selector/page-size-selector.component.html
@@ -2,7 +2,7 @@
     <ds-sidebar-dropdown
             [id]="'search-sidebar-rpp'"
             [label]="'search.sidebar.settings.rpp'"
-            (change)="reloadRPP($event)"
+            (changed)="reloadRPP($event)"
     >
         <option *ngFor="let pageSizeOption of (paginationOptions$ | async).pageSizeOptions"
                 [value]="pageSizeOption"
@@ -10,4 +10,4 @@
             {{pageSizeOption}}
         </option>
     </ds-sidebar-dropdown>
-</div>
\ No newline at end of file
+</div>
diff --git a/src/app/shared/pagination-drag-and-drop/abstract-paginated-drag-and-drop-list.component.spec.ts b/src/app/shared/pagination-drag-and-drop/abstract-paginated-drag-and-drop-list.component.spec.ts
deleted file mode 100644
index bac6b89583..0000000000
--- a/src/app/shared/pagination-drag-and-drop/abstract-paginated-drag-and-drop-list.component.spec.ts
+++ /dev/null
@@ -1,136 +0,0 @@
-import { AbstractPaginatedDragAndDropListComponent } from './abstract-paginated-drag-and-drop-list.component';
-import { DSpaceObject } from '../../core/shared/dspace-object.model';
-import { ObjectUpdatesService } from '../../core/data/object-updates/object-updates.service';
-import { Component, ElementRef } from '@angular/core';
-import { BehaviorSubject, Observable, of as observableOf } from 'rxjs';
-import { PaginatedList } from '../../core/data/paginated-list.model';
-import { RemoteData } from '../../core/data/remote-data';
-import { take } from 'rxjs/operators';
-import { PaginationComponent } from '../pagination/pagination.component';
-import { createSuccessfulRemoteDataObject } from '../remote-data.utils';
-import { createPaginatedList } from '../testing/utils.test';
-import { ObjectValuesPipe } from '../utils/object-values-pipe';
-import { PaginationService } from '../../core/pagination/pagination.service';
-import { PaginationServiceStub } from '../testing/pagination-service.stub';
-import { FieldUpdates } from '../../core/data/object-updates/field-updates.model';
-
-@Component({
-  selector: 'ds-mock-paginated-drag-drop-abstract',
-  template: ''
-})
-class MockAbstractPaginatedDragAndDropListComponent extends AbstractPaginatedDragAndDropListComponent<DSpaceObject> {
-
-  constructor(protected objectUpdatesService: ObjectUpdatesService,
-              protected elRef: ElementRef,
-              protected objectValuesPipe: ObjectValuesPipe,
-              protected mockUrl: string,
-              protected paginationService: PaginationService,
-  protected mockObjectsRD$: Observable<RemoteData<PaginatedList<DSpaceObject>>>) {
-    super(objectUpdatesService, elRef, objectValuesPipe, paginationService);
-  }
-
-  initializeObjectsRD(): void {
-    this.objectsRD$ = this.mockObjectsRD$;
-  }
-
-  initializeURL(): void {
-    this.url = this.mockUrl;
-  }
-}
-
-describe('AbstractPaginatedDragAndDropListComponent', () => {
-  let component: MockAbstractPaginatedDragAndDropListComponent;
-  let objectUpdatesService: ObjectUpdatesService;
-  let elRef: ElementRef;
-  let objectValuesPipe: ObjectValuesPipe;
-
-  const url = 'mock-abstract-paginated-drag-and-drop-list-component';
-
-
-  const object1 = Object.assign(new DSpaceObject(), { uuid: 'object-1' });
-  const object2 = Object.assign(new DSpaceObject(), { uuid: 'object-2' });
-  const objectsRD = createSuccessfulRemoteDataObject(createPaginatedList([object1, object2]));
-  let objectsRD$: BehaviorSubject<RemoteData<PaginatedList<DSpaceObject>>>;
-  let paginationService;
-
-  const updates = {
-    [object1.uuid]: { field: object1, changeType: undefined },
-    [object2.uuid]: { field: object2, changeType: undefined }
-  } as FieldUpdates;
-
-  let paginationComponent: PaginationComponent;
-
-  beforeEach(() => {
-    objectUpdatesService = jasmine.createSpyObj('objectUpdatesService', {
-      initialize: {},
-      getFieldUpdatesExclusive: observableOf(updates)
-    });
-    elRef = {
-      nativeElement: jasmine.createSpyObj('nativeElement', {
-        querySelector: {}
-      })
-    };
-    objectValuesPipe = new ObjectValuesPipe();
-    paginationComponent = jasmine.createSpyObj('paginationComponent', {
-      doPageChange: {}
-    });
-    paginationService = new PaginationServiceStub();
-    objectsRD$ = new BehaviorSubject(objectsRD);
-    component = new MockAbstractPaginatedDragAndDropListComponent(objectUpdatesService, elRef, objectValuesPipe, url, paginationService, objectsRD$);
-    component.paginationComponent = paginationComponent;
-    component.ngOnInit();
-  });
-
-  it('should call initialize to initialize the objects in the store', () => {
-    expect(objectUpdatesService.initialize).toHaveBeenCalled();
-  });
-
-  it('should initialize the updates correctly', (done) => {
-    component.updates$.pipe(take(1)).subscribe((fieldUpdates) => {
-      expect(fieldUpdates).toEqual(updates);
-      done();
-    });
-  });
-
-  describe('drop', () => {
-    const event = {
-      previousIndex: 0,
-      currentIndex: 1,
-      item: { element: { nativeElement: { id: object1.uuid } } }
-    } as any;
-
-    describe('when the user is hovering over a new page', () => {
-      const hoverPage = 3;
-      const hoverElement = { textContent: '' + hoverPage };
-
-      beforeEach(() => {
-        elRef.nativeElement.querySelector.and.returnValue(hoverElement);
-        spyOn(component.dropObject, 'emit');
-        component.drop(event);
-      });
-
-      it('should send out a dropObject event with the expected processed paginated indexes', () => {
-        expect(component.dropObject.emit).toHaveBeenCalledWith(Object.assign({
-          fromIndex: ((component.currentPage$.value.currentPage - 1) * component.pageSize) + event.previousIndex,
-          toIndex: ((hoverPage - 1) * component.pageSize),
-          finish: jasmine.anything()
-        }));
-      });
-    });
-
-    describe('when the user is not hovering over a new page', () => {
-      beforeEach(() => {
-        spyOn(component.dropObject, 'emit');
-        component.drop(event);
-      });
-
-      it('should send out a dropObject event with the expected properties', () => {
-        expect(component.dropObject.emit).toHaveBeenCalledWith(Object.assign({
-          fromIndex: event.previousIndex,
-          toIndex: event.currentIndex,
-          finish: jasmine.anything()
-        }));
-      });
-    });
-  });
-});
diff --git a/src/app/shared/pagination-drag-and-drop/abstract-paginated-drag-and-drop-list.component.ts b/src/app/shared/pagination-drag-and-drop/abstract-paginated-drag-and-drop-list.component.ts
deleted file mode 100644
index 8dba47566f..0000000000
--- a/src/app/shared/pagination-drag-and-drop/abstract-paginated-drag-and-drop-list.component.ts
+++ /dev/null
@@ -1,239 +0,0 @@
-import { BehaviorSubject, Observable, Subscription } from 'rxjs';
-import { RemoteData } from '../../core/data/remote-data';
-import { PaginatedList } from '../../core/data/paginated-list.model';
-import { PaginationComponentOptions } from '../pagination/pagination-component-options.model';
-import { ObjectUpdatesService } from '../../core/data/object-updates/object-updates.service';
-import { distinctUntilChanged, map, switchMap } from 'rxjs/operators';
-import { hasValue } from '../empty.util';
-import {
-  paginatedListToArray,
-  getFirstSucceededRemoteData,
-  getAllSucceededRemoteData
-} from '../../core/shared/operators';
-import { DSpaceObject } from '../../core/shared/dspace-object.model';
-import { CdkDragDrop, moveItemInArray } from '@angular/cdk/drag-drop';
-import { Component, ElementRef, EventEmitter, OnDestroy, Output, ViewChild } from '@angular/core';
-import { PaginationComponent } from '../pagination/pagination.component';
-import { ObjectValuesPipe } from '../utils/object-values-pipe';
-import { compareArraysUsing } from '../../item-page/simple/item-types/shared/item-relationships-utils';
-import { PaginationService } from '../../core/pagination/pagination.service';
-import { FieldUpdate } from '../../core/data/object-updates/field-update.model';
-import { FieldUpdates } from '../../core/data/object-updates/field-updates.model';
-
-/**
- * Operator used for comparing {@link FieldUpdate}s by their field's UUID
- */
-export const compareArraysUsingFieldUuids = () =>
-  compareArraysUsing((fieldUpdate: FieldUpdate) => (hasValue(fieldUpdate) && hasValue(fieldUpdate.field)) ? fieldUpdate.field.uuid : undefined);
-
-/**
- * An abstract component containing general methods and logic to be able to drag and drop objects within a paginated
- * list. This implementation supports being able to drag and drop objects between pages.
- * Dragging an object on top of a page number will automatically detect the page it's being dropped on and send a
- * dropObject event to the parent component containing detailed information about the indexes the object was dropped from
- * and to.
- *
- * To extend this component, it is important to make sure to:
- * - Initialize objectsRD$ within the initializeObjectsRD() method
- * - Initialize a unique URL for this component/page within the initializeURL() method
- * - Add (cdkDropListDropped)="drop($event)" to the cdkDropList element in your template
- * - Add (pageChange)="switchPage($event)" to the ds-pagination element in your template
- * - Use the updates$ observable for building your list of cdkDrag elements in your template
- *
- * An example component extending from this abstract component: PaginatedDragAndDropBitstreamListComponent
- */
-@Component({
-  selector: 'ds-paginated-drag-drop-abstract',
-  template: ''
-})
-export abstract class AbstractPaginatedDragAndDropListComponent<T extends DSpaceObject> implements OnDestroy {
-  /**
-   * A view on the child pagination component
-   */
-  @ViewChild(PaginationComponent) paginationComponent: PaginationComponent;
-
-  /**
-   * Send an event when the user drops an object on the pagination
-   * The event contains details about the index the object came from and is dropped to (across the entirety of the list,
-   * not just within a single page)
-   */
-  @Output() dropObject: EventEmitter<any> = new EventEmitter<any>();
-
-  /**
-   * The URL to use for accessing the object updates from this list
-   */
-  url: string;
-
-  /**
-   * The objects to retrieve data for and transform into field updates
-   */
-  objectsRD$: Observable<RemoteData<PaginatedList<T>>>;
-
-  /**
-   * The updates to the current list
-   */
-  updates$: Observable<FieldUpdates>;
-
-  /**
-   * A list of object UUIDs
-   * This is the order the objects will be displayed in
-   */
-  customOrder: string[];
-
-  /**
-   * The amount of objects to display per page
-   */
-  pageSize = 10;
-
-  /**
-   * The page options to use for fetching the objects
-   * Start at page 1 and always use the set page size
-   */
-  options = Object.assign(new PaginationComponentOptions(),{
-    id: 'dad',
-    currentPage: 1,
-    pageSize: this.pageSize
-  });
-
-  /**
-   * The current page being displayed
-   */
-  currentPage$ = new BehaviorSubject<PaginationComponentOptions>(this.options);
-
-  /**
-   * Whether or not we should display a loading animation
-   * This is used to display a loading page when the user drops a bitstream onto a new page. The loading animation
-   * should stop once the bitstream has moved to the new page and the new page's response has loaded and contains the
-   * dropped object on top (see this.stopLoadingWhenFirstIs below)
-   */
-  loading$: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(false);
-
-  /**
-   * List of subscriptions
-   */
-  subs: Subscription[] = [];
-
-  protected constructor(protected objectUpdatesService: ObjectUpdatesService,
-                        protected elRef: ElementRef,
-                        protected objectValuesPipe: ObjectValuesPipe,
-                        protected paginationService: PaginationService
-                        ) {
-  }
-
-  /**
-   * Initialize the observables
-   */
-  ngOnInit() {
-    this.initializeObjectsRD();
-    this.initializeURL();
-    this.initializeUpdates();
-    this.initializePagination();
-  }
-
-  /**
-   * Overwrite this method to define how the list of objects is initialized and updated
-   */
-  abstract initializeObjectsRD(): void;
-
-  /**
-   * Overwrite this method to define how the URL is set
-   */
-  abstract initializeURL(): void;
-
-  /**
-   * Initialize the current pagination retrieval from the paginationService and push to the currentPage$
-   */
-  initializePagination() {
-    this.paginationService.getCurrentPagination(this.options.id, this.options).subscribe((currentPagination) => {
-      this.currentPage$.next(currentPagination);
-    });
-  }
-
-  /**
-   * Initialize the field-updates in the store
-   */
-  initializeUpdates(): void {
-    this.objectsRD$.pipe(
-      getFirstSucceededRemoteData(),
-      paginatedListToArray(),
-    ).subscribe((objects: T[]) => {
-      this.objectUpdatesService.initialize(this.url, objects, new Date());
-    });
-    this.updates$ = this.objectsRD$.pipe(
-      getAllSucceededRemoteData(),
-      paginatedListToArray(),
-      switchMap((objects: T[]) => this.objectUpdatesService.getFieldUpdatesExclusive(this.url, objects))
-    );
-    this.subs.push(
-      this.updates$.pipe(
-        map((fieldUpdates) => this.objectValuesPipe.transform(fieldUpdates)),
-        distinctUntilChanged(compareArraysUsingFieldUuids())
-      ).subscribe((updateValues) => {
-        this.customOrder = updateValues.map((fieldUpdate) => fieldUpdate.field.uuid);
-        // We received new values, stop displaying a loading indicator if it's present
-        this.loading$.next(false);
-      }),
-      // Disable the pagination when objects are loading
-      this.loading$.subscribe((loading) => this.options.disabled = loading)
-    );
-  }
-
-  /**
-   * An object was moved, send updates to the dropObject EventEmitter
-   * When the object is dropped on a page within the pagination of this component, the object moves to the top of that
-   * page and the pagination automatically loads and switches the view to that page (this is done by calling the event's
-   * finish() method after sending patch requests to the REST API)
-   * @param event
-   */
-  drop(event: CdkDragDrop<any>) {
-    const dragIndex = event.previousIndex;
-    let dropIndex = event.currentIndex;
-    const dragPage = this.currentPage$.value.currentPage - 1;
-    let dropPage = this.currentPage$.value.currentPage - 1;
-
-    // Check if the user is hovering over any of the pagination's pages at the time of dropping the object
-    const droppedOnElement = this.elRef.nativeElement.querySelector('.page-item:hover');
-    if (hasValue(droppedOnElement) && hasValue(droppedOnElement.textContent)) {
-      // The user is hovering over a page, fetch the page's number from the element
-      const droppedPage = Number(droppedOnElement.textContent);
-      if (hasValue(droppedPage) && !Number.isNaN(droppedPage)) {
-        dropPage = droppedPage - 1;
-        dropIndex = 0;
-      }
-    }
-
-    const isNewPage = dragPage !== dropPage;
-    // Move the object in the custom order array if the drop happened within the same page
-    // This allows us to instantly display a change in the order, instead of waiting for the REST API's response first
-    if (!isNewPage && dragIndex !== dropIndex) {
-      moveItemInArray(this.customOrder, dragIndex, dropIndex);
-    }
-
-    const redirectPage = dropPage + 1;
-    const fromIndex = (dragPage * this.pageSize) + dragIndex;
-    const toIndex = (dropPage * this.pageSize) + dropIndex;
-    // Send out a drop event (and navigate to the new page) when the "from" and "to" indexes are different from each other
-    if (fromIndex !== toIndex) {
-      if (isNewPage) {
-        this.loading$.next(true);
-      }
-      this.dropObject.emit(Object.assign({
-        fromIndex,
-        toIndex,
-        finish: () => {
-          if (isNewPage) {
-            this.paginationComponent.doPageChange(redirectPage);
-          }
-        }
-      }));
-    }
-  }
-
-  /**
-   * unsub all subscriptions
-   */
-  ngOnDestroy(): void {
-    this.subs.filter((sub) => hasValue(sub)).forEach((sub) => sub.unsubscribe());
-    this.paginationService.clearPagination(this.options.id);
-  }
-}
diff --git a/src/app/shared/pagination/pagination.component.html b/src/app/shared/pagination/pagination.component.html
index 7d90c6a439..281a009d2e 100644
--- a/src/app/shared/pagination/pagination.component.html
+++ b/src/app/shared/pagination/pagination.component.html
@@ -3,17 +3,33 @@
     <div class="row">
       <div *ngIf="!hidePaginationDetail && collectionSize > 0" class="col-auto pagination-info">
           <span class="align-middle hidden-xs-down">{{ 'pagination.showing.label' | translate }}</span>
-          <span class="align-middle">{{ 'pagination.showing.detail' | translate:(getShowingDetails(collectionSize)|async)}}</span>
+          <span class="align-middle">{{ 'pagination.showing.detail' | translate:(showingDetails$ | async)}}</span>
       </div>
       <div class="col">
         <div *ngIf="!hideGear" ngbDropdown #paginationControls="ngbDropdown" placement="bottom-right" class="d-inline-block float-right">
-          <button class="btn btn-secondary" id="paginationControls" ngbDropdownToggle [title]="'pagination.options.description' | translate" [attr.aria-label]="'pagination.options.description' | translate"><i class="fas fa-cog" aria-hidden="true"></i></button>
-          <div id="paginationControlsDropdownMenu" aria-labelledby="paginationControls" ngbDropdownMenu>
-            <h6 class="dropdown-header">{{ 'pagination.results-per-page' | translate}}</h6>
-            <button class="dropdown-item" *ngFor="let item of pageSizeOptions" (click)="doPageSizeChange(item)"><i [ngClass]="{'invisible': item != (pageSize$|async)}" class="fas fa-check" aria-hidden="true"></i> {{item}} </button>
-            <h6 class="dropdown-header">{{ 'pagination.sort-direction' | translate}}</h6>
-            <button class="dropdown-item" *ngFor="let direction of (sortDirections | dsKeys)" (click)="doSortDirectionChange(direction.value)"><i [ngClass]="{'invisible': direction.value !== (sortDirection$ |async)}" class="fas fa-check" aria-hidden="true"></i> {{'sorting.' + direction.key | translate}} </button>
-          </div>
+          <button class="btn btn-secondary" id="paginationControls" ngbDropdownToggle [title]="'pagination.options.description' | translate" [attr.aria-label]="'pagination.options.description' | translate" aria-haspopup="true" aria-expanded="false" role="button" tabindex="0"><i class="fas fa-cog" aria-hidden="true"></i></button>
+          <ul id="paginationControlsDropdownMenu" aria-labelledby="paginationControls" role="menu" ngbDropdownMenu>
+            <li role="menuitem">
+              <span class="dropdown-header" id="pagination-control_results-per-page" role="heading">{{ 'pagination.results-per-page' | translate}}</span>
+              <ul aria-labelledby="pagination-control_results-per-page" class="list-unstyled" role="listbox">
+                <li *ngFor="let item of pageSizeOptions" role="option" [attr.aria-selected]="item === (pageSize$ | async)">
+                  <button (click)="doPageSizeChange(item)" class="dropdown-item" role="button" tabindex="0">
+                    <i [ngClass]="{'invisible': item !== (pageSize$ | async) }" class="fas fa-check" aria-hidden="true"></i> {{item}}
+                  </button>
+                </li>
+              </ul>
+            </li>
+            <li role="menuitem">
+              <span class="dropdown-header" id="pagination-control_sort-direction" role="heading">{{ 'pagination.sort-direction' | translate}}</span>
+              <ul aria-labelledby="pagination-control_sort-direction" class="list-unstyled" role="listbox">
+                <li *ngFor="let direction of (sortDirections | dsKeys)" [attr.aria-selected]="direction.value === (sortDirection$ | async)" role="option">
+                  <button class="dropdown-item" (click)="doSortDirectionChange(direction.value)" role="button" tabindex="0">
+                    <i [ngClass]="{'invisible': direction.value !== (sortDirection$ |async)}" class="fas fa-check" aria-hidden="true"></i> {{'sorting.' + direction.key | translate}}
+                  </button>
+                </li>
+              </ul>
+            </li>
+          </ul>
         </div>
         <ds-rss></ds-rss>
       </div>
@@ -23,7 +39,8 @@
 
   <div *ngIf="shouldShowBottomPager | async">
     <div *ngIf="showPaginator" class="pagination justify-content-center clearfix bottom">
-      <ngb-pagination [boundaryLinks]="paginationOptions.boundaryLinks"
+      <ngb-pagination [attr.aria-label]="('pagination-control.page-number-bar' | translate) + paginationOptions.id"
+                      [boundaryLinks]="paginationOptions.boundaryLinks"
                       [collectionSize]="collectionSize"
                       [disabled]="paginationOptions.disabled"
                       [ellipses]="paginationOptions.ellipses"
@@ -39,12 +56,12 @@
     <div *ngIf="!showPaginator" class="d-flex justify-content-between">
         <button id="nav-prev" type="button" class="btn btn-outline-primary float-left"
                 (click)="goPrev()"
-                [disabled]="(objects?.payload?.currentPage <= 1) && (paginationOptions?.currentPage <= 1)">
+                [dsBtnDisabled]="(objects?.payload?.currentPage <= 1) && (paginationOptions?.currentPage <= 1)" role="button" tabindex="0">
           <i class="fas fa-angle-left"></i> {{'pagination.previous.button' |translate}}
         </button>
       <button id="nav-next" type="button" class="btn btn-outline-primary float-right"
               (click)="goNext()"
-              [disabled]="(objects?.payload?.currentPage >= objects?.payload?.totalPages) || (paginationOptions?.currentPage >= objects?.payload?.totalPages)">
+              [dsBtnDisabled]="(objects?.payload?.currentPage >= objects?.payload?.totalPages) || (paginationOptions?.currentPage >= objects?.payload?.totalPages)" role="button" tabindex="0">
           <span [ngbTooltip]="objects?.payload?.currentPage >= objects?.payload?.totalPages ? ('pagination.next.button.disabled.tooltip' |translate) : null">
             <i class="fas fa-angle-right"></i> {{'pagination.next.button' |translate}}
           </span>
diff --git a/src/app/shared/pagination/pagination.component.ts b/src/app/shared/pagination/pagination.component.ts
index 6da813cbc7..31c86b6fa4 100644
--- a/src/app/shared/pagination/pagination.component.ts
+++ b/src/app/shared/pagination/pagination.component.ts
@@ -4,27 +4,32 @@ import {
   Component,
   EventEmitter,
   Input,
+  OnChanges,
   OnDestroy,
   OnInit,
   Output,
-  ViewEncapsulation
+  SimpleChanges,
+  ViewEncapsulation,
 } from '@angular/core';
 
-import { Observable, of as observableOf, Subscription } from 'rxjs';
+import { Observable, of as observableOf, Subscription, switchMap } from 'rxjs';
 
 import { HostWindowService } from '../host-window.service';
-import { HostWindowState } from '../search/host-window.reducer';
 import { PaginationComponentOptions } from './pagination-component-options.model';
 import { SortDirection, SortOptions } from '../../core/cache/models/sort-options.model';
-import { hasValue } from '../empty.util';
-import { PageInfo } from '../../core/shared/page-info.model';
+import { hasValue, hasValueOperator } from '../empty.util';
 import { PaginationService } from '../../core/pagination/pagination.service';
-import { map, take } from 'rxjs/operators';
+import { map, take, startWith } from 'rxjs/operators';
 import { RemoteData } from '../../core/data/remote-data';
 import { PaginatedList } from '../../core/data/paginated-list.model';
 import { ListableObject } from '../object-collection/shared/listable-object.model';
 import { ViewMode } from '../../core/shared/view-mode.model';
 
+interface PaginationDetails {
+  range: string;
+  total: number;
+}
+
 /**
  * The default pagination controls component.
  */
@@ -36,7 +41,7 @@ import { ViewMode } from '../../core/shared/view-mode.model';
   changeDetection: ChangeDetectionStrategy.Default,
   encapsulation: ViewEncapsulation.Emulated
 })
-export class PaginationComponent implements OnDestroy, OnInit {
+export class PaginationComponent implements OnChanges, OnDestroy, OnInit {
   /**
    * ViewMode that should be passed to {@link ListableObjectComponentLoaderComponent}.
    */
@@ -47,11 +52,6 @@ export class PaginationComponent implements OnDestroy, OnInit {
    */
   @Input() collectionSize: number;
 
-  /**
-   * Page state of a Remote paginated objects.
-   */
-  @Input() pageInfoState: Observable<PageInfo> = undefined;
-
   /**
    * Configuration for the NgbPagination component.
    */
@@ -136,18 +136,13 @@ export class PaginationComponent implements OnDestroy, OnInit {
   /**
    * Current page.
    */
-  public currentPage$;
+  public currentPage$: Observable<number>;
 
   /**
    * Current page in the state of a Remote paginated objects.
    */
   public currentPageState: number = undefined;
 
-  /**
-   * An observable of HostWindowState type
-   */
-  public hostWindow: Observable<HostWindowState>;
-
   /**
    * ID for the pagination instance. This ID is used in the routing to retrieve the pagination options.
    * This ID needs to be unique between different pagination components when more than one will be displayed on the same page.
@@ -162,7 +157,7 @@ export class PaginationComponent implements OnDestroy, OnInit {
   /**
    * Number of items per page.
    */
-  public pageSize$;
+  public pageSize$: Observable<number>;
 
   /**
    * Declare SortDirection enumeration to use it in the template
@@ -183,9 +178,12 @@ export class PaginationComponent implements OnDestroy, OnInit {
   /**
    * Name of the field that's used to sort by
    */
-  public sortField$;
+  public sortField$: Observable<string>;
   public defaultSortField = 'name';
 
+
+  public showingDetails$: Observable<PaginationDetails>;
+
   /**
    * Array to track all subscriptions and unsubscribe them onDestroy
    * @type {Array}
@@ -214,6 +212,12 @@ export class PaginationComponent implements OnDestroy, OnInit {
     this.initializeConfig();
   }
 
+  ngOnChanges(changes: SimpleChanges): void {
+    if (changes.collectionSize.currentValue !== changes.collectionSize.previousValue) {
+      this.showingDetails$ = this.getShowingDetails(this.collectionSize);
+    }
+  }
+
   /**
    * Method provided by Angular. Invoked when the instance is destroyed.
    */
@@ -237,7 +241,7 @@ export class PaginationComponent implements OnDestroy, OnInit {
       map((currentPagination) => currentPagination.pageSize)
     );
 
-    let sortOptions;
+    let sortOptions: SortOptions;
     if (this.sortOptions) {
       sortOptions = this.sortOptions;
     } else {
@@ -251,19 +255,11 @@ export class PaginationComponent implements OnDestroy, OnInit {
       );
   }
 
-  /**
-   * @param cdRef
-   *    ChangeDetectorRef is a singleton service provided by Angular.
-   * @param route
-   *    Route is a singleton service provided by Angular.
-   * @param router
-   *    Router is a singleton service provided by Angular.
-   * @param hostWindowService
-   *    the HostWindowService singleton.
-   */
-  constructor(private cdRef: ChangeDetectorRef,
-              private paginationService: PaginationService,
-              public hostWindowService: HostWindowService) {
+  constructor(
+    protected cdRef: ChangeDetectorRef,
+    protected paginationService: PaginationService,
+    public hostWindowService: HostWindowService,
+  ) {
   }
 
   /**
@@ -299,17 +295,6 @@ export class PaginationComponent implements OnDestroy, OnInit {
     this.emitPaginationChange();
   }
 
-  /**
-   * Method to change the route to the given sort field
-   *
-   * @param sortField
-   *    The sort field being navigated to.
-   */
-  public doSortFieldChange(field: string) {
-    this.updateParams({ pageId: this.id, page: 1, sortField: field });
-    this.emitPaginationChange();
-  }
-
   /**
    * Method to emit a general pagination change event
    */
@@ -328,26 +313,31 @@ export class PaginationComponent implements OnDestroy, OnInit {
   /**
    * Method to get pagination details of the current viewed page.
    */
-  public getShowingDetails(collectionSize: number): Observable<any> {
-    let showingDetails = observableOf({ range: null + ' - ' + null, total: null });
-    if (collectionSize) {
-      showingDetails = this.paginationService.getCurrentPagination(this.id, this.paginationOptions).pipe(
-        map((currentPaginationOptions) => {
-          let firstItem;
-          let lastItem;
-          const pageMax = currentPaginationOptions.pageSize * currentPaginationOptions.currentPage;
+  public getShowingDetails(collectionSize: number): Observable<PaginationDetails> {
+    return observableOf(collectionSize).pipe(
+      hasValueOperator(),
+      switchMap(() => this.paginationService.getCurrentPagination(this.id, this.paginationOptions)),
+      map((currentPaginationOptions) => {
+        let firstItem: number;
+        let lastItem: number;
+        const pageMax = currentPaginationOptions.pageSize * currentPaginationOptions.currentPage;
 
-          firstItem = currentPaginationOptions.pageSize * (currentPaginationOptions.currentPage - 1) + 1;
-          if (collectionSize > pageMax) {
-            lastItem = pageMax;
-          } else {
-            lastItem = collectionSize;
-          }
-          return {range: firstItem + ' - ' + lastItem, total: collectionSize};
-        })
-      );
-    }
-    return showingDetails;
+        firstItem = currentPaginationOptions.pageSize * (currentPaginationOptions.currentPage - 1) + 1;
+        if (collectionSize > pageMax) {
+          lastItem = pageMax;
+        } else {
+          lastItem = collectionSize;
+        }
+        return {
+          range: `${firstItem} - ${lastItem}`,
+          total: collectionSize,
+        };
+      }),
+      startWith({
+        range: `${null} - ${null}`,
+        total: null,
+      }),
+    );
   }
 
   /**
diff --git a/src/app/shared/resource-policies/edit/resource-policy-edit.component.html b/src/app/shared/resource-policies/edit/resource-policy-edit.component.html
index 0f285c4948..a820fa481a 100644
--- a/src/app/shared/resource-policies/edit/resource-policy-edit.component.html
+++ b/src/app/shared/resource-policies/edit/resource-policy-edit.component.html
@@ -1,5 +1,5 @@
 <div class="container">
-  <h4 class="mb-3">{{'resource-policies.edit.page.heading' | translate}} {{resourcePolicy.id}}</h4>
+  <h1 class="mb-3">{{'resource-policies.edit.page.heading' | translate}} {{resourcePolicy.id}}</h1>
 
   <ds-resource-policy-form [resourcePolicy]="resourcePolicy"
                            [isProcessing]="isProcessing()"
diff --git a/src/app/shared/resource-policies/entry/resource-policy-entry.component.html b/src/app/shared/resource-policies/entry/resource-policy-entry.component.html
index 5a9494fe00..9ad019c8c6 100644
--- a/src/app/shared/resource-policies/entry/resource-policy-entry.component.html
+++ b/src/app/shared/resource-policies/entry/resource-policy-entry.component.html
@@ -5,7 +5,9 @@
            [id]="entry.id"
            [ngModel]="entry.checked"
            (ngModelChange)="this.toggleCheckbox.emit($event);">
-    <label class="custom-control-label" [for]="entry.id"></label>
+    <label class="custom-control-label" [for]="entry.id">
+      <span class="sr-only">{{(entry.checked ? 'resource-policies.table.headers.deselect' : 'resource-policies.table.headers.select') | translate}}</span>
+    </label>
   </div>
 </td>
 <th scope="row">
@@ -28,12 +30,12 @@
     <button class="btn btn-outline-primary btn-sm"
             [title]="'resource-policies.table.headers.edit.policy' | translate"
             (click)="redirectToResourcePolicyEditPage()">
-      <i class="fas fa-edit fa-fw"></i>
+      <i class="fas fa-edit fa-fw" aria-hidden="true"></i>
     </button>
     <button *ngIf="(groupName$ | async) !== undefined" class="btn btn-outline-primary btn-sm"
             [title]="'resource-policies.table.headers.edit.group' | translate"
             (click)="redirectToGroupEditPage()">
-      <i class="fas fa-users fa-fw"></i>
+      <i class="fas fa-users fa-fw" aria-hidden="true"></i>
     </button>
   </div>
 </td>
diff --git a/src/app/shared/resource-policies/entry/resource-policy-entry.component.ts b/src/app/shared/resource-policies/entry/resource-policy-entry.component.ts
index 904a79cbe6..83733c7011 100644
--- a/src/app/shared/resource-policies/entry/resource-policy-entry.component.ts
+++ b/src/app/shared/resource-policies/entry/resource-policy-entry.component.ts
@@ -17,8 +17,7 @@ import { RemoteData } from '../../../core/data/remote-data';
 import { DSpaceObject } from '../../../core/shared/dspace-object.model';
 import { ActivatedRoute, Router } from '@angular/router';
 import { Group } from '../../../core/eperson/models/group.model';
-import { ACCESS_CONTROL_MODULE_PATH } from '../../../app-routing-paths';
-import { GROUP_EDIT_PATH } from '../../../access-control/access-control-routing-paths';
+import { getGroupEditRoute } from '../../../access-control/access-control-routing-paths';
 import { GroupDataService } from '../../../core/eperson/group-data.service';
 
 export interface ResourcePolicyCheckboxEntry {
@@ -97,7 +96,7 @@ export class ResourcePolicyEntryComponent implements OnInit {
       getFirstSucceededRemoteDataPayload(),
       map((group: Group) => group.id),
     ).subscribe((groupUUID) => {
-      this.router.navigate([ACCESS_CONTROL_MODULE_PATH, GROUP_EDIT_PATH, groupUUID]);
+      void this.router.navigate([getGroupEditRoute(groupUUID)]);
     });
   }
 }
diff --git a/src/app/shared/resource-policies/form/resource-policy-form.component.html b/src/app/shared/resource-policies/form/resource-policy-form.component.html
index 66c1fc400e..e155d1689b 100644
--- a/src/app/shared/resource-policies/form/resource-policy-form.component.html
+++ b/src/app/shared/resource-policies/form/resource-policy-form.component.html
@@ -9,13 +9,13 @@
     <label for="ResourcePolicyObject">{{'resource-policies.form.eperson-group-list.label' | translate}}</label>
     <input id="ResourcePolicyObject" class="form-control mb-3" type="text" [value]="resourcePolicyTargetName$ | async">
     <ul ngbNav #nav="ngbNav" class="nav-pills" [(activeId)]="navActiveId" (navChange)="onNavChange($event)">
-      <li [ngbNavItem]="'eperson'">
+      <li [ngbNavItem]="'eperson'" role="presentation">
         <a ngbNavLink>{{'resource-policies.form.eperson-group-list.tab.eperson' | translate}}</a>
         <ng-template ngbNavContent>
           <ds-eperson-group-list (select)="updateObjectSelected($event, true)"></ds-eperson-group-list>
         </ng-template>
       </li>
-      <li [ngbNavItem]="'group'">
+      <li [ngbNavItem]="'group'" role="presentation">
         <a ngbNavLink>{{'resource-policies.form.eperson-group-list.tab.group' | translate}}</a>
         <ng-template ngbNavContent>
           <ds-eperson-group-list [isListOfEPerson]="false"
@@ -31,11 +31,11 @@
         <div class="col text-right">
           <button type="reset"
                   class="btn btn-default"
-                  [disabled]="(isProcessing | async)"
+                  [dsBtnDisabled]="(isProcessing | async)"
                   (click)="onReset()">{{'form.cancel' | translate}}</button>
           <button type="button"
                   class="btn btn-primary"
-                  [disabled]="!(isFormValid() | async) || (isProcessing | async)"
+                  [dsBtnDisabled]="!(isFormValid() | async) || (isProcessing | async)"
                   (click)="onSubmit()">
             <span *ngIf="(isProcessing | async)">
                   <i class='fas fa-circle-notch fa-spin'></i> {{'submission.workflow.tasks.generic.processing' | translate}}
diff --git a/src/app/shared/resource-policies/form/resource-policy-form.component.spec.ts b/src/app/shared/resource-policies/form/resource-policy-form.component.spec.ts
index 1cc908cc6d..6012fe291c 100644
--- a/src/app/shared/resource-policies/form/resource-policy-form.component.spec.ts
+++ b/src/app/shared/resource-policies/form/resource-policy-form.component.spec.ts
@@ -39,6 +39,7 @@ import { PaginationServiceStub } from '../../testing/pagination-service.stub';
 import { PaginationService } from '../../../core/pagination/pagination.service';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { StoreMock } from '../../testing/store.mock';
+import {BtnDisabledDirective} from '../../btn-disabled.directive';
 
 export const mockResourcePolicyFormData = {
   name: [
@@ -189,7 +190,8 @@ describe('ResourcePolicyFormComponent test suite', () => {
         FormComponent,
         EpersonGroupListComponent,
         ResourcePolicyFormComponent,
-        TestComponent
+        TestComponent,
+        BtnDisabledDirective
       ],
       providers: [
         { provide: ActivatedRoute, useValue: activatedRouteStub },
@@ -389,7 +391,8 @@ describe('ResourcePolicyFormComponent test suite', () => {
 
       const depositBtn: any = fixture.debugElement.query(By.css('.btn-primary'));
 
-      expect(depositBtn.nativeElement.disabled).toBeFalsy();
+      expect(depositBtn.nativeElement.getAttribute('aria-disabled')).toBe('false');
+      expect(depositBtn.nativeElement.classList.contains('disabled')).toBeFalse();
     });
 
     it('should emit submit event', () => {
@@ -443,7 +446,8 @@ describe('ResourcePolicyFormComponent test suite', () => {
 
       const depositBtn: any = fixture.debugElement.query(By.css('.btn-primary'));
 
-      expect(depositBtn.nativeElement.disabled).toBeTruthy();
+      expect(depositBtn.nativeElement.getAttribute('aria-disabled')).toBe('true');
+      expect(depositBtn.nativeElement.classList.contains('disabled')).toBeTrue();
     });
 
   });
diff --git a/src/app/shared/resource-policies/form/resource-policy-form.model.ts b/src/app/shared/resource-policies/form/resource-policy-form.model.ts
index 0967a4e70d..71d223e764 100644
--- a/src/app/shared/resource-policies/form/resource-policy-form.model.ts
+++ b/src/app/shared/resource-policies/form/resource-policy-form.model.ts
@@ -68,6 +68,8 @@ const policyActionList: DynamicFormOptionConfig<any>[] = [
 export const RESOURCE_POLICY_FORM_NAME_CONFIG: DsDynamicInputModelConfig = {
   id: 'name',
   label: 'resource-policies.form.name.label',
+  maxLength: 30,
+  hint: 'resource-policies.form.name.hint',
   metadataFields: [],
   repeatable: false,
   submissionId: '',
diff --git a/src/app/shared/resource-policies/resource-policies.component.html b/src/app/shared/resource-policies/resource-policies.component.html
index 277f6e4998..62962495e6 100644
--- a/src/app/shared/resource-policies/resource-policies.component.html
+++ b/src/app/shared/resource-policies/resource-policies.component.html
@@ -13,22 +13,22 @@
             </span>
             <div class="space-children-mr flex-shrink-0">
               <button class="btn btn-danger p-1"
-                      [disabled]="(!(canDelete() | async)) || (isProcessingDelete() | async)"
+                      [dsBtnDisabled]="(!(canDelete() | async)) || (isProcessingDelete() | async)"
                       [title]="'resource-policies.delete.btn.title' | translate"
                       (click)="deleteSelectedResourcePolicies()">
                 <span *ngIf="(isProcessingDelete() | async)">
-                  <i class='fas fa-circle-notch fa-spin'></i> {{'submission.workflow.tasks.generic.processing' | translate}}
+                  <i class='fas fa-circle-notch fa-spin' aria-hidden="true"></i> {{'submission.workflow.tasks.generic.processing' | translate}}
                 </span>
                 <span *ngIf="!(isProcessingDelete() | async)">
-                  <i class='fas fa-trash-alt fa-fw'></i>
+                  <i class='fas fa-trash-alt fa-fw' aria-hidden="true"></i>
                   {{'resource-policies.delete.btn' | translate}}
                 </span>
               </button>
               <button class="btn btn-success p-1"
-                      [disabled]="(isProcessingDelete() | async)"
+                      [dsBtnDisabled]="(isProcessingDelete() | async)"
                       [title]="'resource-policies.add.for.' + resourceType | translate"
                       (click)="redirectToResourcePolicyCreatePage()">
-                <i class='fas fa-plus'></i>
+                <i class='fas fa-plus' aria-hidden="true"></i>
                 {{'resource-policies.add.button' | translate}}
               </button>
             </div>
@@ -38,11 +38,13 @@
       <tr *ngIf="(getResourcePolicies() | async)?.length > 0" class="text-center">
         <th>
           <div class="custom-control custom-checkbox">
-            <input type="checkbox"
+            <input #selectAllBtn type="checkbox"
                    class="custom-control-input"
                    [id]="'selectAll_' + resourceUUID"
                    (change)="selectAllCheckbox($event)">
-            <label class="custom-control-label" [for]="'selectAll_' + resourceUUID"></label>
+            <label class="custom-control-label" [for]="'selectAll_' + resourceUUID">
+              <span class="sr-only">{{(selectAllBtn.checked ? 'resource-policies.table.headers.deselect-all' : 'resource-policies.table.headers.select-all') | translate}}</span>
+            </label>
           </div>
         </th>
         <th>{{'resource-policies.table.headers.id' | translate}}</th>
diff --git a/src/app/shared/results-back-button/results-back-button.component.html b/src/app/shared/results-back-button/results-back-button.component.html
index 79910fa332..aebe1584d4 100644
--- a/src/app/shared/results-back-button/results-back-button.component.html
+++ b/src/app/shared/results-back-button/results-back-button.component.html
@@ -1,4 +1,4 @@
-<button class="btn btn-secondary btn-sm mb-2 ng-tns-c242-28" (click)="back()">
+<button class="btn btn-secondary btn-sm mb-2 ng-tns-c242-28" (click)="back()" role="button" tabindex="0">
   <i _ngcontent-dspace-angular-c242="" class="fas fa-arrow-left ng-tns-c242-3"></i>
   {{this.buttonLabel | async}}
 </button>
diff --git a/src/app/shared/rss-feed/rss.component.html b/src/app/shared/rss-feed/rss.component.html
index 91140c50c5..430677fc61 100644
--- a/src/app/shared/rss-feed/rss.component.html
+++ b/src/app/shared/rss-feed/rss.component.html
@@ -1,5 +1,5 @@
 <ng-container *ngIf="(isEnabled$ | async) && (hasRoute('home') || hasRoute('collections') || hasRoute('communities'))">
   <div *ngIf="route$ | async as route" class="d-inline-block float-right margin-right">
-    <a [href]="route" class="btn btn-secondary" [title]="'feed.description' | translate" [attr.aria-label]="'feed.description' | translate"><i class="fas fa-rss-square"></i></a>
+    <a [href]="route" class="btn btn-secondary" [title]="'feed.description' | translate" [attr.aria-label]="'feed.description' | translate" role="button" tabindex="0"><i class="fas fa-rss-square"></i></a>
   </div>
 </ng-container>
diff --git a/src/app/shared/sass-helper/css-variable.service.ts b/src/app/shared/sass-helper/css-variable.service.ts
index 0190a05036..5ff7345d85 100644
--- a/src/app/shared/sass-helper/css-variable.service.ts
+++ b/src/app/shared/sass-helper/css-variable.service.ts
@@ -26,6 +26,19 @@ export class CSSVariableService {
     return styleSheet.href.indexOf(window.location.origin) === 0;
   };
 
+  /**
+   * Checks whether the specific stylesheet object has the property cssRules
+   * @param styleSheet The stylesheet
+   */
+  hasCssRules = (styleSheet) => {
+    // Injected (cross-origin) styles might have no css rules value and throw some exception
+      try {
+        return styleSheet.cssRules;
+      } catch (e) {
+        return false;
+      }
+  };
+
   /*
    Determine if the given rule is a CSSStyleRule
    See: https://developer.mozilla.org/en-US/docs/Web/API/CSSRule#Type_constants
@@ -93,8 +106,10 @@ export class CSSVariableService {
     if (isNotEmpty(document.styleSheets)) {
       // styleSheets is array-like, so we convert it to an array.
       // Filter out any stylesheets not on this domain
+      // Filter out any stylesheets that have no cssRules property
       return [...document.styleSheets]
         .filter(this.isSameDomain)
+        .filter(this.hasCssRules)
         .reduce(
           (finalArr, sheet) =>
             finalArr.concat(
diff --git a/src/app/shared/search-form/scope-selector-modal/scope-selector-modal.component.html b/src/app/shared/search-form/scope-selector-modal/scope-selector-modal.component.html
index 013274320b..74c71b1d12 100644
--- a/src/app/shared/search-form/scope-selector-modal/scope-selector-modal.component.html
+++ b/src/app/shared/search-form/scope-selector-modal/scope-selector-modal.component.html
@@ -6,14 +6,14 @@
     </div>
     <div class="modal-body">
         <button class="btn btn-outline-primary btn-lg btn-block" (click)="selectObject(undefined)">{{'dso-selector.' + action + '.' + objectType.toString().toLowerCase() + '.button'| translate }}</button>
-        <h3 class="position-relative py-1 my-3 font-weight-normal">
+        <div class="position-relative py-1 my-3 font-weight-normal h3">
             <hr>
             <div id="create-community-or-separator" class="text-center position-absolute w-100">
                 <span class="px-4 bg-white">{{'dso-selector.' + action + '.' + objectType.toString().toLowerCase() + '.or-divider' | translate}}</span>
             </div>
-        </h3>
+        </div>
 
-        <h5 class="px-2">{{'dso-selector.' + action + '.' + objectType.toString().toLowerCase() + '.input-header' | translate}}</h5>
+        <h2 class="px-2 h5">{{'dso-selector.' + action + '.' + objectType.toString().toLowerCase() + '.input-header' | translate}}</h2>
         <ds-dso-selector [currentDSOId]="dsoRD?.payload.uuid" [types]="selectorTypes" [sort]="defaultSort" (onSelect)="selectObject($event)"></ds-dso-selector>
     </div>
 </div>
diff --git a/src/app/shared/search-form/search-form.component.html b/src/app/shared/search-form/search-form.component.html
index f916785804..684329f228 100644
--- a/src/app/shared/search-form/search-form.component.html
+++ b/src/app/shared/search-form/search-form.component.html
@@ -4,7 +4,7 @@
             <div *ngIf="showScopeSelector" class="input-group-prepend">
                 <button class="scope-button btn btn-outline-secondary text-truncate"
                         [ngbTooltip]="dsoNameService.getName(selectedScope | async)" type="button"
-                        (click)="openScopeModal()">
+                        (click)="openScopeModal()" role="button" tabindex="0">
                   {{dsoNameService.getName(selectedScope | async) || ('search.form.scope.all' | translate)}}
                 </button>
             </div>
@@ -12,7 +12,7 @@
                    attr.aria-label="{{ searchPlaceholder }}" [attr.data-test]="'search-box' | dsBrowserOnly"
                    [placeholder]="searchPlaceholder">
             <span class="input-group-append">
-            <button type="submit" class="search-button btn btn-{{brandColor}}" [attr.data-test]="'search-button' | dsBrowserOnly"><i class="fas fa-search"></i> {{ ('search.form.search' | translate) }}</button>
+            <button type="submit" class="search-button btn btn-{{brandColor}}" [attr.data-test]="'search-button' | dsBrowserOnly" role="button" tabindex="0"><i class="fas fa-search"></i> {{ ('search.form.search' | translate) }}</button>
         </span>
         </div>
     </div>
diff --git a/src/app/shared/search-form/search-form.component.spec.ts b/src/app/shared/search-form/search-form.component.spec.ts
index 584b7c5584..1fe1ea8316 100644
--- a/src/app/shared/search-form/search-form.component.spec.ts
+++ b/src/app/shared/search-form/search-form.component.spec.ts
@@ -28,6 +28,7 @@ describe('SearchFormComponent', () => {
   const searchService = new SearchServiceStub();
   const paginationService = new PaginationServiceStub();
   const searchConfigService = { paginationID: 'test-id' };
+  const firstPage = { 'spc.page': 1 };
   const dspaceObjectService = {
     findById: () => createSuccessfulRemoteDataObject$(undefined),
   };
@@ -104,16 +105,16 @@ describe('SearchFormComponent', () => {
     const scope = 'MCU';
     let searchQuery = {};
 
-    it('should navigate to the search page even when no parameters are provided', () => {
+    it('should navigate to the search first page even when no parameters are provided', () => {
       comp.updateSearch(searchQuery);
 
       expect(router.navigate).toHaveBeenCalledWith(comp.getSearchLinkParts(), {
-        queryParams: searchQuery,
+        queryParams: { ...searchQuery, ...firstPage },
         queryParamsHandling: 'merge'
       });
     });
 
-    it('should navigate to the search page with parameters only query if only query is provided', () => {
+    it('should navigate to the search first page with parameters only query if only query is provided', () => {
       searchQuery = {
         query: query
       };
@@ -121,12 +122,12 @@ describe('SearchFormComponent', () => {
       comp.updateSearch(searchQuery);
 
       expect(router.navigate).toHaveBeenCalledWith(comp.getSearchLinkParts(), {
-        queryParams: searchQuery,
+        queryParams: { ...searchQuery, ...firstPage },
         queryParamsHandling: 'merge'
       });
     });
 
-    it('should navigate to the search page with parameters only query if only scope is provided', () => {
+    it('should navigate to the search first page with parameters only query if only scope is provided', () => {
       searchQuery = {
         scope: scope
       };
@@ -134,7 +135,7 @@ describe('SearchFormComponent', () => {
       comp.updateSearch(searchQuery);
 
       expect(router.navigate).toHaveBeenCalledWith(comp.getSearchLinkParts(), {
-        queryParams: searchQuery,
+        queryParams: {...searchQuery, ...firstPage},
         queryParamsHandling: 'merge'
       });
     });
diff --git a/src/app/shared/search-form/search-form.component.ts b/src/app/shared/search-form/search-form.component.ts
index 151ded6f9e..95a063bdd6 100644
--- a/src/app/shared/search-form/search-form.component.ts
+++ b/src/app/shared/search-form/search-form.component.ts
@@ -114,7 +114,14 @@ export class SearchFormComponent implements OnChanges {
    * @param data Updated parameters
    */
   updateSearch(data: any) {
-    const queryParams = Object.assign({}, data);
+    const goToFirstPage = { 'spc.page': 1 };
+
+    const queryParams = Object.assign(
+      {
+        ...goToFirstPage
+      },
+      data
+    );
 
     void this.router.navigate(this.getSearchLinkParts(), {
       queryParams: queryParams,
diff --git a/src/app/shared/search/search-export-csv/search-export-csv.component.spec.ts b/src/app/shared/search/search-export-csv/search-export-csv.component.spec.ts
index 82c15feeac..f75f01afa2 100644
--- a/src/app/shared/search/search-export-csv/search-export-csv.component.spec.ts
+++ b/src/app/shared/search/search-export-csv/search-export-csv.component.spec.ts
@@ -6,7 +6,6 @@ import { AuthorizationDataService } from '../../../core/data/feature-authorizati
 import { SearchExportCsvComponent } from './search-export-csv.component';
 import { ScriptDataService } from '../../../core/data/processes/script-data.service';
 import { createFailedRemoteDataObject$, createSuccessfulRemoteDataObject$ } from '../../remote-data.utils';
-import { Script } from '../../../process-page/scripts/script.model';
 import { Process } from '../../../process-page/processes/process.model';
 import { NotificationsServiceStub } from '../../testing/notifications-service.stub';
 import { NotificationsService } from '../../notifications/notifications.service';
@@ -25,7 +24,6 @@ describe('SearchExportCsvComponent', () => {
   let notificationsService;
   let router;
 
-  const script = Object.assign(new Script(), {id: 'metadata-export-search', name: 'metadata-export-search'});
   const process = Object.assign(new Process(), {processId: 5, scriptName: 'metadata-export-search'});
 
   const searchConfig = new PaginatedSearchOptions({
@@ -41,7 +39,7 @@ describe('SearchExportCsvComponent', () => {
 
   function initBeforeEachAsync() {
     scriptDataService = jasmine.createSpyObj('scriptDataService', {
-      findById: createSuccessfulRemoteDataObject$(script),
+      scriptWithNameExistsAndCanExecute: observableOf(true),
       invoke: createSuccessfulRemoteDataObject$(process)
     });
     authorizationDataService = jasmine.createSpyObj('authorizationService', {
@@ -110,15 +108,22 @@ describe('SearchExportCsvComponent', () => {
     describe('when the metadata-export-search script is not present', () => {
       beforeEach(waitForAsync(() => {
         initBeforeEachAsync();
-        (scriptDataService.findById as jasmine.Spy).and.returnValue(createFailedRemoteDataObject$('Not found', 404));
+        (scriptDataService.scriptWithNameExistsAndCanExecute as jasmine.Spy).and.returnValue(observableOf(false));
       }));
-      beforeEach(() => {
-        initBeforeEach();
-      });
+
       it('should should not add the button', () => {
+        initBeforeEach();
+
         const debugElement = fixture.debugElement.query(By.css('button.export-button'));
         expect(debugElement).toBeNull();
       });
+
+      it('should not call scriptWithNameExistsAndCanExecute when unauthorized', () => {
+        (authorizationDataService.isAuthorized as jasmine.Spy).and.returnValue(observableOf(false));
+        initBeforeEach();
+
+        expect(scriptDataService.scriptWithNameExistsAndCanExecute).not.toHaveBeenCalled();
+      });
     });
   });
   describe('export', () => {
diff --git a/src/app/shared/search/search-export-csv/search-export-csv.component.ts b/src/app/shared/search/search-export-csv/search-export-csv.component.ts
index 6ad105342f..27c0e86205 100644
--- a/src/app/shared/search/search-export-csv/search-export-csv.component.ts
+++ b/src/app/shared/search/search-export-csv/search-export-csv.component.ts
@@ -1,8 +1,8 @@
 import { Component, Input, OnInit } from '@angular/core';
-import { combineLatest as observableCombineLatest, Observable } from 'rxjs';
+import { Observable } from 'rxjs';
 import { ScriptDataService } from '../../../core/data/processes/script-data.service';
 import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
-import { map } from 'rxjs/operators';
+import { map, switchMap, filter, startWith } from 'rxjs/operators';
 import { FeatureID } from '../../../core/data/feature-authorization/feature-id';
 import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
 import { hasValue, isNotEmpty } from '../../empty.util';
@@ -13,6 +13,7 @@ import { NotificationsService } from '../../notifications/notifications.service'
 import { TranslateService } from '@ngx-translate/core';
 import { Router } from '@angular/router';
 import { PaginatedSearchOptions } from '../models/paginated-search-options.model';
+import { SearchFilter } from '../models/search-filter.model';
 
 @Component({
   selector: 'ds-search-export-csv',
@@ -48,15 +49,11 @@ export class SearchExportCsvComponent implements OnInit {
   }
 
   ngOnInit(): void {
-    const scriptExists$ = this.scriptDataService.findById('metadata-export-search').pipe(
-      getFirstCompletedRemoteData(),
-      map((rd) => rd.isSuccess && hasValue(rd.payload))
-    );
-
-    const isAuthorized$ = this.authorizationDataService.isAuthorized(FeatureID.AdministratorOf);
-
-    this.shouldShowButton$ = observableCombineLatest([scriptExists$, isAuthorized$]).pipe(
-      map(([scriptExists, isAuthorized]: [boolean, boolean]) => scriptExists && isAuthorized)
+    this.shouldShowButton$ = this.authorizationDataService.isAuthorized(FeatureID.AdministratorOf).pipe(
+      filter((isAuthorized: boolean) => isAuthorized),
+      switchMap(() => this.scriptDataService.scriptWithNameExistsAndCanExecute('metadata-export-search')),
+      map((canExecute: boolean) => canExecute),
+      startWith(false),
     );
   }
 
@@ -76,24 +73,37 @@ export class SearchExportCsvComponent implements OnInit {
         parameters.push({name: '-c', value: this.searchConfig.configuration});
       }
       if (isNotEmpty(this.searchConfig.filters)) {
-        this.searchConfig.filters.forEach((filter) => {
-          if (hasValue(filter.values)) {
-            filter.values.forEach((value) => {
+        this.searchConfig.filters.forEach((searchFilter: SearchFilter) => {
+          if (hasValue(searchFilter.values)) {
+            searchFilter.values.forEach((value: string) => {
               let operator;
               let filterValue;
-              if (hasValue(filter.operator)) {
-                operator = filter.operator;
+              if (hasValue(searchFilter.operator)) {
+                operator = searchFilter.operator;
                 filterValue = value;
               } else {
                 operator = value.substring(value.lastIndexOf(',') + 1);
                 filterValue = value.substring(0, value.lastIndexOf(','));
               }
-              const valueToAdd = `${filter.key.substring(2)},${operator}=${filterValue}`;
+              const valueToAdd = `${searchFilter.key.substring(2)},${operator}=${filterValue}`;
               parameters.push({name: '-f', value: valueToAdd});
             });
           }
         });
       }
+      if (isNotEmpty(this.searchConfig.fixedFilter)) {
+        const fixedFilter = this.searchConfig.fixedFilter.substring(2);
+        const keyAndValue = fixedFilter.split('=');
+        if (keyAndValue.length > 1) {
+          const key = keyAndValue[0];
+          const valueAndOperator = keyAndValue[1].split(',');
+          if (valueAndOperator.length > 1) {
+            const value = valueAndOperator[0];
+            const operator = valueAndOperator[1];
+            parameters.push({name: '-f', value: `${key},${operator}=${value}`});
+          }
+        }
+      }
     }
 
     this.scriptDataService.invoke('metadata-export-search', parameters, []).pipe(
diff --git a/src/app/shared/search/search-filters/search-filter/search-authority-filter/search-authority-filter.component.html b/src/app/shared/search/search-filters/search-filter/search-authority-filter/search-authority-filter.component.html
index fdf154bc04..4b0baed7d6 100644
--- a/src/app/shared/search/search-filters/search-filter/search-authority-filter/search-authority-filter.component.html
+++ b/src/app/shared/search/search-filters/search-filter/search-authority-filter/search-authority-filter.component.html
@@ -8,11 +8,11 @@
         </ng-container>
         <div class="clearfix toggle-more-filters">
             <a class="float-left" *ngIf="!(isLastPage$ | async)"
-               (click)="showMore()" href="javascript:void(0);">
+               (click)="showMore()" href="javascript:void(0);" role="link" tabindex="0">
               {{"search.filters.filter.show-more" | translate}}
             </a>
             <a class="float-right" *ngIf="(currentPage | async) > 1"
-               (click)="showFirstPageOnly()" href="javascript:void(0);">
+               (click)="showFirstPageOnly()" href="javascript:void(0);" role="link" tabindex="0">
               {{"search.filters.filter.show-less" | translate}}
             </a>
         </div>
@@ -26,5 +26,6 @@
                           (submitSuggestion)="onSubmit($event)"
                           (clickSuggestion)="onClick($event)"
                           (findSuggestions)="findSuggestions($event)"
+                          *ngIf="!(isAvailableForShowSearchText | async)"
                           ngDefaultControl></ds-filter-input-suggestions>
 </div>
diff --git a/src/app/shared/search/search-filters/search-filter/search-boolean-filter/search-boolean-filter.component.html b/src/app/shared/search/search-filters/search-filter/search-boolean-filter/search-boolean-filter.component.html
index 7d0ad89914..1f7ef98c83 100644
--- a/src/app/shared/search/search-filters/search-filter/search-boolean-filter/search-boolean-filter.component.html
+++ b/src/app/shared/search/search-filters/search-filter/search-boolean-filter/search-boolean-filter.component.html
@@ -8,11 +8,11 @@
         </ng-container>
         <div class="clearfix toggle-more-filters">
             <a class="float-left" *ngIf="!(isLastPage$ | async)"
-               (click)="showMore()" href="javascript:void(0);">
+               (click)="showMore()" href="javascript:void(0);" role="link" tabindex="0">
               {{"search.filters.filter.show-more" | translate}}
             </a>
             <a class="float-right" *ngIf="(currentPage | async) > 1"
-               (click)="showFirstPageOnly()" href="javascript:void(0);">
+               (click)="showFirstPageOnly()" href="javascript:void(0);" role="link" tabindex="0">
               {{"search.filters.filter.show-less" | translate}}
             </a>
         </div>
diff --git a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.html b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.html
index 9a4bffadb8..65c566c1e1 100644
--- a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.html
+++ b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.html
@@ -1,9 +1,10 @@
 <a *ngIf="isVisible | async" class="d-flex flex-row"
    [tabIndex]="-1"
    [routerLink]="[searchLink]"
-   [queryParams]="addQueryParams" queryParamsHandling="merge">
+   [queryParams]="addQueryParams" queryParamsHandling="merge"
+   (click)="announceFilter()">
   <label class="mb-0 d-flex w-100">
-    <input type="checkbox" [checked]="false" class="my-1 align-self-stretch filter-checkbox"/>
+    <input type="checkbox" [checked]="false" class="my-1 align-self-stretch filter-checkbox" role="checkbox" tabindex="0"/>
     <span class="w-100 pl-1 break-facet">
       <span class="float-right badge badge-secondary badge-pill mt-1 ml-1">{{filterValue.count | dsShortNumber}}</span>
       {{ 'search.filters.' + filterConfig.name + '.' + filterValue.value | translate: {default: filterValue.value} }}
diff --git a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.spec.ts b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.spec.ts
index 53acb1d911..5ddae92b85 100644
--- a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.spec.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.spec.ts
@@ -19,6 +19,7 @@ import { PaginationComponentOptions } from '../../../../../pagination/pagination
 import { PaginationService } from '../../../../../../core/pagination/pagination.service';
 import { PaginationServiceStub } from '../../../../../testing/pagination-service.stub';
 import { ShortNumberPipe } from '../../../../../utils/short-number.pipe';
+import { UUIDService } from '../../../../../../core/shared/uuid.service';
 
 describe('SearchFacetOptionComponent', () => {
   let comp: SearchFacetOptionComponent;
@@ -113,7 +114,8 @@ describe('SearchFacetOptionComponent', () => {
             }
             /* eslint-enable no-empty, @typescript-eslint/no-empty-function */
           }
-        }
+        },
+        { provide: UUIDService, useClass: UUIDService },
       ],
       schemas: [NO_ERRORS_SCHEMA]
     }).overrideComponent(SearchFacetOptionComponent, {
diff --git a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.ts b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.ts
index cdbab61a30..8ea06890fe 100644
--- a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.ts
@@ -2,10 +2,12 @@ import { combineLatest as observableCombineLatest, Observable, Subscription } fr
 import { map } from 'rxjs/operators';
 import { Component, Input, OnDestroy, OnInit } from '@angular/core';
 import { Router } from '@angular/router';
+import { TranslateService } from '@ngx-translate/core';
 import { FacetValue } from '../../../../models/facet-value.model';
 import { SearchFilterConfig } from '../../../../models/search-filter-config.model';
 import { SearchService } from '../../../../../../core/shared/search/search.service';
 import { SearchFilterService } from '../../../../../../core/shared/search/search-filter.service';
+import { LiveRegionService } from '../../../../../../shared/live-region/live-region.service';
 import { SearchConfigurationService } from '../../../../../../core/shared/search/search-configuration.service';
 import { hasValue } from '../../../../../empty.util';
 import { currentPath } from '../../../../../utils/route.utils';
@@ -67,7 +69,9 @@ export class SearchFacetOptionComponent implements OnInit, OnDestroy {
               protected filterService: SearchFilterService,
               protected searchConfigService: SearchConfigurationService,
               protected router: Router,
-              protected paginationService: PaginationService
+              protected paginationService: PaginationService,
+              protected liveRegionService: LiveRegionService,
+              private translateService: TranslateService,
   ) {
   }
 
@@ -129,4 +133,12 @@ export class SearchFacetOptionComponent implements OnInit, OnDestroy {
       this.sub.unsubscribe();
     }
   }
+
+  /**
+   * Announces to the screen reader that the page will be reloaded, which filter has been selected
+   */
+  announceFilter() {
+    const message = this.translateService.instant('search-facet-option.update.announcement', { filter: this.filterValue.value });
+    this.liveRegionService.addMessage(message);
+  }
 }
diff --git a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component.html b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component.html
index 0e6090b0fa..6cb6081b74 100644
--- a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component.html
+++ b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component.html
@@ -1,4 +1,5 @@
 <a *ngIf="isVisible | async" class="d-flex flex-row"
+   [tabIndex]="-1"
    [routerLink]="[searchLink]"
    [queryParams]="changeQueryParams" queryParamsHandling="merge">
   <span class="filter-value px-1">{{filterValue.label}}</span>
diff --git a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component.html b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component.html
index d5f88c5333..c6c64f8aa1 100644
--- a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component.html
+++ b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component.html
@@ -3,8 +3,8 @@
    [routerLink]="[searchLink]"
    [queryParams]="removeQueryParams" queryParamsHandling="merge">
   <label class="mb-0 d-flex w-100">
-    <input type="checkbox" [checked]="true" class="my-1 align-self-stretch filter-checkbox"/>
-    <span class="filter-value pl-1 text-capitalize break-facet">
+    <input type="checkbox" [checked]="true" class="my-1 align-self-stretch filter-checkbox" role="checkbox" tabindex="0"/>
+    <span class="filter-value pl-1 break-facet">
         {{ 'search.filters.' + filterConfig.name + '.' + selectedValue.value | translate: {default: selectedValue.label} }}
     </span>
   </label>
diff --git a/src/app/shared/search/search-filters/search-filter/search-facet-filter-wrapper/search-facet-filter-wrapper.component.ts b/src/app/shared/search/search-filters/search-filter/search-facet-filter-wrapper/search-facet-filter-wrapper.component.ts
index 0aa131d428..f635c027b5 100644
--- a/src/app/shared/search/search-filters/search-filter/search-facet-filter-wrapper/search-facet-filter-wrapper.component.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-facet-filter-wrapper/search-facet-filter-wrapper.component.ts
@@ -4,6 +4,7 @@ import { FilterType } from '../../../models/filter-type.model';
 import { SearchFilterConfig } from '../../../models/search-filter-config.model';
 import {
   FILTER_CONFIG,
+  SCOPE,
   IN_PLACE_SEARCH,
   REFRESH_FILTER
 } from '../../../../../core/shared/search/search-filter.service';
@@ -35,6 +36,11 @@ export class SearchFacetFilterWrapperComponent implements OnInit {
    */
   @Input() refreshFilters: BehaviorSubject<boolean>;
 
+  /**
+   * The current scope
+   */
+  @Input() scope: string;
+
   /**
    * The constructor of the search facet filter that should be rendered, based on the filter config's type
    */
@@ -56,7 +62,8 @@ export class SearchFacetFilterWrapperComponent implements OnInit {
       providers: [
         { provide: FILTER_CONFIG, useFactory: () => (this.filterConfig), deps: [] },
         { provide: IN_PLACE_SEARCH, useFactory: () => (this.inPlaceSearch), deps: [] },
-        { provide: REFRESH_FILTER, useFactory: () => (this.refreshFilters), deps: [] }
+        { provide: REFRESH_FILTER, useFactory: () => (this.refreshFilters), deps: [] },
+        { provide: SCOPE, useFactory: () => (this.scope), deps: [] },
       ],
       parent: this.injector
     });
diff --git a/src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.spec.ts b/src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.spec.ts
index 92d2e5265b..fc348722e5 100644
--- a/src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.spec.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.spec.ts
@@ -4,6 +4,7 @@ import { TranslateModule } from '@ngx-translate/core';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import {
   FILTER_CONFIG,
+  SCOPE,
   IN_PLACE_SEARCH,
   REFRESH_FILTER,
   SearchFilterService
@@ -99,6 +100,7 @@ describe('SearchFacetFilterComponent', () => {
         { provide: SEARCH_CONFIG_SERVICE, useValue: new SearchConfigurationServiceStub() },
         { provide: IN_PLACE_SEARCH, useValue: false },
         { provide: REFRESH_FILTER, useValue: new BehaviorSubject<boolean>(false) },
+        { provide: SCOPE, useValue: undefined },
         {
           provide: SearchFilterService, useValue: {
             getSelectedValuesForFilter: () => observableOf(selectedValues),
diff --git a/src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.ts b/src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.ts
index 2b2eb9b11a..c25651b330 100644
--- a/src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.ts
@@ -22,6 +22,7 @@ import { SearchFilterConfig } from '../../../models/search-filter-config.model';
 import { SearchService } from '../../../../../core/shared/search/search.service';
 import {
   FILTER_CONFIG,
+  SCOPE,
   IN_PLACE_SEARCH,
   REFRESH_FILTER,
   SearchFilterService
@@ -60,6 +61,10 @@ export class SearchFacetFilterComponent implements OnInit, OnDestroy {
    */
   isLastPage$: BehaviorSubject<boolean> = new BehaviorSubject(false);
 
+  /**
+   * Emits true if show the search text
+   */
+  isAvailableForShowSearchText: BehaviorSubject<boolean> = new BehaviorSubject(false);
   /**
    * The value of the input field that is used to query for possible values for this filter
    */
@@ -104,7 +109,9 @@ export class SearchFacetFilterComponent implements OnInit, OnDestroy {
               @Inject(SEARCH_CONFIG_SERVICE) public searchConfigService: SearchConfigurationService,
               @Inject(IN_PLACE_SEARCH) public inPlaceSearch: boolean,
               @Inject(FILTER_CONFIG) public filterConfig: SearchFilterConfig,
-              @Inject(REFRESH_FILTER) public refreshFilters: BehaviorSubject<boolean>) {
+              @Inject(REFRESH_FILTER) public refreshFilters: BehaviorSubject<boolean>,
+              @Inject(SCOPE) public scope: string,
+  ) {
   }
 
   /**
@@ -114,8 +121,11 @@ export class SearchFacetFilterComponent implements OnInit, OnDestroy {
     this.currentUrl = this.router.url;
     this.filterValues$ = new BehaviorSubject(createPendingRemoteDataObject());
     this.currentPage = this.getCurrentPage().pipe(distinctUntilChanged());
-
-    this.searchOptions$ = this.searchConfigService.searchOptions;
+    this.searchOptions$ = this.searchConfigService.searchOptions.pipe(
+      map((options: SearchOptions) => hasNoValue(this.scope) ? options : Object.assign(new SearchOptions(options), {
+        scope: this.scope,
+      })),
+    );
     this.subs.push(
       this.searchOptions$.subscribe(() => this.updateFilterValueList()),
       this.refreshFilters.asObservable().pipe(
@@ -291,6 +301,8 @@ export class SearchFacetFilterComponent implements OnInit, OnDestroy {
             getFirstSucceededRemoteData(),
             tap((rd: RemoteData<FacetValues>) => {
               this.isLastPage$.next(hasNoValue(rd?.payload?.next));
+              const hasLimitFacets =  rd?.payload?.page.length < rd?.payload?.facetLimit;
+              this.isAvailableForShowSearchText.next(hasLimitFacets && hasNoValue(rd?.payload?.next));
             }),
             map((rd: RemoteData<FacetValues>) => ({
                 values: observableOf(rd),
diff --git a/src/app/shared/search/search-filters/search-filter/search-filter.component.html b/src/app/shared/search/search-filters/search-filter/search-filter.component.html
index a6fb0021b7..c3460a5da0 100644
--- a/src/app/shared/search/search-filters/search-filter/search-filter.component.html
+++ b/src/app/shared/search/search-filters/search-filter/search-filter.component.html
@@ -2,22 +2,26 @@
      [id]="regionId" [attr.aria-labelledby]="toggleId" [ngClass]="{ 'focus': focusBox }" role="region">
   <button (click)="toggle()" (focusin)="focusBox = true" (focusout)="focusBox = false"
           class="filter-name d-flex" [attr.aria-controls]="regionId" [id]="toggleId"
-          [attr.aria-expanded]="false"
+          [attr.aria-expanded]="!(collapsed$ | async)"
           [attr.aria-label]="(((collapsed$ | async) ? 'search.filters.filter.expand' : 'search.filters.filter.collapse') | translate) + ' ' + (('search.filters.filter.' + filter.name + '.head') | translate | lowercase)"
           [attr.data-test]="'filter-toggle' | dsBrowserOnly"
+          role="button"
+          tabindex="0"
   >
-    <h5 class="d-inline-block mb-0">
+    <span class="h4 d-inline-block text-left mt-auto mb-auto dark:text-white text-dark">
       {{'search.filters.filter.' + filter.name + '.head'| translate}}
-    </h5>
-    <span class="filter-toggle flex-grow-1 fas p-auto"
-          [ngClass]="(collapsed$ | async) ? 'fa-plus' : 'fa-minus'"
-          [title]="((collapsed$ | async) ? 'search.filters.filter.expand' : 'search.filters.filter.collapse') | translate">
     </span>
+    <i class="filter-toggle flex-grow-1 fas p-auto"
+       aria-hidden="true"
+       [ngClass]="(collapsed$ | async) ? 'fa-plus' : 'fa-minus'"
+       [title]="((collapsed$ | async) ? 'search.filters.filter.expand' : 'search.filters.filter.collapse') | translate">
+    </i>
   </button>
   <div [@slide]="(collapsed$ | async) ? 'collapsed' : 'expanded'"
        (@slide.start)="startSlide($event)" (@slide.done)="finishSlide($event)"
        class="search-filter-wrapper" [ngClass]="{ 'closed' : closed, 'notab': notab }">
     <ds-search-facet-filter-wrapper
+      [scope]="scope"
       [filterConfig]="filter"
       [inPlaceSearch]="inPlaceSearch"
       [refreshFilters]="refreshFilters" >
diff --git a/src/app/shared/search/search-filters/search-filter/search-filter.component.scss b/src/app/shared/search/search-filters/search-filter/search-filter.component.scss
index 7e2631b55f..6a13d630eb 100644
--- a/src/app/shared/search/search-filters/search-filter/search-filter.component.scss
+++ b/src/app/shared/search/search-filters/search-filter/search-filter.component.scss
@@ -17,7 +17,6 @@
     line-height: var(--bs-line-height-base);
     text-align: right;
     position: relative;
-    top: -0.125rem;           // Fix weird outline shape in Chrome
   }
 
   > button {
diff --git a/src/app/shared/search/search-filters/search-filter/search-filter.component.ts b/src/app/shared/search/search-filters/search-filter/search-filter.component.ts
index d1d3bd729d..a440652fe5 100644
--- a/src/app/shared/search/search-filters/search-filter/search-filter.component.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-filter.component.ts
@@ -1,4 +1,4 @@
-import { Component, Inject, Input, OnInit } from '@angular/core';
+import { Component, EventEmitter, Inject, Input, OnInit, Output } from '@angular/core';
 
 import { BehaviorSubject, Observable, of as observableOf } from 'rxjs';
 import { filter, map, startWith, switchMap, take } from 'rxjs/operators';
@@ -6,7 +6,7 @@ import { filter, map, startWith, switchMap, take } from 'rxjs/operators';
 import { SearchFilterConfig } from '../../models/search-filter-config.model';
 import { SearchFilterService } from '../../../../core/shared/search/search-filter.service';
 import { slide } from '../../../animations/slide';
-import { isNotEmpty } from '../../../empty.util';
+import { isNotEmpty, hasValue } from '../../../empty.util';
 import { SearchService } from '../../../../core/shared/search/search.service';
 import { SearchConfigurationService } from '../../../../core/shared/search/search-configuration.service';
 import { SEARCH_CONFIG_SERVICE } from '../../../../my-dspace-page/my-dspace-page.component';
@@ -38,6 +38,13 @@ export class SearchFilterComponent implements OnInit {
    */
   @Input() refreshFilters: BehaviorSubject<boolean>;
 
+  /**
+   * The current scope
+   */
+  @Input() scope: string;
+
+  @Output() isVisibilityComputed = new EventEmitter<boolean>();
+
   /**
    * True when the filter is 100% collapsed in the UI
    */
@@ -86,7 +93,9 @@ export class SearchFilterComponent implements OnInit {
    */
   ngOnInit() {
     this.selectedValues$ = this.getSelectedValues();
-    this.active$ = this.isActive();
+    this.active$ = this.isActive().pipe(
+      startWith(true)
+    );
     this.collapsed$ = this.isCollapsed();
     this.initializeFilter();
     this.selectedValues$.pipe(take(1)).subscribe((selectedValues) => {
@@ -94,6 +103,9 @@ export class SearchFilterComponent implements OnInit {
         this.filterService.expand(this.filter.name);
       }
     });
+    this.isActive().pipe(take(1)).subscribe(() => {
+      this.isVisibilityComputed.emit(true);
+    });
   }
 
   /**
@@ -171,6 +183,9 @@ export class SearchFilterComponent implements OnInit {
         } else {
           return this.searchConfigService.searchOptions.pipe(
             switchMap((options) => {
+                if (hasValue(this.scope)) {
+                  options.scope = this.scope;
+                }
                 return this.searchService.getFacetValuesFor(this.filter, 1, options).pipe(
                   filter((RD) => !RD.isLoading),
                   map((valuesRD) => {
@@ -179,7 +194,7 @@ export class SearchFilterComponent implements OnInit {
               }
             ));
         }
-      }),
-      startWith(true));
+      })
+    );
   }
 }
diff --git a/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.html b/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.html
index eb49235641..3dfe1d3ca3 100644
--- a/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.html
+++ b/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.html
@@ -8,11 +8,13 @@
         </ng-container>
         <div class="clearfix toggle-more-filters">
             <a class="float-left" *ngIf="!(isLastPage$ | async)"
-               (click)="showMore()" href="javascript:void(0);">
+               (click)="showMore()" href="javascript:void(0);"
+               role="button" tabindex="0">
               {{"search.filters.filter.show-more" | translate}}
             </a>
             <a class="float-right" *ngIf="(currentPage | async) > 1"
-               (click)="showFirstPageOnly()" href="javascript:void(0);">
+               (click)="showFirstPageOnly()" href="javascript:void(0);"
+               role="button" tabindex="0">
               {{"search.filters.filter.show-less" | translate}}
             </a>
         </div>
@@ -26,6 +28,7 @@
                           (submitSuggestion)="onSubmit($event)"
                           (clickSuggestion)="onClick($event)"
                           (findSuggestions)="findSuggestions($event)"
+                          *ngIf="!(isAvailableForShowSearchText | async)"
                           ngDefaultControl
     ></ds-filter-input-suggestions>
 </div>
@@ -33,6 +36,6 @@
 <a *ngIf="vocabularyExists$ | async"
      href="javascript:void(0);"
      id="show-{{filterConfig.name}}-tree"
-     (click)="showVocabularyTree()">
+     (click)="showVocabularyTree()" role="button" tabindex="0">
   {{'search.filters.filter.show-tree' | translate: {name: ('search.filters.filter.' + filterConfig.name + '.head' | translate | lowercase )} }}
 </a>
diff --git a/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.spec.ts b/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.spec.ts
index e6c74d8047..a6212ca9c5 100644
--- a/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.spec.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.spec.ts
@@ -14,6 +14,7 @@ import { CommonModule } from '@angular/common';
 import { SearchService } from '../../../../../core/shared/search/search.service';
 import {
   FILTER_CONFIG,
+  SCOPE,
   IN_PLACE_SEARCH,
   SearchFilterService,
   REFRESH_FILTER
@@ -26,6 +27,8 @@ import { SearchConfigurationServiceStub } from '../../../../testing/search-confi
 import { VocabularyEntryDetail } from '../../../../../core/submission/vocabularies/models/vocabulary-entry-detail.model';
 import { FacetValue} from '../../../models/facet-value.model';
 import { SearchFilterConfig } from '../../../models/search-filter-config.model';
+import { APP_CONFIG } from '../../../../../../config/app-config.interface';
+import { environment } from '../../../../../../environments/environment.test';
 
 describe('SearchHierarchyFilterComponent', () => {
 
@@ -33,7 +36,7 @@ describe('SearchHierarchyFilterComponent', () => {
   let showVocabularyTreeLink: DebugElement;
 
   const testSearchLink = 'test-search';
-  const testSearchFilter = 'test-search-filter';
+  const testSearchFilter = 'subject';
   const VocabularyTreeViewComponent = {
     select: new EventEmitter<VocabularyEntryDetail>(),
   };
@@ -72,10 +75,12 @@ describe('SearchHierarchyFilterComponent', () => {
         { provide: Router, useValue: router },
         { provide: NgbModal, useValue: ngbModal },
         { provide: VocabularyService, useValue: vocabularyService },
+        { provide: APP_CONFIG, useValue: environment },
         { provide: SEARCH_CONFIG_SERVICE, useValue: new SearchConfigurationServiceStub() },
         { provide: IN_PLACE_SEARCH, useValue: false },
         { provide: FILTER_CONFIG, useValue: Object.assign(new SearchFilterConfig(), { name: testSearchFilter }) },
-        { provide: REFRESH_FILTER, useValue: new BehaviorSubject<boolean>(false)}
+        { provide: REFRESH_FILTER, useValue: new BehaviorSubject<boolean>(false)},
+        { provide: SCOPE, useValue: undefined },
       ],
       schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
@@ -84,7 +89,7 @@ describe('SearchHierarchyFilterComponent', () => {
   function init() {
     fixture = TestBed.createComponent(SearchHierarchyFilterComponent);
     fixture.detectChanges();
-    showVocabularyTreeLink = fixture.debugElement.query(By.css('a#show-test-search-filter-tree'));
+    showVocabularyTreeLink = fixture.debugElement.query(By.css(`a#show-${testSearchFilter}-tree`));
   }
 
   describe('if the vocabulary doesn\'t exist', () => {
diff --git a/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.ts b/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.ts
index f9b3f2bff9..18ddbbdf97 100644
--- a/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.ts
@@ -9,6 +9,7 @@ import {
 import { SearchService } from '../../../../../core/shared/search/search.service';
 import {
   FILTER_CONFIG,
+  SCOPE,
   IN_PLACE_SEARCH,
   SearchFilterService, REFRESH_FILTER
 } from '../../../../../core/shared/search/search-filter.service';
@@ -23,9 +24,11 @@ import { filter, map, take } from 'rxjs/operators';
 import { VocabularyService } from '../../../../../core/submission/vocabularies/vocabulary.service';
 import { Observable, BehaviorSubject } from 'rxjs';
 import { PageInfo } from '../../../../../core/shared/page-info.model';
-import { environment } from '../../../../../../environments/environment';
 import { addOperatorToFilterValue } from '../../../search.utils';
 import { VocabularyTreeviewModalComponent } from '../../../../form/vocabulary-treeview-modal/vocabulary-treeview-modal.component';
+import { hasValue } from '../../../../empty.util';
+import { APP_CONFIG, AppConfig } from '../../../../../../config/app-config.interface';
+import { FilterVocabularyConfig } from '../../../../../../config/filter-vocabulary-config';
 
 @Component({
   selector: 'ds-search-hierarchy-filter',
@@ -46,12 +49,14 @@ export class SearchHierarchyFilterComponent extends SearchFacetFilterComponent i
               protected router: Router,
               protected modalService: NgbModal,
               protected vocabularyService: VocabularyService,
+              @Inject(APP_CONFIG) protected appConfig: AppConfig,
               @Inject(SEARCH_CONFIG_SERVICE) public searchConfigService: SearchConfigurationService,
               @Inject(IN_PLACE_SEARCH) public inPlaceSearch: boolean,
               @Inject(FILTER_CONFIG) public filterConfig: SearchFilterConfig,
-              @Inject(REFRESH_FILTER) public refreshFilters: BehaviorSubject<boolean>
+              @Inject(REFRESH_FILTER) public refreshFilters: BehaviorSubject<boolean>,
+              @Inject(SCOPE) public scope: string,
   ) {
-    super(searchService, filterService, rdbs, router, searchConfigService, inPlaceSearch, filterConfig, refreshFilters);
+    super(searchService, filterService, rdbs, router, searchConfigService, inPlaceSearch, filterConfig, refreshFilters, scope);
   }
 
   vocabularyExists$: Observable<boolean>;
@@ -65,17 +70,20 @@ export class SearchHierarchyFilterComponent extends SearchFacetFilterComponent i
     super.onSubmit(addOperatorToFilterValue(data, 'query'));
   }
 
-  ngOnInit() {
+  ngOnInit(): void {
     super.ngOnInit();
-    this.vocabularyExists$ = this.vocabularyService.searchTopEntries(
-      this.getVocabularyEntry(), new PageInfo(), true, false,
-    ).pipe(
-      filter(rd => rd.hasCompleted),
-      take(1),
-      map(rd => {
-        return rd.hasSucceeded;
-      }),
-    );
+    const vocabularyName: string = this.getVocabularyEntry();
+    if (hasValue(vocabularyName)) {
+      this.vocabularyExists$ = this.vocabularyService.searchTopEntries(
+        vocabularyName, new PageInfo(), true, false,
+      ).pipe(
+        filter(rd => rd.hasCompleted),
+        take(1),
+        map(rd => {
+          return rd.hasSucceeded;
+        }),
+      );
+    }
   }
 
   /**
@@ -91,11 +99,11 @@ export class SearchHierarchyFilterComponent extends SearchFacetFilterComponent i
       name: this.getVocabularyEntry(),
       closed: true
     };
-    modalRef.result.then((detail: VocabularyEntryDetail) => {
-      this.selectedValues$
+    void modalRef.result.then((detail: VocabularyEntryDetail) => {
+      this.subs.push(this.selectedValues$
         .pipe(take(1))
         .subscribe((selectedValues) => {
-          this.router.navigate(
+          void this.router.navigate(
             [this.searchService.getSearchLink()],
             {
               queryParams: {
@@ -105,16 +113,16 @@ export class SearchHierarchyFilterComponent extends SearchFacetFilterComponent i
               queryParamsHandling: 'merge',
             },
           );
-        });
-    }).catch();
+        }));
+    });
   }
 
   /**
    * Returns the matching vocabulary entry for the given search filter.
    * These are configurable in the config file.
    */
-  getVocabularyEntry() {
-    const foundVocabularyConfig = environment.vocabularies.filter((v) => v.filter === this.filterConfig.name);
+  getVocabularyEntry(): string {
+    const foundVocabularyConfig: FilterVocabularyConfig[] = this.appConfig.vocabularies.filter((v: FilterVocabularyConfig) => v.filter === this.filterConfig.name);
     if (foundVocabularyConfig.length > 0 && foundVocabularyConfig[0].enabled === true) {
       return foundVocabularyConfig[0].vocabulary;
     }
diff --git a/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.html b/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.html
index 7834c4c557..851e78e86d 100644
--- a/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.html
+++ b/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.html
@@ -8,9 +8,9 @@
                     {{'search.filters.filter.' + filterConfig.name + '.min.label' | translate}}
                   </span>
                   <input type="text" [(ngModel)]="range[0]" [name]="filterConfig.paramName + '.min'"
-                         class="form-control" (blur)="onSubmit()"
-                         aria-label="Mininum value"
-                         [placeholder]="'search.filters.filter.' + filterConfig.name + '.min.placeholder' | translate"
+                         class="form-control"
+                         [attr.aria-label]="minLabel"
+                         [placeholder]="minLabel"
                   />
                 </label>
             </div>
@@ -20,21 +20,21 @@
                       {{'search.filters.filter.' + filterConfig.name + '.max.label' | translate}}
                     </span>
                     <input type="text" [(ngModel)]="range[1]" [name]="filterConfig.paramName + '.max'"
-                           class="form-control" (blur)="onSubmit()"
-                           aria-label="Maximum value"
-                           [placeholder]="'search.filters.filter.' + filterConfig.name + '.max.placeholder' | translate"
+                           class="form-control"
+                           [attr.aria-label]="maxLabel"
+                           [placeholder]="maxLabel"
                     />
                 </label>
             </div>
-            <label class="d-none">
-                <input type="submit" class="d-none"/>
-                <span>{{'search.filters.search.submit' | translate}}</span>
-            </label>
+            <button class="sr-only" type="submit" role="button" tabindex="0">
+                {{'search.filters.search.submit' | translate}}
+            </button>
         </form>
 
         <ng-container *ngIf="shouldShowSlider()">
-            <nouislider [connect]="true" [min]="min" [max]="max" [step]="1"
-                        [dsDebounce]="250" (onDebounce)="onSubmit()"
+            <nouislider [connect]="true" [config]="config" [min]="min" [max]="max" [step]="1"
+                        [dsDebounce]="250"
+                        (change)="onSliderChange($event)"
                         (keydown)="startKeyboardControl()" (keyup)="stopKeyboardControl()"
                         [(ngModel)]="range" ngDefaultControl>
             </nouislider>
@@ -44,5 +44,8 @@
           <ds-search-facet-range-option *ngFor="let value of page.page; trackBy: trackUpdate" [filterConfig]="filterConfig" [filterValue]="value" [inPlaceSearch]="inPlaceSearch"></ds-search-facet-range-option>
           </div>
         </ng-container>
+        <button (click)="onSubmit()" class="btn btn-primary" role="button" tabindex="0">
+          {{'search.filters.search.submit' | translate}}
+        </button>
     </div>
 </div>
diff --git a/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.scss b/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.scss
index b1cfa841f8..1240f35678 100644
--- a/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.scss
+++ b/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.scss
@@ -37,4 +37,10 @@
     margin: 0 calc(-1 * (var(--ds-slider-handle-width) / 2));
     width: calc(100% + var(--ds-slider-handle-width));
   }
+  .noUi-handle {
+      border-color: var(--ds-slider-handle-color);
+      &::before, &::after {
+          background-color: var(--ds-slider-handle-color);
+      }
+  }
 }
diff --git a/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.spec.ts b/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.spec.ts
index 3a146f5059..03f47a7569 100644
--- a/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.spec.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.spec.ts
@@ -4,6 +4,7 @@ import { TranslateModule } from '@ngx-translate/core';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import {
   FILTER_CONFIG,
+  SCOPE,
   IN_PLACE_SEARCH,
   REFRESH_FILTER,
   SearchFilterService
@@ -105,6 +106,7 @@ describe('SearchRangeFilterComponent', () => {
         { provide: SEARCH_CONFIG_SERVICE, useValue: new SearchConfigurationServiceStub() },
         { provide: IN_PLACE_SEARCH, useValue: false },
         { provide: REFRESH_FILTER, useValue: new BehaviorSubject<boolean>(false) },
+        { provide: SCOPE, useValue: undefined },
         {
           provide: SearchFilterService, useValue: {
             getSelectedValuesForFilter: () => selectedValues,
diff --git a/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.ts b/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.ts
index 938f67412e..1528acc0c6 100644
--- a/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.ts
@@ -2,6 +2,7 @@ import { BehaviorSubject, combineLatest as observableCombineLatest, Subscription
 import { map, startWith } from 'rxjs/operators';
 import { isPlatformBrowser } from '@angular/common';
 import { Component, Inject, OnDestroy, OnInit, PLATFORM_ID } from '@angular/core';
+import { TranslateService } from '@ngx-translate/core';
 import { RemoteDataBuildService } from '../../../../../core/cache/builders/remote-data-build.service';
 import { FilterType } from '../../../models/filter-type.model';
 import { renderFacetFor } from '../search-filter-type-decorator';
@@ -9,6 +10,7 @@ import { facetLoad, SearchFacetFilterComponent } from '../search-facet-filter/se
 import { SearchFilterConfig } from '../../../models/search-filter-config.model';
 import {
   FILTER_CONFIG,
+  SCOPE,
   IN_PLACE_SEARCH,
   REFRESH_FILTER,
   SearchFilterService
@@ -53,16 +55,37 @@ export class SearchRangeFilterComponent extends SearchFacetFilterComponent imple
    */
   min = 1950;
 
+  /**
+   * i18n Label to use for minimum field
+   */
+  minLabel: string;
+
   /**
    * Fallback maximum for the range
    */
   max = new Date().getUTCFullYear();
 
+  /**
+   * i18n Label to use for maximum field
+   */
+  maxLabel: string;
+
+  /**
+   * Base configuration for nouislider
+   * https://refreshless.com/nouislider/slider-options/
+   */
+  config = {};
+
   /**
    * The current range of the filter
    */
   range;
 
+  /**
+   * The range currently selected by the slider
+   */
+  sliderRange: [number | undefined, number | undefined];
+
   /**
    * Subscription to unsubscribe from
    */
@@ -78,13 +101,15 @@ export class SearchRangeFilterComponent extends SearchFacetFilterComponent imple
               protected filterService: SearchFilterService,
               protected router: Router,
               protected rdbs: RemoteDataBuildService,
+              private translateService: TranslateService,
               @Inject(SEARCH_CONFIG_SERVICE) public searchConfigService: SearchConfigurationService,
               @Inject(IN_PLACE_SEARCH) public inPlaceSearch: boolean,
               @Inject(FILTER_CONFIG) public filterConfig: SearchFilterConfig,
               @Inject(PLATFORM_ID) private platformId: any,
               @Inject(REFRESH_FILTER) public refreshFilters: BehaviorSubject<boolean>,
+              @Inject(SCOPE) public scope: string,
               private route: RouteService) {
-    super(searchService, filterService, rdbs, router, searchConfigService, inPlaceSearch, filterConfig, refreshFilters);
+    super(searchService, filterService, rdbs, router, searchConfigService, inPlaceSearch, filterConfig, refreshFilters, scope);
 
   }
 
@@ -96,6 +121,8 @@ export class SearchRangeFilterComponent extends SearchFacetFilterComponent imple
     super.ngOnInit();
     this.min = yearFromString(this.filterConfig.minValue) || this.min;
     this.max = yearFromString(this.filterConfig.maxValue) || this.max;
+    this.minLabel = this.translateService.instant('search.filters.filter.' + this.filterConfig.name + '.min.placeholder');
+    this.maxLabel = this.translateService.instant('search.filters.filter.' + this.filterConfig.name + '.max.placeholder');
     const iniMin = this.route.getQueryParameterValue(this.filterConfig.paramName + RANGE_FILTER_MIN_SUFFIX).pipe(startWith(undefined));
     const iniMax = this.route.getQueryParameterValue(this.filterConfig.paramName + RANGE_FILTER_MAX_SUFFIX).pipe(startWith(undefined));
     this.sub = observableCombineLatest(iniMin, iniMax).pipe(
@@ -105,6 +132,24 @@ export class SearchRangeFilterComponent extends SearchFacetFilterComponent imple
         return [minimum, maximum];
       })
     ).subscribe((minmax) => this.range = minmax);
+
+    // Default/base config for nouislider
+    this.config = {
+      // Ensure draggable handles have labels
+      handleAttributes: [
+        { 'aria-label': this.minLabel },
+        { 'aria-label': this.maxLabel },
+      ],
+    };
+  }
+
+  /**
+   * Updates the sliderRange property with the current slider range.
+   * This method is called whenever the slider value changes, but it does not immediately apply the changes.
+   * @param range - The current range selected by the slider
+   */
+  onSliderChange(range: [number | undefined, number | undefined]): void {
+    this.sliderRange = range;
   }
 
   /**
diff --git a/src/app/shared/search/search-filters/search-filter/search-text-filter/search-text-filter.component.html b/src/app/shared/search/search-filters/search-filter/search-text-filter/search-text-filter.component.html
index fdf154bc04..c1cdc3ea0c 100644
--- a/src/app/shared/search/search-filters/search-filter/search-text-filter/search-text-filter.component.html
+++ b/src/app/shared/search/search-filters/search-filter/search-text-filter/search-text-filter.component.html
@@ -8,11 +8,11 @@
         </ng-container>
         <div class="clearfix toggle-more-filters">
             <a class="float-left" *ngIf="!(isLastPage$ | async)"
-               (click)="showMore()" href="javascript:void(0);">
+               (click)="showMore()" href="javascript:void(0);" role="button" tabindex="0">
               {{"search.filters.filter.show-more" | translate}}
             </a>
             <a class="float-right" *ngIf="(currentPage | async) > 1"
-               (click)="showFirstPageOnly()" href="javascript:void(0);">
+               (click)="showFirstPageOnly()" href="javascript:void(0);" role="button" tabindex="0">
               {{"search.filters.filter.show-less" | translate}}
             </a>
         </div>
@@ -26,5 +26,6 @@
                           (submitSuggestion)="onSubmit($event)"
                           (clickSuggestion)="onClick($event)"
                           (findSuggestions)="findSuggestions($event)"
+                          *ngIf="!(isAvailableForShowSearchText | async)"
                           ngDefaultControl></ds-filter-input-suggestions>
 </div>
diff --git a/src/app/shared/search/search-filters/search-filters.component.html b/src/app/shared/search/search-filters/search-filters.component.html
index e392cd2663..bb020f85b1 100644
--- a/src/app/shared/search/search-filters/search-filters.component.html
+++ b/src/app/shared/search/search-filters/search-filters.component.html
@@ -1,7 +1,13 @@
 <h3>{{"search.filters.head" | translate}}</h3>
 <div *ngIf="(filters | async)?.hasSucceeded">
-    <div *ngFor="let filter of (filters | async)?.payload; trackBy: trackUpdate">
-        <ds-search-filter [filter]="filter" [inPlaceSearch]="inPlaceSearch" [refreshFilters]="refreshFilters"></ds-search-filter>
-    </div>
+  <div [class.visually-hidden]="getFinalFiltersComputed(this.currentConfiguration) !== (filters | async)?.payload?.length"
+       *ngFor="let filter of (filters | async)?.payload">
+    <ds-search-filter (isVisibilityComputed)="countFiltersWithComputedVisibility($event)" [scope]="currentScope" [filter]="filter" [inPlaceSearch]="inPlaceSearch" [refreshFilters]="refreshFilters"></ds-search-filter>
+  </div>
 </div>
+
+
+<ng-container *ngIf="getFinalFiltersComputed(this.currentConfiguration) !== (filters | async)?.payload?.length">
+  <ngx-skeleton-loader [count]="defaultFilterCount"/>
+</ng-container>
 <a class="btn btn-primary" [routerLink]="[searchLink]" [queryParams]="clearParams | async" queryParamsHandling="merge" role="button"><i class="fas fa-undo"></i> {{"search.filters.reset" | translate}}</a>
diff --git a/src/app/shared/search/search-filters/search-filters.component.scss b/src/app/shared/search/search-filters/search-filters.component.scss
index b5b2816e89..6170b9281c 100644
--- a/src/app/shared/search/search-filters/search-filters.component.scss
+++ b/src/app/shared/search/search-filters/search-filters.component.scss
@@ -1,2 +1,12 @@
 @import '../../../../styles/variables';
-@import '../../../../styles/mixins';
\ No newline at end of file
+@import '../../../../styles/mixins';
+
+:host ::ng-deep {
+  ngx-skeleton-loader .skeleton-loader {
+    height: var(--ds-filters-skeleton-height);
+    margin-bottom: var(--ds-filters-skeleton-spacing);
+    padding: var(--ds-filters-skeleton-spacing);
+    background-color: var(--bs-light);
+    box-shadow: none;
+  }
+}
diff --git a/src/app/shared/search/search-filters/search-filters.component.spec.ts b/src/app/shared/search/search-filters/search-filters.component.spec.ts
index 522459b603..864d7b583e 100644
--- a/src/app/shared/search/search-filters/search-filters.component.spec.ts
+++ b/src/app/shared/search/search-filters/search-filters.component.spec.ts
@@ -9,6 +9,8 @@ import { SearchFiltersComponent } from './search-filters.component';
 import { SearchService } from '../../../core/shared/search/search.service';
 import { SEARCH_CONFIG_SERVICE } from '../../../my-dspace-page/my-dspace-page.component';
 import { SearchConfigurationServiceStub } from '../../testing/search-configuration-service.stub';
+import { APP_CONFIG } from '../../../../config/app-config.interface';
+import { environment } from '../../../../environments/environment';
 
 describe('SearchFiltersComponent', () => {
   let comp: SearchFiltersComponent;
@@ -37,7 +39,7 @@ describe('SearchFiltersComponent', () => {
         { provide: SearchService, useValue: searchServiceStub },
         { provide: SEARCH_CONFIG_SERVICE, useValue: new SearchConfigurationServiceStub() },
         { provide: SearchFilterService, useValue: searchFiltersStub },
-
+        { provide: APP_CONFIG, useValue: environment },
       ],
       schemas: [NO_ERRORS_SCHEMA]
     }).overrideComponent(SearchFiltersComponent, {
diff --git a/src/app/shared/search/search-filters/search-filters.component.ts b/src/app/shared/search/search-filters/search-filters.component.ts
index 766939226d..189062fea3 100644
--- a/src/app/shared/search/search-filters/search-filters.component.ts
+++ b/src/app/shared/search/search-filters/search-filters.component.ts
@@ -2,7 +2,7 @@ import { Component, Inject, Input, OnDestroy, OnInit } from '@angular/core';
 import { Router } from '@angular/router';
 
 import { BehaviorSubject, Observable } from 'rxjs';
-import { map } from 'rxjs/operators';
+import { map, filter, take } from 'rxjs/operators';
 
 import { SearchService } from '../../../core/shared/search/search.service';
 import { RemoteData } from '../../../core/data/remote-data';
@@ -12,6 +12,7 @@ import { SearchFilterService } from '../../../core/shared/search/search-filter.s
 import { SEARCH_CONFIG_SERVICE } from '../../../my-dspace-page/my-dspace-page.component';
 import { currentPath } from '../../utils/route.utils';
 import { hasValue } from '../../empty.util';
+import { APP_CONFIG, AppConfig } from '../../../../config/app-config.interface';
 
 @Component({
   selector: 'ds-search-filters',
@@ -60,7 +61,20 @@ export class SearchFiltersComponent implements OnInit, OnDestroy {
    */
   searchLink: string;
 
+  /**
+   * Keeps track of the filters computed for each configuration during the current rendering cycle
+   * This array stores objects with configuration identifier and number of computed filters
+   */
+  private currentFiltersComputed = [];
+
+  /**
+   * Stores the final count of computed filters for each configuration
+   * Used to determine when all filters for a configuration have been processed
+   */
+  private finalFiltersComputed = [];
+
   subs = [];
+  defaultFilterCount: number;
 
   /**
    * Initialize instance variables
@@ -68,19 +82,25 @@ export class SearchFiltersComponent implements OnInit, OnDestroy {
    * @param {SearchFilterService} filterService
    * @param {Router} router
    * @param {SearchConfigurationService} searchConfigService
+   * @param appConfig
    */
   constructor(
     private searchService: SearchService,
     private filterService: SearchFilterService,
     private router: Router,
-    @Inject(SEARCH_CONFIG_SERVICE) private searchConfigService: SearchConfigurationService) {
+    @Inject(SEARCH_CONFIG_SERVICE) private searchConfigService: SearchConfigurationService,
+    @Inject(APP_CONFIG) protected appConfig: AppConfig,
+  ) {
+    this.defaultFilterCount = this.appConfig.search.filterPlaceholdersCount ?? 5;
   }
 
   ngOnInit(): void {
-    this.clearParams = this.searchConfigService.getCurrentFrontendFilters().pipe(map((filters) => {
-      Object.keys(filters).forEach((f) => filters[f] = null);
-      return filters;
-    }));
+    this.clearParams = this.searchConfigService.getCurrentFrontendFilters().pipe(
+      map((filters) => {
+        Object.keys(filters).forEach((f) => filters[f] = null);
+        return filters;
+      })
+    );
     this.searchLink = this.getSearchLink();
   }
 
@@ -108,4 +128,125 @@ export class SearchFiltersComponent implements OnInit, OnDestroy {
       }
     });
   }
+
+  countFiltersWithComputedVisibility(computed: boolean) {
+    if (computed) {
+      this.filters.pipe(
+        // Get filter data and check if we need to increment the counter
+        map(filtersData => {
+          if (filtersData && filtersData.hasSucceeded && filtersData.payload) {
+            const totalFilters = filtersData.payload.length;
+            const currentComputed = this.getCurrentFiltersComputed(this.currentConfiguration);
+
+            // If we've already computed all filters for this configuration
+            if (currentComputed >= totalFilters) {
+              // Register in finalFiltersComputed if not already registered
+              if (!this.findConfigInFinalFilters(this.currentConfiguration)) {
+                this.updateFinalFiltersComputed(this.currentConfiguration, totalFilters);
+              }
+              return { shouldIncrement: false };
+            }
+
+            // We haven't reached the total yet, proceed with increment
+            return {
+              shouldIncrement: true,
+              totalFilters
+            };
+          }
+          return { shouldIncrement: false };
+        }),
+        // Only continue if we need to increment the counter
+        filter(result => result.shouldIncrement),
+        // Increment the counter for the current configuration
+        map(result => {
+          const filterConfig = this.findConfigInCurrentFilters(this.currentConfiguration);
+
+          if (filterConfig) {
+            // Update existing counter
+            filterConfig.filtersComputed += 1;
+          } else {
+            // Create new counter entry
+            this.currentFiltersComputed.push({
+              configuration: this.currentConfiguration,
+              filtersComputed: 1
+            });
+          }
+
+          // Pass along the total and updated count
+          return {
+            totalFilters: result.totalFilters,
+            currentComputed: this.getCurrentFiltersComputed(this.currentConfiguration)
+          };
+        }),
+        // Check if we've reached the total after incrementing
+        map(result => {
+          if (result.currentComputed === result.totalFilters) {
+            // If we've reached the total, update final filters count
+            this.updateFinalFiltersComputed(this.currentConfiguration, result.currentComputed);
+          }
+          return result;
+        })
+      ).pipe(take(1)).subscribe(); // Execute the pipeline and immediately unsubscribe
+    }
+  }
+
+  /**
+   * Finds a configuration entry in the currentFiltersComputed array
+   * @param configuration The configuration identifier to search for
+   * @returns The filter configuration object if found, otherwise undefined
+   */
+  private findConfigInCurrentFilters(configuration: string) {
+    return this.currentFiltersComputed.find(
+      (configFilter) => configFilter.configuration === configuration
+    );
+  }
+
+  /**
+   * Finds a configuration entry in the finalFiltersComputed array
+   * @param configuration The configuration identifier to search for
+   * @returns The filter configuration object if found, otherwise undefined
+   */
+  private findConfigInFinalFilters(configuration: string) {
+    return this.finalFiltersComputed.find(
+      (configFilter) => configFilter.configuration === configuration
+    );
+  }
+
+  /**
+   * Updates or adds a new entry in the finalFiltersComputed array
+   * @param configuration The configuration identifier to update
+   * @param count The number of computed filters to set for this configuration
+   */
+  private updateFinalFiltersComputed(configuration: string, count: number) {
+    const filterConfig = this.findConfigInFinalFilters(configuration);
+
+    if (filterConfig) {
+      filterConfig.filtersComputed = count;
+    } else {
+      this.finalFiltersComputed.push({
+        configuration,
+        filtersComputed: count
+      });
+    }
+  }
+
+  /**
+   * Gets the current number of computed filters for a specific configuration
+   * @param configuration The configuration identifier to get the count for
+   * @returns The number of computed filters, or 0 if none found
+   */
+  private getCurrentFiltersComputed(configuration: string) {
+    const configFilter = this.findConfigInCurrentFilters(configuration);
+    return configFilter?.filtersComputed || 0;
+  }
+
+  /**
+   * Gets the final number of computed filters for a specific configuration
+   * @param configuration The configuration identifier to get the count for
+   * @returns The number of computed filters in the final state, or 0 if none found
+   */
+  getFinalFiltersComputed(configuration: string): number {
+    const configFilter = this.findConfigInFinalFilters(configuration);
+    return configFilter?.filtersComputed || 0;
+  }
 }
diff --git a/src/app/shared/search/search-labels/search-label/search-label.component.html b/src/app/shared/search/search-labels/search-label/search-label.component.html
index bffb7f9329..a601534271 100644
--- a/src/app/shared/search/search-labels/search-label/search-label.component.html
+++ b/src/app/shared/search/search-labels/search-label/search-label.component.html
@@ -1,6 +1,9 @@
-<a class="badge badge-primary mr-1 mb-1 text-capitalize"
+<a class="badge badge-primary mb-1"
+   [attr.aria-label]="'search.filters.remove' | translate:{ type: ('search.filters.applied.' + key) | translate, value: normalizeFilterValue(value) }"
    [routerLink]="searchLink"
    [queryParams]="(removeParameters | async)" queryParamsHandling="merge">
-    {{('search.filters.applied.' + key) | translate}}: {{'search.filters.' + filterName + '.' + value | translate: {default: normalizeFilterValue(value)} }}
-    <span> ×</span>
+    <span class="d-flex">
+      <span class="flex-grow-1 text-left">{{('search.filters.applied.' + key) | translate}}: {{'search.filters.' + filterName + '.' + value | translate: {default: normalizeFilterValue(value)} }}</span>
+      <span class="pl-1" aria-hidden="true">×</span>
+    </span>
 </a>
diff --git a/src/app/shared/search/search-labels/search-label/search-label.component.scss b/src/app/shared/search/search-labels/search-label/search-label.component.scss
new file mode 100644
index 0000000000..601f57d407
--- /dev/null
+++ b/src/app/shared/search/search-labels/search-label/search-label.component.scss
@@ -0,0 +1,3 @@
+.badge {
+  white-space: inherit;
+}
diff --git a/src/app/shared/search/search-labels/search-label/search-label.component.ts b/src/app/shared/search/search-labels/search-label/search-label.component.ts
index ab4c57d9f5..bdcdc3efdb 100644
--- a/src/app/shared/search/search-labels/search-label/search-label.component.ts
+++ b/src/app/shared/search/search-labels/search-label/search-label.component.ts
@@ -12,6 +12,7 @@ import { stripOperatorFromFilterValue } from '../../search.utils';
 @Component({
   selector: 'ds-search-label',
   templateUrl: './search-label.component.html',
+  styleUrls: ['./search-label.component.scss']                                                        ,
 })
 
 /**
diff --git a/src/app/shared/search/search-labels/search-labels.component.scss b/src/app/shared/search/search-labels/search-labels.component.scss
index c48cd57304..348c46571d 100644
--- a/src/app/shared/search/search-labels/search-labels.component.scss
+++ b/src/app/shared/search/search-labels/search-labels.component.scss
@@ -1,3 +1,10 @@
 :host {
     line-height: 1;
-}
\ No newline at end of file
+  .labels {
+    margin: 0 calc(-1 * var(--bs-spacer)/8);
+    ds-search-label {
+      display: inline-block;
+      padding: 0 calc(var(--bs-spacer)/8);
+    }
+  }
+}
diff --git a/src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.html b/src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.html
new file mode 100644
index 0000000000..c318eea2e1
--- /dev/null
+++ b/src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.html
@@ -0,0 +1,38 @@
+<div class="row flex-nowrap">
+  <div [class.mb-2]="(viewMode$ | async) === ViewMode.ListElement" class="info-skeleton col-12">
+    <ngx-skeleton-loader/>
+  </div>
+</div>
+
+<ng-container *ngIf="(viewMode$ | async) === ViewMode.ListElement; else grid">
+  <ng-container *ngFor="let result of loadingResults; let first = first">
+    <div [class.my-4]="!first" class="row">
+      <div *ngIf="showThumbnails" class="col-3 col-md-2">
+        <div class="thumbnail-skeleton position-relative">
+          <ngx-skeleton-loader/>
+        </div>
+      </div>
+      <div [class.col-9]="showThumbnails" [class.col-md-10]="showThumbnails" [class.col-md-12]="!showThumbnails">
+        <div class="badge-skeleton">
+          <ngx-skeleton-loader/>
+        </div>
+        <div class="text-skeleton">
+          <ngx-skeleton-loader [count]="textLineCount"/>
+        </div>
+      </div>
+    </div>
+  </ng-container>
+</ng-container>
+
+<ng-template #grid>
+  <div class="card-columns row">
+    <ng-container *ngFor="let result of loadingResults">
+      <div class="card-column col col-sm-6 col-lg-4">
+        <div class="card-skeleton">
+          <ngx-skeleton-loader/>
+        </div>
+      </div>
+    </ng-container>
+  </div>
+</ng-template>
+
diff --git a/src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.scss b/src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.scss
new file mode 100644
index 0000000000..9345f1ab43
--- /dev/null
+++ b/src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.scss
@@ -0,0 +1,56 @@
+:host ::ng-deep {
+  --ds-wrapper-grid-spacing: calc(var(--bs-spacer) / 2);
+
+  .info-skeleton, .badge-skeleton, .text-skeleton{
+    ngx-skeleton-loader .skeleton-loader {
+      height: var(--ds-search-skeleton-text-height);
+    }
+  }
+
+  .badge-skeleton, .info-skeleton {
+    ngx-skeleton-loader .skeleton-loader {
+      width: var(--ds-search-skeleton-badge-width);
+    }
+  }
+
+  .info-skeleton {
+    ngx-skeleton-loader .skeleton-loader {
+      width: var(--ds-search-skeleton-info-width);
+    }
+  }
+
+  .thumbnail-skeleton {
+    max-width: var(--ds-thumbnail-max-width);
+    height: 100%;
+
+    ngx-skeleton-loader .skeleton-loader {
+      margin-right: var(--ds-search-skeleton-thumbnail-margin);
+      border-radius: 0;
+      height: 100%;
+    }
+  }
+
+  .card-skeleton {
+    ngx-skeleton-loader .skeleton-loader {
+      height: var(--ds-search-skeleton-card-height);
+    }
+  }
+
+  ngx-skeleton-loader .skeleton-loader {
+    background-color: var(--bs-light);
+    box-shadow: none;
+  }
+
+  .card-columns {
+    margin-left: calc(-1 * var(--ds-wrapper-grid-spacing));
+    margin-right: calc(-1 * var(--ds-wrapper-grid-spacing));
+    column-gap: 0;
+
+    .card-column {
+      padding-left: var(--ds-wrapper-grid-spacing);
+      padding-right: var(--ds-wrapper-grid-spacing);
+    }
+  }
+}
+
+
diff --git a/src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.spec.ts b/src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.spec.ts
new file mode 100644
index 0000000000..86277181fe
--- /dev/null
+++ b/src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.spec.ts
@@ -0,0 +1,33 @@
+import {
+  ComponentFixture,
+  TestBed,
+} from '@angular/core/testing';
+import { NgxSkeletonLoaderModule } from 'ngx-skeleton-loader';
+
+import { SearchService } from '../../../../core/shared/search/search.service';
+import { SearchServiceStub } from '../../../testing/search-service.stub';
+import { SearchResultsSkeletonComponent } from './search-results-skeleton.component';
+
+describe('SearchResultsSkeletonComponent', () => {
+  let component: SearchResultsSkeletonComponent;
+  let fixture: ComponentFixture<SearchResultsSkeletonComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [NgxSkeletonLoaderModule],
+      declarations: [SearchResultsSkeletonComponent],
+      providers: [
+        { provide: SearchService, useValue: new SearchServiceStub() },
+      ],
+    })
+      .compileComponents();
+
+    fixture = TestBed.createComponent(SearchResultsSkeletonComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.ts b/src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.ts
new file mode 100644
index 0000000000..179b26f1fd
--- /dev/null
+++ b/src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.ts
@@ -0,0 +1,59 @@
+import {
+  Component,
+  Input,
+  OnInit,
+} from '@angular/core';
+import { Observable } from 'rxjs';
+
+import { SearchService } from '../../../../core/shared/search/search.service';
+import { ViewMode } from '../../../../core/shared/view-mode.model';
+import { hasValue } from '../../../empty.util';
+
+@Component({
+  selector: 'ds-search-results-skeleton',
+  templateUrl: './search-results-skeleton.component.html',
+  styleUrls: ['./search-results-skeleton.component.scss'],
+})
+/**
+ * Component to show placeholders for search results while loading, to give a loading feedback to the user without layout shifting.
+ */
+export class SearchResultsSkeletonComponent implements OnInit {
+  /**
+   * Whether the search result contains thumbnail
+   */
+  @Input()
+  showThumbnails: boolean;
+  /**
+   * The number of search result loaded in the current page
+   */
+  @Input()
+  numberOfResults = 0;
+  /**
+   * How many placeholder are displayed for the search result text
+   */
+  @Input()
+  textLineCount = 2;
+  /**
+   * The view mode of the search page
+   */
+  public viewMode$: Observable<ViewMode>;
+  /**
+   * Array built from numberOfResults to count and iterate based on index
+   */
+  public loadingResults: number[];
+
+  protected readonly ViewMode = ViewMode;
+
+  constructor(private searchService: SearchService) {
+    this.viewMode$ = this.searchService.getViewMode();
+  }
+
+  ngOnInit() {
+    this.loadingResults = Array.from({ length: this.numberOfResults }, (_, i) => i + 1);
+
+    if (!hasValue(this.showThumbnails)) {
+      // this is needed as the default value of show thumbnails is true but set in lower levels of the DOM.
+      this.showThumbnails = true;
+    }
+  }
+}
diff --git a/src/app/shared/search/search-results/search-results.component.html b/src/app/shared/search/search-results/search-results.component.html
index 11c589254a..c396fce5fb 100644
--- a/src/app/shared/search/search-results/search-results.component.html
+++ b/src/app/shared/search/search-results/search-results.component.html
@@ -1,5 +1,5 @@
 <div class="d-flex justify-content-between">
-    <h2 *ngIf="!disableHeader">{{ (configuration ? configuration + '.search.results.head' : 'search.results.head') | translate }}</h2>
+    <h1 *ngIf="!disableHeader">{{ (configuration ? configuration + '.search.results.head' : 'search.results.head') | translate }}</h1>
     <ds-search-export-csv *ngIf="showCsvExport" [searchConfig]="searchConfig"></ds-search-export-csv>
 </div>
 <div *ngIf="searchResults && searchResults?.hasSucceeded && !searchResults?.isLoading && searchResults?.payload?.page.length > 0" @fadeIn>
@@ -19,14 +19,20 @@
             (selectObject)="selectObject.emit($event)">
     </ds-viewable-collection>
 </div>
-<ds-themed-loading *ngIf="isLoading()" message="{{'loading.search-results' | translate}}"></ds-themed-loading>
+
+<ds-search-results-skeleton
+  *ngIf="isLoading()"
+  [showThumbnails]="showThumbnails"
+  [numberOfResults]="searchConfig.pagination.pageSize"
+></ds-search-results-skeleton>
+
 <ds-error *ngIf="showError()"
           message="{{errorMessageLabel() | translate}}"></ds-error>
 <div *ngIf="searchResults?.payload?.page.length == 0 || searchResults?.statusCode == 400">
     {{ 'search.results.no-results' | translate }}
     <a [routerLink]="['/search']"
        [queryParams]="{ query: surroundStringWithQuotes(searchConfig?.query) }"
-       queryParamsHandling="merge">
+       queryParamsHandling="merge" role="link" tabindex="0">
         {{"search.results.no-results-link" | translate}}
     </a>
 </div>
diff --git a/src/app/shared/search/search-results/search-results.component.scss b/src/app/shared/search/search-results/search-results.component.scss
new file mode 100644
index 0000000000..6e369c729b
--- /dev/null
+++ b/src/app/shared/search/search-results/search-results.component.scss
@@ -0,0 +1,17 @@
+:host ::ng-deep {
+  .filter-badge-skeleton {
+    ngx-skeleton-loader .skeleton-loader {
+      background-color: var(--bs-light);
+      box-shadow: none;
+      width: var(--ds-search-skeleton-filter-badge-width);
+      height: var(--ds-search-skeleton-badge-height);
+      margin-bottom: 0;
+      margin-right: calc(var(--bs-spacer) / 4);
+    }
+  }
+
+  .filters-badge-skeleton-container {
+    display: flex;
+    max-height: var(--ds-search-skeleton-badge-height);
+  }
+}
diff --git a/src/app/shared/search/search-results/search-results.component.spec.ts b/src/app/shared/search/search-results/search-results.component.spec.ts
index 4cc4f84f65..1ef596a4ed 100644
--- a/src/app/shared/search/search-results/search-results.component.spec.ts
+++ b/src/app/shared/search/search-results/search-results.component.spec.ts
@@ -7,6 +7,11 @@ import { TranslateModule } from '@ngx-translate/core';
 import { SearchResultsComponent } from './search-results.component';
 import { QueryParamsDirectiveStub } from '../../testing/query-params-directive.stub';
 import { createFailedRemoteDataObject } from '../../remote-data.utils';
+import { SearchResultsSkeletonComponent } from './search-results-skeleton/search-results-skeleton.component';
+import { SearchConfigurationService } from '../../../core/shared/search/search-configuration.service';
+import { SearchConfigurationServiceStub } from '../../testing/search-configuration-service.stub';
+import { SearchService } from '../../../core/shared/search/search.service';
+import { SearchServiceStub } from '../../testing/search-service.stub';
 
 describe('SearchResultsComponent', () => {
   let comp: SearchResultsComponent;
@@ -19,7 +24,13 @@ describe('SearchResultsComponent', () => {
       imports: [TranslateModule.forRoot(), NoopAnimationsModule],
       declarations: [
         SearchResultsComponent,
-        QueryParamsDirectiveStub],
+        SearchResultsSkeletonComponent,
+        QueryParamsDirectiveStub
+      ],
+      providers: [
+        { provide: SearchConfigurationService, useValue: new SearchConfigurationServiceStub() },
+        { provide: SearchService, useValue: new SearchServiceStub() },
+      ],
       schemas: [NO_ERRORS_SCHEMA]
     }).compileComponents();
   }));
@@ -63,7 +74,7 @@ describe('SearchResultsComponent', () => {
 
   it('should display link with new search where query is quoted if search return a error 400', () => {
     (comp as any).searchResults = createFailedRemoteDataObject('Error', 400);
-    (comp as any).searchConfig = { query: 'foobar' };
+    (comp as any).searchConfig = { query: 'foobar', pagination: { pageSize: 10 } };
     fixture.detectChanges();
 
     const linkDes = fixture.debugElement.queryAll(By.directive(QueryParamsDirectiveStub));
diff --git a/src/app/shared/search/search-results/search-results.component.ts b/src/app/shared/search/search-results/search-results.component.ts
index 15d2cc0f00..9050ce9cd0 100644
--- a/src/app/shared/search/search-results/search-results.component.ts
+++ b/src/app/shared/search/search-results/search-results.component.ts
@@ -11,6 +11,10 @@ import { CollectionElementLinkType } from '../../object-collection/collection-el
 import { ViewMode } from '../../../core/shared/view-mode.model';
 import { Context } from '../../../core/shared/context.model';
 import { PaginatedSearchOptions } from '../models/paginated-search-options.model';
+import { SearchFilter } from '../models/search-filter.model';
+import { Observable } from 'rxjs';
+import { SearchConfigurationService } from '../../../core/shared/search/search-configuration.service';
+import { SearchService } from '../../../core/shared/search/search.service';
 
 export interface SelectionConfig {
   repeatable: boolean;
@@ -19,6 +23,7 @@ export interface SelectionConfig {
 
 @Component({
   selector: 'ds-search-results',
+  styleUrls: ['./search-results.component.scss'],
   templateUrl: './search-results.component.html',
   animations: [
     fadeIn,
@@ -32,6 +37,8 @@ export interface SelectionConfig {
 export class SearchResultsComponent {
   hasNoValue = hasNoValue;
 
+  filters$: Observable<SearchFilter[]>;
+
   /**
    * The link type of the listed search results
    */
@@ -104,6 +111,13 @@ export class SearchResultsComponent {
 
   @Output() selectObject: EventEmitter<ListableObject> = new EventEmitter<ListableObject>();
 
+  constructor(
+    protected searchConfigService: SearchConfigurationService,
+    protected searchService: SearchService,
+  ) {
+    this.filters$ = this.searchConfigService.getCurrentFilters();
+  }
+
   /**
    * Check if search results are loading
    */
diff --git a/src/app/shared/search/search-settings/search-settings.component.html b/src/app/shared/search/search-settings/search-settings.component.html
index 40bca8e4e8..6469f8ce7e 100644
--- a/src/app/shared/search/search-settings/search-settings.component.html
+++ b/src/app/shared/search/search-settings/search-settings.component.html
@@ -4,7 +4,7 @@
     <ds-sidebar-dropdown *ngIf="sortOptionsList"
                          [id]="'search-sidebar-sort'"
                          [label]="'search.sidebar.settings.sort-by'"
-                         (change)="reloadOrder($event)">
+                         (changed)="reloadOrder($event)">
         <option *ngFor="let sortOptionsEntry of sortOptionsList"
                 [value]="sortOptionsEntry.field + ',' + sortOptionsEntry.direction.toString()"
                 [selected]="sortOptionsEntry.field === currentSortOption?.field && sortOptionsEntry.direction === (currentSortOption?.direction)? 'selected': null">
diff --git a/src/app/shared/search/search-settings/search-settings.component.spec.ts b/src/app/shared/search/search-settings/search-settings.component.spec.ts
index d0b51f04b1..bdcdb6f171 100644
--- a/src/app/shared/search/search-settings/search-settings.component.spec.ts
+++ b/src/app/shared/search/search-settings/search-settings.component.spec.ts
@@ -1,4 +1,3 @@
-import { SearchService } from '../../../core/shared/search/search.service';
 import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
 import { SearchSettingsComponent } from './search-settings.component';
 import { of as observableOf } from 'rxjs';
@@ -6,15 +5,11 @@ import { PaginationComponentOptions } from '../../pagination/pagination-componen
 import { SortDirection, SortOptions } from '../../../core/cache/models/sort-options.model';
 import { TranslateModule } from '@ngx-translate/core';
 import { RouterTestingModule } from '@angular/router/testing';
-import { ActivatedRoute } from '@angular/router';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
 import { EnumKeysPipe } from '../../utils/enum-keys-pipe';
 import { By } from '@angular/platform-browser';
-import { SearchFilterService } from '../../../core/shared/search/search-filter.service';
 import { VarDirective } from '../../utils/var.directive';
 import { SEARCH_CONFIG_SERVICE } from '../../../my-dspace-page/my-dspace-page.component';
-import { SidebarService } from '../../sidebar/sidebar.service';
-import { SidebarServiceStub } from '../../testing/sidebar-service.stub';
 import { PaginationService } from '../../../core/pagination/pagination.service';
 import { PaginationServiceStub } from '../../testing/pagination-service.stub';
 
@@ -22,32 +17,23 @@ describe('SearchSettingsComponent', () => {
 
   let comp: SearchSettingsComponent;
   let fixture: ComponentFixture<SearchSettingsComponent>;
-  let searchServiceObject: SearchService;
 
   let pagination: PaginationComponentOptions;
   let sort: SortOptions;
-  let mockResults;
-  let searchServiceStub;
 
   let queryParam;
   let scopeParam;
   let paginatedSearchOptions;
 
-  let paginationService;
+  let paginationService: PaginationServiceStub;
 
-  let activatedRouteStub;
 
-  beforeEach(waitForAsync(() => {
+  beforeEach(waitForAsync(async () => {
     pagination = new PaginationComponentOptions();
     pagination.id = 'search-results-pagination';
     pagination.currentPage = 1;
     pagination.pageSize = 10;
     sort = new SortOptions('score', SortDirection.DESC);
-    mockResults = ['test', 'data'];
-    searchServiceStub = {
-      searchOptions: { pagination: pagination, sort: sort },
-      search: () => mockResults,
-    };
 
     queryParam = 'test query';
     scopeParam = '7669c72a-3f2a-451f-a3b9-9210e7a4c02f';
@@ -58,30 +44,12 @@ describe('SearchSettingsComponent', () => {
       sort,
     };
 
-    activatedRouteStub = {
-      queryParams: observableOf({
-        query: queryParam,
-        scope: scopeParam,
-      }),
-    };
-
     paginationService = new PaginationServiceStub(pagination, sort);
 
-    TestBed.configureTestingModule({
+    await TestBed.configureTestingModule({
       imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([])],
       declarations: [SearchSettingsComponent, EnumKeysPipe, VarDirective],
       providers: [
-        { provide: SearchService, useValue: searchServiceStub },
-
-        { provide: ActivatedRoute, useValue: activatedRouteStub },
-        {
-          provide: SidebarService,
-          useValue: SidebarServiceStub,
-        },
-        {
-          provide: SearchFilterService,
-          useValue: {},
-        },
         {
           provide: PaginationService,
           useValue: paginationService,
@@ -111,10 +79,7 @@ describe('SearchSettingsComponent', () => {
 
     // SearchPageComponent test instance
     fixture.detectChanges();
-    searchServiceObject = (comp as any).service;
     spyOn(comp, 'reloadOrder');
-    spyOn(searchServiceObject, 'search').and.callThrough();
-
   });
 
   it('it should show the order settings with the respective selectable options', () => {
diff --git a/src/app/shared/search/search-settings/search-settings.component.ts b/src/app/shared/search/search-settings/search-settings.component.ts
index 0efd38b5b2..23c9e78c3a 100644
--- a/src/app/shared/search/search-settings/search-settings.component.ts
+++ b/src/app/shared/search/search-settings/search-settings.component.ts
@@ -1,7 +1,5 @@
 import { Component, Inject, Input } from '@angular/core';
-import { SearchService } from '../../../core/shared/search/search.service';
 import { SortDirection, SortOptions } from '../../../core/cache/models/sort-options.model';
-import { ActivatedRoute, Router } from '@angular/router';
 import { SearchConfigurationService } from '../../../core/shared/search/search-configuration.service';
 import { SEARCH_CONFIG_SERVICE } from '../../../my-dspace-page/my-dspace-page.component';
 import { PaginationService } from '../../../core/pagination/pagination.service';
@@ -26,11 +24,10 @@ export class SearchSettingsComponent {
    */
   @Input() sortOptionsList: SortOptions[];
 
-  constructor(private service: SearchService,
-              private route: ActivatedRoute,
-              private router: Router,
-              private paginationService: PaginationService,
-              @Inject(SEARCH_CONFIG_SERVICE) public searchConfigurationService: SearchConfigurationService) {
+  constructor(
+    protected paginationService: PaginationService,
+    @Inject(SEARCH_CONFIG_SERVICE) public searchConfigurationService: SearchConfigurationService,
+  ) {
   }
 
   /**
diff --git a/src/app/shared/search/search-sidebar/search-sidebar.component.html b/src/app/shared/search/search-sidebar/search-sidebar.component.html
index f489de5d28..529f1de887 100644
--- a/src/app/shared/search/search-sidebar/search-sidebar.component.html
+++ b/src/app/shared/search/search-sidebar/search-sidebar.component.html
@@ -2,9 +2,10 @@
     <div id="sidebar-options" class="d-block d-md-none search-controls clearfix">
         <small class="results">{{resultCount}} {{"search.sidebar.results" | translate}}</small>
         <button (click)="toggleSidebar.emit()"
-                aria-controls="#search-body"
+                [attr.aria-label]="'search.sidebar.close' | translate"
+                aria-controls="search-content"
                 class="btn btn-outline-primary float-right close-sidebar"><i
-                class="fas fa-arrow-right" [title]="'search.sidebar.close' | translate"></i> {{"search.sidebar.close" | translate}}
+                class="fas fa-arrow-right"></i> {{'search.sidebar.close' | translate}}
         </button>
     </div>
     <div id="search-sidebar-content">
diff --git a/src/app/shared/search/search-switch-configuration/search-switch-configuration.component.html b/src/app/shared/search/search-switch-configuration/search-switch-configuration.component.html
index f63bf9fa84..64c0cd5008 100644
--- a/src/app/shared/search/search-switch-configuration/search-switch-configuration.component.html
+++ b/src/app/shared/search/search-switch-configuration/search-switch-configuration.component.html
@@ -1,5 +1,5 @@
 <div *ngIf="configurationList?.length > 1" class="search-switch-configuration">
-  <h5 id="configuration-switch">{{ 'search.switch-configuration.title' | translate}}</h5>
+  <h3 id="configuration-switch">{{ 'search.switch-configuration.title' | translate}}</h3>
 
   <select class="form-control"
           aria-labelledby="configuration-switch"
diff --git a/src/app/shared/search/search.component.html b/src/app/shared/search/search.component.html
index d43f506866..845e1e7af5 100644
--- a/src/app/shared/search/search.component.html
+++ b/src/app/shared/search/search.component.html
@@ -23,7 +23,8 @@
         <div id="search-content" class="col-12">
             <div class="d-block d-md-none search-controls clearfix">
                 <ds-view-mode-switch [viewModeList]="viewModeList" [inPlaceSearch]="inPlaceSearch"></ds-view-mode-switch>
-                <button (click)="openSidebar()" aria-controls="#search-body"
+                <button [attr.aria-label]="'search.sidebar.open' | translate" (click)="openSidebar()"
+                        aria-controls="search-sidebar-content"
                         class="btn btn-outline-primary float-right open-sidebar"><i
                         class="fas fa-sliders"></i> {{"search.sidebar.open"
                         | translate}}
@@ -89,8 +90,8 @@
                     [inPlaceSearch]="inPlaceSearch"
                     [searchPlaceholder]="searchFormPlaceholder | translate">
     </ds-themed-search-form>
-    <div class="row mb-3 mb-md-1">
-        <div class="labels col-sm-9">
+    <div class="mb-3 mb-md-1">
+        <div class="labels">
             <ds-search-labels *ngIf="searchEnabled" [inPlaceSearch]="inPlaceSearch"></ds-search-labels>
         </div>
     </div>
diff --git a/src/app/shared/search/search.component.spec.ts b/src/app/shared/search/search.component.spec.ts
index d0d9bdda86..05d4fc6b85 100644
--- a/src/app/shared/search/search.component.spec.ts
+++ b/src/app/shared/search/search.component.spec.ts
@@ -1,4 +1,4 @@
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
+import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA, PLATFORM_ID } from '@angular/core';
 
 import { ComponentFixture, fakeAsync, TestBed, tick, waitForAsync } from '@angular/core/testing';
 import { RouterTestingModule } from '@angular/router/testing';
@@ -20,6 +20,7 @@ import { SidebarService } from '../sidebar/sidebar.service';
 import { SearchFilterService } from '../../core/shared/search/search-filter.service';
 import { SearchConfigurationService } from '../../core/shared/search/search-configuration.service';
 import { SEARCH_CONFIG_SERVICE } from '../../my-dspace-page/my-dspace-page.component';
+import { XSRFService } from '../../core/xsrf/xsrf.service';
 import { RouteService } from '../../core/services/route.service';
 import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../remote-data.utils';
 import { PaginatedSearchOptions } from './models/paginated-search-options.model';
@@ -33,11 +34,11 @@ import { SearchFilterConfig } from './models/search-filter-config.model';
 import { FilterType } from './models/filter-type.model';
 import { getCommunityPageRoute } from '../../community-page/community-page-routing-paths';
 import { getCollectionPageRoute } from '../../collection-page/collection-page-routing-paths';
+import { environment } from '../../../environments/environment.test';
+import { APP_CONFIG } from '../../../config/app-config.interface';
 
 let comp: SearchComponent;
 let fixture: ComponentFixture<SearchComponent>;
-let searchServiceObject: SearchService;
-let searchConfigurationServiceObject: SearchConfigurationService;
 const store: Store<SearchComponent> = jasmine.createSpyObj('store', {
   /* eslint-disable no-empty,@typescript-eslint/no-empty-function */
   dispatch: {},
@@ -93,7 +94,6 @@ const mockDso2 = Object.assign(new Item(), {
     }
   }
 });
-const sort: SortOptions = new SortOptions('score', SortDirection.DESC);
 const mockSearchResults: SearchObjects<DSpaceObject> = Object.assign(new SearchObjects(), {
   page: [mockDso, mockDso2]
 });
@@ -106,23 +106,14 @@ const searchServiceStub = jasmine.createSpyObj('SearchService', {
   getSearchConfigurationFor: createSuccessfulRemoteDataObject$(searchConfig),
   trackSearch: {},
 }) as SearchService;
-const configurationParam = 'default';
 const queryParam = 'test query';
+const hiddenQuery = 'hidden query';
 const scopeParam = '7669c72a-3f2a-451f-a3b9-9210e7a4c02f';
-const fixedFilter = 'fixed filter';
 
 const defaultSearchOptions = new PaginatedSearchOptions({ pagination });
 
 const paginatedSearchOptions$ = new BehaviorSubject(defaultSearchOptions);
 
-const paginatedSearchOptions = new PaginatedSearchOptions({
-  configuration: configurationParam,
-  query: queryParam,
-  scope: scopeParam,
-  fixedFilter: fixedFilter,
-  pagination,
-  sort
-});
 const activatedRouteStub = {
   snapshot: {
     queryParamMap: new Map([
@@ -155,14 +146,11 @@ const filtersConfigRD = createSuccessfulRemoteDataObject([mockFilterConfig, mock
 const filtersConfigRD$ = observableOf(filtersConfigRD);
 
 const routeServiceStub = {
-  getRouteParameterValue: () => {
-    return observableOf('');
-  },
   getQueryParameterValue: () => {
-    return observableOf('');
+    return observableOf(null);
   },
   getQueryParamsWithPrefix: () => {
-    return observableOf('');
+    return observableOf(null);
   },
   setParameter: () => {
     return;
@@ -222,10 +210,13 @@ export function configureSearchComponentTestingModule(compType, additionalDeclar
         provide: SearchFilterService,
         useValue: {}
       },
+      { provide: XSRFService, useValue: {} },
       {
         provide: SEARCH_CONFIG_SERVICE,
         useValue: searchConfigurationServiceStub
-      }
+      },
+      { provide: APP_CONFIG, useValue: environment },
+      { provide: PLATFORM_ID, useValue: 'browser' },
     ],
     schemas: [NO_ERRORS_SCHEMA]
   }).overrideComponent(compType, {
@@ -250,18 +241,13 @@ describe('SearchComponent', () => {
     comp = fixture.componentInstance; // SearchComponent test instance
     comp.inPlaceSearch = false;
     comp.paginationId = paginationId;
+    comp.hiddenQuery = hiddenQuery;
 
     spyOn((comp as any), 'getSearchOptions').and.returnValue(paginatedSearchOptions$.asObservable());
-
-    searchServiceObject = TestBed.inject(SearchService);
-    searchConfigurationServiceObject = TestBed.inject(SEARCH_CONFIG_SERVICE);
-
   });
 
   afterEach(() => {
     comp = null;
-    searchServiceObject = null;
-    searchConfigurationServiceObject = null;
   });
 
   it('should init search parameters properly and call retrieveSearchResults', fakeAsync(() => {
@@ -389,5 +375,34 @@ describe('SearchComponent', () => {
         expect(result).toBeNull();
       });
     });
+
+    describe('when rendered in SSR', () => {
+      beforeEach(() => {
+        comp.platformId = 'server';
+      });
+
+      it('should not call search method on init', (done) => {
+        comp.ngOnInit();
+        //Check that the first method from which the search depend upon is not being called
+        expect(searchConfigurationServiceStub.getCurrentConfiguration).not.toHaveBeenCalled();
+        comp.initialized$.subscribe((res) => {
+          expect(res).toBeTruthy();
+          done();
+        });
+      });
+    });
+
+    describe('when rendered in CSR', () => {
+      beforeEach(() => {
+        comp.platformId = 'browser';
+      });
+
+      it('should call search method on init', fakeAsync(() => {
+        comp.ngOnInit();
+        tick(100);
+        //Check that the last method from which the search depend upon is being called
+        expect(searchServiceStub.search).toHaveBeenCalled();
+      }));
+    });
   });
 });
diff --git a/src/app/shared/search/search.component.ts b/src/app/shared/search/search.component.ts
index 61f3a119c8..527d2d2719 100644
--- a/src/app/shared/search/search.component.ts
+++ b/src/app/shared/search/search.component.ts
@@ -1,4 +1,14 @@
-import { ChangeDetectionStrategy, Component, EventEmitter, Inject, Input, OnInit, Output } from '@angular/core';
+import {
+  ChangeDetectionStrategy,
+  Component,
+  EventEmitter,
+  Inject,
+  Input,
+  OnInit,
+  Output,
+  OnDestroy,
+  PLATFORM_ID
+} from '@angular/core';
 import { NavigationStart, Router } from '@angular/router';
 
 import { BehaviorSubject, combineLatest, Observable, Subscription } from 'rxjs';
@@ -11,7 +21,7 @@ import { DSpaceObject } from '../../core/shared/dspace-object.model';
 import { pushInOut } from '../animations/push';
 import { HostWindowService } from '../host-window.service';
 import { SidebarService } from '../sidebar/sidebar.service';
-import { hasValue, hasValueOperator, isNotEmpty } from '../empty.util';
+import { hasValue, hasValueOperator, isEmpty, isNotEmpty } from '../empty.util';
 import { RouteService } from '../../core/services/route.service';
 import { SEARCH_CONFIG_SERVICE } from '../../my-dspace-page/my-dspace-page.component';
 import { PaginatedSearchOptions } from './models/paginated-search-options.model';
@@ -31,13 +41,15 @@ import { ViewMode } from '../../core/shared/view-mode.model';
 import { SelectionConfig } from './search-results/search-results.component';
 import { ListableObject } from '../object-collection/shared/listable-object.model';
 import { CollectionElementLinkType } from '../object-collection/collection-element-link.type';
-import { environment } from 'src/environments/environment';
 import { SubmissionObject } from '../../core/submission/models/submission-object.model';
 import { SearchFilterConfig } from './models/search-filter-config.model';
-import { WorkspaceItem } from '../..//core/submission/models/workspaceitem.model';
+import { WorkspaceItem } from '../../core/submission/models/workspaceitem.model';
 import { ITEM_MODULE_PATH } from '../../item-page/item-page-routing-paths';
 import { COLLECTION_MODULE_PATH } from '../../collection-page/collection-page-routing-paths';
 import { COMMUNITY_MODULE_PATH } from '../../community-page/community-page-routing-paths';
+import { AppConfig, APP_CONFIG } from '../../../config/app-config.interface';
+import { isPlatformServer } from '@angular/common';
+import { environment } from 'src/environments/environment';
 
 @Component({
   selector: 'ds-search',
@@ -50,7 +62,7 @@ import { COMMUNITY_MODULE_PATH } from '../../community-page/community-page-routi
 /**
  * This component renders a sidebar, a search input bar and the search results.
  */
-export class SearchComponent implements OnInit {
+export class SearchComponent implements OnDestroy, OnInit {
 
   /**
    * The list of available configuration options
@@ -75,6 +87,11 @@ export class SearchComponent implements OnInit {
    */
   @Input() fixedFilterQuery: string;
 
+  /**
+   * A hidden query that will be used but not displayed in the url/searchbar
+   */
+  @Input() hiddenQuery: string;
+
   /**
    * If this is true, the request will only be sent if there's
    * no valid cached version. Defaults to true
@@ -166,6 +183,16 @@ export class SearchComponent implements OnInit {
    */
   @Input() query: string;
 
+  /**
+   * The fallback scope when no scope is defined in the url, if this is also undefined no scope will be set
+   */
+  @Input() scope: string;
+
+  /**
+   * Defines whether to fetch search results during SSR execution
+   */
+  @Input() renderOnServerSide = false;
+
   /**
    * The current configuration used during the search
    */
@@ -179,7 +206,7 @@ export class SearchComponent implements OnInit {
   /**
    * The current sort options used
    */
-  currentScope$: BehaviorSubject<string> = new BehaviorSubject<string>('');
+  currentScope$: Observable<string>;
 
   /**
    * The current sort options used
@@ -273,7 +300,10 @@ export class SearchComponent implements OnInit {
               protected windowService: HostWindowService,
               @Inject(SEARCH_CONFIG_SERVICE) public searchConfigService: SearchConfigurationService,
               protected routeService: RouteService,
-              protected router: Router) {
+              protected router: Router,
+              @Inject(APP_CONFIG) protected appConfig: AppConfig,
+              @Inject(PLATFORM_ID) public platformId: any,
+  ) {
     this.isXsOrSm$ = this.windowService.isXsOrSm();
   }
 
@@ -285,6 +315,14 @@ export class SearchComponent implements OnInit {
    * If something changes, update the list of scopes for the dropdown
    */
   ngOnInit(): void {
+    if (!this.renderOnServerSide && !environment.universal.enableSearchComponent && isPlatformServer(this.platformId)) {
+      this.subs.push(this.getSearchOptions().pipe(distinctUntilChanged()).subscribe((options) => {
+        this.searchOptions$.next(options);
+      }));
+      this.initialized$.next(true);
+      return;
+    }
+
     if (this.useUniquePageId) {
       // Create an unique pagination id related to the instance of the SearchComponent
       this.paginationId = uniqueId(this.paginationId);
@@ -299,6 +337,10 @@ export class SearchComponent implements OnInit {
       this.routeService.setParameter('fixedFilterQuery', this.fixedFilterQuery);
     }
 
+    this.currentScope$ = this.routeService.getQueryParameterValue('scope').pipe(
+      map((routeValue: string) => hasValue(routeValue) ? routeValue : this.scope),
+    );
+
     this.isSidebarCollapsed$ = this.isSidebarCollapsed();
     this.searchLink = this.getSearchLink();
     this.currentContext$.next(this.context);
@@ -306,9 +348,8 @@ export class SearchComponent implements OnInit {
     // Determinate PaginatedSearchOptions and listen to any update on it
     const configuration$: Observable<string> = this.searchConfigService
       .getCurrentConfiguration(this.configuration).pipe(distinctUntilChanged());
-    const searchSortOptions$: Observable<SortOptions[]> = configuration$.pipe(
-      switchMap((configuration: string) => this.searchConfigService
-        .getConfigurationSearchConfig(configuration)),
+    const searchSortOptions$: Observable<SortOptions[]> = combineLatest([configuration$, this.currentScope$]).pipe(
+      switchMap(([configuration, scope]: [string, string]) => this.searchConfigService.getConfigurationSearchConfig(configuration, scope)),
       map((searchConfig: SearchConfig) => this.searchConfigService.getConfigurationSortOptions(searchConfig)),
       distinctUntilChanged()
     );
@@ -321,13 +362,13 @@ export class SearchComponent implements OnInit {
     );
     const searchOptions$: Observable<PaginatedSearchOptions> = this.getSearchOptions().pipe(distinctUntilChanged());
 
-    this.subs.push(combineLatest([configuration$, searchSortOptions$, searchOptions$, sortOption$]).pipe(
-      filter(([configuration, searchSortOptions, searchOptions, sortOption]: [string, SortOptions[], PaginatedSearchOptions, SortOptions]) => {
+    this.subs.push(combineLatest([configuration$, searchSortOptions$, searchOptions$, sortOption$, this.currentScope$]).pipe(
+      filter(([configuration, searchSortOptions, searchOptions, sortOption, scope]: [string, SortOptions[], PaginatedSearchOptions, SortOptions, string]) => {
         // filter for search options related to instanced paginated id
         return searchOptions.pagination.id === this.paginationId;
       }),
       debounceTime(100)
-    ).subscribe(([configuration, searchSortOptions, searchOptions, sortOption]: [string, SortOptions[], PaginatedSearchOptions, SortOptions]) => {
+    ).subscribe(([configuration, searchSortOptions, searchOptions, sortOption, scope]: [string, SortOptions[], PaginatedSearchOptions, SortOptions, string]) => {
       // Build the PaginatedSearchOptions object
       const combinedOptions = Object.assign({}, searchOptions,
         {
@@ -337,6 +378,9 @@ export class SearchComponent implements OnInit {
       if (combinedOptions.query === '') {
         combinedOptions.query = this.query;
       }
+      if (isEmpty(combinedOptions.scope)) {
+        combinedOptions.scope = scope;
+      }
       const newSearchOptions = new PaginatedSearchOptions(combinedOptions);
       // check if search options are changed
       // if so retrieve new related results otherwise skip it
@@ -344,13 +388,12 @@ export class SearchComponent implements OnInit {
         // Initialize variables
         this.currentConfiguration$.next(configuration);
         this.currentSortOptions$.next(newSearchOptions.sort);
-        this.currentScope$.next(newSearchOptions.scope);
         this.sortOptionsList$.next(searchSortOptions);
         this.searchOptions$.next(newSearchOptions);
         this.initialized$.next(true);
         // retrieve results
         this.retrieveSearchResults(newSearchOptions);
-        this.retrieveFilters(searchOptions);
+        this.retrieveFilters(newSearchOptions);
       }
     }));
 
@@ -435,13 +478,25 @@ export class SearchComponent implements OnInit {
     let followLinks = [
       followLink<Item>('thumbnail', { isOptional: true }),
       followLink<SubmissionObject>('item', { isOptional: true }, followLink<Item>('thumbnail', { isOptional: true })) as any,
-      followLink<Item>('accessStatus', { isOptional: true, shouldEmbed: environment.item.showAccessStatuses }),
     ];
+    if (this.appConfig.item.showAccessStatuses) {
+      followLinks.push(followLink<Item>('accessStatus', { isOptional: true }));
+    }
     if (this.configuration === 'supervision') {
       followLinks.push(followLink<WorkspaceItem>('supervisionOrders', { isOptional: true }) as any);
     }
+
+    const searchOptionsWithHidden = Object.assign (new PaginatedSearchOptions({}), searchOptions);
+    if (isNotEmpty(this.hiddenQuery)) {
+      if (isNotEmpty(searchOptionsWithHidden.query)) {
+        searchOptionsWithHidden.query = searchOptionsWithHidden.query + ' AND ' + this.hiddenQuery;
+      } else {
+        searchOptionsWithHidden.query = this.hiddenQuery;
+      }
+    }
+
     this.service.search(
-      searchOptions,
+      searchOptionsWithHidden,
       undefined,
       this.useCachedVersionIfAvailable,
       true,
@@ -450,7 +505,7 @@ export class SearchComponent implements OnInit {
       .subscribe((results: RemoteData<SearchObjects<DSpaceObject>>) => {
         if (results.hasSucceeded) {
           if (this.trackStatistics) {
-            this.service.trackSearch(searchOptions, results.payload);
+            this.service.trackSearch(searchOptionsWithHidden, results.payload);
           }
           if (results.payload?.page?.length > 0) {
             this.resultFound.emit(results.payload);
diff --git a/src/app/shared/search/search.module.ts b/src/app/shared/search/search.module.ts
index 69500999a8..e2075a5f56 100644
--- a/src/app/shared/search/search.module.ts
+++ b/src/app/shared/search/search.module.ts
@@ -34,6 +34,10 @@ import { ThemedSearchSettingsComponent } from './search-settings/themed-search-s
 import { NouisliderModule } from 'ng2-nouislider';
 import { ThemedSearchFiltersComponent } from './search-filters/themed-search-filters.component';
 import { ThemedSearchSidebarComponent } from './search-sidebar/themed-search-sidebar.component';
+import { NgxSkeletonLoaderModule } from 'ngx-skeleton-loader';
+import {
+  SearchResultsSkeletonComponent
+} from './search-results/search-results-skeleton/search-results-skeleton.component';
 
 const COMPONENTS = [
   SearchComponent,
@@ -62,6 +66,7 @@ const COMPONENTS = [
   ThemedSearchSettingsComponent,
   ThemedSearchFiltersComponent,
   ThemedSearchSidebarComponent,
+  SearchResultsSkeletonComponent
 ];
 
 const ENTRY_COMPONENTS = [
@@ -74,6 +79,7 @@ const ENTRY_COMPONENTS = [
   SearchFacetSelectedOptionComponent,
   SearchFacetRangeOptionComponent,
   SearchAuthorityFilterComponent,
+  SearchResultsSkeletonComponent
 ];
 
 /**
@@ -93,11 +99,12 @@ export const MODELS = [
   imports: [
     CommonModule,
     TranslateModule.forChild({
-      missingTranslationHandler: { provide: MissingTranslationHandler, useClass: MissingTranslationHelper },
+      missingTranslationHandler: {provide: MissingTranslationHandler, useClass: MissingTranslationHelper},
       useDefaultLang: true
     }),
     SharedModule.withEntryComponents(),
     NouisliderModule,
+    NgxSkeletonLoaderModule,
   ],
   exports: [
     ...COMPONENTS
diff --git a/src/app/shared/search/themed-search.component.ts b/src/app/shared/search/themed-search.component.ts
index fe531e4f0f..a0f69a7f6e 100644
--- a/src/app/shared/search/themed-search.component.ts
+++ b/src/app/shared/search/themed-search.component.ts
@@ -15,11 +15,38 @@ import { ListableObject } from '../object-collection/shared/listable-object.mode
  */
 @Component({
   selector: 'ds-themed-search',
-  styleUrls: [],
   templateUrl: '../theme-support/themed.component.html',
 })
 export class ThemedSearchComponent extends ThemedComponent<SearchComponent> {
-  protected inAndOutputNames: (keyof SearchComponent & keyof this)[] = ['configurationList', 'context', 'configuration', 'fixedFilterQuery', 'useCachedVersionIfAvailable', 'inPlaceSearch', 'linkType', 'paginationId', 'searchEnabled', 'sideBarWidth', 'searchFormPlaceholder', 'selectable', 'selectionConfig', 'showCsvExport', 'showSidebar', 'showThumbnails', 'showViewModes', 'useUniquePageId', 'viewModeList', 'showScopeSelector', 'resultFound', 'deselectObject', 'selectObject', 'trackStatistics', 'query'];
+  protected inAndOutputNames: (keyof SearchComponent & keyof this)[] = [
+    'configurationList',
+    'context',
+    'configuration',
+    'fixedFilterQuery',
+    'hiddenQuery',
+    'useCachedVersionIfAvailable',
+    'inPlaceSearch',
+    'linkType',
+    'paginationId',
+    'searchEnabled',
+    'sideBarWidth',
+    'searchFormPlaceholder',
+    'selectable',
+    'selectionConfig',
+    'showCsvExport',
+    'showSidebar',
+    'showThumbnails',
+    'showViewModes',
+    'useUniquePageId',
+    'viewModeList',
+    'showScopeSelector',
+    'trackStatistics',
+    'query',
+    'scope',
+    'resultFound',
+    'deselectObject',
+    'selectObject',
+  ];
 
   @Input() configurationList: SearchConfigurationOption[];
 
@@ -29,6 +56,8 @@ export class ThemedSearchComponent extends ThemedComponent<SearchComponent> {
 
   @Input() fixedFilterQuery: string;
 
+  @Input() hiddenQuery: string;
+
   @Input() useCachedVersionIfAvailable: boolean;
 
   @Input() inPlaceSearch: boolean;
@@ -51,7 +80,7 @@ export class ThemedSearchComponent extends ThemedComponent<SearchComponent> {
 
   @Input() showSidebar: boolean;
 
-  @Input() showThumbnails;
+  @Input() showThumbnails: boolean;
 
   @Input() showViewModes: boolean;
 
@@ -65,6 +94,8 @@ export class ThemedSearchComponent extends ThemedComponent<SearchComponent> {
 
   @Input() query: string;
 
+  @Input() scope: string;
+
   @Output() resultFound: EventEmitter<SearchObjects<DSpaceObject>> = new EventEmitter();
 
   @Output() deselectObject: EventEmitter<ListableObject> = new EventEmitter();
diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts
index 0f7871f7f9..3f3cfdc239 100644
--- a/src/app/shared/shared.module.ts
+++ b/src/app/shared/shared.module.ts
@@ -192,6 +192,7 @@ import {
 import { LogInContainerComponent } from './log-in/container/log-in-container.component';
 import { LogInPasswordComponent } from './log-in/methods/password/log-in-password.component';
 import { LogInComponent } from './log-in/log-in.component';
+import { ThemedLogInComponent } from './log-in/themed-log-in.component';
 import { MissingTranslationHelper } from './translate/missing-translation.helper';
 import { FileValidator } from './utils/require-file.validator';
 import { FileValueAccessorDirective } from './utils/file-value-accessor.directive';
@@ -273,9 +274,6 @@ import {
   AdvancedClaimedTaskActionRatingComponent
 } from './mydspace-actions/claimed-task/rating/advanced-claimed-task-action-rating.component';
 import { ClaimedTaskActionsDeclineTaskComponent } from './mydspace-actions/claimed-task/decline-task/claimed-task-actions-decline-task.component';
-import {
-  DsoPageSubscriptionButtonComponent
-} from './dso-page/dso-page-subscription-button/dso-page-subscription-button.component';
 import { EpersonGroupListComponent } from './eperson-group-list/eperson-group-list.component';
 import { EpersonSearchBoxComponent } from './eperson-group-list/eperson-search-box/eperson-search-box.component';
 import { GroupSearchBoxComponent } from './eperson-group-list/group-search-box/group-search-box.component';
@@ -284,6 +282,11 @@ import {
 } from '../item-page/simple/field-components/specific-field/title/themed-item-page-field.component';
 import { BitstreamListItemComponent } from './object-list/bitstream-list-item/bitstream-list-item.component';
 import { NgxPaginationModule } from 'ngx-pagination';
+import { ThemedLangSwitchComponent } from './lang-switch/themed-lang-switch.component';
+import {ThemedUserMenuComponent} from './auth-nav-menu/user-menu/themed-user-menu.component';
+import { OrcidBadgeAndTooltipComponent } from './orcid-badge-and-tooltip/orcid-badge-and-tooltip.component';
+import { LiveRegionComponent } from './live-region/live-region.component';
+import {BtnDisabledDirective} from './btn-disabled.directive';
 
 const MODULES = [
   CommonModule,
@@ -332,12 +335,15 @@ const COMPONENTS = [
   AuthNavMenuComponent,
   ThemedAuthNavMenuComponent,
   UserMenuComponent,
+  ThemedUserMenuComponent,
   DsSelectComponent,
   ErrorComponent,
   LangSwitchComponent,
+  ThemedLangSwitchComponent,
   LoadingComponent,
   ThemedLoadingComponent,
   LogInComponent,
+  ThemedLogInComponent,
   LogOutComponent,
   ObjectListComponent,
   ThemedObjectListComponent,
@@ -395,13 +401,13 @@ const COMPONENTS = [
   ItemPageTitleFieldComponent,
   ThemedSearchNavbarComponent,
   ListableNotificationObjectComponent,
-  DsoPageSubscriptionButtonComponent,
   MetadataFieldWrapperComponent,
   ContextHelpWrapperComponent,
   EpersonGroupListComponent,
   EpersonSearchBoxComponent,
   GroupSearchBoxComponent,
   ThemedItemPageTitleFieldComponent,
+  OrcidBadgeAndTooltipComponent,
 ];
 
 const ENTRY_COMPONENTS = [
@@ -465,7 +471,8 @@ const ENTRY_COMPONENTS = [
   AdvancedClaimedTaskActionRatingComponent,
   EpersonGroupListComponent,
   EpersonSearchBoxComponent,
-  GroupSearchBoxComponent
+  GroupSearchBoxComponent,
+  LiveRegionComponent,
 ];
 
 const PROVIDERS = [
@@ -491,6 +498,7 @@ const DIRECTIVES = [
   MetadataFieldValidator,
   HoverClassDirective,
   ContextHelpDirective,
+  BtnDisabledDirective,
 ];
 
 @NgModule({
diff --git a/src/app/shared/sidebar/page-with-sidebar.component.html b/src/app/shared/sidebar/page-with-sidebar.component.html
index 9feb6c792e..75f40ef8d6 100644
--- a/src/app/shared/sidebar/page-with-sidebar.component.html
+++ b/src/app/shared/sidebar/page-with-sidebar.component.html
@@ -3,10 +3,12 @@
     <div class="row-with-sidebar row-offcanvas row-offcanvas-left"
          [@pushInOut]="(isSidebarCollapsed$ | async) ? 'collapsed' : 'expanded'">
       <div id="{{id}}-sidebar-content"
+           [class.invisible]="(isSidebarCollapsed$ | async) === true && (isXsOrSm$ | async) === true"
            class="col-12 col-md-{{sideBarWidth}} sidebar-content {{sidebarClasses | async}}">
         <ng-container *ngTemplateOutlet="sidebarContent"></ng-container>
       </div>
-      <div class="col-12 col-md-{{12 - sideBarWidth}}">
+      <div class="col-12 col-md-{{12 - sideBarWidth}}"
+           [class.invisible]="(isSidebarCollapsed$ | async) === false && (isXsOrSm$ | async) === true">
         <ng-content></ng-content>
       </div>
     </div>
diff --git a/src/app/shared/sidebar/sidebar-dropdown.component.html b/src/app/shared/sidebar/sidebar-dropdown.component.html
index 0c2a1c05d2..644e1e0d27 100644
--- a/src/app/shared/sidebar/sidebar-dropdown.component.html
+++ b/src/app/shared/sidebar/sidebar-dropdown.component.html
@@ -1,6 +1,6 @@
 <div class="setting-option mb-3 p-3">
-  <h5><label for="{{id}}">{{label | translate}}</label></h5>
-  <select id="{{id}}" class="form-control" (change)="change.emit($event)">
+  <h4><label for="{{id}}">{{label | translate}}</label></h4>
+  <select id="{{id}}" class="form-control" (change)="changed.emit($event)">
     <ng-content></ng-content>
   </select>
 </div>
diff --git a/src/app/shared/sidebar/sidebar-dropdown.component.ts b/src/app/shared/sidebar/sidebar-dropdown.component.ts
index 471d357e25..030b7487a9 100644
--- a/src/app/shared/sidebar/sidebar-dropdown.component.ts
+++ b/src/app/shared/sidebar/sidebar-dropdown.component.ts
@@ -12,5 +12,5 @@ import { Component, EventEmitter, Input, Output } from '@angular/core';
 export class SidebarDropdownComponent {
   @Input() id: string;
   @Input() label: string;
-  @Output() change: EventEmitter<any> = new EventEmitter<number>();
+  @Output() changed: EventEmitter<any> = new EventEmitter<number>();
 }
diff --git a/src/app/shared/starts-with/date/starts-with-date.component.html b/src/app/shared/starts-with/date/starts-with-date.component.html
index b350d9896c..c3fbb884ab 100644
--- a/src/app/shared/starts-with/date/starts-with-date.component.html
+++ b/src/app/shared/starts-with/date/starts-with-date.component.html
@@ -27,7 +27,7 @@
     <div class="form-group input-group col-12 col-md-6 pt-1 pt-md-0">
       <input class="form-control" placeholder="{{'browse.startsWith.type_date' | translate}}" [attr.aria-label]="'browse.startsWith.type_date.label' |translate" type="text" name="startsWith" formControlName="startsWith" [value]="getStartsWith() ? getStartsWith() : ''" />
       <span class="input-group-append">
-        <button class="btn btn-primary" type="submit"><i class="fas fa-book-open"></i> {{'browse.startsWith.submit' | translate}}</button>
+        <button class="btn btn-primary" type="submit" role="button" tabindex="0"><i class="fas fa-book-open"></i> {{'browse.startsWith.submit' | translate}}</button>
       </span>
     </div>
   </div>
diff --git a/src/app/shared/starts-with/text/starts-with-text.component.html b/src/app/shared/starts-with/text/starts-with-text.component.html
index 926a2f932d..3952f86fda 100644
--- a/src/app/shared/starts-with/text/starts-with-text.component.html
+++ b/src/app/shared/starts-with/text/starts-with-text.component.html
@@ -1,10 +1,13 @@
 <form class="w-100" [formGroup]="formData" (ngSubmit)="submitForm(formData.value)">
+<div class="mb-3">
   <div class="row">
-    <div class="form-group input-group col-8 col-sm-12 col-md-6">
-      <input class="form-control" [attr.aria-label]="'browse.startsWith.input' | translate" placeholder="{{'browse.startsWith.type_text' | translate}}" type="text" name="startsWith" formControlName="startsWith" [value]="getStartsWith()" />
+    <div class="form-group input-group col-sm-12 col-md-6 col-auto">
+      <input class="form-control" [attr.aria-label]="'browse.startsWith.input' | translate" placeholder="{{'browse.search-form.placeholder' | translate}}" type="text" name="startsWith" formControlName="startsWith" [value]="getStartsWith()" />
       <span class="input-group-append">
-        <button class="btn btn-primary" type="submit"><i class="fas fa-book-open"></i> {{'browse.startsWith.submit' | translate}}</button>
+        <button class="btn btn-primary" type="submit" role="button" tabindex="0"><i class="fas fa-book-open"></i> {{'browse.startsWith.submit' | translate}}</button>
       </span>
     </div>
   </div>
+  <small class="text-muted">{{'browse.startsWith.type_text' | translate}}</small>
+</div>
 </form>
diff --git a/src/app/shared/starts-with/text/starts-with-text.component.scss b/src/app/shared/starts-with/text/starts-with-text.component.scss
index 4576be4b28..619da40956 100644
--- a/src/app/shared/starts-with/text/starts-with-text.component.scss
+++ b/src/app/shared/starts-with/text/starts-with-text.component.scss
@@ -3,3 +3,7 @@
   background-color: var(--bs-input-bg);
   color: var(--bs-input-color);
 }
+
+.form-group {
+  margin-bottom: 0;
+}
diff --git a/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.html b/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.html
index 287175bfa1..d483e9d944 100644
--- a/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.html
+++ b/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.html
@@ -34,7 +34,7 @@
             (click)="activeModal.close()">
       {{'subscriptions.modal.close' | translate}}
     </button>
-    <button type="submit" class="btn btn-success" [disabled]="(processing$ | async) || !isValid">
+    <button type="submit" class="btn btn-success" [dsBtnDisabled]="(processing$ | async) || !isValid">
         <span *ngIf="(processing$ | async)">
           <i class='fas fa-circle-notch fa-spin'></i> {{'subscriptions.modal.new-subscription-form.processing' | translate}}
         </span>
diff --git a/src/app/shared/subscriptions/subscription-view/subscription-view.component.html b/src/app/shared/subscriptions/subscription-view/subscription-view.component.html
index 155304154b..a55c2092d4 100644
--- a/src/app/shared/subscriptions/subscription-view/subscription-view.component.html
+++ b/src/app/shared/subscriptions/subscription-view/subscription-view.component.html
@@ -21,7 +21,7 @@
 </td>
 <td class="subscription-actions">
   <div class="btn-group edit-field">
-    <button (click)="$event.preventDefault();openSubscriptionModal();" [disabled]="!dso"
+    <button (click)="$event.preventDefault();openSubscriptionModal();" [dsBtnDisabled]="!dso"
             [title]="'subscriptions.table.edit' | translate"
             class="btn btn-outline-primary btn-sm access-control-editEPersonButton">
       <i class="fas fa-edit fa-fw"></i>
diff --git a/src/app/shared/testing/auth-service.stub.ts b/src/app/shared/testing/auth-service.stub.ts
index 7f3d040042..6913305315 100644
--- a/src/app/shared/testing/auth-service.stub.ts
+++ b/src/app/shared/testing/auth-service.stub.ts
@@ -6,10 +6,11 @@ import { EPerson } from '../../core/eperson/models/eperson.model';
 import { createSuccessfulRemoteDataObject$ } from '../remote-data.utils';
 import { AuthMethod } from '../../core/auth/models/auth.method';
 import { hasValue } from '../empty.util';
+import { AuthMethodType } from '../../core/auth/models/auth.method-type';
 
-export const authMethodsMock = [
-  new AuthMethod('password'),
-  new AuthMethod('shibboleth', 'dspace.test/shibboleth')
+export const authMethodsMock: AuthMethod[] = [
+  new AuthMethod(AuthMethodType.Password, 0),
+  new AuthMethod(AuthMethodType.Shibboleth, 1, 'dspace.test/shibboleth'),
 ];
 
 export class AuthServiceStub {
diff --git a/src/app/shared/testing/base-data-service.stub.ts b/src/app/shared/testing/base-data-service.stub.ts
index f4b6f25923..b8b71845d6 100644
--- a/src/app/shared/testing/base-data-service.stub.ts
+++ b/src/app/shared/testing/base-data-service.stub.ts
@@ -1,11 +1,18 @@
 import { Observable, of as observableOf } from 'rxjs';
 import { CacheableObject } from '../../core/cache/cacheable-object.model';
+import { RemoteData } from '../../core/data/remote-data';
+import { createSuccessfulRemoteDataObject$ } from '../remote-data.utils';
+import { FollowLinkConfig } from '../utils/follow-link-config.model';
 
 /**
  * Stub class for {@link BaseDataService}
  */
 export abstract class BaseDataServiceStub<T extends CacheableObject> {
 
+  findByHref(_href$: string | Observable<string>, _useCachedVersionIfAvailable = true, _reRequestOnStale = true, ..._linksToFollow: FollowLinkConfig<T>[]): Observable<RemoteData<T>> {
+    return createSuccessfulRemoteDataObject$(undefined);
+  }
+
   invalidateByHref(_href: string): Observable<boolean> {
     return observableOf(true);
   }
diff --git a/src/app/shared/testing/browse-service.stub.ts b/src/app/shared/testing/browse-service.stub.ts
new file mode 100644
index 0000000000..85ca717cb0
--- /dev/null
+++ b/src/app/shared/testing/browse-service.stub.ts
@@ -0,0 +1,91 @@
+import {
+  EMPTY,
+  Observable,
+} from 'rxjs';
+
+import {
+  buildPaginatedList,
+  PaginatedList,
+} from '../../core/data/paginated-list.model';
+import { RemoteData } from '../../core/data/remote-data';
+import { BrowseDefinition } from '../../core/shared/browse-definition.model';
+import { FlatBrowseDefinition } from '../../core/shared/flat-browse-definition.model';
+import { HierarchicalBrowseDefinition } from '../../core/shared/hierarchical-browse-definition.model';
+import { PageInfo } from '../../core/shared/page-info.model';
+import { ValueListBrowseDefinition } from '../../core/shared/value-list-browse-definition.model';
+import { createSuccessfulRemoteDataObject$ } from '../remote-data.utils';
+
+const mockData = [
+  Object.assign(new FlatBrowseDefinition(), {
+    'id': 'dateissued',
+    'browseType': 'flatBrowse',
+    'dataType': 'date',
+    'sortOptions': EMPTY,
+    'order': 'ASC',
+    'type': 'browse',
+    'metadataKeys': [
+      'dc.date.issued',
+    ],
+    '_links': EMPTY,
+  }),
+
+  Object.assign(new ValueListBrowseDefinition(), {
+    'id': 'author',
+    'browseType': 'valueList',
+    'dataType': 'text',
+    'sortOptions': EMPTY,
+    'order': 'ASC',
+    'type': 'browse',
+    'metadataKeys': [
+      'dc.contributor.*',
+      'dc.creator',
+    ],
+    '_links': EMPTY,
+  }),
+
+  Object.assign(new FlatBrowseDefinition(), {
+    'id': 'title',
+    'browseType': 'flatBrowse',
+    'dataType': 'title',
+    'sortOptions': EMPTY,
+    'order': 'ASC',
+    'type': 'browse',
+    'metadataKeys': [
+      'dc.title',
+    ],
+    '_links': EMPTY,
+  }),
+
+  Object.assign(new ValueListBrowseDefinition(), {
+    'id': 'subject',
+    'browseType': 'valueList',
+    'dataType': 'text',
+    'sortOptions': EMPTY,
+    'order': 'ASC',
+    'type': 'browse',
+    'metadataKeys': [
+      'dc.subject.*',
+    ],
+    '_links': EMPTY,
+  }),
+
+  Object.assign(new HierarchicalBrowseDefinition(), {
+    'id': 'srsc',
+    'browseType': 'hierarchicalBrowse',
+    'facetType': 'subject',
+    'vocabulary': 'srsc',
+    'type': 'browse',
+    'metadataKeys': [
+      'dc.subject',
+    ],
+    '_links': EMPTY,
+  }),
+];
+export const BrowseServiceStub: any = {
+  /**
+   * Get all browse definitions.
+   */
+  getBrowseDefinitions(): Observable<RemoteData<PaginatedList<BrowseDefinition>>> {
+    return createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), mockData));
+  },
+};
diff --git a/src/app/shared/testing/configuration-data.service.stub.ts b/src/app/shared/testing/configuration-data.service.stub.ts
new file mode 100644
index 0000000000..f17e2d7b5b
--- /dev/null
+++ b/src/app/shared/testing/configuration-data.service.stub.ts
@@ -0,0 +1,14 @@
+import { Observable } from 'rxjs';
+import { RemoteData } from '../../core/data/remote-data';
+import { ConfigurationProperty } from '../../core/shared/configuration-property.model';
+import { createSuccessfulRemoteDataObject$ } from '../remote-data.utils';
+
+export class ConfigurationDataServiceStub {
+
+  findByPropertyName(_name: string): Observable<RemoteData<ConfigurationProperty>> {
+    const configurationProperty = new ConfigurationProperty();
+    configurationProperty.values = [];
+    return createSuccessfulRemoteDataObject$(configurationProperty);
+  }
+
+}
diff --git a/src/app/shared/testing/edit-item-relationships.service.stub.ts b/src/app/shared/testing/edit-item-relationships.service.stub.ts
new file mode 100644
index 0000000000..1d29569793
--- /dev/null
+++ b/src/app/shared/testing/edit-item-relationships.service.stub.ts
@@ -0,0 +1,48 @@
+/* eslint-disable no-empty, @typescript-eslint/no-empty-function */
+import {
+  Observable,
+  Subscription,
+} from 'rxjs';
+
+import {
+  DeleteRelationship,
+  RelationshipIdentifiable,
+} from '../../core/data/object-updates/object-updates.reducer';
+import { RemoteData } from '../../core/data/remote-data';
+import { Item } from '../../core/shared/item.model';
+import { Relationship } from '../../core/shared/item-relationships/relationship.model';
+import { NoContent } from '../../core/shared/NoContent.model';
+import { createSuccessfulRemoteDataObject$ } from '../remote-data.utils';
+
+/**
+ * Stub class of {@link EditItemRelationshipsService}
+ */
+export class EditItemRelationshipsServiceStub {
+
+  submit(_item: Item, _url: string): void {
+  }
+
+  initializeOriginalFields(_item: Item, _url: string): Subscription {
+    return new Subscription();
+  }
+
+  deleteRelationship(_deleteRelationship: DeleteRelationship): Observable<RemoteData<NoContent>> {
+    return createSuccessfulRemoteDataObject$({});
+  }
+
+  addRelationship(_addRelationship: RelationshipIdentifiable): Observable<RemoteData<Relationship>> {
+    return createSuccessfulRemoteDataObject$(undefined);
+  }
+
+  displayNotifications(_responses: RemoteData<NoContent>[]): void {
+  }
+
+  getNotificationTitle(_key: string): string {
+    return '';
+  }
+
+  getNotificationContent(_key: string): string {
+    return '';
+  }
+
+}
diff --git a/src/app/shared/testing/entity-type-data.service.stub.ts b/src/app/shared/testing/entity-type-data.service.stub.ts
new file mode 100644
index 0000000000..367eeb5f74
--- /dev/null
+++ b/src/app/shared/testing/entity-type-data.service.stub.ts
@@ -0,0 +1,5 @@
+/**
+ * Stub class of {@link EntityTypeDataService}
+ */
+export class EntityTypeDataServiceStub {
+}
diff --git a/src/app/shared/testing/eperson.mock.ts b/src/app/shared/testing/eperson.mock.ts
index 370c2ff1b9..dd2918782f 100644
--- a/src/app/shared/testing/eperson.mock.ts
+++ b/src/app/shared/testing/eperson.mock.ts
@@ -91,3 +91,43 @@ export const EPersonMock2: EPerson = Object.assign(new EPerson(), {
     ]
   }
 });
+
+export const EPersonMockWithNoName: EPerson = Object.assign(new EPerson(), {
+  handle: null,
+  groups: [],
+  netid: 'test@test.com',
+  lastActive: '2018-05-14T12:25:42.411+0000',
+  canLogIn: true,
+  email: 'test@test.com',
+  requireCertificate: false,
+  selfRegistered: false,
+  _links: {
+    self: {
+      href: 'https://rest.api/dspace-spring-rest/api/eperson/epersons/testid',
+    },
+    groups: { href: 'https://rest.api/dspace-spring-rest/api/eperson/epersons/testid/groups' },
+  },
+  id: 'testid',
+  uuid: 'testid',
+  type: 'eperson',
+  metadata: {
+    'dc.title': [
+      {
+        language: null,
+        value: 'User Test',
+      },
+    ],
+    'eperson.lastname': [
+      {
+        language: null,
+        value: 'Test',
+      },
+    ],
+    'eperson.language': [
+      {
+        language: null,
+        value: 'en',
+      },
+    ],
+  },
+});
diff --git a/src/app/shared/testing/host-window-service.stub.ts b/src/app/shared/testing/host-window-service.stub.ts
index ecb8c26acb..a0b5d29e9b 100644
--- a/src/app/shared/testing/host-window-service.stub.ts
+++ b/src/app/shared/testing/host-window-service.stub.ts
@@ -1,4 +1,5 @@
 import {of as observableOf,  Observable } from 'rxjs';
+import { WidthCategory } from '../host-window.service';
 
 // declare a stub service
 export class HostWindowServiceStub {
@@ -20,4 +21,12 @@ export class HostWindowServiceStub {
   isXsOrSm(): Observable<boolean> {
     return this.isXs();
   }
+
+  isMobile(): Observable<boolean> {
+    return this.isXs();
+  }
+
+  isUpTo(maxWidthCat: WidthCategory): Observable<boolean> {
+    return this.isXs();
+  }
 }
diff --git a/src/app/shared/testing/item-data.service.stub.ts b/src/app/shared/testing/item-data.service.stub.ts
new file mode 100644
index 0000000000..eed5d4bb11
--- /dev/null
+++ b/src/app/shared/testing/item-data.service.stub.ts
@@ -0,0 +1,8 @@
+import { Item } from '../../core/shared/item.model';
+import { IdentifiableDataServiceStub } from './identifiable-data-service.stub';
+
+/**
+ * Stub class of {@link ItemDataService}
+ */
+export class ItemDataServiceStub extends IdentifiableDataServiceStub<Item> {
+}
diff --git a/src/app/shared/testing/menu-service.stub.ts b/src/app/shared/testing/menu-service.stub.ts
index 71ee777157..50f01f928f 100644
--- a/src/app/shared/testing/menu-service.stub.ts
+++ b/src/app/shared/testing/menu-service.stub.ts
@@ -53,6 +53,9 @@ export class MenuServiceStub {
   deactivateSection(): void { /***/
   }
 
+  toggleSection(): void { /***/
+  }
+
   addSection(menuID: MenuID, section: MenuSection): void { /***/
   }
 
diff --git a/src/app/shared/testing/object-updates.service.stub.ts b/src/app/shared/testing/object-updates.service.stub.ts
new file mode 100644
index 0000000000..c66cc3aa0d
--- /dev/null
+++ b/src/app/shared/testing/object-updates.service.stub.ts
@@ -0,0 +1,24 @@
+/* eslint-disable no-empty, @typescript-eslint/no-empty-function */
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+
+import { FieldUpdates } from '../../core/data/object-updates/field-updates.model';
+import { Identifiable } from '../../core/data/object-updates/identifiable.model';
+import { PatchOperationService } from '../../core/data/object-updates/patch-operation-service/patch-operation.service';
+import { GenericConstructor } from '../../core/shared/generic-constructor';
+
+/**
+ * Stub class of {@link ObjectUpdatesService}
+ */
+export class ObjectUpdatesServiceStub {
+
+  initialize(_url: string, _fields: Identifiable[], _lastModified: Date, _patchOperationService?: GenericConstructor<PatchOperationService>): void {
+  }
+
+  getFieldUpdates(_url: string, _initialFields: Identifiable[], _ignoreStates?: boolean): Observable<FieldUpdates> {
+    return observableOf({});
+  }
+
+}
diff --git a/src/app/shared/testing/registry.service.stub.ts b/src/app/shared/testing/registry.service.stub.ts
new file mode 100644
index 0000000000..b52f32af4e
--- /dev/null
+++ b/src/app/shared/testing/registry.service.stub.ts
@@ -0,0 +1,107 @@
+/* eslint-disable no-empty,@typescript-eslint/no-empty-function */
+import { FindListOptions } from '../../core/data/find-list-options.model';
+import { FollowLinkConfig } from '../utils/follow-link-config.model';
+import { MetadataSchema } from '../../core/metadata/metadata-schema.model';
+import { Observable, of as observableOf } from 'rxjs';
+import { RemoteData } from '../../core/data/remote-data';
+import { PaginatedList } from '../../core/data/paginated-list.model';
+import { createSuccessfulRemoteDataObject$ } from '../remote-data.utils';
+import { createPaginatedList } from './utils.test';
+import { MetadataField } from '../../core/metadata/metadata-field.model';
+import { NoContent } from '../../core/shared/NoContent.model';
+
+/**
+ * Stub class of {@link RegistryService}
+ */
+export class RegistryServiceStub {
+
+  getMetadataSchemas(_options: FindListOptions = {}, _useCachedVersionIfAvailable = true, _reRequestOnStale = true, ..._linksToFollow: FollowLinkConfig<MetadataSchema>[]): Observable<RemoteData<PaginatedList<MetadataSchema>>> {
+    return createSuccessfulRemoteDataObject$(createPaginatedList());
+  }
+
+  getMetadataSchemaByPrefix(_prefix: string, _useCachedVersionIfAvailable = true, _reRequestOnStale = true, ..._linksToFollow: FollowLinkConfig<MetadataSchema>[]): Observable<RemoteData<MetadataSchema>> {
+    return createSuccessfulRemoteDataObject$(undefined);
+  }
+
+  getMetadataFieldsBySchema(_schema: MetadataSchema, _options: FindListOptions = {}, _useCachedVersionIfAvailable = true, _reRequestOnStale = true, ..._linksToFollow: FollowLinkConfig<MetadataField>[]): Observable<RemoteData<PaginatedList<MetadataField>>> {
+    return createSuccessfulRemoteDataObject$(createPaginatedList());
+  }
+
+  editMetadataSchema(_schema: MetadataSchema): void {
+  }
+
+  cancelEditMetadataSchema(): void {
+  }
+
+  getActiveMetadataSchema(): Observable<MetadataSchema> {
+    return observableOf(undefined);
+  }
+
+  selectMetadataSchema(_schema: MetadataSchema): void {
+  }
+
+  deselectMetadataSchema(_schema: MetadataSchema): void {
+  }
+
+  deselectAllMetadataSchema(): void {
+  }
+
+  getSelectedMetadataSchemas(): Observable<MetadataSchema[]> {
+    return observableOf([]);
+  }
+
+  editMetadataField(_field: MetadataField): void {
+  }
+
+  cancelEditMetadataField(): void {
+  }
+
+  getActiveMetadataField(): Observable<MetadataField> {
+    return observableOf(undefined);
+  }
+
+  selectMetadataField(_field: MetadataField): void {
+  }
+
+  deselectMetadataField(_field: MetadataField): void {
+  }
+
+  deselectAllMetadataField(): void {
+  }
+
+  getSelectedMetadataFields(): Observable<MetadataField[]> {
+    return observableOf([]);
+  }
+
+  createOrUpdateMetadataSchema(schema: MetadataSchema): Observable<MetadataSchema> {
+    return observableOf(schema);
+  }
+
+  deleteMetadataSchema(_id: number): Observable<RemoteData<NoContent>> {
+    return createSuccessfulRemoteDataObject$(undefined);
+  }
+
+  clearMetadataSchemaRequests(): Observable<string> {
+    return observableOf('');
+  }
+
+  createMetadataField(field: MetadataField, _schema: MetadataSchema): Observable<MetadataField> {
+    return observableOf(field);
+  }
+
+  updateMetadataField(field: MetadataField): Observable<MetadataField> {
+    return observableOf(field);
+  }
+
+  deleteMetadataField(_id: number): Observable<RemoteData<NoContent>> {
+    return createSuccessfulRemoteDataObject$(undefined);
+  }
+
+  clearMetadataFieldRequests(): void {
+  }
+
+  queryMetadataFields(_query: string, _options: FindListOptions = {}, _useCachedVersionIfAvailable = true, _reRequestOnStale = true, ..._linksToFollow: FollowLinkConfig<MetadataField>[]): Observable<RemoteData<PaginatedList<MetadataField>>> {
+    return createSuccessfulRemoteDataObject$(createPaginatedList());
+  }
+
+}
diff --git a/src/app/shared/testing/relationship-data.service.stub.ts b/src/app/shared/testing/relationship-data.service.stub.ts
new file mode 100644
index 0000000000..f0463b3e6c
--- /dev/null
+++ b/src/app/shared/testing/relationship-data.service.stub.ts
@@ -0,0 +1,86 @@
+/* eslint-disable no-empty, @typescript-eslint/no-empty-function */
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+
+import { FindListOptions } from '../../core/data/find-list-options.model';
+import { PaginatedList } from '../../core/data/paginated-list.model';
+import { RemoteData } from '../../core/data/remote-data';
+import { DSpaceObject } from '../../core/shared/dspace-object.model';
+import { Item } from '../../core/shared/item.model';
+import { Relationship } from '../../core/shared/item-relationships/relationship.model';
+import { MetadataValue } from '../../core/shared/metadata.models';
+import { MetadataRepresentation } from '../../core/shared/metadata-representation/metadata-representation.model';
+import { NoContent } from '../../core/shared/NoContent.model';
+import { createSuccessfulRemoteDataObject$ } from '../remote-data.utils';
+import { FollowLinkConfig } from '../utils/follow-link-config.model';
+
+/**
+ * Stub class of {@link RelationshipDataService}
+ */
+export class RelationshipDataServiceStub {
+
+  deleteRelationship(_id: string, _copyVirtualMetadata: string, _shouldRefresh = true): Observable<RemoteData<NoContent>> {
+    return createSuccessfulRemoteDataObject$({});
+  }
+
+  addRelationship(_typeId: string, _item1: Item, _item2: Item, _leftwardValue?: string, _rightwardValue?: string, _shouldRefresh = true): Observable<RemoteData<Relationship>> {
+    return createSuccessfulRemoteDataObject$(new Relationship());
+  }
+
+  refreshRelationshipItemsInCache(_item: Item): void {
+  }
+
+  getItemRelationshipsArray(_item: Item, ..._linksToFollow: FollowLinkConfig<Relationship>[]): Observable<Relationship[]> {
+    return observableOf([]);
+  }
+
+  getRelatedItems(_item: Item): Observable<Item[]> {
+    return observableOf([]);
+  }
+
+  getRelatedItemsByLabel(_item: Item, _label: string, _options?: FindListOptions): Observable<RemoteData<PaginatedList<Item>>> {
+    return createSuccessfulRemoteDataObject$(new PaginatedList<Item>());
+  }
+
+  getItemRelationshipsByLabel(_item: Item, _label: string, _options?: FindListOptions, _useCachedVersionIfAvailable = true, _reRequestOnStale = true, ..._linksToFollow: FollowLinkConfig<Relationship>[]): Observable<RemoteData<PaginatedList<Relationship>>> {
+    return createSuccessfulRemoteDataObject$(new PaginatedList<Relationship>());
+  }
+
+  getRelationshipByItemsAndLabel(_item1: Item, _item2: Item, _label: string, _options?: FindListOptions): Observable<Relationship> {
+    return observableOf(new Relationship());
+  }
+
+  setNameVariant(_listID: string, _itemID: string, _nameVariant: string): void {
+  }
+
+  getNameVariant(_listID: string, _itemID: string): Observable<string> {
+    return observableOf('');
+  }
+
+  updateNameVariant(_item1: Item, _item2: Item, _relationshipLabel: string, _nameVariant: string): Observable<RemoteData<Relationship>> {
+    return createSuccessfulRemoteDataObject$(new Relationship());
+  }
+
+  isLeftItem(_relationship: Relationship, _item: Item): Observable<boolean> {
+    return observableOf(false);
+  }
+
+  update(_object: Relationship): Observable<RemoteData<Relationship>> {
+    return createSuccessfulRemoteDataObject$(new Relationship());
+  }
+
+  searchByItemsAndType(_typeId: string, _itemUuid: string, _relationshipLabel: string, _arrayOfItemIds: string[]): Observable<RemoteData<PaginatedList<Relationship>>> {
+    return createSuccessfulRemoteDataObject$(new PaginatedList<Relationship>());
+  }
+
+  searchBy(_searchMethod: string, _options?: FindListOptions, _useCachedVersionIfAvailable?: boolean, _reRequestOnStale?: boolean, ..._linksToFollow: FollowLinkConfig<Relationship>[]): Observable<RemoteData<PaginatedList<Relationship>>> {
+    return createSuccessfulRemoteDataObject$(new PaginatedList<Relationship>());
+  }
+
+  resolveMetadataRepresentation(_metadatum: MetadataValue, _parentItem: DSpaceObject, _itemType: string): Observable<MetadataRepresentation> {
+    return observableOf({} as MetadataRepresentation);
+  }
+
+}
diff --git a/src/app/shared/testing/search-configuration-service.stub.ts b/src/app/shared/testing/search-configuration-service.stub.ts
index 78b358f0d4..ef72e40041 100644
--- a/src/app/shared/testing/search-configuration-service.stub.ts
+++ b/src/app/shared/testing/search-configuration-service.stub.ts
@@ -13,6 +13,10 @@ export class SearchConfigurationServiceStub {
     return observableOf([]);
   }
 
+  getCurrentFilters() {
+    return observableOf([]);
+  }
+
   getCurrentScope(a) {
     return observableOf('test-id');
   }
diff --git a/src/app/shared/testing/server-response-service.stub.ts b/src/app/shared/testing/server-response-service.stub.ts
new file mode 100644
index 0000000000..fd6e4a0d24
--- /dev/null
+++ b/src/app/shared/testing/server-response-service.stub.ts
@@ -0,0 +1,30 @@
+/* eslint-disable no-empty,@typescript-eslint/no-empty-function */
+/**
+ * Stub class of {@link ServerResponseService}
+ */
+export class ServerResponseServiceStub {
+
+  setStatus(_code: number, _message?: string): this {
+    return this;
+  }
+
+  setUnauthorized(_message = 'Unauthorized'): this {
+    return this;
+  }
+
+  setForbidden(_message = 'Forbidden'): this {
+    return this;
+  }
+
+  setNotFound(_message = 'Not found'): this {
+    return this;
+  }
+
+  setInternalServerError(_message = 'Internal Server Error'): this {
+    return this;
+  }
+
+  setHeader(_header: string, _content: string): void {
+  }
+
+}
diff --git a/src/app/shared/testing/truncatable-service.stub.ts b/src/app/shared/testing/truncatable-service.stub.ts
new file mode 100644
index 0000000000..080cd98469
--- /dev/null
+++ b/src/app/shared/testing/truncatable-service.stub.ts
@@ -0,0 +1,21 @@
+import { Observable, of as observableOf } from 'rxjs';
+
+export class TruncatableServiceStub {
+
+  isCollapsed(_id: string): Observable<boolean> {
+    return observableOf(false);
+  }
+
+  // eslint-disable-next-line no-empty, @typescript-eslint/no-empty-function
+  public toggle(_id: string): void {
+  }
+
+  // eslint-disable-next-line no-empty, @typescript-eslint/no-empty-function
+  public collapse(_id: string): void {
+  }
+
+  // eslint-disable-next-line no-empty, @typescript-eslint/no-empty-function
+  public expand(_id: string): void {
+  }
+
+}
diff --git a/src/app/shared/theme-support/theme.model.ts b/src/app/shared/theme-support/theme.model.ts
new file mode 100644
index 0000000000..470f09853c
--- /dev/null
+++ b/src/app/shared/theme-support/theme.model.ts
@@ -0,0 +1,90 @@
+/* eslint-disable max-classes-per-file */
+import { hasValue, hasNoValue, isNotEmpty } from '../empty.util';
+import { DSpaceObject } from '../../core/shared/dspace-object.model';
+import { getDSORoute } from '../../app-routing-paths';
+import { HandleObject } from '../../core/shared/handle-object.model';
+import { Injector } from '@angular/core';
+import { HandleService } from '../handle.service';
+import { combineLatest, Observable, of as observableOf } from 'rxjs';
+import { map, take } from 'rxjs/operators';
+import { HandleThemeConfig, NamedThemeConfig, RegExThemeConfig, UUIDThemeConfig, ThemeConfig } from '../../../config/theme.config';
+
+export class Theme {
+  constructor(public config: NamedThemeConfig) {
+  }
+
+  matches(url: string, dso: DSpaceObject): Observable<boolean> {
+    return observableOf(true);
+  }
+}
+
+export class RegExTheme extends Theme {
+  regex: RegExp;
+
+  constructor(public config: RegExThemeConfig) {
+    super(config);
+    this.regex = new RegExp(this.config.regex);
+  }
+
+  matches(url: string, dso: DSpaceObject): Observable<boolean> {
+    let match: RegExpMatchArray;
+    const route = getDSORoute(dso);
+
+    if (isNotEmpty(route)) {
+      match = route.match(this.regex);
+    }
+
+    if (hasNoValue(match)) {
+      match = url.match(this.regex);
+    }
+
+    return observableOf(hasValue(match));
+  }
+}
+
+export class HandleTheme extends Theme {
+
+  constructor(public config: HandleThemeConfig,
+              protected handleService: HandleService
+  ) {
+    super(config);
+  }
+
+  matches<T extends DSpaceObject & HandleObject>(url: string, dso: T): Observable<boolean> {
+    if (hasValue(dso?.handle)) {
+      return combineLatest([
+        this.handleService.normalizeHandle(dso?.handle),
+        this.handleService.normalizeHandle(this.config.handle),
+      ]).pipe(
+        map(([handle, normalizedHandle]: [string | null, string | null]) => {
+          return hasValue(dso) && hasValue(dso.handle) && handle === normalizedHandle;
+        }),
+        take(1),
+      );
+    } else {
+      return observableOf(false);
+    }
+  }
+}
+
+export class UUIDTheme extends Theme {
+  constructor(public config: UUIDThemeConfig) {
+    super(config);
+  }
+
+  matches(url: string, dso: DSpaceObject): Observable<boolean> {
+    return observableOf(hasValue(dso) && dso.uuid === this.config.uuid);
+  }
+}
+
+export const themeFactory = (config: ThemeConfig, injector: Injector): Theme => {
+  if (hasValue((config as RegExThemeConfig).regex)) {
+    return new RegExTheme(config as RegExThemeConfig);
+  } else if (hasValue((config as HandleThemeConfig).handle)) {
+    return new HandleTheme(config as HandleThemeConfig, injector.get(HandleService));
+  } else if (hasValue((config as UUIDThemeConfig).uuid)) {
+    return new UUIDTheme(config as UUIDThemeConfig);
+  } else {
+    return new Theme(config as NamedThemeConfig);
+  }
+};
diff --git a/src/app/shared/theme-support/theme.service.spec.ts b/src/app/shared/theme-support/theme.service.spec.ts
index f56fb86cbc..34dffe2ef2 100644
--- a/src/app/shared/theme-support/theme.service.spec.ts
+++ b/src/app/shared/theme-support/theme.service.spec.ts
@@ -4,7 +4,7 @@ import { provideMockActions } from '@ngrx/effects/testing';
 import { LinkService } from '../../core/cache/builders/link.service';
 import { hot } from 'jasmine-marbles';
 import { SetThemeAction } from './theme.actions';
-import { Theme } from '../../../config/theme.model';
+import { Theme } from './theme.model';
 import { provideMockStore } from '@ngrx/store/testing';
 import { Community } from '../../core/shared/community.model';
 import { COMMUNITY } from '../../core/shared/community.resource-type';
@@ -24,6 +24,8 @@ import { ROUTER_NAVIGATED } from '@ngrx/router-store';
 import { ActivatedRouteSnapshot, Router } from '@angular/router';
 import { CommonModule, DOCUMENT } from '@angular/common';
 import { RouterMock } from '../mocks/router.mock';
+import { ConfigurationDataServiceStub } from '../testing/configuration-data.service.stub';
+import { ConfigurationDataService } from '../../core/data/configuration-data.service';
 
 /**
  * LinkService able to mock recursively resolving DSO parent links
@@ -49,6 +51,7 @@ class MockLinkService {
 describe('ThemeService', () => {
   let themeService: ThemeService;
   let linkService: LinkService;
+  let configurationService: ConfigurationDataServiceStub;
   let initialState;
 
   let ancestorDSOs: DSpaceObject[];
@@ -78,6 +81,7 @@ describe('ThemeService', () => {
         currentTheme: 'custom',
       },
     };
+    configurationService = new ConfigurationDataServiceStub();
   }
 
   function setupServiceWithActions(mockActions) {
@@ -96,6 +100,7 @@ describe('ThemeService', () => {
         provideMockActions(() => mockActions),
         { provide: DSpaceObjectDataService, useValue: mockDsoService },
         { provide: Router, useValue: new RouterMock() },
+        { provide: ConfigurationDataService, useValue: configurationService },
       ]
     });
 
@@ -112,7 +117,7 @@ describe('ThemeService', () => {
 
     function spyOnPrivateMethods() {
       spyOn((themeService as any), 'getAncestorDSOs').and.returnValue(() => observableOf([dso]));
-      spyOn((themeService as any), 'matchThemeToDSOs').and.returnValue(new Theme({ name: 'custom' }));
+      spyOn((themeService as any), 'matchThemeToDSOs').and.returnValue(observableOf(new Theme({ name: 'custom' })));
       spyOn((themeService as any), 'getActionForMatch').and.returnValue(new SetThemeAction('custom'));
     }
 
@@ -283,13 +288,13 @@ describe('ThemeService', () => {
 
       beforeEach(() => {
         nonMatchingTheme = Object.assign(new Theme({ name: 'non-matching-theme' }), {
-          matches: () => false
+          matches: () => observableOf(false),
         });
         itemMatchingTheme = Object.assign(new Theme({ name: 'item-matching-theme' }), {
-          matches: (url, dso) => (dso as any).type === ITEM.value
+          matches: (url, dso) => observableOf((dso as any).type === ITEM.value),
         });
         communityMatchingTheme = Object.assign(new Theme({ name: 'community-matching-theme' }), {
-          matches: (url, dso) => (dso as any).type === COMMUNITY.value
+          matches: (url, dso) => observableOf((dso as any).type === COMMUNITY.value),
         });
         dsos = [
           Object.assign(new Item(), {
@@ -313,8 +318,11 @@ describe('ThemeService', () => {
           themeService.themes = themes;
         });
 
-        it('should return undefined', () => {
-          expect((themeService as any).matchThemeToDSOs(dsos, '')).toBeUndefined();
+        it('should return undefined', (done: DoneFn) => {
+          (themeService as any).matchThemeToDSOs(dsos, '').subscribe((theme: Theme) => {
+            expect(theme).toBeUndefined();
+            done();
+          });
         });
       });
 
@@ -324,20 +332,31 @@ describe('ThemeService', () => {
           themeService.themes = themes;
         });
 
-        it('should return the matching theme', () => {
-          expect((themeService as any).matchThemeToDSOs(dsos, '')).toEqual(itemMatchingTheme);
+        it('should return the matching theme', (done: DoneFn) => {
+          (themeService as any).matchThemeToDSOs(dsos, '').subscribe((theme: Theme) => {
+            expect(theme).toBe(itemMatchingTheme);
+            done();
+          });
         });
       });
 
       describe('when multiple themes match some of the DSOs', () => {
-        it('should return the first matching theme', () => {
+        it('should return the first matching theme (itemMatchingTheme)', (done: DoneFn) => {
           themes = [ nonMatchingTheme, itemMatchingTheme, communityMatchingTheme ];
           themeService.themes = themes;
-          expect((themeService as any).matchThemeToDSOs(dsos, '')).toEqual(itemMatchingTheme);
+          (themeService as any).matchThemeToDSOs(dsos, '').subscribe((theme: Theme) => {
+            expect(theme).toBe(itemMatchingTheme);
+            done();
+          });
+        });
 
+        it('should return the first matching theme (communityMatchingTheme)', (done: DoneFn) => {
           themes = [ nonMatchingTheme, communityMatchingTheme, itemMatchingTheme ];
           themeService.themes = themes;
-          expect((themeService as any).matchThemeToDSOs(dsos, '')).toEqual(communityMatchingTheme);
+          (themeService as any).matchThemeToDSOs(dsos, '').subscribe((theme: Theme) => {
+            expect(theme).toBe(communityMatchingTheme);
+            done();
+          });
         });
       });
     });
@@ -382,6 +401,7 @@ describe('ThemeService', () => {
       const mockDsoService = {
         findById: () => createSuccessfulRemoteDataObject$(mockCommunity)
       };
+      configurationService = new ConfigurationDataServiceStub();
 
       TestBed.configureTestingModule({
         imports: [
@@ -393,6 +413,7 @@ describe('ThemeService', () => {
           provideMockStore({ initialState }),
           { provide: DSpaceObjectDataService, useValue: mockDsoService },
           { provide: Router, useValue: new RouterMock() },
+          { provide: ConfigurationDataService, useValue: configurationService },
         ]
       });
 
diff --git a/src/app/shared/theme-support/theme.service.ts b/src/app/shared/theme-support/theme.service.ts
index 6d2939a5f8..40aa559b23 100644
--- a/src/app/shared/theme-support/theme.service.ts
+++ b/src/app/shared/theme-support/theme.service.ts
@@ -1,18 +1,15 @@
 import { Injectable, Inject, Injector } from '@angular/core';
 import { Store, createFeatureSelector, createSelector, select } from '@ngrx/store';
-import { BehaviorSubject, EMPTY, Observable, of as observableOf } from 'rxjs';
+import { BehaviorSubject, EMPTY, Observable, of as observableOf, from, concatMap } from 'rxjs';
 import { ThemeState } from './theme.reducer';
 import { SetThemeAction, ThemeActionTypes } from './theme.actions';
-import { expand, filter, map, switchMap, take, toArray } from 'rxjs/operators';
+import { defaultIfEmpty, expand, filter, map, switchMap, take, toArray } from 'rxjs/operators';
 import { hasNoValue, hasValue, isNotEmpty } from '../empty.util';
 import { RemoteData } from '../../core/data/remote-data';
 import { DSpaceObject } from '../../core/shared/dspace-object.model';
-import {
-  getFirstCompletedRemoteData,
-  getFirstSucceededRemoteData,
-  getRemoteDataPayload
-} from '../../core/shared/operators';
-import { HeadTagConfig, Theme, ThemeConfig, themeFactory } from '../../../config/theme.model';
+import { getFirstCompletedRemoteData, getFirstSucceededRemoteData, getRemoteDataPayload } from '../../core/shared/operators';
+import { Theme, themeFactory } from './theme.model';
+import { ThemeConfig, HeadTagConfig } from '../../../config/theme.config';
 import { NO_OP_ACTION_TYPE, NoOpAction } from '../ngrx/no-op.action';
 import { followLink } from '../utils/follow-link-config.model';
 import { LinkService } from '../../core/cache/builders/link.service';
@@ -29,7 +26,7 @@ export const themeStateSelector = createFeatureSelector<ThemeState>('theme');
 
 export const currentThemeSelector = createSelector(
   themeStateSelector,
-  (state: ThemeState): string => hasValue(state) ? state.currentTheme : undefined
+  (state: ThemeState): string => hasValue(state) ? state.currentTheme : BASE_THEME_NAME,
 );
 
 @Injectable({
@@ -219,7 +216,7 @@ export class ThemeService {
     // create new head tags (not yet added to DOM)
     const headTagFragment = this.document.createDocumentFragment();
     this.createHeadTags(themeName)
-        .forEach(newHeadTag => headTagFragment.appendChild(newHeadTag));
+      .forEach(newHeadTag => headTagFragment.appendChild(newHeadTag));
 
     // add new head tags to DOM
     head.appendChild(headTagFragment);
@@ -240,14 +237,7 @@ export class ThemeService {
       if (hasValue(parentThemeName)) {
         // inherit the head tags of the parent theme
         return this.createHeadTags(parentThemeName);
-      }
-      const defaultThemeConfig = getDefaultThemeConfig();
-      const defaultThemeName = defaultThemeConfig.name;
-      if (
-        hasNoValue(defaultThemeName) ||
-        themeName === defaultThemeName ||
-        themeName === BASE_THEME_NAME
-      ) {
+      } else {
         // last resort, use fallback favicon.ico
         return [
           this.createHeadTag({
@@ -260,9 +250,6 @@ export class ThemeService {
           })
         ];
       }
-
-      // inherit the head tags of the default theme
-      return this.createHeadTags(defaultThemeConfig.name);
     }
 
     return headTagConfigs.map(this.createHeadTag.bind(this));
@@ -278,7 +265,7 @@ export class ThemeService {
 
     if (hasValue(headTagConfig.attributes)) {
       Object.entries(headTagConfig.attributes)
-            .forEach(([key, value]) => tag.setAttribute(key, value));
+        .forEach(([key, value]) => tag.setAttribute(key, value));
     }
 
     // 'class' attribute should always be 'theme-head-tag' for removal
@@ -302,7 +289,7 @@ export class ThemeService {
     // and the current theme from the store
     const currentTheme$: Observable<string> = this.store.pipe(select(currentThemeSelector));
 
-    const action$ = currentTheme$.pipe(
+    const action$: Observable<SetThemeAction | NoOpAction> = currentTheme$.pipe(
       switchMap((currentTheme: string) => {
         const snapshotWithData = this.findRouteData(activatedRouteSnapshot);
         if (this.hasDynamicTheme === true && isNotEmpty(this.themes)) {
@@ -312,8 +299,10 @@ export class ThemeService {
               // Start with the resolved dso and go recursively through its parents until you reach the top-level community
               return observableOf(dsoRD.payload).pipe(
                 this.getAncestorDSOs(),
-                map((dsos: DSpaceObject[]) => {
-                  const dsoMatch = this.matchThemeToDSOs(dsos, currentRouteUrl);
+                switchMap((dsos: DSpaceObject[]) => {
+                  return this.matchThemeToDSOs(dsos, currentRouteUrl);
+                }),
+                map((dsoMatch: Theme) => {
                   return this.getActionForMatch(dsoMatch, currentTheme);
                 })
               );
@@ -326,33 +315,41 @@ export class ThemeService {
               getFirstSucceededRemoteData(),
               getRemoteDataPayload(),
               this.getAncestorDSOs(),
-              map((dsos: DSpaceObject[]) => {
-                const dsoMatch = this.matchThemeToDSOs(dsos, currentRouteUrl);
+              switchMap((dsos: DSpaceObject[]) => {
+                return this.matchThemeToDSOs(dsos, currentRouteUrl);
+              }),
+              map((dsoMatch: Theme) => {
                 return this.getActionForMatch(dsoMatch, currentTheme);
               })
             );
           }
 
           // check whether the route itself matches
-          const routeMatch = this.themes.find((theme: Theme) => theme.matches(currentRouteUrl, undefined));
-
-          return [this.getActionForMatch(routeMatch, currentTheme)];
+          return from(this.themes).pipe(
+            concatMap((theme: Theme) => theme.matches(currentRouteUrl, undefined).pipe(
+              filter((result: boolean) => result === true),
+              map(() => theme),
+              take(1),
+            )),
+            take(1),
+            map((theme: Theme) => this.getActionForMatch(theme, currentTheme))
+          );
+        } else {
+          // If there are no themes configured, do nothing
+          return observableOf(new NoOpAction());
         }
-
-        // If there are no themes configured, do nothing
-        return [new NoOpAction()];
       }),
       take(1),
     );
 
     action$.pipe(
-      filter((action) => action.type !== NO_OP_ACTION_TYPE),
-    ).subscribe((action) => {
+      filter((action: SetThemeAction | NoOpAction) => action.type !== NO_OP_ACTION_TYPE),
+    ).subscribe((action: SetThemeAction | NoOpAction) => {
       this.store.dispatch(action);
     });
 
     return action$.pipe(
-      map((action) => action.type === ThemeActionTypes.SET),
+      map((action: SetThemeAction | NoOpAction) => action.type === ThemeActionTypes.SET),
     );
   }
 
@@ -425,9 +422,10 @@ export class ThemeService {
    * @private
    */
   private getActionForMatch(newTheme: Theme, currentThemeName: string): SetThemeAction | NoOpAction {
-    if (hasValue(newTheme) && newTheme.config.name !== currentThemeName) {
+    const newThemeName: string = newTheme?.config.name ?? BASE_THEME_NAME;
+    if (newThemeName !== currentThemeName) {
       // If we have a match, and it isn't already the active theme, set it as the new theme
-      return new SetThemeAction(newTheme.config.name);
+      return new SetThemeAction(newThemeName);
     } else {
       // Otherwise, do nothing
       return new NoOpAction();
@@ -442,14 +440,17 @@ export class ThemeService {
    * @param currentRouteUrl The url for the current route
    * @private
    */
-  private matchThemeToDSOs(dsos: DSpaceObject[], currentRouteUrl: string): Theme {
-    // iterate over the themes in order, and return the first one that matches
-    return this.themes.find((theme: Theme) => {
-      // iterate over the dsos's in order (most specific one first, so Item, Collection,
-      // Community), and return the first one that matches the current theme
-      const match = dsos.find((dso: DSpaceObject) => theme.matches(currentRouteUrl, dso));
-      return hasValue(match);
-    });
+  private matchThemeToDSOs(dsos: DSpaceObject[], currentRouteUrl: string): Observable<Theme> {
+    return from(this.themes).pipe(
+      concatMap((theme: Theme) => from(dsos).pipe(
+        concatMap((dso: DSpaceObject) => theme.matches(currentRouteUrl, dso)),
+        filter((result: boolean) => result === true),
+        map(() => theme),
+        take(1),
+      )),
+      take(1),
+      defaultIfEmpty(undefined),
+    );
   }
 
   /**
diff --git a/src/app/shared/theme-support/themed.component.spec.ts b/src/app/shared/theme-support/themed.component.spec.ts
index 7776e60379..3ddc13ab6c 100644
--- a/src/app/shared/theme-support/themed.component.spec.ts
+++ b/src/app/shared/theme-support/themed.component.spec.ts
@@ -6,7 +6,7 @@ import { VarDirective } from '../utils/var.directive';
 import { ThemeService } from './theme.service';
 import { getMockThemeService } from '../mocks/theme-service.mock';
 import { TestComponent } from './test/test.component.spec';
-import { ThemeConfig } from '../../../config/theme.model';
+import { ThemeConfig } from '../../../config/theme.config';
 
 @Component({
   selector: 'ds-test-themed-component',
diff --git a/src/app/shared/theme-support/themed.component.ts b/src/app/shared/theme-support/themed.component.ts
index 6b0727ccdd..0d2833b33f 100644
--- a/src/app/shared/theme-support/themed.component.ts
+++ b/src/app/shared/theme-support/themed.component.ts
@@ -1,12 +1,11 @@
 import {
+  AfterViewInit,
   Component,
   ViewChild,
   ViewContainerRef,
   ComponentRef,
   SimpleChanges,
-  OnInit,
   OnDestroy,
-  ComponentFactoryResolver,
   ChangeDetectorRef,
   OnChanges,
   HostBinding,
@@ -24,7 +23,7 @@ import { BASE_THEME_NAME } from './theme.constants';
   styleUrls: ['./themed.component.scss'],
   templateUrl: './themed.component.html',
 })
-export abstract class ThemedComponent<T> implements OnInit, OnDestroy, OnChanges {
+export abstract class ThemedComponent<T> implements AfterViewInit, OnDestroy, OnChanges {
   @ViewChild('vcr', { read: ViewContainerRef }) vcr: ViewContainerRef;
   @ViewChild('content') themedElementContent: ElementRef;
   protected compRef: ComponentRef<T>;
@@ -47,7 +46,6 @@ export abstract class ThemedComponent<T> implements OnInit, OnDestroy, OnChanges
   @HostBinding('attr.data-used-theme') usedTheme: string;
 
   constructor(
-    protected resolver: ComponentFactoryResolver,
     protected cdr: ChangeDetectorRef,
     protected themeService: ThemeService,
   ) {
@@ -74,8 +72,7 @@ export abstract class ThemedComponent<T> implements OnInit, OnDestroy, OnChanges
     }
   }
 
-  ngOnInit(): void {
-    this.destroyComponentInstance();
+  ngAfterViewInit(): void {
     this.initComponentInstance();
   }
 
@@ -96,8 +93,6 @@ export abstract class ThemedComponent<T> implements OnInit, OnDestroy, OnChanges
     }
 
     if (hasNoValue(this.lazyLoadObs)) {
-      this.destroyComponentInstance();
-
       this.lazyLoadObs = combineLatest([
         observableOf(changes),
         this.resolveThemedComponent(this.themeService.getThemeName()).pipe(
@@ -120,8 +115,10 @@ export abstract class ThemedComponent<T> implements OnInit, OnDestroy, OnChanges
     }
 
     this.lazyLoadSub = this.lazyLoadObs.subscribe(([simpleChanges, constructor]: [SimpleChanges, GenericConstructor<T>]) => {
-      const factory = this.resolver.resolveComponentFactory(constructor);
-      this.compRef = this.vcr.createComponent(factory, undefined, undefined, [this.themedElementContent.nativeElement.childNodes]);
+      this.destroyComponentInstance();
+      this.compRef = this.vcr.createComponent(constructor, {
+        projectableNodes: [this.themedElementContent.nativeElement.childNodes],
+      });
       if (hasValue(simpleChanges)) {
         this.ngOnChanges(simpleChanges);
       } else {
diff --git a/src/app/shared/trackable/abstract-trackable.component.spec.ts b/src/app/shared/trackable/abstract-trackable.component.spec.ts
index c538f074c5..ad2d821ada 100644
--- a/src/app/shared/trackable/abstract-trackable.component.spec.ts
+++ b/src/app/shared/trackable/abstract-trackable.component.spec.ts
@@ -9,6 +9,8 @@ import { NotificationsService } from '../notifications/notifications.service';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
 import { TestScheduler } from 'rxjs/testing';
 import { getTestScheduler } from 'jasmine-marbles';
+import { RouterStub } from '../testing/router.stub';
+import { Router } from '@angular/router';
 
 describe('AbstractTrackableComponent', () => {
   let comp: AbstractTrackableComponent;
@@ -27,6 +29,7 @@ describe('AbstractTrackableComponent', () => {
       success: successNotification
     }
   );
+  let router: RouterStub;
 
   const url = 'http://test-url.com/test-url';
 
@@ -42,6 +45,8 @@ describe('AbstractTrackableComponent', () => {
         isValidPage: observableOf(true)
       }
     );
+    router = new RouterStub();
+    router.url = url;
 
     scheduler = getTestScheduler();
 
@@ -51,6 +56,7 @@ describe('AbstractTrackableComponent', () => {
       providers: [
         { provide: ObjectUpdatesService, useValue: objectUpdatesService },
         { provide: NotificationsService, useValue: notificationsService },
+        { provide: Router, useValue: router },
       ], schemas: [
         NO_ERRORS_SCHEMA
       ]
@@ -60,7 +66,6 @@ describe('AbstractTrackableComponent', () => {
   beforeEach(() => {
     fixture = TestBed.createComponent(AbstractTrackableComponent);
     comp = fixture.componentInstance;
-    comp.url = url;
 
     fixture.detectChanges();
   });
diff --git a/src/app/shared/trackable/abstract-trackable.component.ts b/src/app/shared/trackable/abstract-trackable.component.ts
index e1a99d90b9..396d743855 100644
--- a/src/app/shared/trackable/abstract-trackable.component.ts
+++ b/src/app/shared/trackable/abstract-trackable.component.ts
@@ -2,7 +2,8 @@ import { ObjectUpdatesService } from '../../core/data/object-updates/object-upda
 import { NotificationsService } from '../notifications/notifications.service';
 import { TranslateService } from '@ngx-translate/core';
 import { Observable } from 'rxjs';
-import { Component } from '@angular/core';
+import { Component, OnInit } from '@angular/core';
+import { Router } from '@angular/router';
 
 /**
  * Abstract Component that is able to track changes made in the inheriting component using the ObjectUpdateService
@@ -11,7 +12,7 @@ import { Component } from '@angular/core';
   selector: 'ds-abstract-trackable',
   template: ''
 })
-export class AbstractTrackableComponent {
+export class AbstractTrackableComponent implements OnInit {
 
   /**
    * The time span for being able to undo discarding changes
@@ -21,14 +22,25 @@ export class AbstractTrackableComponent {
   public url: string;
   public notificationsPrefix = 'static-pages.form.notification';
 
+  hasChanges$: Observable<boolean>;
+
+  isReinstatable$: Observable<boolean>;
+
   constructor(
     public objectUpdatesService: ObjectUpdatesService,
     public notificationsService: NotificationsService,
     public translateService: TranslateService,
+    public router: Router,
   ) {
 
   }
 
+  ngOnInit(): void {
+    this.url = this.router.url.split('?')[0];
+    this.hasChanges$ = this.hasChanges();
+    this.isReinstatable$ = this.isReinstatable();
+  }
+
   /**
    * Request the object updates service to discard all current changes to this item
    * Shows a notification to remind the user that they can undo this
diff --git a/src/app/shared/truncatable/truncatable-part/truncatable-part.component.html b/src/app/shared/truncatable/truncatable-part/truncatable-part.component.html
index 32a2a21349..1ac89e5329 100644
--- a/src/app/shared/truncatable/truncatable-part/truncatable-part.component.html
+++ b/src/app/shared/truncatable/truncatable-part/truncatable-part.component.html
@@ -2,12 +2,17 @@
   <div #content class="content dont-break-out preserve-line-breaks">
     <ng-content></ng-content>
   </div>
-  <button class="btn btn-link p-0 expandButton" dsDragClick (actualClick)="toggle()">
-    <i class="fas fa-angle-down"></i>
-    <span class="ml-1">{{ 'item.truncatable-part.show-more' | translate }}</span>
-  </button>
-  <button class="btn btn-link p-0 collapseButton" dsDragClick (actualClick)="toggle()" *ngIf="expand && expandable">
-    <i class="fas fa-angle-up"></i>
-    <span class="ml-1">{{ 'item.truncatable-part.show-less' | translate }}</span>
+  <button
+    class="btn btn-link p-0 {{isExpanded ? 'collapseButton' : 'expandButton'}}"
+    dsDragClick
+    (actualClick)="toggle()"
+    (keyup.Enter)="toggle()"
+    (keyup.Space)="toggle()"
+    role="button"
+    [attr.aria-expanded]="isExpanded"
+    tabindex="0"
+  >
+    <i class="fas {{isExpanded ? 'fa-angle-up' : 'fa-angle-down'}}"></i>
+    <span class="ml-1">{{ 'item.truncatable-part.show-' + (isExpanded ? 'less' : 'more') | translate }}</span>
   </button>
 </div>
diff --git a/src/app/shared/truncatable/truncatable-part/truncatable-part.component.spec.ts b/src/app/shared/truncatable/truncatable-part/truncatable-part.component.spec.ts
index 08d3e18117..a40703bbf3 100644
--- a/src/app/shared/truncatable/truncatable-part/truncatable-part.component.spec.ts
+++ b/src/app/shared/truncatable/truncatable-part/truncatable-part.component.spec.ts
@@ -73,6 +73,11 @@ describe('TruncatablePartComponent', () => {
       const a = fixture.debugElement.query(By.css('.collapseButton'));
       expect(a).toBeNull();
     });
+
+    it('expandButton aria-expanded should be false', () => {
+      const btn = fixture.debugElement.query(By.css('.expandButton'));
+      expect(btn.nativeElement.getAttribute('aria-expanded')).toEqual('false');
+    });
   });
 
   describe('When the item is expanded', () => {
@@ -101,6 +106,14 @@ describe('TruncatablePartComponent', () => {
       const a = fixture.debugElement.query(By.css('.collapseButton'));
       expect(a).not.toBeNull();
     });
+
+    it('collapseButton aria-expanded should be true', () => {
+      (comp as any).setLines();
+      (comp as any).expandable = true;
+      fixture.detectChanges();
+      const btn = fixture.debugElement.query(By.css('.collapseButton'));
+      expect(btn.nativeElement.getAttribute('aria-expanded')).toEqual('true');
+    });
   });
 });
 
diff --git a/src/app/shared/truncatable/truncatable-part/truncatable-part.component.ts b/src/app/shared/truncatable/truncatable-part/truncatable-part.component.ts
index 790bd5985d..c25e44c968 100644
--- a/src/app/shared/truncatable/truncatable-part/truncatable-part.component.ts
+++ b/src/app/shared/truncatable/truncatable-part/truncatable-part.component.ts
@@ -136,6 +136,13 @@ export class TruncatablePartComponent implements AfterViewChecked, OnInit, OnDes
     }
   }
 
+  /**
+   * Indicates if the content is expanded, button state is 'Collapse'
+   */
+  public get isExpanded() {
+    return this.expand && this.expandable;
+  }
+
   /**
    * Unsubscribe from the subscription
    */
diff --git a/src/app/shared/upload/uploader/uploader-options.model.ts b/src/app/shared/upload/uploader/uploader-options.model.ts
index 559fb0485b..e21628d06e 100644
--- a/src/app/shared/upload/uploader/uploader-options.model.ts
+++ b/src/app/shared/upload/uploader/uploader-options.model.ts
@@ -22,6 +22,11 @@ export class UploaderOptions {
    */
   maxFileNumber: number;
 
+  /**
+   * Impersonating user uuid
+   */
+  impersonatingID: string;
+
   /**
    * The request method to use for the file upload request
    */
diff --git a/src/app/shared/upload/uploader/uploader.component.html b/src/app/shared/upload/uploader/uploader.component.html
index 88dc5926e4..ae7c07bbab 100644
--- a/src/app/shared/upload/uploader/uploader.component.html
+++ b/src/app/shared/upload/uploader/uploader.component.html
@@ -19,11 +19,11 @@
          (fileOver)="fileOverBase($event)"
          class="well ds-base-drop-zone mt-1 mb-3 text-muted">
       <div class="text-center m-0 p-2 d-flex justify-content-center align-items-center" *ngIf="uploader?.queue?.length === 0">
-        <span>
-          <i class="fas fa-upload" aria-hidden="true"></i>
+        <span class="d-flex align-items-center">
+          <i class="fas fa-upload pr-1" aria-hidden="true"></i>
           {{dropMsg | translate}}{{'uploader.or' | translate}}
           <label for="inputFileUploader-{{uploaderId}}" class="btn btn-link m-0 p-0 ml-1" tabindex="0" (keyup.enter)="$event.stopImmediatePropagation(); fileInput.click()">
-            <span role="button" [attr.aria-label]="'uploader.browse' | translate">{{'uploader.browse' | translate}}</span>
+            <span role="button" [attr.aria-label]="ariaLabel | translate">{{'uploader.browse' | translate}}</span>
           </label>
           <input #fileInput id="inputFileUploader-{{uploaderId}}" class="d-none" type="file" ng2FileSelect [uploader]="uploader" multiple tabindex="0" />
         </span>
@@ -35,7 +35,7 @@
               <span *ngIf="!uploader.options.disableMultipart">{{'uploader.queue-length' | translate}}: {{ uploader?.queue?.length }} | </span>{{ uploader?.queue[0]?.file.name }}
             </span>
             <div class="btn-group btn-group-sm float-right" role="group">
-              <button type="button" class="btn btn-danger" title="{{'uploader.delete.btn-title' | translate}}" (click)="uploader.clearQueue()" [disabled]="!uploader.queue.length">
+              <button type="button" class="btn btn-danger" title="{{'uploader.delete.btn-title' | translate}}" (click)="uploader.clearQueue()" [dsBtnDisabled]="!uploader.queue.length">
                 <i class="fas fa-trash" aria-hidden="true"></i>
               </button>
             </div>
diff --git a/src/app/shared/upload/uploader/uploader.component.ts b/src/app/shared/upload/uploader/uploader.component.ts
index ef4ce4ee45..5033746f6a 100644
--- a/src/app/shared/upload/uploader/uploader.component.ts
+++ b/src/app/shared/upload/uploader/uploader.component.ts
@@ -23,6 +23,11 @@ import { DragService } from '../../../core/drag.service';
 
 export class UploaderComponent {
 
+  /**
+   * Header key to impersonate a user
+   */
+  private readonly ON_BEHALF_HEADER = 'X-On-Behalf-Of';
+
   /**
    * The message to show when drag files on the drop zone
    */
@@ -53,6 +58,11 @@ export class UploaderComponent {
    */
   @Input() uploadProperties: UploaderProperties;
 
+  /**
+   * The aria label to describe what kind of files need to be uploaded
+   */
+  @Input() ariaLabel: string;
+
   /**
    * The function to call when upload is completed
    */
@@ -134,7 +144,13 @@ export class UploaderComponent {
         item.url = this.uploader.options.url;
       }
       // Ensure the current XSRF token is included in every upload request (token may change between items uploaded)
-      this.uploader.options.headers = [{ name: XSRF_REQUEST_HEADER, value: this.tokenExtractor.getToken() }];
+      // Ensure the behalf header is set if impersonating
+      this.uploader.options.headers = [
+        { name: XSRF_REQUEST_HEADER, value: this.tokenExtractor.getToken() },
+      ];
+      if (hasValue(this.uploadFilesOptions.impersonatingID)) {
+        this.uploader.options.headers.push({ name: this.ON_BEHALF_HEADER, value: this.uploadFilesOptions.impersonatingID });
+      }
       this.onBeforeUpload();
       this.isOverDocumentDropZone = observableOf(false);
     };
diff --git a/src/app/shared/utils/hover-outside.directive.ts b/src/app/shared/utils/hover-outside.directive.ts
new file mode 100644
index 0000000000..fd6676cbe7
--- /dev/null
+++ b/src/app/shared/utils/hover-outside.directive.ts
@@ -0,0 +1,52 @@
+import {
+  Directive,
+  ElementRef,
+  EventEmitter,
+  HostListener,
+  Input,
+  Output,
+} from '@angular/core';
+
+/**
+ * Directive to detect when the user hovers outside the element the directive was put on
+ *
+ * **Performance Consideration**: it's probably not good for performance to use this excessively (on
+ * {@link ExpandableNavbarSectionComponent} for example, a workaround for this problem was to add an `*ngIf` to prevent
+ * this Directive from always being active)
+ */
+@Directive({
+  selector: '[dsHoverOutside]',
+})
+export class HoverOutsideDirective {
+
+  /**
+   * Emits null when the user hovers outside of the element
+   */
+  @Output()
+  public dsHoverOutside = new EventEmitter();
+
+  /**
+   * CSS selector for the parent element to monitor. If set, the directive will use this
+   * selector to determine if the hover event originated within the selected parent element.
+   * If left unset, the directive will monitor mouseover hover events for the element it is applied to.
+   */
+  @Input()
+  public dsHoverOutsideOfParentSelector: string;
+
+  constructor(
+    private elementRef: ElementRef,
+  ) {
+  }
+
+  @HostListener('document:mouseover', ['$event'])
+  public onMouseOver(event: MouseEvent): void {
+    const targetElement: HTMLElement = event.target as HTMLElement;
+    const element: Element = document.querySelector(this.dsHoverOutsideOfParentSelector);
+    const hoveredInside = (element ? new ElementRef(element) : this.elementRef).nativeElement.contains(targetElement);
+
+    if (!hoveredInside) {
+      this.dsHoverOutside.emit(null);
+    }
+  }
+
+}
diff --git a/src/app/shared/utils/markdown.pipe.ts b/src/app/shared/utils/markdown.pipe.ts
index e494a82613..90b6d25731 100644
--- a/src/app/shared/utils/markdown.pipe.ts
+++ b/src/app/shared/utils/markdown.pipe.ts
@@ -67,7 +67,9 @@ export class MarkdownPipe implements PipeTransform {
         // sanitize-html doesn't let through SVG by default, so we extend its allowlists to cover MathJax SVG
         allowedTags: [
           ...sanitizeHtml.defaults.allowedTags,
-          'mjx-container', 'svg', 'g', 'path', 'rect', 'text'
+          'mjx-container', 'svg', 'g', 'path', 'rect', 'text',
+          // Also let the mjx-assistive-mml tag (and it's children) through (for screen readers)
+          'mjx-assistive-mml', 'math', 'mrow', 'mi',
         ],
         allowedAttributes: {
           ...sanitizeHtml.defaults.allowedAttributes,
@@ -88,7 +90,16 @@ export class MarkdownPipe implements PipeTransform {
           ],
           text: [
             'transform', 'font-size'
-          ]
+          ],
+          'mjx-assistive-mml': [
+            'unselectable', 'display', 'style',
+          ],
+          math: [
+            'xmlns',
+          ],
+          mrow: [
+            'data-mjx-texclass',
+          ],
         },
         parser: {
           lowerCaseAttributeNames: false,
diff --git a/src/app/shared/utils/relation-query.utils.ts b/src/app/shared/utils/relation-query.utils.ts
index 62a69075fc..635ae946da 100644
--- a/src/app/shared/utils/relation-query.utils.ts
+++ b/src/app/shared/utils/relation-query.utils.ts
@@ -1,5 +1,6 @@
 import { followLink, FollowLinkConfig } from './follow-link-config.model';
 import { Relationship } from '../../core/shared/item-relationships/relationship.model';
+import { Item } from '../../core/shared/item.model';
 
 /**
  * Get the query for looking up items by relation type
@@ -21,19 +22,22 @@ export function getFilterByRelation(relationType: string, itemUUID: string): str
 }
 
 /**
- * Creates links to follow for the leftItem and rightItem. Links will include
- * @param showThumbnail thumbnail image configuration
- * @returns followLink array
+ * Creates links to follow for the leftItem and rightItem. Optionally additional links for `thumbnail` & `accessStatus`
+ * can be embedded as well.
+ *
+ * @param showThumbnail    Whether the `thumbnail` needs to be embedded on the {@link Item}
+ * @param showAccessStatus Whether the `accessStatus` needs to be embedded on the {@link Item}
  */
-export function itemLinksToFollow(showThumbnail: boolean):  FollowLinkConfig<Relationship>[] {
-  let linksToFollow: FollowLinkConfig<Relationship>[];
+export function itemLinksToFollow(showThumbnail: boolean, showAccessStatus: boolean):  FollowLinkConfig<Relationship>[] {
+  const conditionalLinksToFollow: FollowLinkConfig<Item>[] = [];
   if (showThumbnail) {
-    linksToFollow = [
-      followLink('leftItem',{}, followLink('thumbnail')),
-      followLink('rightItem',{}, followLink('thumbnail'))
-    ];
-  } else {
-    linksToFollow = [followLink('leftItem'), followLink('rightItem')];
+    conditionalLinksToFollow.push(followLink<Item>('thumbnail'));
   }
-  return linksToFollow;
+  if (showAccessStatus) {
+    conditionalLinksToFollow.push(followLink<Item>('accessStatus'));
+  }
+  return [
+    followLink('leftItem', undefined, ...conditionalLinksToFollow),
+    followLink('rightItem', undefined, ...conditionalLinksToFollow),
+  ];
 }
diff --git a/src/app/shared/utils/safe-url-pipe.ts b/src/app/shared/utils/safe-url-pipe.ts
index 3f35ed9262..c3b8db62ce 100644
--- a/src/app/shared/utils/safe-url-pipe.ts
+++ b/src/app/shared/utils/safe-url-pipe.ts
@@ -10,6 +10,6 @@ import { DomSanitizer } from '@angular/platform-browser';
 export class SafeUrlPipe implements PipeTransform {
   constructor(private domSanitizer: DomSanitizer) { }
   transform(url) {
-    return this.domSanitizer.bypassSecurityTrustResourceUrl(url);
+    return url == null ? null : this.domSanitizer.bypassSecurityTrustResourceUrl(url);
   }
 }
diff --git a/src/app/shared/view-mode-switch/view-mode-switch.component.html b/src/app/shared/view-mode-switch/view-mode-switch.component.html
index 45d219eb91..5d29562a76 100644
--- a/src/app/shared/view-mode-switch/view-mode-switch.component.html
+++ b/src/app/shared/view-mode-switch/view-mode-switch.component.html
@@ -1,5 +1,7 @@
 <div class="btn-group" data-toggle="buttons">
     <button *ngIf="isToShow(viewModeEnum.ListElement)"
+            [attr.aria-current]="currentMode === viewModeEnum.ListElement"
+            [attr.aria-label]="'search.view-switch.show-list' | translate"
        routerLink="."
        [queryParams]="{view: 'list'}"
        queryParamsHandling="merge"
@@ -8,9 +10,11 @@
        [class.active]="currentMode === viewModeEnum.ListElement"
        class="btn btn-secondary"
        [attr.data-test]="'list-view' | dsBrowserOnly">
-       <span class="fas fa-list"></span><span class="sr-only">{{'search.view-switch.show-list' | translate}}</span>
+       <i class="fas fa-list"></i>
     </button>
     <button *ngIf="isToShow(viewModeEnum.GridElement)"
+            [attr.aria-current]="currentMode === viewModeEnum.GridElement"
+            [attr.aria-label]="'search.view-switch.show-grid' | translate"
        routerLink="."
        [queryParams]="{view: 'grid'}"
        queryParamsHandling="merge"
@@ -19,7 +23,7 @@
        [class.active]="currentMode === viewModeEnum.GridElement"
        class="btn btn-secondary"
        [attr.data-test]="'grid-view' | dsBrowserOnly">
-       <span class="fas fa-th-large"></span><span class="sr-only">{{'search.view-switch.show-grid' | translate}}</span>
+       <i class="fas fa-th-large"></i>
     </button>
     <button *ngIf="isToShow(viewModeEnum.DetailedListElement)"
        routerLink="."
diff --git a/src/app/statistics-page/statistics-page/statistics-page.component.html b/src/app/statistics-page/statistics-page/statistics-page.component.html
index c6938c7582..047bf52e7c 100644
--- a/src/app/statistics-page/statistics-page/statistics-page.component.html
+++ b/src/app/statistics-page/statistics-page/statistics-page.component.html
@@ -1,11 +1,11 @@
 <div class="container">
 
   <ng-container *ngVar="(scope$ | async) as scope">
-    <h2 *ngIf="scope"
+    <h1 *ngIf="scope"
         class="header"
         id="{{ scope.id }}">
       {{ 'statistics.header' | translate: { scope: getName(scope) } }}
-    </h2>
+    </h1>
   </ng-container>
 
   <ng-container *ngVar="reports$ | async as reports">
diff --git a/src/app/statistics-page/statistics-table/statistics-table.component.html b/src/app/statistics-page/statistics-table/statistics-table.component.html
index 5a333b9658..efa9ce43d9 100644
--- a/src/app/statistics-page/statistics-table/statistics-table.component.html
+++ b/src/app/statistics-page/statistics-table/statistics-table.component.html
@@ -1,9 +1,9 @@
 <div *ngIf="hasData"
      class="m-1">
 
-  <h3 class="m-1">
+  <h2 class="m-1">
     {{ 'statistics.table.title.' + report.reportType | translate }}
-  </h3>
+  </h2>
 
   <table class="table table-striped" [attr.data-test]="report.reportType">
 
diff --git a/src/app/statistics/angulartics/dspace-provider.ts b/src/app/statistics/angulartics/dspace-provider.ts
index 86c16b5c01..957b09a0c8 100644
--- a/src/app/statistics/angulartics/dspace-provider.ts
+++ b/src/app/statistics/angulartics/dspace-provider.ts
@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Angulartics2 } from 'angulartics2';
+import { Angulartics2, EventTrack } from 'angulartics2';
 import { StatisticsService } from '../statistics.service';
 
 /**
@@ -23,7 +23,7 @@ export class Angulartics2DSpace {
       .subscribe((event) => this.eventTrack(event));
   }
 
-  private eventTrack(event) {
+  private eventTrack(event: Partial<EventTrack>): void {
     if (event.action === 'page_view') {
       this.statisticsService.trackViewEvent(event.properties.object, event.properties.referrer);
     } else if (event.action === 'search') {
@@ -32,7 +32,7 @@ export class Angulartics2DSpace {
         event.properties.page,
         event.properties.sort,
         event.properties.filters,
-        event.properties.clickedObject,
+        event.properties.clickedObject?.split('?')[0],
       );
     }
   }
diff --git a/src/app/statistics/angulartics/dspace/view-tracker-resolver.service.ts b/src/app/statistics/angulartics/dspace/view-tracker-resolver.service.ts
new file mode 100644
index 0000000000..fc23c09c51
--- /dev/null
+++ b/src/app/statistics/angulartics/dspace/view-tracker-resolver.service.ts
@@ -0,0 +1,56 @@
+import { Injectable, } from '@angular/core';
+import { Angulartics2 } from 'angulartics2';
+import { switchMap } from 'rxjs';
+import { filter, take } from 'rxjs/operators';
+
+import { ReferrerService } from '../../../core/services/referrer.service';
+import { ActivatedRouteSnapshot, ResolveEnd, Router, RouterStateSnapshot } from '@angular/router';
+
+/**
+ * This component triggers a page view statistic
+ */
+@Injectable({
+  providedIn: 'root'
+})
+export class ViewTrackerResolverService {
+
+  constructor(
+    public angulartics2: Angulartics2,
+    public referrerService: ReferrerService,
+    public router: Router,
+  ) {
+  }
+
+  resolve(routeSnapshot: ActivatedRouteSnapshot, state: RouterStateSnapshot): boolean {
+    const dsoPath = routeSnapshot.data.dsoPath || 'dso.payload'; // Fetch the resolvers passed via the route data
+    this.router.events.pipe(
+      filter(event => event instanceof ResolveEnd),
+      take(1),
+      switchMap(() =>
+        this.referrerService.getReferrer().pipe(take(1))))
+      .subscribe((referrer: string) => {
+        this.angulartics2.eventTrack.next({
+          action: 'page_view',
+          properties: {
+            object: this.getNestedProperty(routeSnapshot.data, dsoPath),
+            referrer,
+          },
+        });
+      });
+    return true;
+  }
+
+  private getNestedProperty(obj: any, path: string) {
+    const keys = path.split('.');
+    let result = obj;
+
+    for (const key of keys) {
+      if (result && result.hasOwnProperty(key)) {
+        result = result[key];
+      } else {
+        return undefined;
+      }
+    }
+    return result;
+  }
+}
diff --git a/src/app/statistics/angulartics/dspace/view-tracker.component.html b/src/app/statistics/angulartics/dspace/view-tracker.component.html
deleted file mode 100644
index c0c0ffe181..0000000000
--- a/src/app/statistics/angulartics/dspace/view-tracker.component.html
+++ /dev/null
@@ -1 +0,0 @@
-&nbsp;
diff --git a/src/app/statistics/angulartics/dspace/view-tracker.component.scss b/src/app/statistics/angulartics/dspace/view-tracker.component.scss
deleted file mode 100644
index c76cafbe44..0000000000
--- a/src/app/statistics/angulartics/dspace/view-tracker.component.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-:host {
-  display: none
-}
diff --git a/src/app/statistics/angulartics/dspace/view-tracker.component.ts b/src/app/statistics/angulartics/dspace/view-tracker.component.ts
deleted file mode 100644
index 805d311cfd..0000000000
--- a/src/app/statistics/angulartics/dspace/view-tracker.component.ts
+++ /dev/null
@@ -1,56 +0,0 @@
-import { Component, Input, OnInit, OnDestroy } from '@angular/core';
-import { Angulartics2 } from 'angulartics2';
-import { DSpaceObject } from '../../../core/shared/dspace-object.model';
-import { Subscription } from 'rxjs/internal/Subscription';
-import { take } from 'rxjs/operators';
-import { hasValue } from '../../../shared/empty.util';
-import { ReferrerService } from '../../../core/services/referrer.service';
-
-/**
- * This component triggers a page view statistic
- */
-@Component({
-  selector: 'ds-view-tracker',
-  styleUrls: ['./view-tracker.component.scss'],
-  templateUrl: './view-tracker.component.html',
-})
-export class ViewTrackerComponent implements OnInit, OnDestroy {
-  /**
-   * The DSpaceObject to track a view event about
-   */
-  @Input() object: DSpaceObject;
-
-  /**
-   * The subscription on this.referrerService.getReferrer()
-   * @protected
-   */
-  protected sub: Subscription;
-
-  constructor(
-    public angulartics2: Angulartics2,
-    public referrerService: ReferrerService
-  ) {
-  }
-
-  ngOnInit(): void {
-    this.sub = this.referrerService.getReferrer()
-      .pipe(take(1))
-      .subscribe((referrer: string) => {
-        this.angulartics2.eventTrack.next({
-          action: 'page_view',
-          properties: {
-            object: this.object,
-            referrer
-          },
-        });
-      });
-  }
-
-  ngOnDestroy(): void {
-    // unsubscribe in the case that this component is destroyed before
-    // this.referrerService.getReferrer() has emitted
-    if (hasValue(this.sub)) {
-      this.sub.unsubscribe();
-    }
-  }
-}
diff --git a/src/app/statistics/statistics.module.ts b/src/app/statistics/statistics.module.ts
index 4870e4fbf0..d93d774394 100644
--- a/src/app/statistics/statistics.module.ts
+++ b/src/app/statistics/statistics.module.ts
@@ -2,7 +2,6 @@ import { ModuleWithProviders, NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { CoreModule } from '../core/core.module';
 import { SharedModule } from '../shared/shared.module';
-import { ViewTrackerComponent } from './angulartics/dspace/view-tracker.component';
 import { StatisticsEndpoint } from './statistics-endpoint.model';
 
 /**
@@ -19,10 +18,8 @@ export const models = [
     SharedModule,
   ],
   declarations: [
-    ViewTrackerComponent,
   ],
   exports: [
-    ViewTrackerComponent,
   ]
 })
 /**
diff --git a/src/app/submission/edit/submission-edit.component.spec.ts b/src/app/submission/edit/submission-edit.component.spec.ts
index 8013162d85..a476c9ab1f 100644
--- a/src/app/submission/edit/submission-edit.component.spec.ts
+++ b/src/app/submission/edit/submission-edit.component.spec.ts
@@ -18,6 +18,7 @@ import { ActivatedRouteStub } from '../../shared/testing/active-router.stub';
 import { mockSubmissionObject } from '../../shared/mocks/submission.mock';
 import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
 import { ItemDataService } from '../../core/data/item-data.service';
+import { XSRFService } from '../../core/xsrf/xsrf.service';
 import { SubmissionJsonPatchOperationsServiceStub } from '../../shared/testing/submission-json-patch-operations-service.stub';
 import { SubmissionJsonPatchOperationsService } from '../../core/submission/submission-json-patch-operations.service';
 
@@ -54,7 +55,7 @@ describe('SubmissionEditComponent Component', () => {
         { provide: TranslateService, useValue: getMockTranslateService() },
         { provide: Router, useValue: new RouterStub() },
         { provide: ActivatedRoute, useValue: route },
-
+        { provide: XSRFService, useValue: {} },
       ],
       schemas: [NO_ERRORS_SCHEMA]
     }).compileComponents();
diff --git a/src/app/submission/form/collection/submission-form-collection.component.html b/src/app/submission/form/collection/submission-form-collection.component.html
index a78d737640..fe9527c266 100644
--- a/src/app/submission/form/collection/submission-form-collection.component.html
+++ b/src/app/submission/form/collection/submission-form-collection.component.html
@@ -25,14 +25,14 @@
             class="btn btn-outline-primary"
             (blur)="onClose()"
             (click)="onClose()"
-            [disabled]="(processingChange$ | async) || collectionModifiable == false || isReadonly"
+            [dsBtnDisabled]="(processingChange$ | async) || collectionModifiable == false || isReadonly"
             ngbDropdownToggle>
       <span *ngIf="(processingChange$ | async)"><i class='fas fa-circle-notch fa-spin'></i></span>
       <span *ngIf="!(processingChange$ | async)">{{ selectedCollectionName$ | async }}</span>
     </button>
 
     <div ngbDropdownMenu
-         class="dropdown-menu"
+         class="dropdown-menu p-0"
          id="collectionControlsDropdownMenu"
          aria-labelledby="collectionControlsMenuButton">
       <ds-themed-collection-dropdown
diff --git a/src/app/submission/form/collection/submission-form-collection.component.spec.ts b/src/app/submission/form/collection/submission-form-collection.component.spec.ts
index c76de83b83..467f164f89 100644
--- a/src/app/submission/form/collection/submission-form-collection.component.spec.ts
+++ b/src/app/submission/form/collection/submission-form-collection.component.spec.ts
@@ -25,6 +25,7 @@ import { Collection } from '../../../core/shared/collection.model';
 import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
 import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
 import { DSONameServiceMock } from '../../../shared/mocks/dso-name.service.mock';
+import {BtnDisabledDirective} from '../../../shared/btn-disabled.directive';
 
 describe('SubmissionFormCollectionComponent Component', () => {
 
@@ -135,7 +136,8 @@ describe('SubmissionFormCollectionComponent Component', () => {
       ],
       declarations: [
         SubmissionFormCollectionComponent,
-        TestComponent
+        TestComponent,
+        BtnDisabledDirective
       ],
       providers: [
         { provide: DSONameService, useValue: new DSONameServiceMock() },
@@ -255,7 +257,8 @@ describe('SubmissionFormCollectionComponent Component', () => {
       it('the dropdown button should be disabled when isReadonly is true', () => {
         comp.isReadonly = true;
         fixture.detectChanges();
-        expect(dropdowBtn.nativeNode.attributes.disabled).toBeDefined();
+        expect(dropdowBtn.nativeNode.getAttribute('aria-disabled')).toBe('true');
+        expect(dropdowBtn.nativeNode.classList.contains('disabled')).toBeTrue();
       });
 
       it('should be simulated when the drop-down menu is closed', () => {
diff --git a/src/app/submission/form/footer/submission-form-footer.component.html b/src/app/submission/form/footer/submission-form-footer.component.html
index e898e1c220..457a56cc76 100644
--- a/src/app/submission/form/footer/submission-form-footer.component.html
+++ b/src/app/submission/form/footer/submission-form-footer.component.html
@@ -5,7 +5,7 @@
             id="discard"
             [attr.data-test]="'discard' | dsBrowserOnly"
             class="btn btn-danger"
-            [disabled]="(processingSaveStatus | async) || (processingDepositStatus | async)"
+            [dsBtnDisabled]="(processingSaveStatus | async) || (processingDepositStatus | async)"
             (click)="$event.preventDefault();confirmDiscard(content)">
       <i class="fas fa-trash"></i> {{'submission.general.discard.submit' | translate}}
     </button>
@@ -28,7 +28,7 @@
               class="btn btn-secondary"
               id="save"
               [attr.data-test]="'save' | dsBrowserOnly"
-              [disabled]="(processingSaveStatus | async) || !(hasUnsavedModification | async)"
+              [dsBtnDisabled]="(processingSaveStatus | async) || !(hasUnsavedModification | async)"
               (click)="save($event)">
         <span><i class="fas fa-save"></i> {{'submission.general.save' | translate}}</span>
       </button>
@@ -38,7 +38,7 @@
               class="btn"
               id="saveForLater"
               [attr.data-test]="'save-for-later' | dsBrowserOnly"
-              [disabled]="(processingSaveStatus | async) || (processingDepositStatus | async)"
+              [dsBtnDisabled]="(processingSaveStatus | async) || (processingDepositStatus | async)"
               (click)="saveLater($event)">
         <span><i class="fas fa-save"></i> {{'submission.general.save-later' | translate}}</span>
       </button>
@@ -47,7 +47,7 @@
               id="deposit"
               [attr.data-test]="'deposit' | dsBrowserOnly"
               class="btn btn-success"
-              [disabled]="(processingSaveStatus | async) || (processingDepositStatus | async)"
+              [dsBtnDisabled]="(processingSaveStatus | async) || (processingDepositStatus | async)"
               (click)="deposit($event)">
         <span><i class="fas fa-plus"></i> {{'submission.general.deposit' | translate}}</span>
       </button>
diff --git a/src/app/submission/form/footer/submission-form-footer.component.spec.ts b/src/app/submission/form/footer/submission-form-footer.component.spec.ts
index dd28f9a10a..658926834c 100644
--- a/src/app/submission/form/footer/submission-form-footer.component.spec.ts
+++ b/src/app/submission/form/footer/submission-form-footer.component.spec.ts
@@ -16,6 +16,7 @@ import { SubmissionFormFooterComponent } from './submission-form-footer.componen
 import { SubmissionRestService } from '../../../core/submission/submission-rest.service';
 import { createTestComponent } from '../../../shared/testing/utils.test';
 import { BrowserOnlyMockPipe } from '../../../shared/testing/browser-only-mock.pipe';
+import {BtnDisabledDirective} from '../../../shared/btn-disabled.directive';
 
 const submissionServiceStub: SubmissionServiceStub = new SubmissionServiceStub();
 
@@ -39,6 +40,7 @@ describe('SubmissionFormFooterComponent', () => {
         SubmissionFormFooterComponent,
         TestComponent,
         BrowserOnlyMockPipe,
+        BtnDisabledDirective
       ],
       providers: [
         { provide: SubmissionService, useValue: submissionServiceStub },
@@ -215,7 +217,8 @@ describe('SubmissionFormFooterComponent', () => {
       fixture.detectChanges();
       const depositBtn: any = fixture.debugElement.query(By.css('.btn-success'));
 
-      expect(depositBtn.nativeElement.disabled).toBeFalsy();
+      expect(depositBtn.nativeElement.getAttribute('aria-disabled')).toBe('false');
+      expect(depositBtn.nativeElement.classList.contains('disabled')).toBeFalse();
     });
 
     it('should not have deposit button disabled when submission is valid', () => {
@@ -224,7 +227,8 @@ describe('SubmissionFormFooterComponent', () => {
       fixture.detectChanges();
       const depositBtn: any = fixture.debugElement.query(By.css('.btn-success'));
 
-      expect(depositBtn.nativeElement.disabled).toBeFalsy();
+      expect(depositBtn.nativeElement.getAttribute('aria-disabled')).toBe('false');
+      expect(depositBtn.nativeElement.classList.contains('disabled')).toBeFalse();
     });
 
     it('should disable save button when all modifications had been saved', () => {
@@ -232,7 +236,8 @@ describe('SubmissionFormFooterComponent', () => {
       fixture.detectChanges();
 
       const saveBtn: any = fixture.debugElement.query(By.css('#save'));
-      expect(saveBtn.nativeElement.disabled).toBeTruthy();
+      expect(saveBtn.nativeElement.getAttribute('aria-disabled')).toBe('true');
+      expect(saveBtn.nativeElement.classList.contains('disabled')).toBeTrue();
     });
 
     it('should enable save button when there are not saved modifications', () => {
@@ -240,7 +245,8 @@ describe('SubmissionFormFooterComponent', () => {
       fixture.detectChanges();
 
       const saveBtn: any = fixture.debugElement.query(By.css('#save'));
-      expect(saveBtn.nativeElement.disabled).toBeFalsy();
+      expect(saveBtn.nativeElement.getAttribute('aria-disabled')).toBe('false');
+      expect(saveBtn.nativeElement.classList.contains('disabled')).toBeFalse();
     });
 
   });
diff --git a/src/app/submission/form/section-add/submission-form-section-add.component.html b/src/app/submission/form/section-add/submission-form-section-add.component.html
index 939f23209a..3740de6345 100644
--- a/src/app/submission/form/section-add/submission-form-section-add.component.html
+++ b/src/app/submission/form/section-add/submission-form-section-add.component.html
@@ -3,13 +3,14 @@
      placement="bottom-right"
      class="d-inline-block"
      [ngClass]="{'w-100': windowService.isXs()}">
+  <ng-container *ngIf="hasSections$ | async">
   <button class="btn btn-outline-primary dropdown-toggle"
           id="sectionControls"
-          [disabled]="!(hasSections$ | async)"
           [ngClass]="{'w-100': (windowService.isXs() | async)}"
           ngbDropdownToggle>
           {{ 'submission.sections.general.add-more' | translate }} <i class="fa fa-plus" aria-hidden="true"></i>
   </button>
+  </ng-container>
   <div ngbDropdownMenu
        class="sections-dropdown-menu"
        aria-labelledby="sectionControls"
diff --git a/src/app/submission/form/submission-form.component.ts b/src/app/submission/form/submission-form.component.ts
index 0eb9ad2037..49b5eea0f0 100644
--- a/src/app/submission/form/submission-form.component.ts
+++ b/src/app/submission/form/submission-form.component.ts
@@ -173,6 +173,7 @@ export class SubmissionFormComponent implements OnChanges, OnDestroy {
           distinctUntilChanged())
           .subscribe((endpointURL) => {
             this.uploadFilesOptions.authToken = this.authService.buildAuthHeader();
+            this.uploadFilesOptions.impersonatingID = this.authService.getImpersonateID();
             this.uploadFilesOptions.url = endpointURL.concat(`/${this.submissionId}`);
             this.definitionId = this.submissionDefinition.name;
             this.submissionService.dispatchInit(
diff --git a/src/app/submission/import-external/import-external-preview/submission-import-external-preview.component.html b/src/app/submission/import-external/import-external-preview/submission-import-external-preview.component.html
index bbb0dbcc94..beecd68d70 100644
--- a/src/app/submission/import-external/import-external-preview/submission-import-external-preview.component.html
+++ b/src/app/submission/import-external/import-external-preview/submission-import-external-preview.component.html
@@ -18,10 +18,12 @@
       </div>
     </div>
     <div *ngFor="let metadata of metadataList" class="row">
-      <div class="col-md-12">
-        <strong>{{'item.preview.' + metadata.key | translate}}</strong>
-        <p>{{metadata.value.value}}</p>
-      </div>
+      <p class="col-md-12">
+        <strong class="">{{'item.preview.' + metadata.key | translate}}</strong><br>
+        <ng-container *ngFor="let metadatum of metadata.values">
+          <span>{{metadatum.value}}</span><br>
+        </ng-container>
+      </p>
     </div>
     <div class="row">
       <div class="col-md-12">
diff --git a/src/app/submission/import-external/import-external-preview/submission-import-external-preview.component.spec.ts b/src/app/submission/import-external/import-external-preview/submission-import-external-preview.component.spec.ts
index f7ff88c3b1..4f46a78da0 100644
--- a/src/app/submission/import-external/import-external-preview/submission-import-external-preview.component.spec.ts
+++ b/src/app/submission/import-external/import-external-preview/submission-import-external-preview.component.spec.ts
@@ -105,7 +105,7 @@ describe('SubmissionImportExternalPreviewComponent test suite', () => {
     it('Should init component properly', () => {
       comp.externalSourceEntry = externalEntry;
       const expected = [
-        { key: 'dc.identifier.uri', value: Metadata.first(comp.externalSourceEntry.metadata, 'dc.identifier.uri') }
+        { key: 'dc.identifier.uri', values: Metadata.all(comp.externalSourceEntry.metadata, 'dc.identifier.uri') },
       ];
       fixture.detectChanges();
 
diff --git a/src/app/submission/import-external/import-external-preview/submission-import-external-preview.component.ts b/src/app/submission/import-external/import-external-preview/submission-import-external-preview.component.ts
index ccc9ede142..2c7b3a66be 100644
--- a/src/app/submission/import-external/import-external-preview/submission-import-external-preview.component.ts
+++ b/src/app/submission/import-external/import-external-preview/submission-import-external-preview.component.ts
@@ -27,7 +27,7 @@ export class SubmissionImportExternalPreviewComponent implements OnInit {
   /**
    * The entry metadata list
    */
-  public metadataList: { key: string, value: MetadataValue }[];
+  public metadataList: { key: string, values: MetadataValue[] }[];
   /**
    * The label prefix to use to generate the translation label
    */
@@ -62,7 +62,7 @@ export class SubmissionImportExternalPreviewComponent implements OnInit {
     metadataKeys.forEach((key) => {
       this.metadataList.push({
         key: key,
-        value: Metadata.first(this.externalSourceEntry.metadata, key)
+        values: Metadata.all(this.externalSourceEntry.metadata, key)
       });
     });
   }
diff --git a/src/app/submission/import-external/import-external-searchbar/submission-import-external-searchbar.component.html b/src/app/submission/import-external/import-external-searchbar/submission-import-external-searchbar.component.html
index 535395e534..cb8dde18c5 100644
--- a/src/app/submission/import-external/import-external-searchbar/submission-import-external-searchbar.component.html
+++ b/src/app/submission/import-external/import-external-searchbar/submission-import-external-searchbar.component.html
@@ -1,25 +1,28 @@
 <div *ngIf="(isXsOrSm$ | async)" class="input-group mb-2">
-  <input type="text" class="form-control" (keyup.enter)="(searchString === '')?null:search()" [(ngModel)]="searchString" placeholder="{{'submission.import-external.search.placeholder' |translate}}" aria-label="" aria-describedby="">
+  <input type="text" class="form-control" (keyup.enter)="(searchString === '')?null:search()" [(ngModel)]="searchString" placeholder="{{'submission.import-external.search.placeholder' | translate}}" [attr.aria-label]="'submission.import-external.search.placeholder' | translate">
 </div>
 <div class="input-group mb-5">
-  <input *ngIf="!(isXsOrSm$ | async)" type="text" class="form-control" (keyup.enter)="(searchString === '')?null:search()" [(ngModel)]="searchString" placeholder="{{'submission.import-external.search.placeholder' |translate}}" aria-label="" aria-describedby="">
-  <div [ngClass]="{'input-group-append': !(isXsOrSm$ | async)}" ngbDropdown role="group" aria-label="">
-    <button class="btn btn-outline-secondary w-fx" title="{{'submission.import-external.search.source.hint' |translate}}" ngbDropdownToggle>{{'submission.import-external.source.' + selectedElement?.name | translate}}</button>
-    <div ngbDropdownMenu class="dropdown-menu scrollable-dropdown-menu w-100"
+  <input *ngIf="!(isXsOrSm$ | async)" type="text" class="form-control" (keyup.enter)="(searchString === '')?null:search()" [(ngModel)]="searchString" placeholder="{{'submission.import-external.search.placeholder' | translate}}" [attr.aria-label]="'submission.import-external.search.placeholder' | translate">
+  <div [ngClass]="{'input-group-append': !(isXsOrSm$ | async)}" ngbDropdown role="group">
+    <button [attr.aria-label]="'submission.import-external.search.source.hint' |translate"
+            class="btn btn-outline-secondary w-fx"
+            title="{{'submission.import-external.search.source.hint' |translate}}"
+            ngbDropdownToggle>
+      {{'submission.import-external.source.' + selectedElement?.name | translate}}
+    </button>
+    <ul ngbDropdownMenu class="dropdown-menu scrollable-dropdown-menu w-100"
       aria-haspopup="true"
-      aria-expanded="false"
-      aria-labelledby="scrollableDropdownMenuButton">
-      <div class="scrollable-menu"
-        aria-labelledby="scrollableDropdownMenuButton"
+      aria-expanded="false">
+      <li class="scrollable-menu"
         infiniteScroll
         [infiniteScrollDistance]="2"
         [infiniteScrollThrottle]="50"
         (scrolled)="onScroll()"
         [scrollWindow]="false">
-        <button ngbDropdownItem class="dropdown-item text-truncate" title="{{'submission.import-external.source.' + source?.name | translate}}" (click)="makeSourceSelection(source)" *ngFor="let source of sourceList">{{'submission.import-external.source.' + source?.name | translate}}</button>
+        <button ngbDropdownItem class="dropdown-item text-truncate" (click)="makeSourceSelection(source)" *ngFor="let source of sourceList">{{'submission.import-external.source.' + source?.name | translate}}</button>
         <div ngbDropdownItem class="scrollable-dropdown-loading text-center" *ngIf="sourceListLoading"><p>{{'submission.import-external.source.loading' | translate}}</p></div>
-      </div>
-    </div>
-    <button type="button" class="btn btn-primary" [title]="(searchString === '')?('submission.import-external.search.button.hint' | translate):('submission.import-external.search.button' | translate)" [disabled]="searchString === ''" (click)="search()">{{'submission.import-external.search.button' | translate}}</button>
+      </li>
+    </ul>
+    <button type="button" class="btn btn-primary" [title]="(searchString === '')?('submission.import-external.search.button.hint' | translate):''" [dsBtnDisabled]="searchString === ''" (click)="search()">{{'submission.import-external.search.button' | translate}}</button>
   </div>
 </div>
diff --git a/src/app/submission/import-external/submission-import-external.component.html b/src/app/submission/import-external/submission-import-external.component.html
index dc46e6758f..8d13b1785a 100644
--- a/src/app/submission/import-external/submission-import-external.component.html
+++ b/src/app/submission/import-external/submission-import-external.component.html
@@ -1,7 +1,7 @@
 <div class="container">
   <div class="row">
     <div class="col-md-12">
-      <h2 id="header" class="pb-2">{{'submission.import-external.title' + ((label) ? '.' + label : '') | translate}}</h2>
+      <h1 id="header" class="pb-2">{{'submission.import-external.title' + ((label) ? '.' + label : '') | translate}}</h1>
       <ds-submission-import-external-searchbar
         [initExternalSourceData]="reload$.value"
         (externalSourceData) = "getExternalSourceData($event)">
@@ -11,7 +11,7 @@
   <div class="row" *ngIf="reload$.value.entity">
     <div *ngIf="reload$.value.sourceId !== ''" class="col-md-12">
       <ng-container *ngVar="(entriesRD$ | async) as entriesRD">
-        <h3 *ngIf="entriesRD && entriesRD?.payload?.page?.length !== 0">{{ 'submission.sections.describe.relationship-lookup.selection-tab.title' | translate}}</h3>
+        <h2 *ngIf="entriesRD && entriesRD?.payload?.page?.length !== 0">{{ 'submission.sections.describe.relationship-lookup.selection-tab.title' | translate}}</h2>
         <ds-viewable-collection *ngIf="entriesRD?.hasSucceeded && !(isLoading$ | async) && entriesRD?.payload?.page?.length > 0" @fadeIn
                                 [objects]="entriesRD"
                                 [selectionConfig]="{ repeatable: repeatable, listId: listId }"
@@ -25,15 +25,15 @@
         <ds-themed-loading *ngIf="(isLoading$ | async)"
                     message="{{'loading.search-results' | translate}}"></ds-themed-loading>
         <div *ngIf="!(isLoading$ | async) && entriesRD?.payload?.page?.length === 0" data-test="empty-external-entry-list">
-          <ds-alert [type]="'alert-info'">{{ 'search.results.empty' | translate }}</ds-alert>
+          <ds-alert [type]="AlertType.Info">{{ 'search.results.empty' | translate }}</ds-alert>
         </div>
         <div *ngIf="!(isLoading$ | async) && entriesRD.statusCode === 500" data-test="empty-external-error-500">
-          <ds-alert [type]="'alert-info'">{{ 'search.results.response.500' | translate }}</ds-alert>
+          <ds-alert [type]="AlertType.Info">{{ 'search.results.response.500' | translate }}</ds-alert>
         </div>
       </ng-container>
     </div>
     <div *ngIf="reload$.value.sourceId === ''" class="col-md-12">
-      <ds-alert [type]="'alert-info'">
+      <ds-alert [type]="AlertType.Info">
         <p class="lead mb-0">{{'submission.import-external.page.hint' | translate}}</p>
       </ds-alert>
     </div>
diff --git a/src/app/submission/import-external/submission-import-external.component.ts b/src/app/submission/import-external/submission-import-external.component.ts
index 25b1d5d1aa..b4aacd4e63 100644
--- a/src/app/submission/import-external/submission-import-external.component.ts
+++ b/src/app/submission/import-external/submission-import-external.component.ts
@@ -23,6 +23,7 @@ import { PageInfo } from '../../core/shared/page-info.model';
 import { hasValue, isNotEmpty } from '../../shared/empty.util';
 import { getFinishedRemoteData } from '../../core/shared/operators';
 import { NONE_ENTITY_TYPE } from '../../core/shared/item-relationships/item-type.resource-type';
+import { AlertType } from 'src/app/shared/alert/alert-type';
 
 /**
  * This component allows to submit a new workspaceitem importing the data from an external source.
@@ -92,6 +93,8 @@ export class SubmissionImportExternalComponent implements OnInit, OnDestroy {
 
   private retrieveExternalSourcesSub: Subscription;
 
+  public readonly AlertType = AlertType;
+
   /**
    * Initialize the component variables.
    * @param {SearchConfigurationService} searchConfigService
diff --git a/src/app/submission/objects/submission-objects.effects.spec.ts b/src/app/submission/objects/submission-objects.effects.spec.ts
index a1bb878aa5..11eb375cc6 100644
--- a/src/app/submission/objects/submission-objects.effects.spec.ts
+++ b/src/app/submission/objects/submission-objects.effects.spec.ts
@@ -66,6 +66,8 @@ describe('SubmissionObjectEffects test suite', () => {
   let submissionServiceStub;
   let submissionJsonPatchOperationsServiceStub;
   let submissionObjectDataServiceStub;
+  let workspaceItemDataService;
+
   const collectionId: string = mockSubmissionCollectionId;
   const submissionId: string = mockSubmissionId;
   const submissionDefinitionResponse: any = mockSubmissionDefinitionResponse;
@@ -82,6 +84,10 @@ describe('SubmissionObjectEffects test suite', () => {
 
     submissionServiceStub.hasUnsavedModification.and.returnValue(observableOf(true));
 
+    workspaceItemDataService = jasmine.createSpyObj('WorkspaceItemDataService', {
+      invalidateById: observableOf(true),
+    });
+
     TestBed.configureTestingModule({
       imports: [
         StoreModule.forRoot({}, storeModuleConfig),
@@ -106,6 +112,7 @@ describe('SubmissionObjectEffects test suite', () => {
         { provide: WorkflowItemDataService, useValue: {} },
         { provide: HALEndpointService, useValue: {} },
         { provide: SubmissionObjectDataService, useValue: submissionObjectDataServiceStub },
+        { provide: WorkspaceitemDataService, useValue: workspaceItemDataService },
       ],
     });
 
diff --git a/src/app/submission/objects/submission-objects.effects.ts b/src/app/submission/objects/submission-objects.effects.ts
index 98646009d5..4623d808e2 100644
--- a/src/app/submission/objects/submission-objects.effects.ts
+++ b/src/app/submission/objects/submission-objects.effects.ts
@@ -55,6 +55,7 @@ import parseSectionErrorPaths, { SectionErrorPath } from '../utils/parseSectionE
 import { FormState } from '../../shared/form/form.reducer';
 import { SubmissionSectionObject } from './submission-section-object.model';
 import { SubmissionSectionError } from './submission-section-error.model';
+import { WorkspaceitemDataService } from '../../core/submission/workspaceitem-data.service';
 
 @Injectable()
 export class SubmissionObjectEffects {
@@ -210,7 +211,7 @@ export class SubmissionObjectEffects {
           action.payload.submissionId,
           'sections') as Observable<SubmissionObject[]>;
       } else {
-        response$ = this.submissionObjectService.findById(action.payload.submissionId, false, true).pipe(
+        response$ = this.submissionObjectService.findById(action.payload.submissionId, false, true, followLink('item'), followLink('collection')).pipe(
           getFirstSucceededRemoteDataPayload(),
           map((submissionObject: SubmissionObject) => [submissionObject])
         );
@@ -258,6 +259,7 @@ export class SubmissionObjectEffects {
   depositSubmissionSuccess$ = createEffect(() => this.actions$.pipe(
     ofType(SubmissionObjectActionTypes.DEPOSIT_SUBMISSION_SUCCESS),
     tap(() => this.notificationsService.success(null, this.translate.get('submission.sections.general.deposit_success_notice'))),
+    tap((action: DepositSubmissionSuccessAction) => this.workspaceItemDataService.invalidateById(action.payload.submissionId)),
     tap(() => this.submissionService.redirectToMyDSpace())), { dispatch: false });
 
   /**
@@ -326,14 +328,17 @@ export class SubmissionObjectEffects {
     ofType(SubmissionObjectActionTypes.DISCARD_SUBMISSION_ERROR),
     tap(() => this.notificationsService.error(null, this.translate.get('submission.sections.general.discard_error_notice')))), { dispatch: false });
 
-  constructor(private actions$: Actions,
+  constructor(
+    private actions$: Actions,
     private notificationsService: NotificationsService,
     private operationsService: SubmissionJsonPatchOperationsService,
     private sectionService: SectionsService,
     private store$: Store<any>,
     private submissionService: SubmissionService,
     private submissionObjectService: SubmissionObjectDataService,
-    private translate: TranslateService) {
+    private translate: TranslateService,
+    private workspaceItemDataService: WorkspaceitemDataService,
+  ) {
   }
 
   /**
diff --git a/src/app/submission/sections/accesses/section-accesses.component.spec.ts b/src/app/submission/sections/accesses/section-accesses.component.spec.ts
index c70758a4df..651223c04b 100644
--- a/src/app/submission/sections/accesses/section-accesses.component.spec.ts
+++ b/src/app/submission/sections/accesses/section-accesses.component.spec.ts
@@ -40,6 +40,7 @@ import { AppState } from '../../../app.reducer';
 import { getMockFormService } from '../../../shared/mocks/form-service.mock';
 import { mockAccessesFormData } from '../../../shared/mocks/submission.mock';
 import { accessConditionChangeEvent, checkboxChangeEvent } from '../../../shared/testing/form-event.stub';
+import { XSRFService } from '../../../core/xsrf/xsrf.service';
 
 describe('SubmissionSectionAccessesComponent', () => {
   let component: SubmissionSectionAccessesComponent;
@@ -96,6 +97,7 @@ describe('SubmissionSectionAccessesComponent', () => {
           { provide: TranslateService, useValue: getMockTranslateService() },
           { provide: FormService, useValue: getMockFormService() },
           { provide: Store, useValue: storeStub },
+          { provide: XSRFService, useValue: {} },
           { provide: SubmissionJsonPatchOperationsService, useValue: SubmissionJsonPatchOperationsServiceStub },
           { provide: 'sectionDataProvider', useValue: sectionData },
           { provide: 'submissionIdProvider', useValue: '1508' },
@@ -188,6 +190,7 @@ describe('SubmissionSectionAccessesComponent', () => {
           { provide: TranslateService, useValue: getMockTranslateService() },
           { provide: FormService, useValue: getMockFormService() },
           { provide: Store, useValue: storeStub },
+          { provide: XSRFService, useValue: {} },
           { provide: SubmissionJsonPatchOperationsService, useValue: SubmissionJsonPatchOperationsServiceStub },
           { provide: 'sectionDataProvider', useValue: sectionData },
           { provide: 'submissionIdProvider', useValue: '1508' },
diff --git a/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.html b/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.html
index 0796da5a64..e3e11c258a 100644
--- a/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.html
+++ b/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.html
@@ -1,38 +1,40 @@
-<div class="mb-4 ccLicense-select">
-  <ds-select
-    [disabled]="!submissionCcLicenses">
-
-    <ng-container class="selection">
-      <span *ngIf="!submissionCcLicenses">
-        <ds-themed-loading></ds-themed-loading>
-      </span>
-      <span *ngIf="getSelectedCcLicense()">
-        {{ getSelectedCcLicense().name }}
-      </span>
-      <span *ngIf="submissionCcLicenses && !getSelectedCcLicense()">
-        <ng-container *ngIf="storedCcLicenseLink">
-          {{ 'submission.sections.ccLicense.change' | translate }}
+<ng-container *ngIf="selectedCcLicense">
+  <div class="mb-4 ccLicense-select">
+    <div ngbDropdown>
+      <input id="cc-license-dropdown"
+             class="form-control"
+             [(ngModel)]="selectedCcLicense.name"
+             placeholder="{{ !storedCcLicenseLink ? ('submission.sections.ccLicense.select' | translate) : ('submission.sections.ccLicense.change' | translate)}}"
+             [ngModelOptions]="{standalone: true}"
+             ngbDropdownToggle
+             role="combobox"
+             #script="ngModel">
+      <div ngbDropdownMenu aria-labelledby="cc-license-dropdown" class="w-100 scrollable-menu"
+           role="menu"
+           infiniteScroll
+           (scroll)="onScroll($event)"
+           [infiniteScrollDistance]="5"
+           [infiniteScrollThrottle]="300"
+           [infiniteScrollUpDistance]="1.5"
+           [fromRoot]="true"
+           [scrollWindow]="false">
+        <ng-container *ngIf="submissionCcLicenses?.length === 0; else licensesList">
+          <button class="dropdown-item disabled">
+            {{ 'submission.sections.ccLicense.none' | translate }}
+          </button>
         </ng-container>
-        <ng-container *ngIf="!storedCcLicenseLink">
-          {{ 'submission.sections.ccLicense.select' | translate }}
-        </ng-container>
-      </span>
-    </ng-container>
+      </div>
+    </div>
+  </div>
+</ng-container>
 
-    <ng-container class="menu">
-      <button *ngIf="submissionCcLicenses?.length == 0"
-              class="dropdown-item disabled">
-        {{ 'submission.sections.ccLicense.none' | translate }}
-      </button>
-      <button *ngFor="let license of submissionCcLicenses"
-              class="dropdown-item"
-              (click)="selectCcLicense(license)">
-        {{ license.name }}
-      </button>
-    </ng-container>
-
-  </ds-select>
-</div>
+<ng-template #licensesList>
+  <ng-container *ngFor="let license of submissionCcLicenses">
+    <button class="dropdown-item" (click)="selectCcLicense(license)">
+      {{ license.name }}
+    </button>
+  </ng-container>
+</ng-template>
 
 <ng-container *ngIf="getSelectedCcLicense()">
 
@@ -134,6 +136,7 @@
       <div class="m-2">
         <div (click)="setAccepted(!accepted)">
           <input type="checkbox"
+                 class="mr-2"
                  title="accepted"
                  [checked]="accepted">
           <span> {{ 'submission.sections.ccLicense.confirmation' | translate }}</span>
diff --git a/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.scss b/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.scss
index 62a902b79a..142cd82822 100644
--- a/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.scss
+++ b/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.scss
@@ -1,3 +1,13 @@
 .options-select-menu {
   max-height: 25vh;
 }
+
+.ccLicense-select {
+  width: fit-content;
+}
+
+.scrollable-menu {
+  height: auto;
+  max-height: var(--ds-dropdown-menu-max-height);
+  overflow-x: hidden;
+}
diff --git a/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.spec.ts b/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.spec.ts
index bb83e48d21..b2d9c5ad60 100644
--- a/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.spec.ts
+++ b/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.spec.ts
@@ -198,10 +198,10 @@ describe('SubmissionSectionCcLicensesComponent', () => {
 
   it('should display a dropdown with the different cc licenses', () => {
     expect(
-      de.query(By.css('.ccLicense-select ds-select .dropdown-menu button:nth-child(1)')).nativeElement.innerText
+      de.query(By.css('.ccLicense-select .scrollable-menu button:nth-child(1)')).nativeElement.innerText,
     ).toContain('test license name 1');
     expect(
-      de.query(By.css('.ccLicense-select ds-select .dropdown-menu button:nth-child(2)')).nativeElement.innerText
+      de.query(By.css('.ccLicense-select .scrollable-menu button:nth-child(2)')).nativeElement.innerText,
     ).toContain('test license name 2');
   });
 
@@ -215,9 +215,7 @@ describe('SubmissionSectionCcLicensesComponent', () => {
     });
 
     it('should display the selected cc license', () => {
-      expect(
-        de.query(By.css('.ccLicense-select ds-select button.selection')).nativeElement.innerText
-      ).toContain('test license name 2');
+      expect(component.selectedCcLicense.name).toContain('test license name 2');
     });
 
     it('should display all field labels of the selected cc license only', () => {
diff --git a/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.ts b/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.ts
index c8cd898f96..fff5428c2f 100644
--- a/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.ts
+++ b/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.ts
@@ -1,9 +1,8 @@
-import { Component, Inject } from '@angular/core';
-import { Observable, of as observableOf, Subscription } from 'rxjs';
+import { ChangeDetectorRef, Component, Inject } from '@angular/core';
+import { Observable, of as observableOf, Subscription, tap } from 'rxjs';
 import { Field, Option, SubmissionCcLicence } from '../../../core/submission/models/submission-cc-license.model';
 import {
-  getFirstCompletedRemoteData,
-  getFirstSucceededRemoteData,
+  getFirstCompletedRemoteData, getFirstSucceededRemoteDataPayload,
   getRemoteDataPayload
 } from '../../../core/shared/operators';
 import { distinctUntilChanged, filter, map, take } from 'rxjs/operators';
@@ -20,6 +19,7 @@ import { isNotEmpty } from '../../../shared/empty.util';
 import { JsonPatchOperationsBuilder } from '../../../core/json-patch/builder/json-patch-operations-builder';
 import { SubmissionCcLicenseUrlDataService } from '../../../core/submission/submission-cc-license-url-data.service';
 import {ConfigurationDataService} from '../../../core/data/configuration-data.service';
+import { FindListOptions } from '../../../core/data/find-list-options.model';
 
 /**
  * This component represents the submission section to select the Creative Commons license.
@@ -58,7 +58,7 @@ export class SubmissionSectionCcLicensesComponent extends SectionModelComponent
   /**
    * Cache of the available Creative Commons licenses.
    */
-  submissionCcLicenses: SubmissionCcLicence[];
+  submissionCcLicenses: SubmissionCcLicence[] = [];
 
   /**
    * Reference to NgbModal
@@ -70,6 +70,25 @@ export class SubmissionSectionCcLicensesComponent extends SectionModelComponent
    */
   defaultJurisdiction: string;
 
+  /**
+   * The currently selected cc licence
+   */
+  selectedCcLicense: SubmissionCcLicence = new SubmissionCcLicence();
+
+  /**
+   * Options for paginated data loading
+   */
+  ccLicenceOptions: FindListOptions = {
+    elementsPerPage: 20,
+    currentPage: 1,
+  };
+  /**
+   * Check to stop paginated search
+   *
+   * @private
+   */
+  private _isLastPage: boolean;
+
   /**
    * The Creative Commons link saved in the workspace item.
    */
@@ -94,6 +113,7 @@ export class SubmissionSectionCcLicensesComponent extends SectionModelComponent
     protected submissionCcLicenseUrlDataService: SubmissionCcLicenseUrlDataService,
     protected operationsBuilder: JsonPatchOperationsBuilder,
     protected configService: ConfigurationDataService,
+    protected ref: ChangeDetectorRef,
     @Inject('collectionIdProvider') public injectedCollectionId: string,
     @Inject('sectionDataProvider') public injectedSectionData: SectionDataObject,
     @Inject('submissionIdProvider') public injectedSubmissionId: string
@@ -117,9 +137,10 @@ export class SubmissionSectionCcLicensesComponent extends SectionModelComponent
    * @param ccLicense the Creative Commons license to select.
    */
   selectCcLicense(ccLicense: SubmissionCcLicence) {
-    if (!!this.getSelectedCcLicense() && this.getSelectedCcLicense().id === ccLicense.id) {
+    if (this.selectedCcLicense.id === ccLicense.id) {
       return;
     }
+    this.selectedCcLicense = ccLicense;
     this.setAccepted(false);
     this.updateSectionData({
       ccLicense: {
@@ -263,13 +284,6 @@ export class SubmissionSectionCcLicensesComponent extends SectionModelComponent
         }
         this.sectionData.data = data;
       }),
-      this.submissionCcLicensesDataService.findAll({ elementsPerPage: 9999 }).pipe(
-        getFirstSucceededRemoteData(),
-        getRemoteDataPayload(),
-        map((list) => list.page),
-      ).subscribe(
-        (licenses) => this.submissionCcLicenses = licenses
-      ),
       this.configService.findByPropertyName('cc.license.jurisdiction').pipe(
         getFirstCompletedRemoteData(),
         getRemoteDataPayload()
@@ -282,6 +296,7 @@ export class SubmissionSectionCcLicensesComponent extends SectionModelComponent
           }
       })
     );
+    this.loadCcLicences();
   }
 
   /**
@@ -301,4 +316,31 @@ export class SubmissionSectionCcLicensesComponent extends SectionModelComponent
   updateSectionData(data: WorkspaceitemSectionCcLicenseObject) {
     this.sectionService.updateSectionData(this.submissionId, this.sectionData.id, Object.assign({}, this.data, data));
   }
+
+  onScroll(event) {
+    if (event.target.scrollTop + event.target.clientHeight >= event.target.scrollHeight) {
+      if (!this.isLoading && !this._isLastPage) {
+        this.ccLicenceOptions.currentPage++;
+        this.loadCcLicences();
+      }
+    }
+  }
+
+  loadCcLicences() {
+    this.isLoading = true;
+
+    this.subscriptions.push(
+      this.submissionCcLicensesDataService.findAll(this.ccLicenceOptions).pipe(
+        getFirstSucceededRemoteDataPayload(),
+        tap((response) => this._isLastPage = response.pageInfo.currentPage === response.pageInfo.totalPages),
+        map((list) => list.page),
+      ).subscribe(
+        (licenses) => {
+          this.submissionCcLicenses = [...this.submissionCcLicenses, ...licenses];
+          this.isLoading = false;
+          this.ref.detectChanges();
+        },
+      ),
+    );
+  }
 }
diff --git a/src/app/submission/sections/container/section-container.component.ts b/src/app/submission/sections/container/section-container.component.ts
index 8f9ebfbfda..3331629f33 100644
--- a/src/app/submission/sections/container/section-container.component.ts
+++ b/src/app/submission/sections/container/section-container.component.ts
@@ -3,7 +3,7 @@ import { Component, Injector, Input, OnInit, ViewChild } from '@angular/core';
 import { SectionsDirective } from '../sections.directive';
 import { SectionDataObject } from '../models/section-data.model';
 import { rendersSectionType } from '../sections-decorator';
-import { AlertType } from '../../../shared/alert/aletr-type';
+import { AlertType } from '../../../shared/alert/alert-type';
 
 /**
  * This component represents a section that contains the submission license form.
diff --git a/src/app/submission/sections/form/section-form-operations.service.ts b/src/app/submission/sections/form/section-form-operations.service.ts
index 778063dd31..2ae5903d6b 100644
--- a/src/app/submission/sections/form/section-form-operations.service.ts
+++ b/src/app/submission/sections/form/section-form-operations.service.ts
@@ -403,7 +403,7 @@ export class SectionFormOperationsService {
             );
           }
         }
-      } else if (!value.hasValue()) {
+      } else if (isNotEmpty(value) && !value.hasValue()) {
         // New value is empty, so dispatch a remove operation
         if (this.getArrayIndexFromEvent(event) === 0) {
           this.operationsBuilder.remove(pathCombiner.getPath(segmentedPath));
diff --git a/src/app/submission/sections/form/section-form.component.spec.ts b/src/app/submission/sections/form/section-form.component.spec.ts
index 4fbf324edf..22525720fa 100644
--- a/src/app/submission/sections/form/section-form.component.spec.ts
+++ b/src/app/submission/sections/form/section-form.component.spec.ts
@@ -261,7 +261,7 @@ describe('SubmissionSectionFormComponent test suite', () => {
       expect(comp.sectionData.errorsToShow).toEqual([]);
       expect(comp.sectionData.data).toEqual(sectionData);
       expect(comp.isLoading).toBeFalsy();
-      expect(comp.initForm).toHaveBeenCalledWith(sectionData);
+      expect(comp.initForm).toHaveBeenCalledWith(sectionData, [], []);
       expect(comp.subscriptions).toHaveBeenCalled();
     });
 
@@ -269,7 +269,7 @@ describe('SubmissionSectionFormComponent test suite', () => {
       formBuilderService.modelFromConfiguration.and.returnValue(testFormModel);
       const sectionData = {};
 
-      comp.initForm(sectionData);
+      comp.initForm(sectionData, [], []);
 
       expect(comp.formModel).toEqual(testFormModel);
 
@@ -284,7 +284,7 @@ describe('SubmissionSectionFormComponent test suite', () => {
         path: '/sections/' + sectionObject.id
       };
 
-      comp.initForm(sectionData);
+      comp.initForm(sectionData, [], []);
 
       expect(comp.formModel).toBeUndefined();
       expect(sectionsServiceStub.setSectionError).toHaveBeenCalledWith(submissionId, sectionObject.id, sectionError);
@@ -443,7 +443,7 @@ describe('SubmissionSectionFormComponent test suite', () => {
       compAsAny.formData = {};
       compAsAny.sectionMetadata = ['dc.title'];
 
-      comp.updateForm(sectionData, sectionError);
+      comp.updateForm({ data: sectionData, errorsToShow: sectionError } as any);
 
       expect(comp.isUpdating).toBeFalsy();
       expect(comp.initForm).toHaveBeenCalled();
@@ -455,15 +455,19 @@ describe('SubmissionSectionFormComponent test suite', () => {
     it('should update form error properly', () => {
       spyOn(comp, 'initForm');
       spyOn(comp, 'checksForErrors');
-      const sectionData: any = {
+      const sectionData = {
         'dc.title': [new FormFieldMetadataValueObject('test')]
       };
+      const sectionState = {
+        data: sectionData,
+        errorsToShow: [{ path: '/test', message: 'test' }],
+      } as any;
       comp.sectionData.data = {};
       comp.sectionData.errorsToShow = [];
       compAsAny.formData = sectionData;
       compAsAny.sectionMetadata = ['dc.title'];
 
-      comp.updateForm(sectionData, parsedSectionErrors);
+      comp.updateForm(sectionState);
 
       expect(comp.initForm).not.toHaveBeenCalled();
       expect(comp.checksForErrors).toHaveBeenCalled();
@@ -474,8 +478,9 @@ describe('SubmissionSectionFormComponent test suite', () => {
       spyOn(comp, 'initForm');
       spyOn(comp, 'checksForErrors');
       const sectionData: any = {};
+      const sectionErrors: any = [{ path: '/test', message: 'test' }];
 
-      comp.updateForm(sectionData, parsedSectionErrors);
+      comp.updateForm({ data: sectionData, errorsToShow: sectionErrors } as any);
 
       expect(comp.initForm).not.toHaveBeenCalled();
       expect(comp.checksForErrors).toHaveBeenCalled();
@@ -541,7 +546,7 @@ describe('SubmissionSectionFormComponent test suite', () => {
       const sectionState = {
         data: sectionData,
         errorsToShow: parsedSectionErrors
-      };
+      } as any;
 
       formService.getFormData.and.returnValue(observableOf(formData));
       sectionsServiceStub.getSectionState.and.returnValue(observableOf(sectionState));
@@ -550,7 +555,7 @@ describe('SubmissionSectionFormComponent test suite', () => {
 
       expect(compAsAny.subs.length).toBe(2);
       expect(compAsAny.formData).toEqual(formData);
-      expect(comp.updateForm).toHaveBeenCalledWith(sectionState.data, sectionState.errorsToShow);
+      expect(comp.updateForm).toHaveBeenCalledWith(sectionState);
 
     });
 
diff --git a/src/app/submission/sections/form/section-form.component.ts b/src/app/submission/sections/form/section-form.component.ts
index 2a07f7e3f1..4cbb97fd1f 100644
--- a/src/app/submission/sections/form/section-form.component.ts
+++ b/src/app/submission/sections/form/section-form.component.ts
@@ -192,7 +192,7 @@ export class SubmissionSectionFormComponent extends SectionModelComponent {
           this.submissionObject = submissionObject;
           this.isSectionReadonly = isSectionReadOnly;
           // Is the first loading so init form
-          this.initForm(sectionData);
+          this.initForm(sectionData, this.sectionData.errorsToShow, this.sectionData.serverValidationErrors);
           this.sectionData.data = sectionData;
           this.subscriptions();
           this.isLoading = false;
@@ -296,7 +296,7 @@ export class SubmissionSectionFormComponent extends SectionModelComponent {
    * @param sectionData
    *    the section data retrieved from the server
    */
-  initForm(sectionData: WorkspaceitemSectionFormObject): void {
+  initForm(sectionData: WorkspaceitemSectionFormObject, errorsToShow: SubmissionSectionError[], serverValidationErrors: SubmissionSectionError[]): void {
     try {
       this.formModel = this.formBuilderService.modelFromConfiguration(
         this.submissionId,
@@ -307,7 +307,7 @@ export class SubmissionSectionFormComponent extends SectionModelComponent {
         this.isSectionReadonly
       );
       const sectionMetadata = this.sectionService.computeSectionConfiguredMetadata(this.formConfig);
-      this.sectionService.updateSectionData(this.submissionId, this.sectionData.id, sectionData, this.sectionData.errorsToShow, this.sectionData.serverValidationErrors, sectionMetadata);
+      this.sectionService.updateSectionData(this.submissionId, this.sectionData.id, sectionData, errorsToShow, serverValidationErrors, sectionMetadata);
     } catch (e) {
       const msg: string = this.translate.instant('error.submission.sections.init-form-error') + e.toString();
       const sectionError: SubmissionSectionError = {
@@ -322,12 +322,13 @@ export class SubmissionSectionFormComponent extends SectionModelComponent {
   /**
    * Update form model
    *
-   * @param sectionData
-   *    the section data retrieved from the server
-   * @param errors
-   *    the section errors retrieved from the server
+   * @param sectionState
+   *    the section state retrieved from the server
    */
-  updateForm(sectionData: WorkspaceitemSectionFormObject, errors: SubmissionSectionError[]): void {
+  updateForm(sectionState: SubmissionSectionObject): void {
+
+    const sectionData = sectionState.data as WorkspaceitemSectionFormObject;
+    const errors = sectionState.errorsToShow;
 
     if (isNotEmpty(sectionData) && !isEqual(sectionData, this.sectionData.data)) {
       this.sectionData.data = sectionData;
@@ -335,7 +336,7 @@ export class SubmissionSectionFormComponent extends SectionModelComponent {
         this.isUpdating = true;
         this.formModel = null;
         this.cdr.detectChanges();
-        this.initForm(sectionData);
+        this.initForm(sectionData, errors, sectionState.serverValidationErrors);
         this.checksForErrors(errors);
         this.isUpdating = false;
         this.cdr.detectChanges();
@@ -389,7 +390,7 @@ export class SubmissionSectionFormComponent extends SectionModelComponent {
         .subscribe((sectionState: SubmissionSectionObject) => {
           this.fieldsOnTheirWayToBeRemoved = new Map();
           this.sectionMetadata = sectionState.metadata;
-          this.updateForm(sectionState.data as WorkspaceitemSectionFormObject, sectionState.errorsToShow);
+          this.updateForm(sectionState);
         })
     );
   }
diff --git a/src/app/submission/sections/identifiers/section-identifiers.component.ts b/src/app/submission/sections/identifiers/section-identifiers.component.ts
index 2dc70f668e..ac4af63adb 100644
--- a/src/app/submission/sections/identifiers/section-identifiers.component.ts
+++ b/src/app/submission/sections/identifiers/section-identifiers.component.ts
@@ -7,7 +7,7 @@ import { SectionModelComponent } from '../models/section.model';
 import { renderSectionFor } from '../sections-decorator';
 import { SectionDataObject } from '../models/section-data.model';
 import { SubmissionService } from '../../submission.service';
-import { AlertType } from '../../../shared/alert/aletr-type';
+import { AlertType } from '../../../shared/alert/alert-type';
 import { SectionsService } from '../sections.service';
 import { WorkspaceitemSectionIdentifiersObject } from '../../../core/submission/models/workspaceitem-section-identifiers.model';
 
diff --git a/src/app/submission/sections/license/section-license.component.spec.ts b/src/app/submission/sections/license/section-license.component.spec.ts
index 35fea95b8d..f15dcf9964 100644
--- a/src/app/submission/sections/license/section-license.component.spec.ts
+++ b/src/app/submission/sections/license/section-license.component.spec.ts
@@ -38,6 +38,7 @@ import { Collection } from '../../../core/shared/collection.model';
 import { License } from '../../../core/shared/license.model';
 import { FormFieldMetadataValueObject } from '../../../shared/form/builder/models/form-field-metadata-value.model';
 import { cold } from 'jasmine-marbles';
+import { XSRFService } from '../../../core/xsrf/xsrf.service';
 
 const collectionId = mockSubmissionCollectionId;
 const licenseText = 'License text';
@@ -137,6 +138,7 @@ describe('SubmissionSectionLicenseComponent test suite', () => {
         { provide: 'collectionIdProvider', useValue: collectionId },
         { provide: 'sectionDataProvider', useValue: Object.assign({}, sectionObject) },
         { provide: 'submissionIdProvider', useValue: submissionId },
+        { provide: XSRFService, useValue: {} },
         ChangeDetectorRef,
         FormBuilderService,
         SubmissionSectionLicenseComponent
diff --git a/src/app/submission/sections/sherpa-policies/publisher-policy/publisher-policy.component.ts b/src/app/submission/sections/sherpa-policies/publisher-policy/publisher-policy.component.ts
index 96ada3904c..25407f5a7b 100644
--- a/src/app/submission/sections/sherpa-policies/publisher-policy/publisher-policy.component.ts
+++ b/src/app/submission/sections/sherpa-policies/publisher-policy/publisher-policy.component.ts
@@ -1,7 +1,7 @@
 import { Component, Input } from '@angular/core';
 
 import { Policy } from '../../../../core/submission/models/sherpa-policies-details.model';
-import { AlertType } from '../../../../shared/alert/aletr-type';
+import { AlertType } from '../../../../shared/alert/alert-type';
 
 /**
  * This component represents a section that contains the publisher policy informations.
diff --git a/src/app/submission/sections/sherpa-policies/section-sherpa-policies.component.ts b/src/app/submission/sections/sherpa-policies/section-sherpa-policies.component.ts
index e55b75146f..eb273a8420 100644
--- a/src/app/submission/sections/sherpa-policies/section-sherpa-policies.component.ts
+++ b/src/app/submission/sections/sherpa-policies/section-sherpa-policies.component.ts
@@ -1,4 +1,4 @@
-import { AlertType } from '../../../shared/alert/aletr-type';
+import { AlertType } from '../../../shared/alert/alert-type';
 import { Component, Inject } from '@angular/core';
 
 import { BehaviorSubject, Observable, of, Subscription } from 'rxjs';
diff --git a/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.html b/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.html
index 2baa6c1555..b529d9aee4 100644
--- a/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.html
+++ b/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.html
@@ -1,7 +1,7 @@
 <div>
   <div class="modal-header">
     <h4 class="modal-title">{{'submission.sections.upload.edit.title' | translate}}</h4>
-    <button type="button" class="close" (click)="onModalClose()" aria-label="Close" [disabled]="isSaving">
+    <button type="button" class="close" (click)="onModalClose()" aria-label="Close" [dsBtnDisabled]="isSaving">
       <span aria-hidden="true">×</span>
     </button>
   </div>
diff --git a/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.spec.ts b/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.spec.ts
index d008bf61f1..251f9aea81 100644
--- a/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.spec.ts
+++ b/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.spec.ts
@@ -47,6 +47,7 @@ import {
 } from '../../../../../core/json-patch/builder/json-patch-operation-path-combiner';
 import { dateToISOFormat } from '../../../../../shared/date.util';
 import { of } from 'rxjs';
+import { XSRFService } from '../../../../../core/xsrf/xsrf.service';
 
 const jsonPatchOpBuilder: any = jasmine.createSpyObj('jsonPatchOpBuilder', {
   add: jasmine.createSpy('add'),
@@ -80,6 +81,9 @@ describe('SubmissionSectionUploadFileEditComponent test suite', () => {
   const fileData: any = mockUploadFiles[0];
   const pathCombiner = new JsonPatchOperationPathCombiner('sections', sectionId, 'files', fileIndex);
 
+  let noAccessConditionsMock = Object.assign({}, mockFileFormData);
+  delete noAccessConditionsMock.accessConditions;
+
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
       imports: [
@@ -100,6 +104,7 @@ describe('SubmissionSectionUploadFileEditComponent test suite', () => {
         { provide: SubmissionJsonPatchOperationsService, useValue: submissionJsonPatchOperationsServiceStub },
         { provide: JsonPatchOperationsBuilder, useValue: jsonPatchOpBuilder },
         { provide: SectionUploadService, useValue: getMockSectionUploadService() },
+        { provide: XSRFService, useValue: {} },
         FormBuilderService,
         ChangeDetectorRef,
         SubmissionSectionUploadFileEditComponent,
@@ -299,6 +304,28 @@ describe('SubmissionSectionUploadFileEditComponent test suite', () => {
 
     }));
 
+    it('should update Bitstream data properly when access options are omitted', fakeAsync(() => {
+      compAsAny.formRef = {formGroup: null};
+      compAsAny.fileData = fileData;
+      compAsAny.pathCombiner = pathCombiner;
+      formService.validateAllFormFields.and.callFake(() => null);
+      formService.isValid.and.returnValue(of(true));
+      formService.getFormData.and.returnValue(of(noAccessConditionsMock));
+      const response = [
+        Object.assign(mockSubmissionObject, {
+          sections: {
+            upload: {
+              files: mockUploadFiles
+            }
+          }
+        })
+      ];
+      operationsService.jsonPatchByResourceID.and.returnValue(of(response));
+      comp.saveBitstreamData();
+      tick();
+      expect(uploadService.updateFileData).toHaveBeenCalled();
+    }));
+
     it('should not save Bitstream File data properly when form is not valid', fakeAsync(() => {
       compAsAny.formRef = {formGroup: null};
       compAsAny.pathCombiner = pathCombiner;
diff --git a/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.ts b/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.ts
index 9ee4a7dda5..eb4dc5aaf8 100644
--- a/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.ts
+++ b/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.ts
@@ -416,56 +416,58 @@ export class SubmissionSectionUploadFileEditComponent
             this.operationsBuilder.remove(this.pathCombiner.getPath(path));
           });
         const accessConditionsToSave = [];
-        formData.accessConditions
-          .map((accessConditions) => accessConditions.accessConditionGroup)
-          .filter((accessCondition) => isNotEmpty(accessCondition))
-          .forEach((accessCondition) => {
-            let accessConditionOpt;
+        if (formData.hasOwnProperty('accessConditions')) {
+          formData.accessConditions
+            .filter((accessConditions) => isNotNull(accessConditions))
+            .map((accessConditions) => accessConditions.accessConditionGroup)
+            .filter((accessCondition) => isNotEmpty(accessCondition))
+            .forEach((accessCondition) => {
+              let accessConditionOpt;
 
-            this.availableAccessConditionOptions
-              .filter((element) => isNotNull(accessCondition.name) && element.name === accessCondition.name[0].value)
-              .forEach((element) => accessConditionOpt = element);
+              this.availableAccessConditionOptions
+                .filter((element) => isNotNull(accessCondition.name) && element.name === accessCondition.name[0].value)
+                .forEach((element) => accessConditionOpt = element);
 
-            if (accessConditionOpt) {
-              const currentAccessCondition = Object.assign({}, accessCondition);
-              currentAccessCondition.name = this.retrieveValueFromField(accessCondition.name);
+              if (accessConditionOpt) {
+                const currentAccessCondition = Object.assign({}, accessCondition);
+                currentAccessCondition.name = this.retrieveValueFromField(accessCondition.name);
 
-              /* When start and end date fields are deactivated, their values may be still present in formData,
-              therefore it is necessary to delete them if they're not allowed by the current access condition option. */
-              if (!accessConditionOpt.hasStartDate) {
-                delete currentAccessCondition.startDate;
-              } else if (accessCondition.startDate) {
-                const startDate = this.retrieveValueFromField(accessCondition.startDate);
-                // Clamp the start date to the maximum, if any, since the
-                // datepicker sometimes exceeds it.
-                let startDateDate = new Date(startDate);
-                if (accessConditionOpt.maxStartDate) {
+                /* When start and end date fields are deactivated, their values may be still present in formData,
+                therefore it is necessary to delete them if they're not allowed by the current access condition option. */
+                if (!accessConditionOpt.hasStartDate) {
+                  delete currentAccessCondition.startDate;
+                } else if (accessCondition.startDate) {
+                  const startDate = this.retrieveValueFromField(accessCondition.startDate);
+                  // Clamp the start date to the maximum, if any, since the
+                  // datepicker sometimes exceeds it.
+                  let startDateDate = new Date(startDate);
+                  if (accessConditionOpt.maxStartDate) {
                     const maxStartDateDate = new Date(accessConditionOpt.maxStartDate);
                     if (startDateDate > maxStartDateDate) {
-                        startDateDate = maxStartDateDate;
+                      startDateDate = maxStartDateDate;
                     }
+                  }
+                  currentAccessCondition.startDate = dateToISOFormat(startDateDate);
                 }
-                currentAccessCondition.startDate = dateToISOFormat(startDateDate);
-              }
-              if (!accessConditionOpt.hasEndDate) {
-                delete currentAccessCondition.endDate;
-              } else if (accessCondition.endDate) {
-                const endDate = this.retrieveValueFromField(accessCondition.endDate);
-                // Clamp the end date to the maximum, if any, since the
-                // datepicker sometimes exceeds it.
-                let endDateDate = new Date(endDate);
-                if (accessConditionOpt.maxEndDate) {
+                if (!accessConditionOpt.hasEndDate) {
+                  delete currentAccessCondition.endDate;
+                } else if (accessCondition.endDate) {
+                  const endDate = this.retrieveValueFromField(accessCondition.endDate);
+                  // Clamp the end date to the maximum, if any, since the
+                  // datepicker sometimes exceeds it.
+                  let endDateDate = new Date(endDate);
+                  if (accessConditionOpt.maxEndDate) {
                     const maxEndDateDate = new Date(accessConditionOpt.maxEndDate);
                     if (endDateDate > maxEndDateDate) {
-                        endDateDate = maxEndDateDate;
+                      endDateDate = maxEndDateDate;
                     }
+                  }
+                  currentAccessCondition.endDate = dateToISOFormat(endDateDate);
                 }
-                currentAccessCondition.endDate = dateToISOFormat(endDateDate);
+                accessConditionsToSave.push(currentAccessCondition);
               }
-              accessConditionsToSave.push(currentAccessCondition);
-            }
-          });
-
+            });
+        }
         if (isNotEmpty(accessConditionsToSave)) {
           this.operationsBuilder.add(this.pathCombiner.getPath('accessConditions'), accessConditionsToSave, true);
         }
diff --git a/src/app/submission/sections/upload/file/section-upload-file.component.html b/src/app/submission/sections/upload/file/section-upload-file.component.html
index 8999853d72..3567ef5c64 100644
--- a/src/app/submission/sections/upload/file/section-upload-file.component.html
+++ b/src/app/submission/sections/upload/file/section-upload-file.component.html
@@ -1,16 +1,13 @@
 <ng-container *ngIf="fileData">
   <div class="row">
-    <div class="col-md-2">
-      <!--ds-themed-thumbnail [thumbnail]="bitstreamsList[bitstreamKey].url | async"></ds-themed-thumbnail-->
-      <ds-themed-thumbnail [thumbnail]="fileData?.thumbnail"></ds-themed-thumbnail>
-    </div>
-    <div class="col-md-10">
+    <div class="col-md-12">
       <div class="float-left w-75">
         <h3>{{fileName}} <span class="text-muted">({{fileData?.sizeBytes | dsFileSize}})</span></h3>
       </div>
       <div class="float-right w-15">
         <ng-container>
-          <ds-themed-file-download-link [cssClasses]="'btn btn-link-focus'" [isBlank]="true" [bitstream]="getBitstream()" [enableRequestACopy]="false">
+          <ds-themed-file-download-link [cssClasses]="'btn btn-link-focus'" [isBlank]="true"
+                                        [bitstream]="getBitstream()" [enableRequestACopy]="false">
             <i class="fa fa-download fa-2x text-normal" aria-hidden="true"></i>
           </ds-themed-file-download-link>
           <button class="btn btn-link-focus"
@@ -22,7 +19,7 @@
           <button class="btn btn-link-focus"
                   [attr.aria-label]="'submission.sections.upload.delete.confirm.title' | translate"
                   title="{{ 'submission.sections.upload.delete.confirm.title' | translate }}"
-                  [disabled]="(processingDelete$ | async)"
+                  [dsBtnDisabled]="(processingDelete$ | async)"
                   (click)="$event.preventDefault();confirmDelete(content);">
             <i *ngIf="(processingDelete$ | async)" class="fas fa-circle-notch fa-spin fa-2x text-danger"></i>
             <i *ngIf="!(processingDelete$ | async)" class="fa fa-trash fa-2x text-danger"></i>
@@ -46,7 +43,9 @@
     <p>{{ 'submission.sections.upload.delete.confirm.info' | translate }}</p>
   </div>
   <div class="modal-footer">
-    <button type="button" class="btn btn-secondary" (click)="c('cancel')">{{ 'submission.sections.upload.delete.confirm.cancel' | translate }}</button>
-    <button type="button" class="btn btn-danger" (click)="c('ok')">{{ 'submission.sections.upload.delete.confirm.submit' | translate }}</button>
+    <button type="button" class="btn btn-secondary"
+            (click)="c('cancel')">{{ 'submission.sections.upload.delete.confirm.cancel' | translate }}</button>
+    <button type="button" class="btn btn-danger"
+            (click)="c('ok')">{{ 'submission.sections.upload.delete.confirm.submit' | translate }}</button>
   </div>
 </ng-template>
diff --git a/src/app/submission/sections/upload/file/view/section-upload-file-view.component.html b/src/app/submission/sections/upload/file/view/section-upload-file-view.component.html
index b84ef6f6a8..cc12b5dea6 100644
--- a/src/app/submission/sections/upload/file/view/section-upload-file-view.component.html
+++ b/src/app/submission/sections/upload/file/view/section-upload-file-view.component.html
@@ -15,15 +15,23 @@
     </ng-container>
     <ng-container *ngFor="let entry of getAllMetadataValue(fileDescrKey)">
       <ng-container *ngIf="entry.value !== ''">
-          {{entry.value | dsTruncate:['150']}}
+        {{entry.value | dsTruncate:['150']}}
       </ng-container>
       <ng-container *ngIf="entry.value === ''">
-        <span *ngIf="metadata[fileDescrKey].indexOf(entry) === 0" class="text-muted">{{'submission.sections.upload.no-entry' | translate}} {{fileDescrKey}}</span>
+        <span *ngIf="metadata[fileDescrKey].indexOf(entry) === 0"
+              class="text-muted">{{'submission.sections.upload.no-entry' | translate}} {{fileDescrKey}}</span>
       </ng-container>
       <span class="clearfix"></span>
     </ng-container>
   </ng-container>
 
+
+  <div class="mt-1" *ngIf="fileFormat">
+    {{'admin.registries.bitstream-formats.edit.head' | translate:{format: fileFormat} }}
+  </div>
+  <div class="mt-1" *ngIf="fileCheckSum">
+    Checksum {{fileCheckSum.checkSumAlgorithm}}: {{fileCheckSum.value}}
+  </div>
   <span class="clearfix"></span>
   <ds-submission-section-upload-access-conditions [accessConditions]="fileData.accessConditions"></ds-submission-section-upload-access-conditions>
 </div>
diff --git a/src/app/submission/sections/upload/file/view/section-upload-file-view.component.ts b/src/app/submission/sections/upload/file/view/section-upload-file-view.component.ts
index bb2fea20f8..b15b0ab321 100644
--- a/src/app/submission/sections/upload/file/view/section-upload-file-view.component.ts
+++ b/src/app/submission/sections/upload/file/view/section-upload-file-view.component.ts
@@ -38,6 +38,13 @@ export class SubmissionSectionUploadFileViewComponent implements OnInit {
    */
   public fileDescrKey = 'Description';
 
+  public fileFormat!: string;
+
+  public fileCheckSum!: {
+    checkSumAlgorithm: string;
+    value: string;
+  };
+
   /**
    * Initialize instance variables
    */
@@ -46,6 +53,8 @@ export class SubmissionSectionUploadFileViewComponent implements OnInit {
       this.metadata[this.fileTitleKey] = Metadata.all(this.fileData.metadata, 'dc.title');
       this.metadata[this.fileDescrKey] = Metadata.all(this.fileData.metadata, 'dc.description');
     }
+    this.fileCheckSum = this.fileData.checkSum;
+    this.fileFormat = this.fileData.format.shortDescription;
   }
 
   /**
diff --git a/src/app/submission/sections/upload/section-upload.component.html b/src/app/submission/sections/upload/section-upload.component.html
index b57b454288..3c4fbe49f6 100644
--- a/src/app/submission/sections/upload/section-upload.component.html
+++ b/src/app/submission/sections/upload/section-upload.component.html
@@ -5,7 +5,7 @@
 <ng-container *ngIf="fileList.length == 0">
   <div class="row">
     <div class="col-md-12">
-      <h3 class="text-center"><span class="text-muted">{{'submission.sections.upload.no-file-uploaded' | translate}}</span></h3>
+      <div class="text-center h3"><span class="text-muted">{{'submission.sections.upload.no-file-uploaded' | translate}}</span></div>
     </div>
   </div>
 </ng-container>
diff --git a/src/app/submission/sections/upload/section-upload.component.ts b/src/app/submission/sections/upload/section-upload.component.ts
index eefed8a36b..10203adbc0 100644
--- a/src/app/submission/sections/upload/section-upload.component.ts
+++ b/src/app/submission/sections/upload/section-upload.component.ts
@@ -21,7 +21,7 @@ import { SectionsType } from '../sections-type';
 import { renderSectionFor } from '../sections-decorator';
 import { SectionDataObject } from '../models/section-data.model';
 import { SubmissionObjectEntry } from '../../objects/submission-objects.reducer';
-import { AlertType } from '../../../shared/alert/aletr-type';
+import { AlertType } from '../../../shared/alert/alert-type';
 import { RemoteData } from '../../../core/data/remote-data';
 import { Group } from '../../../core/eperson/models/group.model';
 import { SectionsService } from '../sections.service';
diff --git a/src/app/submission/submission.service.ts b/src/app/submission/submission.service.ts
index 9eb8cf110a..610570e8c0 100644
--- a/src/app/submission/submission.service.ts
+++ b/src/app/submission/submission.service.ts
@@ -4,7 +4,7 @@ import { Router } from '@angular/router';
 
 import { Observable, of as observableOf, Subscription, timer as observableTimer } from 'rxjs';
 import { catchError, concatMap, distinctUntilChanged, filter, find, map, startWith, take, tap } from 'rxjs/operators';
-import { Store } from '@ngrx/store';
+import { Store, MemoizedSelector, createSelector, select } from '@ngrx/store';
 import { TranslateService } from '@ngx-translate/core';
 
 import { submissionSelector, SubmissionState } from './submission.reducers';
@@ -47,6 +47,20 @@ import { SubmissionJsonPatchOperationsService } from '../core/submission/submiss
 import { SubmissionSectionObject } from './objects/submission-section-object.model';
 import { SubmissionError } from './objects/submission-error.model';
 
+function getSubmissionSelector(submissionId: string):  MemoizedSelector<SubmissionState, SubmissionObjectEntry> {
+  return createSelector(
+    submissionSelector,
+    (state: SubmissionState) => state.objects[submissionId],
+  );
+}
+
+function getSubmissionCollectionIdSelector(submissionId: string): MemoizedSelector<SubmissionState, string> {
+  return createSelector(
+    getSubmissionSelector(submissionId),
+    (submission: SubmissionObjectEntry) => submission?.collection,
+  );
+}
+
 /**
  * A service that provides methods used in submission process.
  */
@@ -96,10 +110,19 @@ export class SubmissionService {
    * @param collectionId
    *    The collection id
    */
-  changeSubmissionCollection(submissionId, collectionId) {
+  changeSubmissionCollection(submissionId: string, collectionId: string): void {
     this.store.dispatch(new ChangeSubmissionCollectionAction(submissionId, collectionId));
   }
 
+  /**
+   * Listen to collection changes for a certain {@link SubmissionObject}
+   *
+   * @param submissionId The submission id
+   */
+  getSubmissionCollectionId(submissionId: string): Observable<string> {
+    return this.store.pipe(select(getSubmissionCollectionIdSelector(submissionId)));
+  }
+
   /**
    * Perform a REST call to create a new workspaceitem and return response
    *
diff --git a/src/app/subscriptions-page/subscriptions-page.component.html b/src/app/subscriptions-page/subscriptions-page.component.html
index ed31e16759..4d204df93c 100644
--- a/src/app/subscriptions-page/subscriptions-page.component.html
+++ b/src/app/subscriptions-page/subscriptions-page.component.html
@@ -1,7 +1,7 @@
 <div class="container">
   <div class="row">
     <div class="col-md-12 m-40">
-      <h2>{{'subscriptions.title' | translate}}</h2>
+      <h1>{{'subscriptions.title' | translate}}</h1>
       <div class="row">
         <div class="col-md-12 m-40">
           <ds-themed-loading *ngIf="loading$ | async"></ds-themed-loading>
@@ -34,7 +34,7 @@
               </div>
             </ds-pagination>
 
-            <ds-alert *ngIf="subscriptions?.pageInfo?.totalElements == 0 && !(loading$ | async)" [type]="'alert-info'" data-test="empty-alert">
+            <ds-alert *ngIf="subscriptions?.pageInfo?.totalElements == 0 && !(loading$ | async)" [type]="AlertType.Info" data-test="empty-alert">
               {{ 'subscriptions.table.empty.message' | translate }}
             </ds-alert>
 
diff --git a/src/app/subscriptions-page/subscriptions-page.component.ts b/src/app/subscriptions-page/subscriptions-page.component.ts
index 05c587ba12..35278d5dc2 100644
--- a/src/app/subscriptions-page/subscriptions-page.component.ts
+++ b/src/app/subscriptions-page/subscriptions-page.component.ts
@@ -14,6 +14,7 @@ import { EPerson } from '../core/eperson/models/eperson.model';
 import { getAllCompletedRemoteData } from '../core/shared/operators';
 import { RemoteData } from '../core/data/remote-data';
 import { hasValue } from '../shared/empty.util';
+import { AlertType } from '../shared/alert/alert-type';
 
 @Component({
   selector: 'ds-subscriptions-page',
@@ -54,6 +55,8 @@ export class SubscriptionsPageComponent implements OnInit, OnDestroy {
    */
   sub: rxjsSubscription = null;
 
+  readonly AlertType = AlertType;
+
   constructor(
     private paginationService: PaginationService,
     private authService: AuthService,
diff --git a/src/app/system-wide-alert/alert-banner/system-wide-alert-banner.component.html b/src/app/system-wide-alert/alert-banner/system-wide-alert-banner.component.html
index 5f741091f1..c2c1942cdd 100644
--- a/src/app/system-wide-alert/alert-banner/system-wide-alert-banner.component.html
+++ b/src/app/system-wide-alert/alert-banner/system-wide-alert-banner.component.html
@@ -1,27 +1,21 @@
 <div *ngIf="(systemWideAlert$ |async)?.active">
-    <div class="rounded-0 alert alert-warning w100">
+    <div class="rounded-0 alert alert-warning w100 m-0 px-1">
         <div class="container">
             <span class="font-weight-bold">
-        <span *ngIf="(countDownDays|async) > 0 || (countDownHours| async) > 0 || (countDownMinutes|async) > 0 ">
-            {{'system-wide-alert-banner.countdown.prefix' | translate }}
-        </span>
-            <span *ngIf="(countDownDays|async) > 0">
-            {{'system-wide-alert-banner.countdown.days' | translate: {
-                days: countDownDays|async
-            } }}
-        </span>
-            <span *ngIf="(countDownDays|async) > 0 || (countDownHours| async) > 0 ">
-            {{'system-wide-alert-banner.countdown.hours' | translate: {
-                hours: countDownHours| async
-            } }}
-        </span>
-            <span *ngIf="(countDownDays|async) > 0 || (countDownHours| async) > 0 || (countDownMinutes|async) > 0 ">
-            {{'system-wide-alert-banner.countdown.minutes' | translate: {
-                minutes: countDownMinutes|async
-            } }}
-        </span>
+                <span *ngIf="(countDownDays|async) > 0 || (countDownHours| async) > 0 || (countDownMinutes|async) > 0 ">
+                    {{ 'system-wide-alert-banner.countdown.prefix' | translate }}
+                </span>
+                <span *ngIf="(countDownDays|async) > 0">
+                    {{ 'system-wide-alert-banner.countdown.days' | translate: { days: countDownDays|async } }}
+                </span>
+                <span *ngIf="(countDownDays|async) > 0 || (countDownHours| async) > 0 ">
+                    {{ 'system-wide-alert-banner.countdown.hours' | translate: { hours: countDownHours| async } }}
+                </span>
+                <span *ngIf="(countDownDays|async) > 0 || (countDownHours| async) > 0 || (countDownMinutes|async) > 0 ">
+                    {{ 'system-wide-alert-banner.countdown.minutes' | translate: { minutes: countDownMinutes|async } }}
+                </span>
             </span>
-            <span>{{(systemWideAlert$ |async)?.message}}</span>
+            <span [innerHTML]="(systemWideAlert$ |async)?.message"></span>
         </div>
     </div>
-</div>
+</div>
\ No newline at end of file
diff --git a/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.html b/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.html
index 169081e277..dc2699b6d1 100644
--- a/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.html
+++ b/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.html
@@ -1,27 +1,26 @@
 <div class="container">
-    <h2 id="header">{{'system-wide-alert.form.header' | translate}}</h2>
+    <h1 id="header">{{'system-wide-alert.form.header' | translate}}</h1>
     <div [formGroup]="alertForm" [class]="'ng-invalid'">
         <div class="form-group">
             <div class="row mb-2">
                 <div class="col">
                     <ui-switch [checkedLabel]="'system-wide-alert.form.label.active' | translate"
-                               [uncheckedLabel]="'system-wide-alert.form.label.inactive' | translate"
-                               [checked]="formActive.value"
-                               (change)="setActive($event)"></ui-switch>
+                        [uncheckedLabel]="'system-wide-alert.form.label.inactive' | translate"
+                        [checked]="formActive.value" (change)="setActive($event)"></ui-switch>
                 </div>
             </div>
             <div class="row">
                 <div class="col">
                     <label for="formMessage">{{ 'system-wide-alert.form.label.message' | translate }}</label>
                     <textarea id="formMessage" rows="5"
-                              [className]="(formMessage.invalid) && (formMessage.dirty || formMessage.touched) ? 'form-control is-invalid' :'form-control'"
-                              formControlName="formMessage">
+                        [className]="(formMessage.invalid) && (formMessage.dirty || formMessage.touched) ? 'form-control is-invalid' :'form-control'"
+                        formControlName="formMessage">
                 </textarea>
                     <div *ngIf="formMessage.invalid && (formMessage.dirty || formMessage.touched)"
-                         class="invalid-feedback show-feedback">
-                <span *ngIf="formMessage.errors">
-                {{ 'system-wide-alert.form.error.message' | translate }}
-            </span>
+                        class="invalid-feedback show-feedback">
+                        <span *ngIf="formMessage.errors">
+                            {{ 'system-wide-alert.form.error.message' | translate }}
+                        </span>
                     </div>
                 </div>
             </div>
@@ -29,9 +28,8 @@
     </div>
     <div class="row">
         <div class="col mb-2 d-flex align-items-end">
-            <ui-switch size="small"
-                       [checked]="counterEnabled$ |async"
-                       (change)="setCounterEnabled($event)"></ui-switch>
+            <ui-switch size="small" [ariaLabel]="'system-wide-alert.form.label.countdownTo.enable' | translate"
+                [checked]="counterEnabled$ |async" (change)="setCounterEnabled($event)"></ui-switch>
             <span class="ml-2">{{ 'system-wide-alert.form.label.countdownTo.enable' | translate }}</span>
         </div>
     </div>
@@ -39,18 +37,11 @@
         <div class="row">
             <div class="col-sm-12 col-md-6">
                 <div class="input-group">
-                    <input
-                            class="form-control"
-                            placeholder="yyyy-mm-dd"
-                            name="dp"
-                            [(ngModel)]="date"
-                            [minDate]="minDate"
-                            ngbDatepicker
-                            #d="ngbDatepicker"
-                            (ngModelChange)="updatePreviewTime()"
-                    />
-                    <button class="btn btn-outline-secondary fas fa-calendar" (click)="d.toggle()"
-                            type="button"></button>
+                    <input class="form-control" placeholder="yyyy-mm-dd" name="dp" [(ngModel)]="date"
+                        [minDate]="minDate" ngbDatepicker #d="ngbDatepicker" (ngModelChange)="updatePreviewTime()" />
+                    <button [attr.aria-label]="'system-wide-alert-form.select-date-by-calendar' | translate"
+                        (click)="d.toggle()" class="btn btn-outline-secondary fas fa-calendar" type="button">
+                    </button>
                 </div>
             </div>
             <div class="col-12 d-md-none">
@@ -66,49 +57,38 @@
         </div>
     </div>
     <div class="mb-2">
-        <span class="text-muted"> {{'system-wide-alert.form.label.countdownTo.hint' | translate}}</span>
+        <span class="text-muted">{{ 'system-wide-alert.form.label.countdownTo.hint' | translate }}</span>
     </div>
-
-
     <div *ngIf="formMessage.value">
         <div class="row">
             <div class="col">
-                <label>{{ 'system-wide-alert.form.label.preview' | translate }}</label>
+                <label>{{ 'system-wide-alert.form.label.preview' | translate}}</label>
             </div>
         </div>
         <div class="rounded-0 alert alert-warning">
             <span class="font-weight-bold">
-        <span *ngIf="previewDays > 0 || previewHours > 0 || previewMinutes > 0 ">
-            {{'system-wide-alert-banner.countdown.prefix' | translate }}
-        </span>
-            <span *ngIf="previewDays > 0">
-            {{'system-wide-alert-banner.countdown.days' | translate: {
-                days: previewDays
-            } }}
-        </span>
-            <span *ngIf="previewDays > 0 || previewHours > 0 ">
-            {{'system-wide-alert-banner.countdown.hours' | translate: {
-                hours: previewHours
-            } }}
-        </span>
-            <span *ngIf="previewDays > 0 || previewHours > 0 || previewMinutes > 0 ">
-            {{'system-wide-alert-banner.countdown.minutes' | translate: {
-                minutes: previewMinutes
-            } }}
-        </span>
+                <span *ngIf="previewDays > 0 || previewHours > 0 || previewMinutes > 0 ">
+                    {{ 'system-wide-alert-banner.countdown.prefix' | translate }}
+                </span>
+                <span *ngIf="previewDays > 0">
+                    {{ 'system-wide-alert-banner.countdown.days' | translate: { days: previewDays } }}
+                </span>
+                <span *ngIf="previewDays > 0 || previewHours > 0 ">
+                    {{ 'system-wide-alert-banner.countdown.hours' | translate: { hours: previewHours } }}
+                </span>
+                <span *ngIf="previewDays > 0 || previewHours > 0 || previewMinutes > 0 ">
+                    {{ 'system-wide-alert-banner.countdown.minutes' | translate: { minutes: previewMinutes } }}
+                </span>
             </span>
-            <span>{{formMessage.value}}</span>
+            <span [innerHTML]="formMessage.value"></span>
         </div>
     </div>
-
     <div class="btn-row float-right space-children-mr mt-2">
-        <button (click)="back()"
-                class="btn btn-outline-secondary"><i
-                class="fas fa-arrow-left"></i> {{'system-wide-alert.form.cancel' | translate}}</button>
-        <button class="btn btn-primary" [disabled]="alertForm.invalid"
-                (click)="save()">
-            <i class="fa fa-save"></i> {{ 'system-wide-alert.form.save' | translate}}
+        <button (click)="back()" class="btn btn-outline-secondary">
+            <i class="fas fa-arrow-left"></i> {{ 'system-wide-alert.form.cancel' | translate }}
+        </button>
+        <button class="btn btn-primary" [dsBtnDisabled]="alertForm.invalid" (click)="save()">
+            <i class="fa fa-save"></i> {{ 'system-wide-alert.form.save' | translate }}
         </button>
     </div>
-
 </div>
diff --git a/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.spec.ts b/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.spec.ts
index 505990b445..a42a24d61d 100644
--- a/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.spec.ts
+++ b/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.spec.ts
@@ -302,6 +302,14 @@ describe('SystemWideAlertFormComponent', () => {
       expect(comp.back).not.toHaveBeenCalled();
 
     });
+    it('should not create the new alert when the enable button is clicked on an invalid the form', () => {
+      spyOn(comp as any, 'handleResponse');
+
+      comp.formMessage.patchValue('');
+      comp.save();
+
+      expect((comp as any).handleResponse).not.toHaveBeenCalled();
+    });
   });
   describe('back', () => {
     it('should navigate back to the home page', () => {
diff --git a/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.ts b/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.ts
index eaff12c169..b4a272890b 100644
--- a/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.ts
+++ b/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.ts
@@ -219,11 +219,13 @@ export class SystemWideAlertFormComponent implements OnInit {
     } else {
       alert.countdownTo = null;
     }
-    if (hasValue(this.currentAlert)) {
-      const updatedAlert = Object.assign(new SystemWideAlert(), this.currentAlert, alert);
-      this.handleResponse(this.systemWideAlertDataService.put(updatedAlert), 'system-wide-alert.form.update', navigateToHomePage);
-    } else {
-      this.handleResponse(this.systemWideAlertDataService.create(alert), 'system-wide-alert.form.create', navigateToHomePage);
+    if (this.alertForm.valid) {
+      if (hasValue(this.currentAlert)) {
+        const updatedAlert = Object.assign(new SystemWideAlert(), this.currentAlert, alert);
+        this.handleResponse(this.systemWideAlertDataService.put(updatedAlert), 'system-wide-alert.form.update', navigateToHomePage);
+      } else {
+        this.handleResponse(this.systemWideAlertDataService.create(alert), 'system-wide-alert.form.create', navigateToHomePage);
+      }
     }
   }
 
diff --git a/src/app/thumbnail/thumbnail.component.html b/src/app/thumbnail/thumbnail.component.html
index 6a0516b0d4..bd161ea748 100644
--- a/src/app/thumbnail/thumbnail.component.html
+++ b/src/app/thumbnail/thumbnail.component.html
@@ -1,21 +1,19 @@
-<div class="thumbnail" [class.limit-width]="limitWidth" *ngVar="(isLoading$ | async) as isLoading">
-  <div *ngIf="isLoading" class="thumbnail-content outer">
+<div class="thumbnail" [class.limit-width]="limitWidth">
+  <div *ngIf="(isLoading$ | async)" class="thumbnail-content outer">
     <div class="inner">
       <div class="centered">
         <ds-themed-loading [spinner]="true"></ds-themed-loading>
       </div>
     </div>
   </div>
-  <ng-container *ngVar="(src$ | async) as src">
-    <!-- don't use *ngIf="!isLoading" so the thumbnail can load in while the animation is playing -->
-    <img *ngIf="src !== null" class="thumbnail-content img-fluid" [ngClass]="{'d-none': isLoading}"
-         [src]="src | dsSafeUrl" [alt]="alt | translate" (error)="errorHandler()" (load)="successHandler()">
-    <div *ngIf="src === null && !isLoading" class="thumbnail-content outer">
-      <div class="inner">
-        <div class="thumbnail-placeholder centered lead">
-          {{ placeholder | translate }}
-        </div>
+  <!-- don't use *ngIf="!(isLoading$ | async)" so the thumbnail can load in while the animation is playing -->
+  <img *ngIf="(src$ | async) !== null" class="thumbnail-content img-fluid" [ngClass]="{'d-none': (isLoading$ | async)}"
+       [src]="(src$ | async) | dsSafeUrl" [alt]="alt | translate" (error)="errorHandler()" (load)="successHandler()">
+  <div *ngIf="(src$ | async) === null && !(isLoading$ | async)" class="thumbnail-content outer">
+    <div class="inner">
+      <div class="thumbnail-placeholder centered lead">
+        {{ placeholder | translate }}
       </div>
     </div>
-  </ng-container>
+  </div>
 </div>
diff --git a/src/app/thumbnail/thumbnail.component.spec.ts b/src/app/thumbnail/thumbnail.component.spec.ts
index ebecb5e075..56250bf6e8 100644
--- a/src/app/thumbnail/thumbnail.component.spec.ts
+++ b/src/app/thumbnail/thumbnail.component.spec.ts
@@ -1,4 +1,4 @@
-import { DebugElement, Pipe, PipeTransform } from '@angular/core';
+import { DebugElement, Pipe, PipeTransform, PLATFORM_ID } from '@angular/core';
 import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
 import { Bitstream } from '../core/shared/bitstream.model';
@@ -12,6 +12,9 @@ import { AuthService } from '../core/auth/auth.service';
 import { FileService } from '../core/shared/file.service';
 import { VarDirective } from '../shared/utils/var.directive';
 import { AuthorizationDataService } from '../core/data/feature-authorization/authorization-data.service';
+import { TranslateModule } from '@ngx-translate/core';
+import { ThemeService } from '../shared/theme-support/theme.service';
+import { getMockThemeService } from '../shared/mocks/theme-service.mock';
 
 // eslint-disable-next-line @angular-eslint/pipe-prefix
 @Pipe({ name: 'translate' })
@@ -31,286 +34,249 @@ describe('ThumbnailComponent', () => {
   let authService;
   let authorizationService;
   let fileService;
+  let spy;
 
-  beforeEach(waitForAsync(() => {
-    authService = jasmine.createSpyObj('AuthService', {
-      isAuthenticated: observableOf(true),
-    });
-    authorizationService = jasmine.createSpyObj('AuthorizationService', {
-      isAuthorized: observableOf(true),
-    });
-    fileService = jasmine.createSpyObj('FileService', {
+  describe('when platform is browser', () => {
+    beforeEach(waitForAsync(() => {
+      authService = jasmine.createSpyObj('AuthService', {
+        isAuthenticated: observableOf(true),
+      });
+      authorizationService = jasmine.createSpyObj('AuthorizationService', {
+        isAuthorized: observableOf(true),
+      });
+      fileService = jasmine.createSpyObj('FileService', {
       retrieveFileDownloadLink: null
-    });
-    fileService.retrieveFileDownloadLink.and.callFake((url) => observableOf(`${url}?authentication-token=fake`));
+      });
+      fileService.retrieveFileDownloadLink.and.callFake((url) => observableOf(`${url}?authentication-token=fake`));
 
-    TestBed.configureTestingModule({
+      TestBed.configureTestingModule({
       declarations: [ThumbnailComponent, SafeUrlPipe, MockTranslatePipe, VarDirective],
-      providers: [
-        { provide: AuthService, useValue: authService },
-        { provide: AuthorizationDataService, useValue: authorizationService },
-        { provide: FileService, useValue: fileService }
+        providers: [
+          { provide: AuthService, useValue: authService },
+          { provide: AuthorizationDataService, useValue: authorizationService },
+          { provide: FileService, useValue: fileService },
+          { provide: PLATFORM_ID, useValue: 'browser' },
       ]
     }).compileComponents();
-  }));
+    }));
 
-  beforeEach(() => {
-    fixture = TestBed.createComponent(ThumbnailComponent);
-    fixture.detectChanges();
+    beforeEach(() => {
+      fixture = TestBed.createComponent(ThumbnailComponent);
+      fixture.detectChanges();
 
-    authService = TestBed.inject(AuthService);
+      authService = TestBed.inject(AuthService);
 
-    comp = fixture.componentInstance; // ThumbnailComponent test instance
-    de = fixture.debugElement.query(By.css('div.thumbnail'));
-    el = de.nativeElement;
-  });
+      comp = fixture.componentInstance; // ThumbnailComponent test instance
+      de = fixture.debugElement.query(By.css('div.thumbnail'));
+      el = de.nativeElement;
+    });
 
-  describe('loading', () => {
-    it('should start out with isLoading$ true', () => {
+    describe('loading', () => {
+      it('should start out with isLoading$ true', () => {
       expect(comp.isLoading$.getValue()).toBeTrue();
-    });
+      });
 
-    it('should set isLoading$ to false once an image is successfully loaded', () => {
-      comp.setSrc('http://bit.stream');
-      fixture.debugElement.query(By.css('img.thumbnail-content')).triggerEventHandler('load', new Event('load'));
+      it('should set isLoading$ to false once an image is successfully loaded', () => {
+        comp.setSrc('http://bit.stream');
+        fixture.debugElement.query(By.css('img.thumbnail-content')).triggerEventHandler('load', new Event('load'));
       expect(comp.isLoading$.getValue()).toBeFalse();
-    });
+      });
 
-    it('should set isLoading$ to false once the src is set to null', () => {
-      comp.setSrc(null);
+      it('should set isLoading$ to false once the src is set to null', () => {
+        comp.setSrc(null);
       expect(comp.isLoading$.getValue()).toBeFalse();
-    });
+      });
 
-    it('should show a loading animation while isLoading$ is true', () => {
+      it('should show a loading animation while isLoading$ is true', () => {
       expect(de.query(By.css('ds-themed-loading'))).toBeTruthy();
 
       comp.isLoading$.next(false);
-      fixture.detectChanges();
+        fixture.detectChanges();
       expect(fixture.debugElement.query(By.css('ds-themed-loading'))).toBeFalsy();
-    });
+      });
 
-    describe('with a thumbnail image', () => {
-      beforeEach(() => {
+      describe('with a thumbnail image', () => {
+        beforeEach(() => {
         comp.src$.next('https://bit.stream');
-        fixture.detectChanges();
-      });
+          fixture.detectChanges();
+        });
 
-      it('should render but hide the image while loading and show it once done', () => {
-        let img = fixture.debugElement.query(By.css('img.thumbnail-content'));
-        expect(img).toBeTruthy();
-        expect(img.classes['d-none']).toBeTrue();
+        it('should render but hide the image while loading and show it once done', () => {
+          let img = fixture.debugElement.query(By.css('img.thumbnail-content'));
+          expect(img).toBeTruthy();
+          expect(img.classes['d-none']).toBeTrue();
 
         comp.isLoading$.next(false);
-        fixture.detectChanges();
-        img = fixture.debugElement.query(By.css('img.thumbnail-content'));
-        expect(img).toBeTruthy();
-        expect(img.classes['d-none']).toBeFalsy();
+          fixture.detectChanges();
+          img = fixture.debugElement.query(By.css('img.thumbnail-content'));
+          expect(img).toBeTruthy();
+          expect(img.classes['d-none']).toBeFalsy();
+        });
+
       });
 
-    });
-
-    describe('without a thumbnail image', () => {
-      beforeEach(() => {
+      describe('without a thumbnail image', () => {
+        beforeEach(() => {
         comp.src$.next(null);
-        fixture.detectChanges();
-      });
+          fixture.detectChanges();
+        });
 
-      it('should only show the HTML placeholder once done loading', () => {
-        expect(fixture.debugElement.query(By.css('div.thumbnail-placeholder'))).toBeFalsy();
+        it('should only show the HTML placeholder once done loading', () => {
+          expect(fixture.debugElement.query(By.css('div.thumbnail-placeholder'))).toBeFalsy();
 
         comp.isLoading$.next(false);
-        fixture.detectChanges();
-        expect(fixture.debugElement.query(By.css('div.thumbnail-placeholder'))).toBeTruthy();
-      });
-    });
-
-  });
-
-  const errorHandler = () => {
-    let setSrcSpy;
-
-    beforeEach(() => {
-      // disconnect error handler to be sure it's only called once
-      const img = fixture.debugElement.query(By.css('img.thumbnail-content'));
-      img.nativeNode.onerror = null;
-
-      comp.ngOnChanges({});
-      setSrcSpy = spyOn(comp, 'setSrc').and.callThrough();
-    });
-
-    describe('retry with authentication token', () => {
-      it('should remember that it already retried once', () => {
-        expect(comp.retriedWithToken).toBeFalse();
-        comp.errorHandler();
-        expect(comp.retriedWithToken).toBeTrue();
-      });
-
-      describe('if not logged in', () => {
-        beforeEach(() => {
-          authService.isAuthenticated.and.returnValue(observableOf(false));
+          fixture.detectChanges();
+          expect(fixture.debugElement.query(By.css('div.thumbnail-placeholder'))).toBeTruthy();
         });
+      });
 
-        it('should fall back to default', () => {
+    });
+
+    const errorHandler = () => {
+      let setSrcSpy;
+
+      beforeEach(() => {
+        // disconnect error handler to be sure it's only called once
+        const img = fixture.debugElement.query(By.css('img.thumbnail-content'));
+        img.nativeNode.onerror = null;
+
+        comp.ngOnChanges({});
+        setSrcSpy = spyOn(comp, 'setSrc').and.callThrough();
+      });
+
+      describe('retry with authentication token', () => {
+        it('should remember that it already retried once', () => {
+          expect(comp.retriedWithToken).toBeFalse();
           comp.errorHandler();
-          expect(setSrcSpy).toHaveBeenCalledWith(comp.defaultImage);
-        });
-      });
-
-      describe('if logged in', () => {
-        beforeEach(() => {
-          authService.isAuthenticated.and.returnValue(observableOf(true));
+          expect(comp.retriedWithToken).toBeTrue();
         });
 
-        describe('and authorized to download the thumbnail', () => {
+        describe('if not logged in', () => {
           beforeEach(() => {
-            authorizationService.isAuthorized.and.returnValue(observableOf(true));
-          });
-
-          it('should add an authentication token to the thumbnail URL', () => {
-            comp.errorHandler();
-
-            if ((comp.thumbnail as RemoteData<Bitstream>)?.hasFailed) {
-              // If we failed to retrieve the Bitstream in the first place, fall back to the default
-              expect(setSrcSpy).toHaveBeenCalledWith(comp.defaultImage);
-            } else {
-              expect(setSrcSpy).toHaveBeenCalledWith(CONTENT + '?authentication-token=fake');
-            }
-          });
-        });
-
-        describe('but not authorized to download the thumbnail', () => {
-          beforeEach(() => {
-            authorizationService.isAuthorized.and.returnValue(observableOf(false));
+            authService.isAuthenticated.and.returnValue(observableOf(false));
           });
 
           it('should fall back to default', () => {
             comp.errorHandler();
-
             expect(setSrcSpy).toHaveBeenCalledWith(comp.defaultImage);
-
-            // We don't need to check authorization if we failed to retrieve the Bitstreamin the first place
-            if (!(comp.thumbnail as RemoteData<Bitstream>)?.hasFailed) {
-              expect(authorizationService.isAuthorized).toHaveBeenCalled();
-            }
           });
         });
+
+        describe('if logged in', () => {
+          beforeEach(() => {
+            authService.isAuthenticated.and.returnValue(observableOf(true));
+          });
+
+          describe('and authorized to download the thumbnail', () => {
+            beforeEach(() => {
+              authorizationService.isAuthorized.and.returnValue(observableOf(true));
+            });
+
+            it('should add an authentication token to the thumbnail URL', () => {
+              comp.errorHandler();
+
+              if ((comp.thumbnail as RemoteData<Bitstream>)?.hasFailed) {
+                // If we failed to retrieve the Bitstream in the first place, fall back to the default
+                expect(setSrcSpy).toHaveBeenCalledWith(comp.defaultImage);
+              } else {
+                expect(setSrcSpy).toHaveBeenCalledWith(CONTENT + '?authentication-token=fake');
+              }
+            });
+          });
+
+          describe('but not authorized to download the thumbnail', () => {
+            beforeEach(() => {
+              authorizationService.isAuthorized.and.returnValue(observableOf(false));
+            });
+
+            it('should fall back to default', () => {
+              comp.errorHandler();
+
+              expect(setSrcSpy).toHaveBeenCalledWith(comp.defaultImage);
+
+              // We don't need to check authorization if we failed to retrieve the Bitstreamin the first place
+              if (!(comp.thumbnail as RemoteData<Bitstream>)?.hasFailed) {
+                expect(authorizationService.isAuthorized).toHaveBeenCalled();
+              }
+            });
+          });
+        });
+      });
+
+      describe('after retrying with token', () => {
+        beforeEach(() => {
+          comp.retriedWithToken = true;
+        });
+
+        it('should fall back to default', () => {
+          comp.errorHandler();
+          expect(authService.isAuthenticated).not.toHaveBeenCalled();
+          expect(fileService.retrieveFileDownloadLink).not.toHaveBeenCalled();
+          expect(setSrcSpy).toHaveBeenCalledWith(comp.defaultImage);
+        });
+      });
+    };
+
+    describe('fallback', () => {
+      describe('if there is a default image', () => {
+        it('should display the default image', () => {
+          comp.src$.next('http://bit.stream');
+          comp.defaultImage = 'http://default.img';
+          comp.errorHandler();
+          expect(comp.src$.getValue()).toBe(comp.defaultImage);
+        });
+
+        it('should include the alt text', () => {
+          comp.src$.next('http://bit.stream');
+          comp.defaultImage = 'http://default.img';
+          comp.errorHandler();
+
+          fixture.detectChanges();
+          const image: HTMLElement = fixture.debugElement.query(By.css('img')).nativeElement;
+          expect(image.getAttribute('alt')).toBe('TRANSLATED ' + comp.alt);
+        });
+      });
+
+      describe('if there is no default image', () => {
+        it('should display the HTML placeholder', () => {
+          comp.src$.next('http://default.img');
+          comp.defaultImage = null;
+          comp.errorHandler();
+          expect(comp.src$.getValue()).toBe(null);
+
+          fixture.detectChanges();
+          const placeholder = fixture.debugElement.query(By.css('div.thumbnail-placeholder')).nativeElement;
+          expect(placeholder.innerHTML).toContain('TRANSLATED ' + comp.placeholder);
+        });
       });
     });
 
-    describe('after retrying with token', () => {
+    describe('with thumbnail as Bitstream', () => {
+      let thumbnail;
       beforeEach(() => {
-        comp.retriedWithToken = true;
-      });
-
-      it('should fall back to default', () => {
-        comp.errorHandler();
-        expect(authService.isAuthenticated).not.toHaveBeenCalled();
-        expect(fileService.retrieveFileDownloadLink).not.toHaveBeenCalled();
-        expect(setSrcSpy).toHaveBeenCalledWith(comp.defaultImage);
-      });
-    });
-  };
-
-  describe('fallback', () => {
-    describe('if there is a default image', () => {
-      it('should display the default image', () => {
-        comp.src$.next('http://bit.stream');
-        comp.defaultImage = 'http://default.img';
-        comp.errorHandler();
-        expect(comp.src$.getValue()).toBe(comp.defaultImage);
-      });
-
-      it('should include the alt text', () => {
-        comp.src$.next('http://bit.stream');
-        comp.defaultImage = 'http://default.img';
-        comp.errorHandler();
-
-        fixture.detectChanges();
-        const image: HTMLElement = fixture.debugElement.query(By.css('img')).nativeElement;
-        expect(image.getAttribute('alt')).toBe('TRANSLATED ' + comp.alt);
-      });
-    });
-
-    describe('if there is no default image', () => {
-      it('should display the HTML placeholder', () => {
-        comp.src$.next('http://default.img');
-        comp.defaultImage = null;
-        comp.errorHandler();
-        expect(comp.src$.getValue()).toBe(null);
-
-        fixture.detectChanges();
-        const placeholder = fixture.debugElement.query(By.css('div.thumbnail-placeholder')).nativeElement;
-        expect(placeholder.innerHTML).toContain('TRANSLATED ' + comp.placeholder);
-      });
-    });
-  });
-
-  describe('with thumbnail as Bitstream', () => {
-    let thumbnail;
-    beforeEach(() => {
-      thumbnail = new Bitstream();
-      thumbnail._links = {
-        self: { href: 'self.url' },
-        bundle: { href: 'bundle.url' },
-        format: { href: 'format.url' },
-        content: { href: CONTENT },
-        thumbnail: undefined,
-      };
-      comp.thumbnail = thumbnail;
-    });
-
-    describe('if content can be loaded', () => {
-      it('should display an image', () => {
-        comp.ngOnChanges({});
-        fixture.detectChanges();
-        const image: HTMLElement = fixture.debugElement.query(By.css('img')).nativeElement;
-        expect(image.getAttribute('src')).toBe(thumbnail._links.content.href);
-      });
-
-      it('should include the alt text', () => {
-        comp.ngOnChanges({});
-        fixture.detectChanges();
-        const image: HTMLElement = fixture.debugElement.query(By.css('img')).nativeElement;
-        expect(image.getAttribute('alt')).toBe('TRANSLATED ' + comp.alt);
-      });
-    });
-
-    describe('if content can\'t be loaded', () => {
-      errorHandler();
-    });
-  });
-
-  describe('with thumbnail as RemoteData<Bitstream>', () => {
-    let thumbnail: Bitstream;
-
-    beforeEach(() => {
-      thumbnail = new Bitstream();
-      thumbnail._links = {
-        self: { href: 'self.url' },
-        bundle: { href: 'bundle.url' },
-        format: { href: 'format.url' },
-        content: { href: CONTENT },
-        thumbnail: undefined
-      };
-    });
-
-    describe('if RemoteData succeeded', () => {
-      beforeEach(() => {
-        comp.thumbnail = createSuccessfulRemoteDataObject(thumbnail);
+        thumbnail = new Bitstream();
+        thumbnail._links = {
+          self: { href: 'self.url' },
+          bundle: { href: 'bundle.url' },
+          format: { href: 'format.url' },
+          content: { href: CONTENT },
+          thumbnail: undefined,
+        };
+        comp.thumbnail = thumbnail;
       });
 
       describe('if content can be loaded', () => {
         it('should display an image', () => {
           comp.ngOnChanges({});
           fixture.detectChanges();
-          const image: HTMLElement = de.query(By.css('img')).nativeElement;
+          const image: HTMLElement = fixture.debugElement.query(By.css('img')).nativeElement;
           expect(image.getAttribute('src')).toBe(thumbnail._links.content.href);
         });
 
-        it('should display the alt text', () => {
+        it('should include the alt text', () => {
           comp.ngOnChanges({});
           fixture.detectChanges();
-          const image: HTMLElement = de.query(By.css('img')).nativeElement;
+          const image: HTMLElement = fixture.debugElement.query(By.css('img')).nativeElement;
           expect(image.getAttribute('alt')).toBe('TRANSLATED ' + comp.alt);
         });
       });
@@ -320,16 +286,109 @@ describe('ThumbnailComponent', () => {
       });
     });
 
-    describe('if RemoteData failed', () => {
+    describe('with thumbnail as RemoteData<Bitstream>', () => {
+      let thumbnail: Bitstream;
+
       beforeEach(() => {
-        comp.thumbnail = createFailedRemoteDataObject();
+        thumbnail = new Bitstream();
+        thumbnail._links = {
+          self: { href: 'self.url' },
+          bundle: { href: 'bundle.url' },
+          format: { href: 'format.url' },
+          content: { href: CONTENT },
+        thumbnail: undefined
+        };
       });
 
-      it('should show the default image', () => {
-        comp.defaultImage = 'default/image.jpg';
-        comp.ngOnChanges({});
-        expect(comp.src$.getValue()).toBe('default/image.jpg');
+      describe('if RemoteData succeeded', () => {
+        beforeEach(() => {
+          comp.thumbnail = createSuccessfulRemoteDataObject(thumbnail);
+        });
+
+        describe('if content can be loaded', () => {
+          it('should display an image', () => {
+            comp.ngOnChanges({});
+            fixture.detectChanges();
+            const image: HTMLElement = de.query(By.css('img')).nativeElement;
+            expect(image.getAttribute('src')).toBe(thumbnail._links.content.href);
+          });
+
+          it('should display the alt text', () => {
+            comp.ngOnChanges({});
+            fixture.detectChanges();
+            const image: HTMLElement = de.query(By.css('img')).nativeElement;
+            expect(image.getAttribute('alt')).toBe('TRANSLATED ' + comp.alt);
+          });
+        });
+
+        describe('if content can\'t be loaded', () => {
+          errorHandler();
+        });
+      });
+
+      describe('if RemoteData failed', () => {
+        beforeEach(() => {
+          comp.thumbnail = createFailedRemoteDataObject();
+        });
+
+        it('should show the default image', () => {
+          comp.defaultImage = 'default/image.jpg';
+          comp.ngOnChanges({});
+          expect(comp.src$.getValue()).toBe('default/image.jpg');
+        });
       });
     });
   });
+
+  describe('when platform is server', () => {
+    beforeEach(waitForAsync(() => {
+
+      authService = jasmine.createSpyObj('AuthService', {
+        isAuthenticated: observableOf(true),
+      });
+      authorizationService = jasmine.createSpyObj('AuthorizationService', {
+        isAuthorized: observableOf(true),
+      });
+      fileService = jasmine.createSpyObj('FileService', {
+        retrieveFileDownloadLink: null,
+      });
+      fileService.retrieveFileDownloadLink.and.callFake((url) => observableOf(`${url}?authentication-token=fake`));
+
+      TestBed.configureTestingModule({
+        imports: [
+          TranslateModule.forRoot(),
+        ],
+        declarations: [ThumbnailComponent, SafeUrlPipe, MockTranslatePipe, VarDirective],
+        providers: [
+          { provide: AuthService, useValue: authService },
+          { provide: AuthorizationDataService, useValue: authorizationService },
+          { provide: FileService, useValue: fileService },
+          { provide: ThemeService, useValue: getMockThemeService() },
+          { provide: PLATFORM_ID, useValue: 'server' },
+        ],
+      }).compileComponents();
+    }));
+
+    beforeEach(() => {
+      fixture = TestBed.createComponent(ThumbnailComponent);
+      spyOn(fixture.componentInstance, 'setSrc').and.callThrough();
+      fixture.detectChanges();
+
+      authService = TestBed.inject(AuthService);
+
+      comp = fixture.componentInstance; // ThumbnailComponent test instance
+      de = fixture.debugElement.query(By.css('div.thumbnail'));
+      el = de.nativeElement;
+    });
+
+    it('should start out with isLoading$ true', () => {
+      expect(comp.isLoading$.getValue()).toBeTrue();
+      expect(de.query(By.css('ds-themed-loading'))).toBeTruthy();
+    });
+
+    it('should not call setSrc', () => {
+      expect(comp.setSrc).not.toHaveBeenCalled();
+    });
+
+  });
 });
diff --git a/src/app/thumbnail/thumbnail.component.ts b/src/app/thumbnail/thumbnail.component.ts
index 7f6531cc5e..5f8927f3a2 100644
--- a/src/app/thumbnail/thumbnail.component.ts
+++ b/src/app/thumbnail/thumbnail.component.ts
@@ -1,13 +1,14 @@
-import { Component, Input, OnChanges, SimpleChanges } from '@angular/core';
+import { Component, Inject, Input, OnChanges, PLATFORM_ID, SimpleChanges } from '@angular/core';
 import { Bitstream } from '../core/shared/bitstream.model';
 import { hasNoValue, hasValue } from '../shared/empty.util';
 import { RemoteData } from '../core/data/remote-data';
-import { BehaviorSubject, of as observableOf } from 'rxjs';
+import { of as observableOf, BehaviorSubject } from 'rxjs';
 import { switchMap } from 'rxjs/operators';
 import { FeatureID } from '../core/data/feature-authorization/feature-id';
 import { AuthorizationDataService } from '../core/data/feature-authorization/authorization-data.service';
 import { AuthService } from '../core/auth/auth.service';
 import { FileService } from '../core/shared/file.service';
+import { isPlatformBrowser } from '@angular/common';
 
 /**
  * This component renders a given Bitstream as a thumbnail.
@@ -34,7 +35,7 @@ export class ThumbnailComponent implements OnChanges {
   /**
    * The src attribute used in the template to render the image.
    */
-  src$ = new BehaviorSubject<string>(undefined);
+  src$: BehaviorSubject<string> = new BehaviorSubject<string>(undefined);
 
   retriedWithToken = false;
 
@@ -57,9 +58,10 @@ export class ThumbnailComponent implements OnChanges {
    * Whether the thumbnail is currently loading
    * Start out as true to avoid flashing the alt text while a thumbnail is being loaded.
    */
-  isLoading$ = new BehaviorSubject(true);
+  isLoading$: BehaviorSubject<boolean> = new BehaviorSubject(true);
 
   constructor(
+    @Inject(PLATFORM_ID) private platformID: any,
     protected auth: AuthService,
     protected authorizationService: AuthorizationDataService,
     protected fileService: FileService,
@@ -71,16 +73,18 @@ export class ThumbnailComponent implements OnChanges {
    * Use a default image if no actual image is available.
    */
   ngOnChanges(changes: SimpleChanges): void {
-    if (hasNoValue(this.thumbnail)) {
-      this.setSrc(this.defaultImage);
-      return;
-    }
+    if (isPlatformBrowser(this.platformID)) {
+      if (hasNoValue(this.thumbnail)) {
+        this.setSrc(this.defaultImage);
+        return;
+      }
 
-    const src = this.contentHref;
-    if (hasValue(src)) {
-      this.setSrc(src);
-    } else {
-      this.setSrc(this.defaultImage);
+      const src = this.contentHref;
+      if (hasValue(src)) {
+        this.setSrc(src);
+      } else {
+        this.setSrc(this.defaultImage);
+      }
     }
   }
 
@@ -162,9 +166,22 @@ export class ThumbnailComponent implements OnChanges {
    * @param src
    */
   setSrc(src: string): void {
-    this.src$.next(src);
-    if (src === null) {
-      this.isLoading$.next(false);
+    // only update the src if it has changed (the parent component may fire the same one multiple times
+    if (this.src$.getValue() !== src) {
+      // every time the src changes we need to start the loading animation again, as it's possible
+      // that it is first set to null when the parent component initializes and then set to
+      // the actual value
+      //
+      // isLoading$ will be set to false by the error or success handler afterwards, except in the
+      // case where src is null, then we have to set it manually here (because those handlers won't
+      // trigger)
+      if (src !== null && this.isLoading$.getValue() === false) {
+        this.isLoading$.next(true);
+      }
+      this.src$.next(src);
+      if (src === null && this.isLoading$.getValue() === true) {
+        this.isLoading$.next(false);
+      }
     }
   }
 
diff --git a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/reviewers-list/reviewers-list.component.spec.ts b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/reviewers-list/reviewers-list.component.spec.ts
index 7c8db782ce..91e200e85d 100644
--- a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/reviewers-list/reviewers-list.component.spec.ts
+++ b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/reviewers-list/reviewers-list.component.spec.ts
@@ -17,7 +17,7 @@ import { Group } from '../../../../core/eperson/models/group.model';
 import { PageInfo } from '../../../../core/shared/page-info.model';
 import { FormBuilderService } from '../../../../shared/form/builder/form-builder.service';
 import { NotificationsService } from '../../../../shared/notifications/notifications.service';
-import { GroupMock, GroupMock2 } from '../../../../shared/testing/group-mock';
+import { GroupMock } from '../../../../shared/testing/group-mock';
 import { ReviewersListComponent } from './reviewers-list.component';
 import { EPersonMock, EPersonMock2 } from '../../../../shared/testing/eperson.mock';
 import {
@@ -31,8 +31,10 @@ import { NotificationsServiceStub } from '../../../../shared/testing/notificatio
 import { RouterMock } from '../../../../shared/mocks/router.mock';
 import { PaginationService } from '../../../../core/pagination/pagination.service';
 import { PaginationServiceStub } from '../../../../shared/testing/pagination-service.stub';
-import { EpersonDtoModel } from '../../../../core/eperson/models/eperson-dto.model';
 
+// NOTE: Because ReviewersListComponent extends MembersListComponent, the below tests ONLY validate
+// features which are *unique* to ReviewersListComponent. All other features are tested in the
+// members-list.component.spec.ts file.
 describe('ReviewersListComponent', () => {
   let component: ReviewersListComponent;
   let fixture: ComponentFixture<ReviewersListComponent>;
@@ -40,31 +42,27 @@ describe('ReviewersListComponent', () => {
   let builderService: FormBuilderService;
   let ePersonDataServiceStub: any;
   let groupsDataServiceStub: any;
-  let activeGroup;
-  let allEPersons;
-  let allGroups;
-  let epersonMembers;
-  let subgroupMembers;
+  let activeGroup: Group;
+  let epersonMembers: EPerson[];
+  let epersonNonMembers: EPerson[];
   let paginationService;
-  let ePersonDtoModel1: EpersonDtoModel;
-  let ePersonDtoModel2: EpersonDtoModel;
 
   beforeEach(waitForAsync(() => {
     activeGroup = GroupMock;
     epersonMembers = [EPersonMock2];
-    subgroupMembers = [GroupMock2];
-    allEPersons = [EPersonMock, EPersonMock2];
-    allGroups = [GroupMock, GroupMock2];
+    epersonNonMembers = [EPersonMock];
     ePersonDataServiceStub = {
       activeGroup: activeGroup,
       epersonMembers: epersonMembers,
-      subgroupMembers: subgroupMembers,
+      epersonNonMembers: epersonNonMembers,
+      // This method is used to get all the current members
       findListByHref(_href: string): Observable<RemoteData<PaginatedList<EPerson>>> {
         return createSuccessfulRemoteDataObject$(buildPaginatedList<EPerson>(new PageInfo(), groupsDataServiceStub.getEPersonMembers()));
       },
+      // This method is used to search across *non-members*
       searchByScope(scope: string, query: string): Observable<RemoteData<PaginatedList<EPerson>>> {
         if (query === '') {
-          return createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), allEPersons));
+          return createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), epersonNonMembers));
         }
         return createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), []));
       },
@@ -74,29 +72,26 @@ describe('ReviewersListComponent', () => {
       clearLinkRequests() {
         // empty
       },
-      getEPeoplePageRouterLink(): string {
-        return '/access-control/epeople';
-      }
     };
     groupsDataServiceStub = {
       activeGroup: activeGroup,
       epersonMembers: epersonMembers,
-      subgroupMembers: subgroupMembers,
-      allGroups: allGroups,
+      epersonNonMembers: epersonNonMembers,
       getActiveGroup(): Observable<Group> {
         return observableOf(activeGroup);
       },
       getEPersonMembers() {
         return this.epersonMembers;
       },
-      searchGroups(query: string): Observable<RemoteData<PaginatedList<Group>>> {
-        if (query === '') {
-          return createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), this.allGroups));
-        }
-        return createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), []));
-      },
-      addMemberToGroup(parentGroup, eperson: EPerson): Observable<RestResponse> {
-        this.epersonMembers = [...this.epersonMembers, eperson];
+      addMemberToGroup(parentGroup, epersonToAdd: EPerson): Observable<RestResponse> {
+        // Add eperson to list of members
+        this.epersonMembers = [...this.epersonMembers, epersonToAdd];
+        // Remove eperson from list of non-members
+        this.epersonNonMembers.forEach( (eperson: EPerson, index: number) => {
+          if (eperson.id === epersonToAdd.id) {
+            this.epersonNonMembers.splice(index, 1);
+          }
+        });
         return observableOf(new RestResponse(true, 200, 'Success'));
       },
       clearGroupsRequests() {
@@ -109,21 +104,20 @@ describe('ReviewersListComponent', () => {
         return '/access-control/groups/' + group.id;
       },
       deleteMemberFromGroup(parentGroup, epersonToDelete: EPerson): Observable<RestResponse> {
-        this.epersonMembers = this.epersonMembers.find((eperson: EPerson) => {
-          if (eperson.id !== epersonToDelete.id) {
-            return eperson;
+        // Remove eperson from list of members
+        this.epersonMembers.forEach( (eperson: EPerson, index: number) => {
+          if (eperson.id === epersonToDelete.id) {
+            this.epersonMembers.splice(index, 1);
           }
         });
-        if (this.epersonMembers === undefined) {
-          this.epersonMembers = [];
-        }
+        // Add eperson to list of non-members
+        this.epersonNonMembers = [...this.epersonNonMembers, epersonToDelete];
         return observableOf(new RestResponse(true, 200, 'Success'));
       },
+      // Used to find the currently active group
       findById(id: string) {
-        for (const group of allGroups) {
-          if (group.id === id) {
-            return createSuccessfulRemoteDataObject$(group);
-          }
+        if (activeGroup.id === id) {
+          return createSuccessfulRemoteDataObject$(activeGroup);
         }
         return createNoContentRemoteDataObject$();
       },
@@ -135,7 +129,7 @@ describe('ReviewersListComponent', () => {
     translateService = getMockTranslateService();
 
     paginationService = new PaginationServiceStub();
-    TestBed.configureTestingModule({
+    return TestBed.configureTestingModule({
       imports: [CommonModule, NgbModule, FormsModule, ReactiveFormsModule, BrowserModule,
         TranslateModule.forRoot({
           loader: {
@@ -169,12 +163,6 @@ describe('ReviewersListComponent', () => {
     fixture.debugElement.nativeElement.remove();
   }));
 
-  beforeEach(() => {
-    ePersonDtoModel1 = new EpersonDtoModel();
-    ePersonDtoModel1.eperson = EPersonMock;
-    ePersonDtoModel2 = new EpersonDtoModel();
-    ePersonDtoModel2.eperson = EPersonMock2;
-  });
 
   describe('when no group is selected', () => {
     beforeEach(() => {
@@ -218,34 +206,32 @@ describe('ReviewersListComponent', () => {
   it('should replace the value when a new member is added when multipleReviewers is false', () => {
     spyOn(component.selectedReviewersUpdated, 'emit');
     component.multipleReviewers = false;
-    component.selectedReviewers = [ePersonDtoModel1];
+    component.selectedReviewers = [EPersonMock];
 
-    component.addMemberToGroup(ePersonDtoModel2);
+    component.addMemberToGroup(EPersonMock2);
 
-    expect(component.selectedReviewers).toEqual([ePersonDtoModel2]);
-    expect(component.selectedReviewersUpdated.emit).toHaveBeenCalledWith([ePersonDtoModel2.eperson]);
+    expect(component.selectedReviewers).toEqual([EPersonMock2]);
+    expect(component.selectedReviewersUpdated.emit).toHaveBeenCalledWith([EPersonMock2]);
   });
 
   it('should add the value when a new member is added when multipleReviewers is true', () => {
     spyOn(component.selectedReviewersUpdated, 'emit');
     component.multipleReviewers = true;
-    component.selectedReviewers = [ePersonDtoModel1];
+    component.selectedReviewers = [EPersonMock];
 
-    component.addMemberToGroup(ePersonDtoModel2);
+    component.addMemberToGroup(EPersonMock2);
 
-    expect(component.selectedReviewers).toEqual([ePersonDtoModel1, ePersonDtoModel2]);
-    expect(component.selectedReviewersUpdated.emit).toHaveBeenCalledWith([ePersonDtoModel1.eperson, ePersonDtoModel2.eperson]);
+    expect(component.selectedReviewers).toEqual([EPersonMock, EPersonMock2]);
+    expect(component.selectedReviewersUpdated.emit).toHaveBeenCalledWith([EPersonMock, EPersonMock2]);
   });
 
   it('should delete the member when present', () => {
     spyOn(component.selectedReviewersUpdated, 'emit');
-    ePersonDtoModel1.memberOfGroup = true;
-    component.selectedReviewers = [ePersonDtoModel1];
+    component.selectedReviewers = [EPersonMock];
 
-    component.deleteMemberFromGroup(ePersonDtoModel1);
+    component.deleteMemberFromGroup(EPersonMock);
 
     expect(component.selectedReviewers).toEqual([]);
-    expect(ePersonDtoModel1.memberOfGroup).toBeFalse();
     expect(component.selectedReviewersUpdated.emit).toHaveBeenCalledWith([]);
   });
 
diff --git a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/reviewers-list/reviewers-list.component.ts b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/reviewers-list/reviewers-list.component.ts
index 6984a1d86d..65a106e2e8 100644
--- a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/reviewers-list/reviewers-list.component.ts
+++ b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/reviewers-list/reviewers-list.component.ts
@@ -8,10 +8,7 @@ import { NotificationsService } from '../../../../shared/notifications/notificat
 import { PaginationService } from '../../../../core/pagination/pagination.service';
 import { Group } from '../../../../core/eperson/models/group.model';
 import { getFirstSucceededRemoteDataPayload } from '../../../../core/shared/operators';
-import { EpersonDtoModel } from '../../../../core/eperson/models/eperson-dto.model';
 import { EPerson } from '../../../../core/eperson/models/eperson.model';
-import { Observable, of as observableOf } from 'rxjs';
-import { hasValue } from '../../../../shared/empty.util';
 import { PaginatedList } from '../../../../core/data/paginated-list.model';
 import {
   MembersListComponent,
@@ -24,8 +21,8 @@ import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
  */
 enum SubKey {
   ActiveGroup,
-  MembersDTO,
-  SearchResultsDTO,
+  Members,
+  SearchResults,
 }
 
 /**
@@ -50,7 +47,7 @@ export class ReviewersListComponent extends MembersListComponent implements OnIn
   @Output()
   selectedReviewersUpdated: EventEmitter<EPerson[]> = new EventEmitter();
 
-  selectedReviewers: EpersonDtoModel[] = [];
+  selectedReviewers: EPerson[] = [];
 
   constructor(
     protected groupService: GroupDataService,
@@ -100,54 +97,40 @@ export class ReviewersListComponent extends MembersListComponent implements OnIn
   retrieveMembers(page: number): void {
     this.config.currentPage = page;
     if (this.groupId === null) {
-      this.unsubFrom(SubKey.MembersDTO);
-      const paginatedListOfDTOs: PaginatedList<EpersonDtoModel> = new PaginatedList();
-      paginatedListOfDTOs.page = this.selectedReviewers;
-      this.ePeopleMembersOfGroupDtos.next(paginatedListOfDTOs);
+      this.unsubFrom(SubKey.Members);
+      const paginatedListOfEPersons: PaginatedList<EPerson> = new PaginatedList();
+      paginatedListOfEPersons.page = this.selectedReviewers;
+      this.ePeopleMembersOfGroup.next(paginatedListOfEPersons);
     } else {
       super.retrieveMembers(page);
     }
   }
 
   /**
-   * Checks whether the given {@link possibleMember} is part of the {@link selectedReviewers}.
+   * Removes the {@link eperson} from the {@link selectedReviewers}
    *
-   * @param possibleMember The {@link EPerson} that needs to be checked
+   * @param eperson The {@link EPerson} to remove
    */
-  isMemberOfGroup(possibleMember: EPerson): Observable<boolean> {
-    return observableOf(hasValue(this.selectedReviewers.find((reviewer: EpersonDtoModel) => reviewer.eperson.id === possibleMember.id)));
-  }
-
-  /**
-   * Removes the {@link ePerson} from the {@link selectedReviewers}
-   *
-   * @param ePerson The {@link EpersonDtoModel} containg the {@link EPerson} to remove
-   */
-  deleteMemberFromGroup(ePerson: EpersonDtoModel) {
-    ePerson.memberOfGroup = false;
-    const index = this.selectedReviewers.indexOf(ePerson);
+  deleteMemberFromGroup(eperson: EPerson) {
+    const index = this.selectedReviewers.indexOf(eperson);
     if (index !== -1) {
       this.selectedReviewers.splice(index, 1);
     }
-    this.selectedReviewersUpdated.emit(this.selectedReviewers.map((ePersonDtoModel: EpersonDtoModel) => ePersonDtoModel.eperson));
+    this.selectedReviewersUpdated.emit(this.selectedReviewers);
   }
 
   /**
-   * Adds the {@link ePerson} to the {@link selectedReviewers} (or replaces it when {@link multipleReviewers} is
+   * Adds the {@link eperson} to the {@link selectedReviewers} (or replaces it when {@link multipleReviewers} is
    * `false`). Afterwards it will emit the list.
    *
-   * @param ePerson The {@link EPerson} to add to the list
+   * @param eperson The {@link EPerson} to add to the list
    */
-  addMemberToGroup(ePerson: EpersonDtoModel) {
-    ePerson.memberOfGroup = true;
+  addMemberToGroup(eperson: EPerson) {
     if (!this.multipleReviewers) {
-      for (const selectedReviewer of this.selectedReviewers) {
-        selectedReviewer.memberOfGroup = false;
-      }
       this.selectedReviewers = [];
     }
-    this.selectedReviewers.push(ePerson);
-    this.selectedReviewersUpdated.emit(this.selectedReviewers.map((epersonDtoModel: EpersonDtoModel) => epersonDtoModel.eperson));
+    this.selectedReviewers.push(eperson);
+    this.selectedReviewersUpdated.emit(this.selectedReviewers);
   }
 
 }
diff --git a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-actions-loader/advanced-workflow-actions-loader.component.ts b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-actions-loader/advanced-workflow-actions-loader.component.ts
index 32f14c015d..db47c6638f 100644
--- a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-actions-loader/advanced-workflow-actions-loader.component.ts
+++ b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-actions-loader/advanced-workflow-actions-loader.component.ts
@@ -1,4 +1,4 @@
-import { Component, Input, ViewChild, ComponentFactoryResolver, OnInit } from '@angular/core';
+import { Component, Input, ViewChild, OnInit, ComponentRef, OnDestroy } from '@angular/core';
 import { hasValue } from '../../../shared/empty.util';
 import {
   getAdvancedComponentByWorkflowTaskOption
@@ -15,7 +15,7 @@ import { PAGE_NOT_FOUND_PATH } from '../../../app-routing-paths';
   templateUrl: './advanced-workflow-actions-loader.component.html',
   styleUrls: ['./advanced-workflow-actions-loader.component.scss'],
 })
-export class AdvancedWorkflowActionsLoaderComponent implements OnInit {
+export class AdvancedWorkflowActionsLoaderComponent implements OnDestroy, OnInit {
 
   /**
    * The name of the type to render
@@ -28,8 +28,12 @@ export class AdvancedWorkflowActionsLoaderComponent implements OnInit {
    */
   @ViewChild(AdvancedWorkflowActionsDirective, { static: true }) claimedTaskActionsDirective: AdvancedWorkflowActionsDirective;
 
+  /**
+   * The reference to the dynamic component
+   */
+  protected compRef: ComponentRef<Component>;
+
   constructor(
-    private componentFactoryResolver: ComponentFactoryResolver,
     private router: Router,
   ) {
   }
@@ -40,16 +44,24 @@ export class AdvancedWorkflowActionsLoaderComponent implements OnInit {
   ngOnInit(): void {
     const comp = this.getComponentByWorkflowTaskOption(this.type);
     if (hasValue(comp)) {
-      const componentFactory = this.componentFactoryResolver.resolveComponentFactory(comp);
-
       const viewContainerRef = this.claimedTaskActionsDirective.viewContainerRef;
       viewContainerRef.clear();
-      viewContainerRef.createComponent(componentFactory);
+      this.compRef = viewContainerRef.createComponent(comp);
     } else {
       void this.router.navigate([PAGE_NOT_FOUND_PATH]);
     }
   }
 
+  /**
+   * Destroy the dynamically created component
+   */
+  ngOnDestroy(): void {
+    if (hasValue(this.compRef)) {
+      this.compRef.destroy();
+      this.compRef = undefined;
+    }
+  }
+
   getComponentByWorkflowTaskOption(type: string): any {
     return getAdvancedComponentByWorkflowTaskOption(type);
   }
diff --git a/src/app/workflowitems-edit-page/item-from-workflow-breadcrumb.resolver.ts b/src/app/workflowitems-edit-page/item-from-workflow-breadcrumb.resolver.ts
new file mode 100644
index 0000000000..f4fb543605
--- /dev/null
+++ b/src/app/workflowitems-edit-page/item-from-workflow-breadcrumb.resolver.ts
@@ -0,0 +1,22 @@
+import { Injectable } from '@angular/core';
+import { Resolve } from '@angular/router';
+import { WorkflowItemDataService } from '../core/submission/workflowitem-data.service';
+import { SubmissionParentBreadcrumbResolver } from '../core/submission/resolver/submission-parent-breadcrumb.resolver';
+import { BreadcrumbConfig } from '../breadcrumbs/breadcrumb/breadcrumb-config.model';
+import { SubmissionParentBreadcrumbsService } from '../core/submission/submission-parent-breadcrumb.service';
+import { SubmissionObject } from '../core/submission/models/submission-object.model';
+
+/**
+ * This class represents a resolver that retrieves the breadcrumbs of the workflow item
+ */
+@Injectable()
+export class ItemFromWorkflowBreadcrumbResolver extends SubmissionParentBreadcrumbResolver implements Resolve<BreadcrumbConfig<SubmissionObject>> {
+
+  constructor(
+    protected dataService: WorkflowItemDataService,
+    protected breadcrumbService: SubmissionParentBreadcrumbsService,
+  ) {
+    super(dataService, breadcrumbService);
+  }
+
+}
diff --git a/src/app/workflowitems-edit-page/item-from-workflow.resolver.spec.ts b/src/app/workflowitems-edit-page/item-from-workflow.resolver.spec.ts
index 1ef87ad10f..40cec6a3e5 100644
--- a/src/app/workflowitems-edit-page/item-from-workflow.resolver.spec.ts
+++ b/src/app/workflowitems-edit-page/item-from-workflow.resolver.spec.ts
@@ -19,7 +19,7 @@ describe('ItemFromWorkflowResolver', () => {
       wfiService = {
         findById: (id: string) => createSuccessfulRemoteDataObject$(wfi)
       } as any;
-      resolver = new ItemFromWorkflowResolver(wfiService, null);
+      resolver = new ItemFromWorkflowResolver(wfiService);
     });
 
     it('should resolve a an item from from the workflow item with the correct id', (done) => {
diff --git a/src/app/workflowitems-edit-page/item-from-workflow.resolver.ts b/src/app/workflowitems-edit-page/item-from-workflow.resolver.ts
index bacf515656..8a749b8988 100644
--- a/src/app/workflowitems-edit-page/item-from-workflow.resolver.ts
+++ b/src/app/workflowitems-edit-page/item-from-workflow.resolver.ts
@@ -2,7 +2,6 @@ import { Injectable } from '@angular/core';
 import { Resolve } from '@angular/router';
 import { RemoteData } from '../core/data/remote-data';
 import { Item } from '../core/shared/item.model';
-import { Store } from '@ngrx/store';
 import { WorkflowItemDataService } from '../core/submission/workflowitem-data.service';
 import { SubmissionObjectResolver } from '../core/submission/resolver/submission-object.resolver';
 
@@ -10,12 +9,12 @@ import { SubmissionObjectResolver } from '../core/submission/resolver/submission
  * This class represents a resolver that requests a specific item before the route is activated
  */
 @Injectable()
-export class ItemFromWorkflowResolver extends SubmissionObjectResolver<Item> implements Resolve<RemoteData<Item>>  {
+export class ItemFromWorkflowResolver extends SubmissionObjectResolver<Item> implements Resolve<RemoteData<Item>> {
+
   constructor(
-    private workflowItemService: WorkflowItemDataService,
-    protected store: Store<any>
+    protected dataService: WorkflowItemDataService,
   ) {
-    super(workflowItemService, store);
+    super(dataService);
   }
 
 }
diff --git a/src/app/workflowitems-edit-page/workflowitems-edit-page-routing.module.ts b/src/app/workflowitems-edit-page/workflowitems-edit-page-routing.module.ts
index b093f20563..16eeaafe01 100644
--- a/src/app/workflowitems-edit-page/workflowitems-edit-page-routing.module.ts
+++ b/src/app/workflowitems-edit-page/workflowitems-edit-page-routing.module.ts
@@ -19,13 +19,17 @@ import { ThemedFullItemPageComponent } from '../item-page/full/themed-full-item-
 import {
   AdvancedWorkflowActionPageComponent
 } from './advanced-workflow-action/advanced-workflow-action-page/advanced-workflow-action-page.component';
+import { ItemFromWorkflowBreadcrumbResolver } from './item-from-workflow-breadcrumb.resolver';
 
 @NgModule({
   imports: [
     RouterModule.forChild([
       {
         path: ':id',
-        resolve: { wfi: WorkflowItemPageResolver },
+        resolve: {
+          breadcrumb: ItemFromWorkflowBreadcrumbResolver,
+          wfi: WorkflowItemPageResolver,
+        },
         children: [
           {
             canActivate: [AuthenticatedGuard],
@@ -81,7 +85,11 @@ import {
       }]
     )
   ],
-  providers: [WorkflowItemPageResolver, ItemFromWorkflowResolver]
+  providers: [
+    ItemFromWorkflowBreadcrumbResolver,
+    ItemFromWorkflowResolver,
+    WorkflowItemPageResolver,
+  ],
 })
 /**
  * This module defines the default component to load when navigating to the workflowitems edit page path.
diff --git a/src/app/workspaceitems-edit-page/item-from-workspace-breadcrumb.resolver.ts b/src/app/workspaceitems-edit-page/item-from-workspace-breadcrumb.resolver.ts
new file mode 100644
index 0000000000..2ec872521a
--- /dev/null
+++ b/src/app/workspaceitems-edit-page/item-from-workspace-breadcrumb.resolver.ts
@@ -0,0 +1,22 @@
+import { Injectable } from '@angular/core';
+import { Resolve } from '@angular/router';
+import { WorkspaceitemDataService } from '../core/submission/workspaceitem-data.service';
+import { SubmissionParentBreadcrumbResolver } from '../core/submission/resolver/submission-parent-breadcrumb.resolver';
+import { BreadcrumbConfig } from '../breadcrumbs/breadcrumb/breadcrumb-config.model';
+import { SubmissionParentBreadcrumbsService } from '../core/submission/submission-parent-breadcrumb.service';
+import { SubmissionObject } from '../core/submission/models/submission-object.model';
+
+/**
+ * This class represents a resolver that retrieves the breadcrumbs of the workspace item
+ */
+@Injectable()
+export class ItemFromWorkspaceBreadcrumbResolver extends SubmissionParentBreadcrumbResolver implements Resolve<BreadcrumbConfig<SubmissionObject>> {
+
+  constructor(
+    protected dataService: WorkspaceitemDataService,
+    protected breadcrumbService: SubmissionParentBreadcrumbsService,
+  ) {
+    super(dataService, breadcrumbService);
+  }
+
+}
diff --git a/src/app/workspaceitems-edit-page/item-from-workspace.resolver.spec.ts b/src/app/workspaceitems-edit-page/item-from-workspace.resolver.spec.ts
index c14344d70d..f350be4f66 100644
--- a/src/app/workspaceitems-edit-page/item-from-workspace.resolver.spec.ts
+++ b/src/app/workspaceitems-edit-page/item-from-workspace.resolver.spec.ts
@@ -19,7 +19,7 @@ describe('ItemFromWorkspaceResolver', () => {
       wfiService = {
         findById: (id: string) => createSuccessfulRemoteDataObject$(wfi)
       } as any;
-      resolver = new ItemFromWorkspaceResolver(wfiService, null);
+      resolver = new ItemFromWorkspaceResolver(wfiService);
     });
 
     it('should resolve a an item from from the workflow item with the correct id', (done) => {
diff --git a/src/app/workspaceitems-edit-page/item-from-workspace.resolver.ts b/src/app/workspaceitems-edit-page/item-from-workspace.resolver.ts
index 60e1fe6a87..2c76a426cf 100644
--- a/src/app/workspaceitems-edit-page/item-from-workspace.resolver.ts
+++ b/src/app/workspaceitems-edit-page/item-from-workspace.resolver.ts
@@ -2,7 +2,6 @@ import { Injectable } from '@angular/core';
 import { Resolve } from '@angular/router';
 import { RemoteData } from '../core/data/remote-data';
 import { Item } from '../core/shared/item.model';
-import { Store } from '@ngrx/store';
 import { SubmissionObjectResolver } from '../core/submission/resolver/submission-object.resolver';
 import { WorkspaceitemDataService } from '../core/submission/workspaceitem-data.service';
 
@@ -10,12 +9,12 @@ import { WorkspaceitemDataService } from '../core/submission/workspaceitem-data.
  * This class represents a resolver that requests a specific item before the route is activated
  */
 @Injectable()
-export class ItemFromWorkspaceResolver extends SubmissionObjectResolver<Item> implements Resolve<RemoteData<Item>>  {
-    constructor(
-        private workspaceItemService: WorkspaceitemDataService,
-        protected store: Store<any>
-    ) {
-        super(workspaceItemService, store);
-    }
+export class ItemFromWorkspaceResolver extends SubmissionObjectResolver<Item> implements Resolve<RemoteData<Item>> {
+
+  constructor(
+    protected dataService: WorkspaceitemDataService,
+  ) {
+    super(dataService);
+  }
 
 }
diff --git a/src/app/workspaceitems-edit-page/workspaceitems-delete-page/workspaceitems-delete-page.component.html b/src/app/workspaceitems-edit-page/workspaceitems-delete-page/workspaceitems-delete-page.component.html
index a0f0a1711e..9d9bece197 100644
--- a/src/app/workspaceitems-edit-page/workspaceitems-delete-page/workspaceitems-delete-page.component.html
+++ b/src/app/workspaceitems-edit-page/workspaceitems-delete-page/workspaceitems-delete-page.component.html
@@ -1,5 +1,5 @@
 <div class="container">
-  <h2>{{ 'workspace-item.delete.header' | translate }}</h2>
+  <h1>{{ 'workspace-item.delete.header' | translate }}</h1>
   <ds-modify-item-overview *ngIf="(dso$ | async)" [item]="(dso$ | async)"></ds-modify-item-overview>
   <button class="btn btn-default" (click)="previousPage()">{{ 'workspace-item.delete.button.cancel' | translate }}</button>
   <button class="btn btn-danger" (click)="$event.preventDefault();confirmDelete(content)">{{ 'workspace-item.delete.button.confirm' | translate }}</button>
@@ -7,7 +7,7 @@
 
 <ng-template #content let-c="close" let-d="dismiss" id="delete-modal">
   <div class="modal-header">
-    <h4 class="modal-title text-danger">{{ 'workspace-item.delete.header' | translate }}</h4>
+    <div class="modal-title text-danger h4">{{ 'workspace-item.delete.header' | translate }}</div>
     <button type="button" id="delete_close" class="close" aria-label="Close" (click)="d('cancel')">
       <span aria-hidden="true">&times;</span>
     </button>
diff --git a/src/app/workspaceitems-edit-page/workspaceitems-edit-page-routing.module.ts b/src/app/workspaceitems-edit-page/workspaceitems-edit-page-routing.module.ts
index 61393d9f64..7a9a8b57ef 100644
--- a/src/app/workspaceitems-edit-page/workspaceitems-edit-page-routing.module.ts
+++ b/src/app/workspaceitems-edit-page/workspaceitems-edit-page-routing.module.ts
@@ -9,6 +9,7 @@ import { ItemFromWorkspaceResolver } from './item-from-workspace.resolver';
 import { WorkspaceItemPageResolver } from './workspace-item-page.resolver';
 import { WorkspaceItemsDeletePageComponent } from './workspaceitems-delete-page/workspaceitems-delete-page.component';
 import { ThemedWorkspaceItemsDeletePageComponent } from './workspaceitems-delete-page/themed-workspaceitems-delete-page.component';
+import { ItemFromWorkspaceBreadcrumbResolver } from './item-from-workspace-breadcrumb.resolver';
 
 @NgModule({
   imports: [
@@ -16,7 +17,10 @@ import { ThemedWorkspaceItemsDeletePageComponent } from './workspaceitems-delete
       { path: '', redirectTo: '/home', pathMatch: 'full' },
       {
         path: ':id',
-        resolve: { wsi: WorkspaceItemPageResolver },
+        resolve: {
+          breadcrumb: ItemFromWorkspaceBreadcrumbResolver,
+          wsi: WorkspaceItemPageResolver,
+        },
         children: [
           {
             canActivate: [AuthenticatedGuard],
@@ -61,7 +65,11 @@ import { ThemedWorkspaceItemsDeletePageComponent } from './workspaceitems-delete
       }
     ])
   ],
-  providers: [WorkspaceItemPageResolver, ItemFromWorkspaceResolver]
+  providers: [
+    ItemFromWorkspaceBreadcrumbResolver,
+    ItemFromWorkspaceResolver,
+    WorkspaceItemPageResolver,
+  ],
 })
 /**
  * This module defines the default component to load when navigating to the workspaceitems edit page path
diff --git a/src/assets/i18n/ar.json5 b/src/assets/i18n/ar.json5
index 70f5fdadb1..0e15293e0a 100644
--- a/src/assets/i18n/ar.json5
+++ b/src/assets/i18n/ar.json5
@@ -1,6744 +1,10650 @@
 {
 
   // "401.help": "You're not authorized to access this page. You can use the button below to get back to the home page.",
-  // TODO New key - Add a translation
-  "401.help": "You're not authorized to access this page. You can use the button below to get back to the home page.",
+  "401.help": "غير مصرح لك بالوصول إلى هذه الصفحة. يمكنك استخدام الزر أدناه للعودة إلى الصفحة الرئيسية.",
 
   // "401.link.home-page": "Take me to the home page",
-  // TODO New key - Add a translation
-  "401.link.home-page": "Take me to the home page",
-
-  // "401.unauthorized": "unauthorized",
-  // TODO New key - Add a translation
-  "401.unauthorized": "unauthorized",
-
+  "401.link.home-page": "اذهب إلى الصفحة الرئيسية",
 
+  // "401.unauthorized": "Unauthorized",
+  "401.unauthorized": "بدون تصريح",
 
   // "403.help": "You don't have permission to access this page. You can use the button below to get back to the home page.",
-  // TODO New key - Add a translation
-  "403.help": "You don't have permission to access this page. You can use the button below to get back to the home page.",
+  "403.help": "ليس لديك صلاحية الوصول إلى هذه الصفحة. يمكنك استخدام الزر أدناه للعودة إلى الصفحة الرئيسية.",
 
   // "403.link.home-page": "Take me to the home page",
-  // TODO New key - Add a translation
-  "403.link.home-page": "Take me to the home page",
+  "403.link.home-page": "اذهب إلى الصفحة الرئيسية",
 
-  // "403.forbidden": "forbidden",
-  // TODO New key - Add a translation
-  "403.forbidden": "forbidden",
+  // "403.forbidden": "Forbidden",
+  "403.forbidden": "ممنوع",
 
+  // "500.page-internal-server-error": "Service unavailable",
+  "500.page-internal-server-error": "الخدمة غير متاحة",
 
+  // "500.help": "The server is temporarily unable to service your request due to maintenance downtime or capacity problems. Please try again later.",
+  "500.help": "الخادم غير قادر مؤقتًا على تلبية طلبك بسبب توقف الصيانة أو وجود مشاكل في السعة. يرجى إعادة المحاولة في وقت لاحق.",
+
+  // "500.link.home-page": "Take me to the home page",
+  "500.link.home-page": "اذهب إلى الصفحة الرئيسية",
 
   // "404.help": "We can't find the page you're looking for. The page may have been moved or deleted. You can use the button below to get back to the home page. ",
-  // TODO New key - Add a translation
-  "404.help": "We can't find the page you're looking for. The page may have been moved or deleted. You can use the button below to get back to the home page. ",
+  "404.help": "تعذر العثور على الصفحة التي تبحث عنها. ربما تمت إزالتها أو حذفها. يمكنك استخدام الزر أدناه للعودة إلى الصفحة الرئيسية.  ",
 
   // "404.link.home-page": "Take me to the home page",
-  // TODO New key - Add a translation
-  "404.link.home-page": "Take me to the home page",
+  "404.link.home-page": "اذهب إلى الصفحة الرئيسية",
 
-  // "404.page-not-found": "page not found",
-  // TODO New key - Add a translation
-  "404.page-not-found": "page not found",
+  // "404.page-not-found": "Page not found",
+  "404.page-not-found": "لم يتم العثور على الصفحة",
+
+  // "error-page.description.401": "Unauthorized",
+  "error-page.description.401": "بدون تصريح",
+
+  // "error-page.description.403": "Forbidden",
+  "error-page.description.403": "ممنوع",
+
+  // "error-page.description.500": "Service unavailable",
+  "error-page.description.500": "الخدمة غير متاحة",
+
+  // "error-page.description.404": "Page not found",
+  "error-page.description.404": "لم يتم العثور على الصفحة",
+
+  // "error-page.orcid.generic-error": "An error occurred during login via ORCID. Make sure you have shared your ORCID account email address with DSpace. If the error persists, contact the administrator",
+  "error-page.orcid.generic-error": "حدث خطأ أثناء تسجيل الدخول عبر أوركيد. يرجى التأكد من أنك قمت بمشاركة عنوان البريد الإلكتروني الخاص بحساب أوركيد الخاص بك مع دي سبيس. إذا استمر الخطأ، فاتصل بالمسؤول",
+
+  // "access-status.embargo.listelement.badge": "Embargo",
+  "access-status.embargo.listelement.badge": "حظر",
+
+  // "access-status.metadata.only.listelement.badge": "Metadata only",
+  "access-status.metadata.only.listelement.badge": "ميتاداتا فقط",
+
+  // "access-status.open.access.listelement.badge": "Open Access",
+  "access-status.open.access.listelement.badge": "وصول حر",
+
+  // "access-status.restricted.listelement.badge": "Restricted",
+  "access-status.restricted.listelement.badge": "مقيد",
+
+  // "access-status.unknown.listelement.badge": "Unknown",
+  "access-status.unknown.listelement.badge": "غير معروف",
 
   // "admin.curation-tasks.breadcrumbs": "System curation tasks",
-  // TODO New key - Add a translation
-  "admin.curation-tasks.breadcrumbs": "System curation tasks",
+  "admin.curation-tasks.breadcrumbs": "مهام أكرتة النظام",
 
   // "admin.curation-tasks.title": "System curation tasks",
-  // TODO New key - Add a translation
-  "admin.curation-tasks.title": "System curation tasks",
+  "admin.curation-tasks.title": "مهام أكرتة النظام",
 
   // "admin.curation-tasks.header": "System curation tasks",
-  // TODO New key - Add a translation
-  "admin.curation-tasks.header": "System curation tasks",
+  "admin.curation-tasks.header": "مهام أكرتة النظام",
 
   // "admin.registries.bitstream-formats.breadcrumbs": "Format registry",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.breadcrumbs": "Format registry",
+  "admin.registries.bitstream-formats.breadcrumbs": "سجل التنسيق",
 
   // "admin.registries.bitstream-formats.create.breadcrumbs": "Bitstream format",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.create.breadcrumbs": "Bitstream format",
+  "admin.registries.bitstream-formats.create.breadcrumbs": "تنسيق تدفق البت",
 
   // "admin.registries.bitstream-formats.create.failure.content": "An error occurred while creating the new bitstream format.",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.create.failure.content": "An error occurred while creating the new bitstream format.",
+  "admin.registries.bitstream-formats.create.failure.content": "حدث خطأ أثناء إنشاء تنسيق تدفق البت الجديد.",
 
   // "admin.registries.bitstream-formats.create.failure.head": "Failure",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.create.failure.head": "Failure",
+  "admin.registries.bitstream-formats.create.failure.head": "فشل",
 
-  // "admin.registries.bitstream-formats.create.head": "Create Bitstream format",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.create.head": "Create Bitstream format",
+  // "admin.registries.bitstream-formats.create.head": "Create bitstream format",
+  "admin.registries.bitstream-formats.create.head": "إنشاء تنسيق تدفق بت",
 
   // "admin.registries.bitstream-formats.create.new": "Add a new bitstream format",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.create.new": "Add a new bitstream format",
+  "admin.registries.bitstream-formats.create.new": "إضافة تنسيق تدفق بت جديد",
 
   // "admin.registries.bitstream-formats.create.success.content": "The new bitstream format was successfully created.",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.create.success.content": "The new bitstream format was successfully created.",
+  "admin.registries.bitstream-formats.create.success.content": "تم إنشاء تنسيق تدفق البت الجديد بنجاح.",
 
   // "admin.registries.bitstream-formats.create.success.head": "Success",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.create.success.head": "Success",
+  "admin.registries.bitstream-formats.create.success.head": "نجاح",
 
   // "admin.registries.bitstream-formats.delete.failure.amount": "Failed to remove {{ amount }} format(s)",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.delete.failure.amount": "Failed to remove {{ amount }} format(s)",
+  "admin.registries.bitstream-formats.delete.failure.amount": "فشل إزالة {{ amount }} تنسيقًا",
 
   // "admin.registries.bitstream-formats.delete.failure.head": "Failure",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.delete.failure.head": "Failure",
+  "admin.registries.bitstream-formats.delete.failure.head": "فشل",
 
   // "admin.registries.bitstream-formats.delete.success.amount": "Successfully removed {{ amount }} format(s)",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.delete.success.amount": "Successfully removed {{ amount }} format(s)",
+  "admin.registries.bitstream-formats.delete.success.amount": "تمت إزالة {{ amount }} تنسيقًا بنجاح",
 
   // "admin.registries.bitstream-formats.delete.success.head": "Success",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.delete.success.head": "Success",
+  "admin.registries.bitstream-formats.delete.success.head": "نجاح",
 
   // "admin.registries.bitstream-formats.description": "This list of bitstream formats provides information about known formats and their support level.",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.description": "This list of bitstream formats provides information about known formats and their support level.",
+  "admin.registries.bitstream-formats.description": "توفر قائمة تنسيقات تدفق البت معلومات حول التنسيقات المعروفة ومستوى دعمها.",
 
   // "admin.registries.bitstream-formats.edit.breadcrumbs": "Bitstream format",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.edit.breadcrumbs": "Bitstream format",
+  "admin.registries.bitstream-formats.edit.breadcrumbs": "تنسيق تدفق البت",
 
   // "admin.registries.bitstream-formats.edit.description.hint": "",
-  // TODO New key - Add a translation
   "admin.registries.bitstream-formats.edit.description.hint": "",
 
   // "admin.registries.bitstream-formats.edit.description.label": "Description",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.edit.description.label": "Description",
+  "admin.registries.bitstream-formats.edit.description.label": "الوصف",
 
   // "admin.registries.bitstream-formats.edit.extensions.hint": "Extensions are file extensions that are used to automatically identify the format of uploaded files. You can enter several extensions for each format.",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.edit.extensions.hint": "Extensions are file extensions that are used to automatically identify the format of uploaded files. You can enter several extensions for each format.",
+  "admin.registries.bitstream-formats.edit.extensions.hint": "الامتدادات هي امتدادات الملفات التي تستخدم لتعريف تنسيق الملفات المرفوعة تلقائيًا. يمكنك إدخال عدة امتدادات لكل تنسيق.",
 
   // "admin.registries.bitstream-formats.edit.extensions.label": "File extensions",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.edit.extensions.label": "File extensions",
+  "admin.registries.bitstream-formats.edit.extensions.label": "امتدادات الملفات",
 
   // "admin.registries.bitstream-formats.edit.extensions.placeholder": "Enter a file extension without the dot",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.edit.extensions.placeholder": "Enter a file extension without the dot",
+  "admin.registries.bitstream-formats.edit.extensions.placeholder": "قم بإدخال امتداد ملف بدون النقطة",
 
   // "admin.registries.bitstream-formats.edit.failure.content": "An error occurred while editing the bitstream format.",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.edit.failure.content": "An error occurred while editing the bitstream format.",
+  "admin.registries.bitstream-formats.edit.failure.content": "حدث خطأ أثناء تحرير تنسيق تدفق البت.",
 
   // "admin.registries.bitstream-formats.edit.failure.head": "Failure",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.edit.failure.head": "Failure",
+  "admin.registries.bitstream-formats.edit.failure.head": "فشل",
 
   // "admin.registries.bitstream-formats.edit.head": "Bitstream format: {{ format }}",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.edit.head": "Bitstream format: {{ format }}",
+  "admin.registries.bitstream-formats.edit.head": "تنسيق تدفق البت: {{ format }}",
 
   // "admin.registries.bitstream-formats.edit.internal.hint": "Formats marked as internal are hidden from the user, and used for administrative purposes.",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.edit.internal.hint": "Formats marked as internal are hidden from the user, and used for administrative purposes.",
+  "admin.registries.bitstream-formats.edit.internal.hint": "التنسيقات الداخلية مخفية من المستخدم، وتستخدم لأغراض إدارية.",
 
   // "admin.registries.bitstream-formats.edit.internal.label": "Internal",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.edit.internal.label": "Internal",
+  "admin.registries.bitstream-formats.edit.internal.label": "داخلي",
 
   // "admin.registries.bitstream-formats.edit.mimetype.hint": "The MIME type associated with this format, does not have to be unique.",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.edit.mimetype.hint": "The MIME type associated with this format, does not have to be unique.",
+  "admin.registries.bitstream-formats.edit.mimetype.hint": "نوع المايم المرتبط بهذا التنسيق، لا يجب أن يكون فريدًا.",
 
   // "admin.registries.bitstream-formats.edit.mimetype.label": "MIME Type",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.edit.mimetype.label": "MIME Type",
+  "admin.registries.bitstream-formats.edit.mimetype.label": "نوع المايم",
 
   // "admin.registries.bitstream-formats.edit.shortDescription.hint": "A unique name for this format, (e.g. Microsoft Word XP or Microsoft Word 2000)",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.edit.shortDescription.hint": "A unique name for this format, (e.g. Microsoft Word XP or Microsoft Word 2000)",
+  "admin.registries.bitstream-formats.edit.shortDescription.hint": "اسم فريد لهذا التنسيق، (مثال: ميكروسوفت وورد إكس بي أو ميكروسوفت وورد 200)",
 
   // "admin.registries.bitstream-formats.edit.shortDescription.label": "Name",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.edit.shortDescription.label": "Name",
+  "admin.registries.bitstream-formats.edit.shortDescription.label": "الاسم",
 
   // "admin.registries.bitstream-formats.edit.success.content": "The bitstream format was successfully edited.",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.edit.success.content": "The bitstream format was successfully edited.",
+  "admin.registries.bitstream-formats.edit.success.content": "تم تحرير تنسيق تدفق البت بنجاح.",
 
   // "admin.registries.bitstream-formats.edit.success.head": "Success",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.edit.success.head": "Success",
+  "admin.registries.bitstream-formats.edit.success.head": "نجاح",
 
   // "admin.registries.bitstream-formats.edit.supportLevel.hint": "The level of support your institution pledges for this format.",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.edit.supportLevel.hint": "The level of support your institution pledges for this format.",
+  "admin.registries.bitstream-formats.edit.supportLevel.hint": "مستوى الدعم التي تتعهد به مؤسستك لهذا التنسيق.",
 
   // "admin.registries.bitstream-formats.edit.supportLevel.label": "Support level",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.edit.supportLevel.label": "Support level",
+  "admin.registries.bitstream-formats.edit.supportLevel.label": "مستوى الدعم",
 
   // "admin.registries.bitstream-formats.head": "Bitstream Format Registry",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.head": "Bitstream Format Registry",
+  "admin.registries.bitstream-formats.head": "سجل تنسيق تدفق البت",
 
   // "admin.registries.bitstream-formats.no-items": "No bitstream formats to show.",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.no-items": "No bitstream formats to show.",
+  "admin.registries.bitstream-formats.no-items": "لا توجد تنسيقات لتدفق البت.",
 
   // "admin.registries.bitstream-formats.table.delete": "Delete selected",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.table.delete": "Delete selected",
+  "admin.registries.bitstream-formats.table.delete": "حذف المحدد",
 
   // "admin.registries.bitstream-formats.table.deselect-all": "Deselect all",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.table.deselect-all": "Deselect all",
+  "admin.registries.bitstream-formats.table.deselect-all": "إلغاء تحديد الكل",
 
   // "admin.registries.bitstream-formats.table.internal": "internal",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.table.internal": "internal",
+  "admin.registries.bitstream-formats.table.internal": "داخلي",
 
   // "admin.registries.bitstream-formats.table.mimetype": "MIME Type",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.table.mimetype": "MIME Type",
+  "admin.registries.bitstream-formats.table.mimetype": "نوع المايم",
 
   // "admin.registries.bitstream-formats.table.name": "Name",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.table.name": "Name",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.table.id": "ID",
+  "admin.registries.bitstream-formats.table.name": "الاسم",
 
-  // "admin.registries.bitstream-formats.table.return": "Return",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.table.return": "Return",
+  // "admin.registries.bitstream-formats.table.selected": "Selected bitstream formats",
+  "admin.registries.bitstream-formats.table.selected": "تنسيقات تدفقات البت المحددة",
+
+  // "admin.registries.bitstream-formats.table.id": "ID",
+  "admin.registries.bitstream-formats.table.id": "المعرّف",
+
+  // "admin.registries.bitstream-formats.table.return": "Back",
+  "admin.registries.bitstream-formats.table.return": "رجوع",
 
   // "admin.registries.bitstream-formats.table.supportLevel.KNOWN": "Known",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.table.supportLevel.KNOWN": "Known",
+  "admin.registries.bitstream-formats.table.supportLevel.KNOWN": "معروف",
 
   // "admin.registries.bitstream-formats.table.supportLevel.SUPPORTED": "Supported",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.table.supportLevel.SUPPORTED": "Supported",
+  "admin.registries.bitstream-formats.table.supportLevel.SUPPORTED": "مدعوم",
 
   // "admin.registries.bitstream-formats.table.supportLevel.UNKNOWN": "Unknown",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.table.supportLevel.UNKNOWN": "Unknown",
+  "admin.registries.bitstream-formats.table.supportLevel.UNKNOWN": "غير معروف",
 
   // "admin.registries.bitstream-formats.table.supportLevel.head": "Support Level",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.table.supportLevel.head": "Support Level",
+  "admin.registries.bitstream-formats.table.supportLevel.head": "مستوى الدعم",
 
-  // "admin.registries.bitstream-formats.title": "DSpace Angular :: Bitstream Format Registry",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.title": "DSpace Angular :: Bitstream Format Registry",
+  // "admin.registries.bitstream-formats.title": "Bitstream Format Registry",
+  "admin.registries.bitstream-formats.title": "سجل تنسيق تدفق البت",
 
+  // "admin.registries.bitstream-formats.select": "Select",
+  "admin.registries.bitstream-formats.select": "تحديد",
 
+  // "admin.registries.bitstream-formats.deselect": "Deselect",
+  "admin.registries.bitstream-formats.deselect": "إلغاء تحديد",
 
   // "admin.registries.metadata.breadcrumbs": "Metadata registry",
-  // TODO New key - Add a translation
-  "admin.registries.metadata.breadcrumbs": "Metadata registry",
+  "admin.registries.metadata.breadcrumbs": "سجل الميتاداتا",
 
   // "admin.registries.metadata.description": "The metadata registry maintains a list of all metadata fields available in the repository. These fields may be divided amongst multiple schemas. However, DSpace requires the qualified Dublin Core schema.",
-  // TODO New key - Add a translation
-  "admin.registries.metadata.description": "The metadata registry maintains a list of all metadata fields available in the repository. These fields may be divided amongst multiple schemas. However, DSpace requires the qualified Dublin Core schema.",
+  "admin.registries.metadata.description": "يحتفظ سجل الميتاداتا بقائمة بجميع حقول الميتاداتا المتاحة في المستودع. يمكن تقسيم تلك الحقول بين عدة تخطيطات، يتطلب دي سبيس مخطط دبلن كور المؤهل.",
 
   // "admin.registries.metadata.form.create": "Create metadata schema",
-  // TODO New key - Add a translation
-  "admin.registries.metadata.form.create": "Create metadata schema",
+  "admin.registries.metadata.form.create": "إنشاء مخطط ميتاداتا",
 
   // "admin.registries.metadata.form.edit": "Edit metadata schema",
-  // TODO New key - Add a translation
-  "admin.registries.metadata.form.edit": "Edit metadata schema",
+  "admin.registries.metadata.form.edit": "تحرير مخطط الميتاداتا",
 
   // "admin.registries.metadata.form.name": "Name",
-  // TODO New key - Add a translation
-  "admin.registries.metadata.form.name": "Name",
+  "admin.registries.metadata.form.name": "الاسم",
 
   // "admin.registries.metadata.form.namespace": "Namespace",
-  // TODO New key - Add a translation
-  "admin.registries.metadata.form.namespace": "Namespace",
+  "admin.registries.metadata.form.namespace": "مسافة الاسم",
 
   // "admin.registries.metadata.head": "Metadata Registry",
-  // TODO New key - Add a translation
-  "admin.registries.metadata.head": "Metadata Registry",
+  "admin.registries.metadata.head": "سجل الميتاداتا",
 
   // "admin.registries.metadata.schemas.no-items": "No metadata schemas to show.",
-  // TODO New key - Add a translation
-  "admin.registries.metadata.schemas.no-items": "No metadata schemas to show.",
+  "admin.registries.metadata.schemas.no-items": "لا توجد مخططات ميتاداتا للعرض.",
+
+  // "admin.registries.metadata.schemas.select": "Select",
+  "admin.registries.metadata.schemas.select": "تحديد",
+
+  // "admin.registries.metadata.schemas.deselect": "Deselect",
+  "admin.registries.metadata.schemas.deselect": "إلغاء تحديد",
 
   // "admin.registries.metadata.schemas.table.delete": "Delete selected",
-  // TODO New key - Add a translation
-  "admin.registries.metadata.schemas.table.delete": "Delete selected",
+  "admin.registries.metadata.schemas.table.delete": "حذف المحدد",
+
+  // "admin.registries.metadata.schemas.table.selected": "Selected schemas",
+  "admin.registries.metadata.schemas.table.selected": "المخططات المحددة",
 
   // "admin.registries.metadata.schemas.table.id": "ID",
-  // TODO New key - Add a translation
-  "admin.registries.metadata.schemas.table.id": "ID",
+  "admin.registries.metadata.schemas.table.id": "المعرّف",
 
   // "admin.registries.metadata.schemas.table.name": "Name",
-  // TODO New key - Add a translation
-  "admin.registries.metadata.schemas.table.name": "Name",
+  "admin.registries.metadata.schemas.table.name": "الاسم",
 
   // "admin.registries.metadata.schemas.table.namespace": "Namespace",
-  // TODO New key - Add a translation
-  "admin.registries.metadata.schemas.table.namespace": "Namespace",
-
-  // "admin.registries.metadata.title": "DSpace Angular :: Metadata Registry",
-  // TODO New key - Add a translation
-  "admin.registries.metadata.title": "DSpace Angular :: Metadata Registry",
-
+  "admin.registries.metadata.schemas.table.namespace": "مسافة الاسم",
 
+  // "admin.registries.metadata.title": "Metadata Registry",
+  "admin.registries.metadata.title": "سجل الميتاداتا",
 
   // "admin.registries.schema.breadcrumbs": "Metadata schema",
-  // TODO New key - Add a translation
-  "admin.registries.schema.breadcrumbs": "Metadata schema",
+  "admin.registries.schema.breadcrumbs": "مخطط الميتاداتا",
 
   // "admin.registries.schema.description": "This is the metadata schema for \"{{namespace}}\".",
-  // TODO New key - Add a translation
-  "admin.registries.schema.description": "This is the metadata schema for \"{{namespace}}\".",
+  "admin.registries.schema.description": "هذا هو مخطط الميتاداتا لـ  \"{{namespace}}\".",
+
+  // "admin.registries.schema.fields.select": "Select",
+  "admin.registries.schema.fields.select": "تحديد",
+
+  // "admin.registries.schema.fields.deselect": "Deselect",
+  "admin.registries.schema.fields.deselect": "إلغاء تحديد",
 
   // "admin.registries.schema.fields.head": "Schema metadata fields",
-  // TODO New key - Add a translation
-  "admin.registries.schema.fields.head": "Schema metadata fields",
+  "admin.registries.schema.fields.head": "حقول مخطط الميتاداتا",
 
   // "admin.registries.schema.fields.no-items": "No metadata fields to show.",
-  // TODO New key - Add a translation
-  "admin.registries.schema.fields.no-items": "No metadata fields to show.",
+  "admin.registries.schema.fields.no-items": "لا توجد حقول ميتاداتا للعرض.",
 
   // "admin.registries.schema.fields.table.delete": "Delete selected",
-  // TODO New key - Add a translation
-  "admin.registries.schema.fields.table.delete": "Delete selected",
+  "admin.registries.schema.fields.table.delete": "حذف المحدد",
 
   // "admin.registries.schema.fields.table.field": "Field",
-  // TODO New key - Add a translation
-  "admin.registries.schema.fields.table.field": "Field",
-  // TODO New key - Add a translation
-  "admin.registries.schema.fields.table.id": "ID",
+  "admin.registries.schema.fields.table.field": "حقل",
+
+  // "admin.registries.schema.fields.table.selected": "Selected metadata fields",
+  "admin.registries.schema.fields.table.selected": "حقول الميتاداتا المحددة",
+
+  // "admin.registries.schema.fields.table.id": "ID",
+  "admin.registries.schema.fields.table.id": "المعرّف",
 
   // "admin.registries.schema.fields.table.scopenote": "Scope Note",
-  // TODO New key - Add a translation
-  "admin.registries.schema.fields.table.scopenote": "Scope Note",
+  "admin.registries.schema.fields.table.scopenote": "ملاحظة النطاق",
 
   // "admin.registries.schema.form.create": "Create metadata field",
-  // TODO New key - Add a translation
-  "admin.registries.schema.form.create": "Create metadata field",
+  "admin.registries.schema.form.create": "إنشاء حقل ميتاداتا",
 
   // "admin.registries.schema.form.edit": "Edit metadata field",
-  // TODO New key - Add a translation
-  "admin.registries.schema.form.edit": "Edit metadata field",
+  "admin.registries.schema.form.edit": "تحرير حقل ميتاداتا",
 
   // "admin.registries.schema.form.element": "Element",
-  // TODO New key - Add a translation
-  "admin.registries.schema.form.element": "Element",
+  "admin.registries.schema.form.element": "عنصر",
 
   // "admin.registries.schema.form.qualifier": "Qualifier",
-  // TODO New key - Add a translation
-  "admin.registries.schema.form.qualifier": "Qualifier",
+  "admin.registries.schema.form.qualifier": "مؤهل",
 
   // "admin.registries.schema.form.scopenote": "Scope Note",
-  // TODO New key - Add a translation
-  "admin.registries.schema.form.scopenote": "Scope Note",
+  "admin.registries.schema.form.scopenote": "ملاحظة النطاق",
 
   // "admin.registries.schema.head": "Metadata Schema",
-  // TODO New key - Add a translation
-  "admin.registries.schema.head": "Metadata Schema",
+  "admin.registries.schema.head": "مخطط الميتاداتا",
 
   // "admin.registries.schema.notification.created": "Successfully created metadata schema \"{{prefix}}\"",
-  // TODO New key - Add a translation
-  "admin.registries.schema.notification.created": "Successfully created metadata schema \"{{prefix}}\"",
+  "admin.registries.schema.notification.created": "تم بنجاح إنشاء مخطط الميتاداتا \"{{prefix}}\"",
 
   // "admin.registries.schema.notification.deleted.failure": "Failed to delete {{amount}} metadata schemas",
-  // TODO New key - Add a translation
-  "admin.registries.schema.notification.deleted.failure": "Failed to delete {{amount}} metadata schemas",
+  "admin.registries.schema.notification.deleted.failure": "فشل حذف {{amount}} مخطط ميتاداتا",
 
   // "admin.registries.schema.notification.deleted.success": "Successfully deleted {{amount}} metadata schemas",
-  // TODO New key - Add a translation
-  "admin.registries.schema.notification.deleted.success": "Successfully deleted {{amount}} metadata schemas",
+  "admin.registries.schema.notification.deleted.success": "تم حذف {{amount}} مخطط ميتاداتا بنجاح",
 
   // "admin.registries.schema.notification.edited": "Successfully edited metadata schema \"{{prefix}}\"",
-  // TODO New key - Add a translation
-  "admin.registries.schema.notification.edited": "Successfully edited metadata schema \"{{prefix}}\"",
+  "admin.registries.schema.notification.edited": "تم بنجاح تحرير مخطط الميتاداتا \"{{prefix}}\"",
 
   // "admin.registries.schema.notification.failure": "Error",
-  // TODO New key - Add a translation
-  "admin.registries.schema.notification.failure": "Error",
+  "admin.registries.schema.notification.failure": "خطأ",
 
   // "admin.registries.schema.notification.field.created": "Successfully created metadata field \"{{field}}\"",
-  // TODO New key - Add a translation
-  "admin.registries.schema.notification.field.created": "Successfully created metadata field \"{{field}}\"",
+  "admin.registries.schema.notification.field.created": "تم بنجاح إنشاء حقل الميتاداتا  \"{{field}}\"",
 
   // "admin.registries.schema.notification.field.deleted.failure": "Failed to delete {{amount}} metadata fields",
-  // TODO New key - Add a translation
-  "admin.registries.schema.notification.field.deleted.failure": "Failed to delete {{amount}} metadata fields",
+  "admin.registries.schema.notification.field.deleted.failure": "فشل حذف {{amount}} حقل ميتاداتا",
 
   // "admin.registries.schema.notification.field.deleted.success": "Successfully deleted {{amount}} metadata fields",
-  // TODO New key - Add a translation
-  "admin.registries.schema.notification.field.deleted.success": "Successfully deleted {{amount}} metadata fields",
+  "admin.registries.schema.notification.field.deleted.success": "تم حذف {{amount}} حقل ميتاداتا بنجاح",
 
   // "admin.registries.schema.notification.field.edited": "Successfully edited metadata field \"{{field}}\"",
-  // TODO New key - Add a translation
-  "admin.registries.schema.notification.field.edited": "Successfully edited metadata field \"{{field}}\"",
+  "admin.registries.schema.notification.field.edited": "تم بنجاح تحرير حقل الميتاداتا \"{{field}}\"",
 
   // "admin.registries.schema.notification.success": "Success",
-  // TODO New key - Add a translation
-  "admin.registries.schema.notification.success": "Success",
+  "admin.registries.schema.notification.success": "نجاح",
 
-  // "admin.registries.schema.return": "Return",
-  // TODO New key - Add a translation
-  "admin.registries.schema.return": "Return",
+  // "admin.registries.schema.return": "Back",
+  "admin.registries.schema.return": "رجوع",
 
-  // "admin.registries.schema.title": "DSpace Angular :: Metadata Schema Registry",
-  // TODO New key - Add a translation
-  "admin.registries.schema.title": "DSpace Angular :: Metadata Schema Registry",
+  // "admin.registries.schema.title": "Metadata Schema Registry",
+  "admin.registries.schema.title": "سجل مخطط الميتاداتا",
 
+  // "admin.access-control.bulk-access.breadcrumbs": "Bulk Access Management",
+  "admin.access-control.bulk-access.breadcrumbs": "إدارة الوصول بالجملة",
 
+  // "administrativeBulkAccess.search.results.head": "Search Results",
+  "administrativeBulkAccess.search.results.head": "نتائج البحث",
+
+  // "admin.access-control.bulk-access": "Bulk Access Management",
+  "admin.access-control.bulk-access": "إدارة الوصول بالجملة",
+
+  // "admin.access-control.bulk-access.title": "Bulk Access Management",
+  "admin.access-control.bulk-access.title": "إدارة الوصول بالجملة",
+
+  // "admin.access-control.bulk-access-browse.header": "Step 1: Select Objects",
+  "admin.access-control.bulk-access-browse.header": "الخطوة الأولى: قم بتحديد الكائنات",
+
+  // "admin.access-control.bulk-access-browse.search.header": "Search",
+  "admin.access-control.bulk-access-browse.search.header": "بحث",
+
+  // "admin.access-control.bulk-access-browse.selected.header": "Current selection({{number}})",
+  "admin.access-control.bulk-access-browse.selected.header": "التحديد الحالي({{number}})",
+
+  // "admin.access-control.bulk-access-settings.header": "Step 2: Operation to Perform",
+  "admin.access-control.bulk-access-settings.header": "الخطوة الثانية: العملية المراد إجراؤها",
 
   // "admin.access-control.epeople.actions.delete": "Delete EPerson",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.actions.delete": "Delete EPerson",
+  "admin.access-control.epeople.actions.delete": "حذف شخص إلكتروني",
 
   // "admin.access-control.epeople.actions.impersonate": "Impersonate EPerson",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.actions.impersonate": "Impersonate EPerson",
+  "admin.access-control.epeople.actions.impersonate": "التصرف كشخص إلكتروني",
 
   // "admin.access-control.epeople.actions.reset": "Reset password",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.actions.reset": "Reset password",
+  "admin.access-control.epeople.actions.reset": "إعادة تعيين كلمة المرور",
 
   // "admin.access-control.epeople.actions.stop-impersonating": "Stop impersonating EPerson",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.actions.stop-impersonating": "Stop impersonating EPerson",
+  "admin.access-control.epeople.actions.stop-impersonating": "التوقف عن التصرف كشخص إلكتروني",
 
-  // "admin.access-control.epeople.title": "DSpace Angular :: EPeople",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.title": "DSpace Angular :: EPeople",
+  // "admin.access-control.epeople.breadcrumbs": "EPeople",
+  "admin.access-control.epeople.breadcrumbs": "أشخاص إلكترونيين",
+
+  // "admin.access-control.epeople.title": "EPeople",
+  "admin.access-control.epeople.title": "أشخاص إلكترونيين",
+
+  // "admin.access-control.epeople.edit.breadcrumbs": "New EPerson",
+  "admin.access-control.epeople.edit.breadcrumbs": "شخص إلكتروني جديد",
+
+  // "admin.access-control.epeople.edit.title": "New EPerson",
+  "admin.access-control.epeople.edit.title": "شخص إلكتروني جديد",
+
+  // "admin.access-control.epeople.add.breadcrumbs": "Add EPerson",
+  "admin.access-control.epeople.add.breadcrumbs": "إضافة شخص إلكتروني",
+
+  // "admin.access-control.epeople.add.title": "Add EPerson",
+  "admin.access-control.epeople.add.title": "إضافة شخص إلكتروني",
 
   // "admin.access-control.epeople.head": "EPeople",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.head": "EPeople",
+  "admin.access-control.epeople.head": "أشخاص إلكترونيين",
 
   // "admin.access-control.epeople.search.head": "Search",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.search.head": "Search",
+  "admin.access-control.epeople.search.head": "بحث",
 
   // "admin.access-control.epeople.button.see-all": "Browse All",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.button.see-all": "Browse All",
+  "admin.access-control.epeople.button.see-all": "استعراض الكل",
 
   // "admin.access-control.epeople.search.scope.metadata": "Metadata",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.search.scope.metadata": "Metadata",
+  "admin.access-control.epeople.search.scope.metadata": "الميتاداتا",
 
-  // "admin.access-control.epeople.search.scope.email": "E-mail (exact)",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.search.scope.email": "E-mail (exact)",
+  // "admin.access-control.epeople.search.scope.email": "Email (exact)",
+  "admin.access-control.epeople.search.scope.email": "البريد الإلكتروني (بالضبط)",
 
   // "admin.access-control.epeople.search.button": "Search",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.search.button": "Search",
+  "admin.access-control.epeople.search.button": "بحث",
+
+  // "admin.access-control.epeople.search.placeholder": "Search people...",
+  "admin.access-control.epeople.search.placeholder": "بحث الأشخاص...",
 
   // "admin.access-control.epeople.button.add": "Add EPerson",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.button.add": "Add EPerson",
+  "admin.access-control.epeople.button.add": "إضافة شخص إلكتروني",
 
   // "admin.access-control.epeople.table.id": "ID",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.table.id": "ID",
+  "admin.access-control.epeople.table.id": "المعرّف",
 
   // "admin.access-control.epeople.table.name": "Name",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.table.name": "Name",
+  "admin.access-control.epeople.table.name": "الاسم",
 
-  // "admin.access-control.epeople.table.email": "E-mail (exact)",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.table.email": "E-mail (exact)",
+  // "admin.access-control.epeople.table.email": "Email (exact)",
+  "admin.access-control.epeople.table.email": "البريد الإلكتروني (بالضبط)",
 
   // "admin.access-control.epeople.table.edit": "Edit",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.table.edit": "Edit",
+  "admin.access-control.epeople.table.edit": "تحرير",
 
   // "admin.access-control.epeople.table.edit.buttons.edit": "Edit \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.table.edit.buttons.edit": "Edit \"{{name}}\"",
+  "admin.access-control.epeople.table.edit.buttons.edit": "تحرير \"{{name}}\"",
+
+  // "admin.access-control.epeople.table.edit.buttons.edit-disabled": "You are not authorized to edit this group",
+  "admin.access-control.epeople.table.edit.buttons.edit-disabled": "غير مصرح لك بتحرير هذه المجموعة",
 
   // "admin.access-control.epeople.table.edit.buttons.remove": "Delete \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.table.edit.buttons.remove": "Delete \"{{name}}\"",
+  "admin.access-control.epeople.table.edit.buttons.remove": "حذف \"{{name}}\"",
 
   // "admin.access-control.epeople.no-items": "No EPeople to show.",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.no-items": "No EPeople to show.",
+  "admin.access-control.epeople.no-items": "لا يوجد أشخاص إلكترونيين للعرض.",
 
   // "admin.access-control.epeople.form.create": "Create EPerson",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.form.create": "Create EPerson",
+  "admin.access-control.epeople.form.create": "إنشاء شخص إلكتروني",
 
   // "admin.access-control.epeople.form.edit": "Edit EPerson",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.form.edit": "Edit EPerson",
+  "admin.access-control.epeople.form.edit": "تحرير شخص إلكتروني",
 
   // "admin.access-control.epeople.form.firstName": "First name",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.form.firstName": "First name",
+  "admin.access-control.epeople.form.firstName": "الاسم الأول",
 
   // "admin.access-control.epeople.form.lastName": "Last name",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.form.lastName": "Last name",
+  "admin.access-control.epeople.form.lastName": "اسم العائلة",
 
-  // "admin.access-control.epeople.form.email": "E-mail",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.form.email": "E-mail",
+  // "admin.access-control.epeople.form.email": "Email",
+  "admin.access-control.epeople.form.email": "البريد الإلكتروني",
 
-  // "admin.access-control.epeople.form.emailHint": "Must be valid e-mail address",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.form.emailHint": "Must be valid e-mail address",
+  // "admin.access-control.epeople.form.emailHint": "Must be a valid email address",
+  "admin.access-control.epeople.form.emailHint": "يجب أن يكون عنوان بريد إلكتروني صالح",
 
   // "admin.access-control.epeople.form.canLogIn": "Can log in",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.form.canLogIn": "Can log in",
+  "admin.access-control.epeople.form.canLogIn": "يمكنه تسجيل الدخول",
 
   // "admin.access-control.epeople.form.requireCertificate": "Requires certificate",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.form.requireCertificate": "Requires certificate",
+  "admin.access-control.epeople.form.requireCertificate": "يتطلب شهادة",
+
+  // "admin.access-control.epeople.form.return": "Back",
+  "admin.access-control.epeople.form.return": "رجوع",
 
   // "admin.access-control.epeople.form.notification.created.success": "Successfully created EPerson \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.form.notification.created.success": "Successfully created EPerson \"{{name}}\"",
+  "admin.access-control.epeople.form.notification.created.success": "تم إنشاء الشخص الإلكتروني \"{{name}}\"",
 
   // "admin.access-control.epeople.form.notification.created.failure": "Failed to create EPerson \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.form.notification.created.failure": "Failed to create EPerson \"{{name}}\"",
+  "admin.access-control.epeople.form.notification.created.failure": "فشل إنشاء الشخص الإلكتروني \"{{name}}\"",
 
   // "admin.access-control.epeople.form.notification.created.failure.emailInUse": "Failed to create EPerson \"{{name}}\", email \"{{email}}\" already in use.",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.form.notification.created.failure.emailInUse": "Failed to create EPerson \"{{name}}\", email \"{{email}}\" already in use.",
+  "admin.access-control.epeople.form.notification.created.failure.emailInUse": "فشل إنشاء الشخص الإلكتروني \"{{name}}\", البريد الإلكتروني \"{{email}}\" قيد الاستخدام بالفعل.",
 
   // "admin.access-control.epeople.form.notification.edited.failure.emailInUse": "Failed to edit EPerson \"{{name}}\", email \"{{email}}\" already in use.",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.form.notification.edited.failure.emailInUse": "Failed to edit EPerson \"{{name}}\", email \"{{email}}\" already in use.",
+  "admin.access-control.epeople.form.notification.edited.failure.emailInUse": "فشل تحرير الشخص الإلكتروني \"{{name}}\", البريد الإلكتروني \"{{email}}\" قيد الاستخدام بالفعل.",
 
   // "admin.access-control.epeople.form.notification.edited.success": "Successfully edited EPerson \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.form.notification.edited.success": "Successfully edited EPerson \"{{name}}\"",
+  "admin.access-control.epeople.form.notification.edited.success": "تم تحرير الشخص الإلكتروني \"{{name}}\"بنجاح",
 
   // "admin.access-control.epeople.form.notification.edited.failure": "Failed to edit EPerson \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.form.notification.edited.failure": "Failed to edit EPerson \"{{name}}\"",
+  "admin.access-control.epeople.form.notification.edited.failure": "فشل تحرير الشخص الإلكتروني \"{{name}}\"",
 
   // "admin.access-control.epeople.form.notification.deleted.success": "Successfully deleted EPerson \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.form.notification.deleted.success": "Successfully deleted EPerson \"{{name}}\"",
+  "admin.access-control.epeople.form.notification.deleted.success": "تم حذف الشخص الإلكتروني \"{{name}}\"بنجاح",
 
   // "admin.access-control.epeople.form.notification.deleted.failure": "Failed to delete EPerson \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.form.notification.deleted.failure": "Failed to delete EPerson \"{{name}}\"",
+  "admin.access-control.epeople.form.notification.deleted.failure": "فشل حذف الشخص الإلكتروني \"{{name}}\"",
 
   // "admin.access-control.epeople.form.groupsEPersonIsMemberOf": "Member of these groups:",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.form.groupsEPersonIsMemberOf": "Member of these groups:",
+  "admin.access-control.epeople.form.groupsEPersonIsMemberOf": "عضو في هذه المجموعات:",
 
   // "admin.access-control.epeople.form.table.id": "ID",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.form.table.id": "ID",
+  "admin.access-control.epeople.form.table.id": "المعرّف",
 
   // "admin.access-control.epeople.form.table.name": "Name",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.form.table.name": "Name",
+  "admin.access-control.epeople.form.table.name": "الاسم",
+
+  // "admin.access-control.epeople.form.table.collectionOrCommunity": "Collection/Community",
+  "admin.access-control.epeople.form.table.collectionOrCommunity": "حاوية/مجتمع",
 
   // "admin.access-control.epeople.form.memberOfNoGroups": "This EPerson is not a member of any groups",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.form.memberOfNoGroups": "This EPerson is not a member of any groups",
+  "admin.access-control.epeople.form.memberOfNoGroups": "هذا الشخص الإلكتروني ليس عضواً في أي مجموعة",
 
   // "admin.access-control.epeople.form.goToGroups": "Add to groups",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.form.goToGroups": "Add to groups",
+  "admin.access-control.epeople.form.goToGroups": "أضف إلى مجموعات",
 
-  // "admin.access-control.epeople.notification.deleted.failure": "Failed to delete EPerson: \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.notification.deleted.failure": "Failed to delete EPerson: \"{{name}}\"",
+  // "admin.access-control.epeople.notification.deleted.failure": "Error occurred when trying to delete EPerson with id \"{{id}}\" with code: \"{{statusCode}}\" and message: \"{{restResponse.errorMessage}}\"",
+  "admin.access-control.epeople.notification.deleted.failure": "حدث خطأ عند محاولة حذف شخص إلكتروني بالمعرف \"{{id}}\" بالرمز: \"{{statusCode}}\" والرسالة: \"{{restResponse.errorMessage}}\"",
 
   // "admin.access-control.epeople.notification.deleted.success": "Successfully deleted EPerson: \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.notification.deleted.success": "Successfully deleted EPerson: \"{{name}}\"",
+  "admin.access-control.epeople.notification.deleted.success": "تم حذف الشخص الإلكتروني: \"{{name}}\"بنجاح",
 
+  // "admin.access-control.groups.title": "Groups",
+  "admin.access-control.groups.title": "المجموعات",
 
+  // "admin.access-control.groups.breadcrumbs": "Groups",
+  "admin.access-control.groups.breadcrumbs": "المجموعات",
 
-  // "admin.access-control.groups.title": "DSpace Angular :: Groups",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.title": "DSpace Angular :: Groups",
+  // "admin.access-control.groups.singleGroup.breadcrumbs": "Edit Group",
+  "admin.access-control.groups.singleGroup.breadcrumbs": "تحرير مجموعة",
 
-  // "admin.access-control.groups.title.singleGroup": "DSpace Angular :: Edit Group",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.title.singleGroup": "DSpace Angular :: Edit Group",
+  // "admin.access-control.groups.title.singleGroup": "Edit Group",
+  "admin.access-control.groups.title.singleGroup": "تحرير مجموعة",
 
-  // "admin.access-control.groups.title.addGroup": "DSpace Angular :: New Group",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.title.addGroup": "DSpace Angular :: New Group",
+  // "admin.access-control.groups.title.addGroup": "New Group",
+  "admin.access-control.groups.title.addGroup": "مجموعة جديدة",
+
+  // "admin.access-control.groups.addGroup.breadcrumbs": "New Group",
+  "admin.access-control.groups.addGroup.breadcrumbs": "مجموعة جديدة",
 
   // "admin.access-control.groups.head": "Groups",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.head": "Groups",
+  "admin.access-control.groups.head": "المجموعات",
 
   // "admin.access-control.groups.button.add": "Add group",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.button.add": "Add group",
+  "admin.access-control.groups.button.add": "إضافة مجموعة",
 
   // "admin.access-control.groups.search.head": "Search groups",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.search.head": "Search groups",
+  "admin.access-control.groups.search.head": "بحث المجموعات",
 
   // "admin.access-control.groups.button.see-all": "Browse all",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.button.see-all": "Browse all",
+  "admin.access-control.groups.button.see-all": "استعراض الكل",
 
   // "admin.access-control.groups.search.button": "Search",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.search.button": "Search",
+  "admin.access-control.groups.search.button": "بحث",
+
+  // "admin.access-control.groups.search.placeholder": "Search groups...",
+  "admin.access-control.groups.search.placeholder": "بحث المجموعات...",
 
   // "admin.access-control.groups.table.id": "ID",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.table.id": "ID",
+  "admin.access-control.groups.table.id": "المعرّف",
 
   // "admin.access-control.groups.table.name": "Name",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.table.name": "Name",
+  "admin.access-control.groups.table.name": "الاسم",
+
+  // "admin.access-control.groups.table.collectionOrCommunity": "Collection/Community",
+  "admin.access-control.groups.table.collectionOrCommunity": "حاوية/مجتمع",
 
   // "admin.access-control.groups.table.members": "Members",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.table.members": "Members",
+  "admin.access-control.groups.table.members": "الأعضاء",
 
   // "admin.access-control.groups.table.edit": "Edit",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.table.edit": "Edit",
+  "admin.access-control.groups.table.edit": "تحرير",
 
   // "admin.access-control.groups.table.edit.buttons.edit": "Edit \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.table.edit.buttons.edit": "Edit \"{{name}}\"",
+  "admin.access-control.groups.table.edit.buttons.edit": "تحرير \"{{name}}\"",
 
   // "admin.access-control.groups.table.edit.buttons.remove": "Delete \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.table.edit.buttons.remove": "Delete \"{{name}}\"",
+  "admin.access-control.groups.table.edit.buttons.remove": "حذف \"{{name}}\"",
 
   // "admin.access-control.groups.no-items": "No groups found with this in their name or this as UUID",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.no-items": "No groups found with this in their name or this as UUID",
+  "admin.access-control.groups.no-items": "لم يتم العثور على أي مجموعات بهذا في اسمها أو كمعرف عمومي فريد",
 
   // "admin.access-control.groups.notification.deleted.success": "Successfully deleted group \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.notification.deleted.success": "Successfully deleted group \"{{name}}\"",
+  "admin.access-control.groups.notification.deleted.success": "تم حذف المجموعة \"{{name}}\"بنجاح",
 
   // "admin.access-control.groups.notification.deleted.failure.title": "Failed to delete group \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.notification.deleted.failure.title": "Failed to delete group \"{{name}}\"",
+  "admin.access-control.groups.notification.deleted.failure.title": "فشل حذف المجموعة \"{{name}}\"",
 
   // "admin.access-control.groups.notification.deleted.failure.content": "Cause: \"{{cause}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.notification.deleted.failure.content": "Cause: \"{{cause}}\"",
-
-
+  "admin.access-control.groups.notification.deleted.failure.content": "السبب: \"{{cause}}\"",
 
   // "admin.access-control.groups.form.alert.permanent": "This group is permanent, so it can't be edited or deleted. You can still add and remove group members using this page.",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.alert.permanent": "This group is permanent, so it can't be edited or deleted. You can still add and remove group members using this page.",
+  "admin.access-control.groups.form.alert.permanent": "هذه المجموعة دائمة، لذا لا يمكن تحريرها أو حذفها. لكن لايزال بإمكانك إضافة وإزالة أعضاء المجموعة باستخدام هذه الصفحة..",
 
   // "admin.access-control.groups.form.alert.workflowGroup": "This group can’t be modified or deleted because it corresponds to a role in the submission and workflow process in the \"{{name}}\" {{comcol}}. You can delete it from the <a href='{{comcolEditRolesRoute}}'>\"assign roles\"</a> tab on the edit {{comcol}} page. You can still add and remove group members using this page.",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.alert.workflowGroup": "This group can’t be modified or deleted because it corresponds to a role in the submission and workflow process in the \"{{name}}\" {{comcol}}. You can delete it from the <a href='{{comcolEditRolesRoute}}'>\"assign roles\"</a> tab on the edit {{comcol}} page. You can still add and remove group members using this page.",
+  "admin.access-control.groups.form.alert.workflowGroup": "لا يمكن تعديل هذه المجموعة أو حذفها لأنها تتوافق مع دور في عملية التقديم وسير العمل في \"{{name}}\" {{comcol}}. يمكنك حذفها من تبويب <a href='{{comcolEditRolesRoute}}'>\"تعيين الأدوار\"</a> في صفحة تحرير {{comcol}}. لا يزال بإمكانك إضافة وإزالة أعضاء المجموعة باستخدام هذه الصفحة.",
 
   // "admin.access-control.groups.form.head.create": "Create group",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.head.create": "Create group",
+  "admin.access-control.groups.form.head.create": "إنشاء مجموعة",
 
   // "admin.access-control.groups.form.head.edit": "Edit group",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.head.edit": "Edit group",
+  "admin.access-control.groups.form.head.edit": "تحرير مجموعة",
 
   // "admin.access-control.groups.form.groupName": "Group name",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.groupName": "Group name",
+  "admin.access-control.groups.form.groupName": "اسم المجموعة",
+
+  // "admin.access-control.groups.form.groupCommunity": "Community or Collection",
+  "admin.access-control.groups.form.groupCommunity": "مجتمع أو حاوية",
 
   // "admin.access-control.groups.form.groupDescription": "Description",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.groupDescription": "Description",
+  "admin.access-control.groups.form.groupDescription": "الوصف",
 
   // "admin.access-control.groups.form.notification.created.success": "Successfully created Group \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.notification.created.success": "Successfully created Group \"{{name}}\"",
+  "admin.access-control.groups.form.notification.created.success": "تم إنشاء المجموعة \"{{name}}\"بنجاح",
 
   // "admin.access-control.groups.form.notification.created.failure": "Failed to create Group \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.notification.created.failure": "Failed to create Group \"{{name}}\"",
+  "admin.access-control.groups.form.notification.created.failure": "فشل إنشاء المجموعة \"{{name}}\"",
 
   // "admin.access-control.groups.form.notification.created.failure.groupNameInUse": "Failed to create Group with name: \"{{name}}\", make sure the name is not already in use.",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.notification.created.failure.groupNameInUse": "Failed to create Group with name: \"{{name}}\", make sure the name is not already in use.",
+  "admin.access-control.groups.form.notification.created.failure.groupNameInUse": "فشل إنشاء المجموعة بالاسم: \"{{name}}\"، يرجى التأكد أن الاسم ليس قيد الاستخدام بالفعل.",
 
   // "admin.access-control.groups.form.notification.edited.failure": "Failed to edit Group \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.notification.edited.failure": "Failed to edit Group \"{{name}}\"",
+  "admin.access-control.groups.form.notification.edited.failure": "فشل تحرير المجموعة \"{{name}}\"",
 
   // "admin.access-control.groups.form.notification.edited.failure.groupNameInUse": "Name \"{{name}}\" already in use!",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.notification.edited.failure.groupNameInUse": "Name \"{{name}}\" already in use!",
+  "admin.access-control.groups.form.notification.edited.failure.groupNameInUse": "الاسم \"{{name}}\" قيد الاستخدام بالفعل!",
 
   // "admin.access-control.groups.form.notification.edited.success": "Successfully edited Group \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.notification.edited.success": "Successfully edited Group \"{{name}}\"",
+  "admin.access-control.groups.form.notification.edited.success": "تم تحرير المجموعة \"{{name}}\"بنجاح",
 
   // "admin.access-control.groups.form.actions.delete": "Delete Group",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.actions.delete": "Delete Group",
+  "admin.access-control.groups.form.actions.delete": "حذف المجموعة",
 
   // "admin.access-control.groups.form.delete-group.modal.header": "Delete Group \"{{ dsoName }}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.delete-group.modal.header": "Delete Group \"{{ dsoName }}\"",
+  "admin.access-control.groups.form.delete-group.modal.header": "حذف المجموعة \"{{ dsoName }}\"",
 
   // "admin.access-control.groups.form.delete-group.modal.info": "Are you sure you want to delete Group \"{{ dsoName }}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.delete-group.modal.info": "Are you sure you want to delete Group \"{{ dsoName }}\"",
+  "admin.access-control.groups.form.delete-group.modal.info": "هل أنت متأكد من أنك ترغب في حذف المجموعة \"{{ dsoName }}\"",
 
   // "admin.access-control.groups.form.delete-group.modal.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.delete-group.modal.cancel": "Cancel",
+  "admin.access-control.groups.form.delete-group.modal.cancel": "إلغاء",
 
   // "admin.access-control.groups.form.delete-group.modal.confirm": "Delete",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.delete-group.modal.confirm": "Delete",
+  "admin.access-control.groups.form.delete-group.modal.confirm": "حذف",
 
   // "admin.access-control.groups.form.notification.deleted.success": "Successfully deleted group \"{{ name }}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.notification.deleted.success": "Successfully deleted group \"{{ name }}\"",
+  "admin.access-control.groups.form.notification.deleted.success": "تم حذف المجموعة \"{{ name }}\"بنجاح",
 
   // "admin.access-control.groups.form.notification.deleted.failure.title": "Failed to delete group \"{{ name }}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.notification.deleted.failure.title": "Failed to delete group \"{{ name }}\"",
+  "admin.access-control.groups.form.notification.deleted.failure.title": "فشل حذف المجموعة \"{{ name }}\"",
 
   // "admin.access-control.groups.form.notification.deleted.failure.content": "Cause: \"{{ cause }}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.notification.deleted.failure.content": "Cause: \"{{ cause }}\"",
+  "admin.access-control.groups.form.notification.deleted.failure.content": "السبب: \"{{ cause }}\"",
 
   // "admin.access-control.groups.form.members-list.head": "EPeople",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.members-list.head": "EPeople",
+  "admin.access-control.groups.form.members-list.head": "أشخاص إلكترونيين",
 
   // "admin.access-control.groups.form.members-list.search.head": "Add EPeople",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.members-list.search.head": "Add EPeople",
+  "admin.access-control.groups.form.members-list.search.head": "إضافة أشخاص إلكترونيين",
 
   // "admin.access-control.groups.form.members-list.button.see-all": "Browse All",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.members-list.button.see-all": "Browse All",
+  "admin.access-control.groups.form.members-list.button.see-all": "استعراض الكل",
 
   // "admin.access-control.groups.form.members-list.headMembers": "Current Members",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.members-list.headMembers": "Current Members",
-
-  // "admin.access-control.groups.form.members-list.search.scope.metadata": "Metadata",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.members-list.search.scope.metadata": "Metadata",
-
-  // "admin.access-control.groups.form.members-list.search.scope.email": "E-mail (exact)",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.members-list.search.scope.email": "E-mail (exact)",
+  "admin.access-control.groups.form.members-list.headMembers": "الأعضاء الحاليين",
 
   // "admin.access-control.groups.form.members-list.search.button": "Search",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.members-list.search.button": "Search",
+  "admin.access-control.groups.form.members-list.search.button": "بحث",
 
   // "admin.access-control.groups.form.members-list.table.id": "ID",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.members-list.table.id": "ID",
+  "admin.access-control.groups.form.members-list.table.id": "المعرّف",
 
   // "admin.access-control.groups.form.members-list.table.name": "Name",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.members-list.table.name": "Name",
+  "admin.access-control.groups.form.members-list.table.name": "الاسم",
+
+  // "admin.access-control.groups.form.members-list.table.identity": "Identity",
+  "admin.access-control.groups.form.members-list.table.identity": "الهوية",
+
+  // "admin.access-control.groups.form.members-list.table.email": "Email",
+  "admin.access-control.groups.form.members-list.table.email": "البريد الإلكتروني",
+
+  // "admin.access-control.groups.form.members-list.table.netid": "NetID",
+  "admin.access-control.groups.form.members-list.table.netid": "NetID",
 
   // "admin.access-control.groups.form.members-list.table.edit": "Remove / Add",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.members-list.table.edit": "Remove / Add",
+  "admin.access-control.groups.form.members-list.table.edit": "إزالة / إضافة",
 
   // "admin.access-control.groups.form.members-list.table.edit.buttons.remove": "Remove member with name \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.members-list.table.edit.buttons.remove": "Remove member with name \"{{name}}\"",
+  "admin.access-control.groups.form.members-list.table.edit.buttons.remove": "حذف عضو باسم \"{{name}}\"",
 
   // "admin.access-control.groups.form.members-list.notification.success.addMember": "Successfully added member: \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.members-list.notification.success.addMember": "Successfully added member: \"{{name}}\"",
+  "admin.access-control.groups.form.members-list.notification.success.addMember": "تمت إضافة العضو: \"{{name}}\"بنجاح",
 
   // "admin.access-control.groups.form.members-list.notification.failure.addMember": "Failed to add member: \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.members-list.notification.failure.addMember": "Failed to add member: \"{{name}}\"",
+  "admin.access-control.groups.form.members-list.notification.failure.addMember": "فشل إضافة العضو: \"{{name}}\"",
 
   // "admin.access-control.groups.form.members-list.notification.success.deleteMember": "Successfully deleted member: \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.members-list.notification.success.deleteMember": "Successfully deleted member: \"{{name}}\"",
+  "admin.access-control.groups.form.members-list.notification.success.deleteMember": "تم حذف العضو: \"{{name}}\"بنجاح",
 
   // "admin.access-control.groups.form.members-list.notification.failure.deleteMember": "Failed to delete member: \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.members-list.notification.failure.deleteMember": "Failed to delete member: \"{{name}}\"",
+  "admin.access-control.groups.form.members-list.notification.failure.deleteMember": "فشل حذف العضو: \"{{name}}\"",
 
   // "admin.access-control.groups.form.members-list.table.edit.buttons.add": "Add member with name \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.members-list.table.edit.buttons.add": "Add member with name \"{{name}}\"",
+  "admin.access-control.groups.form.members-list.table.edit.buttons.add": "إضافة عضو باسم \"{{name}}\"",
 
   // "admin.access-control.groups.form.members-list.notification.failure.noActiveGroup": "No current active group, submit a name first.",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.members-list.notification.failure.noActiveGroup": "No current active group, submit a name first.",
+  "admin.access-control.groups.form.members-list.notification.failure.noActiveGroup": "لا توجد مجموعة نشطة حالياً، قم بتقديم الاسم أولاً.",
 
   // "admin.access-control.groups.form.members-list.no-members-yet": "No members in group yet, search and add.",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.members-list.no-members-yet": "No members in group yet, search and add.",
+  "admin.access-control.groups.form.members-list.no-members-yet": "لا يوجد أعضاء في المجموعة حتى الآن، قم بالبحث والإضافة.",
 
   // "admin.access-control.groups.form.members-list.no-items": "No EPeople found in that search",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.members-list.no-items": "No EPeople found in that search",
+  "admin.access-control.groups.form.members-list.no-items": "لم يتم العثور على أي أشخاص إلكترونيين في هذا البحث",
 
   // "admin.access-control.groups.form.subgroups-list.notification.failure": "Something went wrong: \"{{cause}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.subgroups-list.notification.failure": "Something went wrong: \"{{cause}}\"",
+  "admin.access-control.groups.form.subgroups-list.notification.failure": "هناك خطأ ما: \"{{cause}}\"",
 
   // "admin.access-control.groups.form.subgroups-list.head": "Groups",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.subgroups-list.head": "Groups",
+  "admin.access-control.groups.form.subgroups-list.head": "المجموعات",
 
   // "admin.access-control.groups.form.subgroups-list.search.head": "Add Subgroup",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.subgroups-list.search.head": "Add Subgroup",
+  "admin.access-control.groups.form.subgroups-list.search.head": "إضافة مجموعة فرعية",
 
   // "admin.access-control.groups.form.subgroups-list.button.see-all": "Browse All",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.subgroups-list.button.see-all": "Browse All",
+  "admin.access-control.groups.form.subgroups-list.button.see-all": "استعراض الكل",
 
   // "admin.access-control.groups.form.subgroups-list.headSubgroups": "Current Subgroups",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.subgroups-list.headSubgroups": "Current Subgroups",
+  "admin.access-control.groups.form.subgroups-list.headSubgroups": "المجموعات الفرعية الحالية",
 
   // "admin.access-control.groups.form.subgroups-list.search.button": "Search",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.subgroups-list.search.button": "Search",
+  "admin.access-control.groups.form.subgroups-list.search.button": "بحث",
 
   // "admin.access-control.groups.form.subgroups-list.table.id": "ID",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.subgroups-list.table.id": "ID",
+  "admin.access-control.groups.form.subgroups-list.table.id": "المعرّف",
 
   // "admin.access-control.groups.form.subgroups-list.table.name": "Name",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.subgroups-list.table.name": "Name",
+  "admin.access-control.groups.form.subgroups-list.table.name": "الاسم",
+
+  // "admin.access-control.groups.form.subgroups-list.table.collectionOrCommunity": "Collection/Community",
+  "admin.access-control.groups.form.subgroups-list.table.collectionOrCommunity": "الحاوية/المجتمع",
 
   // "admin.access-control.groups.form.subgroups-list.table.edit": "Remove / Add",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.subgroups-list.table.edit": "Remove / Add",
+  "admin.access-control.groups.form.subgroups-list.table.edit": "إزالة / إضافة",
 
   // "admin.access-control.groups.form.subgroups-list.table.edit.buttons.remove": "Remove subgroup with name \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.subgroups-list.table.edit.buttons.remove": "Remove subgroup with name \"{{name}}\"",
+  "admin.access-control.groups.form.subgroups-list.table.edit.buttons.remove": "إزالة مجموعة فرعية باسم \"{{name}}\"",
 
   // "admin.access-control.groups.form.subgroups-list.table.edit.buttons.add": "Add subgroup with name \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.subgroups-list.table.edit.buttons.add": "Add subgroup with name \"{{name}}\"",
-
-  // "admin.access-control.groups.form.subgroups-list.table.edit.currentGroup": "Current group",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.subgroups-list.table.edit.currentGroup": "Current group",
+  "admin.access-control.groups.form.subgroups-list.table.edit.buttons.add": "إضافة مجموعة فرعية باسم \"{{name}}\"",
 
   // "admin.access-control.groups.form.subgroups-list.notification.success.addSubgroup": "Successfully added subgroup: \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.subgroups-list.notification.success.addSubgroup": "Successfully added subgroup: \"{{name}}\"",
+  "admin.access-control.groups.form.subgroups-list.notification.success.addSubgroup": "تمت إضافة المجموعة الفرعية: \"{{name}}\"بنجاح",
 
   // "admin.access-control.groups.form.subgroups-list.notification.failure.addSubgroup": "Failed to add subgroup: \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.subgroups-list.notification.failure.addSubgroup": "Failed to add subgroup: \"{{name}}\"",
+  "admin.access-control.groups.form.subgroups-list.notification.failure.addSubgroup": "فشل إضافة مجموعة فرعية: \"{{name}}\"",
 
   // "admin.access-control.groups.form.subgroups-list.notification.success.deleteSubgroup": "Successfully deleted subgroup: \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.subgroups-list.notification.success.deleteSubgroup": "Successfully deleted subgroup: \"{{name}}\"",
+  "admin.access-control.groups.form.subgroups-list.notification.success.deleteSubgroup": "تم حذف المجموعة الفرعية: \"{{name}}\"بنجاح",
 
   // "admin.access-control.groups.form.subgroups-list.notification.failure.deleteSubgroup": "Failed to delete subgroup: \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.subgroups-list.notification.failure.deleteSubgroup": "Failed to delete subgroup: \"{{name}}\"",
+  "admin.access-control.groups.form.subgroups-list.notification.failure.deleteSubgroup": "فشل حذف المجموعة الفرعية: \"{{name}}\"",
 
   // "admin.access-control.groups.form.subgroups-list.notification.failure.noActiveGroup": "No current active group, submit a name first.",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.subgroups-list.notification.failure.noActiveGroup": "No current active group, submit a name first.",
+  "admin.access-control.groups.form.subgroups-list.notification.failure.noActiveGroup": "لا توجد مجموعة نشطة حالياً، قم بتقديم الاسم أولاً.",
 
   // "admin.access-control.groups.form.subgroups-list.notification.failure.subgroupToAddIsActiveGroup": "This is the current group, can't be added.",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.subgroups-list.notification.failure.subgroupToAddIsActiveGroup": "This is the current group, can't be added.",
+  "admin.access-control.groups.form.subgroups-list.notification.failure.subgroupToAddIsActiveGroup": "هذه هي المجموعة الحالية، لا يمكن إضافتها.",
 
   // "admin.access-control.groups.form.subgroups-list.no-items": "No groups found with this in their name or this as UUID",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.subgroups-list.no-items": "No groups found with this in their name or this as UUID",
+  "admin.access-control.groups.form.subgroups-list.no-items": "لم يتم العثور على مجموعات بهذا في اسمها أو بهذا كمعرف عمومي فريد",
 
   // "admin.access-control.groups.form.subgroups-list.no-subgroups-yet": "No subgroups in group yet.",
+  "admin.access-control.groups.form.subgroups-list.no-subgroups-yet": "لا توجد مجموعات فرعية في المجموعة حتى الآن.",
+
+  // "admin.access-control.groups.form.return": "Back",
+  "admin.access-control.groups.form.return": "رجوع",
+
+  // "admin.quality-assurance.breadcrumbs": "Quality Assurance",
+  "admin.quality-assurance.breadcrumbs": "ضمان الجودة",
+
+  // "admin.notifications.event.breadcrumbs": "Quality Assurance Suggestions",
+  "admin.notifications.event.breadcrumbs": "مقترحات ضمان الجودة",
+
+  // "admin.notifications.event.page.title": "Quality Assurance Suggestions",
+  "admin.notifications.event.page.title": "مقترحات ضمان الجودة",
+
+  // "admin.quality-assurance.page.title": "Quality Assurance",
+  "admin.quality-assurance.page.title": "ضمان الجودة",
+
+  // "admin.notifications.source.breadcrumbs": "Quality Assurance",
+  "admin.notifications.source.breadcrumbs": "مصدر ضمان الجودة",
+
+  // "admin.access-control.groups.form.tooltip.editGroupPage": "On this page, you can modify the properties and members of a group. In the top section, you can edit the group name and description, unless this is an admin group for a collection or community, in which case the group name and description are auto-generated and cannot be edited. In the following sections, you can edit group membership. See [the wiki](https://wiki.lyrasis.org/display/DSDOC7x/Create+or+manage+a+user+group) for more details.",
+  "admin.access-control.groups.form.tooltip.editGroupPage": "في هذه الصفحة، يمكنك تعديل خصائص المجموعة وأعضائها. في القسم العلوي، يمكنك تحرير اسم المجموعة ووصفها، ما لم تكن هذه مجموعة إدارية لحاوية أو مجتمع، وفي هذه الحالة يتم إنشاء اسم المجموعة ووصفها تلقائياً ولا يمكن تحريرهما. في الأقسام التالية، يمكنك تعديل عضوية المجموعة. انظر [الويكي](https://wiki.lyrasis.org/display/DSDOC7x/Create+or+manage+a+user+group) للمزيد من التفاصيل.",
+
+  // "admin.access-control.groups.form.tooltip.editGroup.addEpeople": "To add or remove an EPerson to/from this group, either click the 'Browse All' button or use the search bar below to search for users (use the dropdown to the left of the search bar to choose whether to search by metadata or by email). Then click the plus icon for each user you wish to add in the list below, or the trash can icon for each user you wish to remove. The list below may have several pages: use the page controls below the list to navigate to the next pages.",
+  "admin.access-control.groups.form.tooltip.editGroup.addEpeople": "لإضافة شخص إلكتروني إلى هذه المجموعة أو إزالته منها، قم بالنقر على زر 'استعراض الكل' أو قم باستخدام شريط البحث أدناه للبحث عن المستخدمين (استخدم القائمة المنسدلة الموجودة على يسار شريط البحث لاختيار ما إذا كنت تريد البحث حسب الميتاداتا أو حسب البريد الإلكتروني). ثم قم بالنقر على أيقونة زائد لكل مستخدم ترغب في إضافته في القائمة أدناه، أو أيقونة سلة المهملات لكل مستخدم ترغب في إزالته. قد تحتوي القائمة أدناه على عدة صفحات: استخدم عناصر التحكم في الصفحة الموجودة أسفل القائمة للانتقال إلى الصفحات التالية.",
+
+  // "admin.access-control.groups.form.tooltip.editGroup.addSubgroups": "To add or remove a Subgroup to/from this group, either click the 'Browse All' button or use the search bar below to search for groups. Then click the plus icon for each group you wish to add in the list below, or the trash can icon for each group you wish to remove. The list below may have several pages: use the page controls below the list to navigate to the next pages.",
+  "admin.access-control.groups.form.tooltip.editGroup.addSubgroups": "لإضافة مجموعة فرعية إلى هذه المجموعة أو إزالتها منها، قم بالنقر على زر 'استعراض الكل' أو قم باستخدام شريط البحث أدناه للبحث عن المجموعات. ثم قم بالنقر على أيقونة زائد لكل مجموعة ترغب في إضافتها في القائمة أدناه، أو أيقونة سلة المهملات لكل مجموعة ترغب في إزالتها. قد تحتوي القائمة أدناه على عدة صفحات: استخدم عناصر التحكم في الصفحة الموجودة أسفل القائمة للانتقال إلى الصفحات التالية.",
+
+  // "admin.reports.collections.title": "Collection Filter Report",
   // TODO New key - Add a translation
-  "admin.access-control.groups.form.subgroups-list.no-subgroups-yet": "No subgroups in group yet.",
+  "admin.reports.collections.title": "Collection Filter Report",
 
-  // "admin.access-control.groups.form.return": "Return to groups",
+  // "admin.reports.collections.breadcrumbs": "Collection Filter Report",
   // TODO New key - Add a translation
-  "admin.access-control.groups.form.return": "Return to groups",
+  "admin.reports.collections.breadcrumbs": "Collection Filter Report",
 
+  // "admin.reports.collections.head": "Collection Filter Report",
+  // TODO New key - Add a translation
+  "admin.reports.collections.head": "Collection Filter Report",
 
+  // "admin.reports.button.show-collections": "Show Collections",
+  // TODO New key - Add a translation
+  "admin.reports.button.show-collections": "Show Collections",
+
+  // "admin.reports.collections.collections-report": "Collection Report",
+  // TODO New key - Add a translation
+  "admin.reports.collections.collections-report": "Collection Report",
+
+  // "admin.reports.collections.item-results": "Item Results",
+  // TODO New key - Add a translation
+  "admin.reports.collections.item-results": "Item Results",
+
+  // "admin.reports.collections.community": "Community",
+  // TODO New key - Add a translation
+  "admin.reports.collections.community": "Community",
+
+  // "admin.reports.collections.collection": "Collection",
+  // TODO New key - Add a translation
+  "admin.reports.collections.collection": "Collection",
+
+  // "admin.reports.collections.nb_items": "Nb. Items",
+  // TODO New key - Add a translation
+  "admin.reports.collections.nb_items": "Nb. Items",
+
+  // "admin.reports.collections.match_all_selected_filters": "Matching all selected filters",
+  // TODO New key - Add a translation
+  "admin.reports.collections.match_all_selected_filters": "Matching all selected filters",
+
+  // "admin.reports.items.breadcrumbs": "Metadata Query Report",
+  // TODO New key - Add a translation
+  "admin.reports.items.breadcrumbs": "Metadata Query Report",
+
+  // "admin.reports.items.head": "Metadata Query Report",
+  // TODO New key - Add a translation
+  "admin.reports.items.head": "Metadata Query Report",
+
+  // "admin.reports.items.run": "Run Item Query",
+  // TODO New key - Add a translation
+  "admin.reports.items.run": "Run Item Query",
+
+  // "admin.reports.items.section.collectionSelector": "Collection Selector",
+  // TODO New key - Add a translation
+  "admin.reports.items.section.collectionSelector": "Collection Selector",
+
+  // "admin.reports.items.section.metadataFieldQueries": "Metadata Field Queries",
+  // TODO New key - Add a translation
+  "admin.reports.items.section.metadataFieldQueries": "Metadata Field Queries",
+
+  // "admin.reports.items.predefinedQueries": "Predefined Queries",
+  // TODO New key - Add a translation
+  "admin.reports.items.predefinedQueries": "Predefined Queries",
+
+  // "admin.reports.items.section.limitPaginateQueries": "Limit/Paginate Queries",
+  // TODO New key - Add a translation
+  "admin.reports.items.section.limitPaginateQueries": "Limit/Paginate Queries",
+
+  // "admin.reports.items.limit": "Limit/",
+  // TODO New key - Add a translation
+  "admin.reports.items.limit": "Limit/",
+
+  // "admin.reports.items.offset": "Offset",
+  // TODO New key - Add a translation
+  "admin.reports.items.offset": "Offset",
+
+  // "admin.reports.items.wholeRepo": "Whole Repository",
+  // TODO New key - Add a translation
+  "admin.reports.items.wholeRepo": "Whole Repository",
+
+  // "admin.reports.items.anyField": "Any field",
+  // TODO New key - Add a translation
+  "admin.reports.items.anyField": "Any field",
+
+  // "admin.reports.items.predicate.exists": "exists",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.exists": "exists",
+
+  // "admin.reports.items.predicate.doesNotExist": "does not exist",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.doesNotExist": "does not exist",
+
+  // "admin.reports.items.predicate.equals": "equals",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.equals": "equals",
+
+  // "admin.reports.items.predicate.doesNotEqual": "does not equal",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.doesNotEqual": "does not equal",
+
+  // "admin.reports.items.predicate.like": "like",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.like": "like",
+
+  // "admin.reports.items.predicate.notLike": "not like",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.notLike": "not like",
+
+  // "admin.reports.items.predicate.contains": "contains",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.contains": "contains",
+
+  // "admin.reports.items.predicate.doesNotContain": "does not contain",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.doesNotContain": "does not contain",
+
+  // "admin.reports.items.predicate.matches": "matches",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.matches": "matches",
+
+  // "admin.reports.items.predicate.doesNotMatch": "does not match",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.doesNotMatch": "does not match",
+
+  // "admin.reports.items.preset.new": "New Query",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.new": "New Query",
+
+  // "admin.reports.items.preset.hasNoTitle": "Has No Title",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasNoTitle": "Has No Title",
+
+  // "admin.reports.items.preset.hasNoIdentifierUri": "Has No dc.identifier.uri",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasNoIdentifierUri": "Has No dc.identifier.uri",
+
+  // "admin.reports.items.preset.hasCompoundSubject": "Has compound subject",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasCompoundSubject": "Has compound subject",
+
+  // "admin.reports.items.preset.hasCompoundAuthor": "Has compound dc.contributor.author",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasCompoundAuthor": "Has compound dc.contributor.author",
+
+  // "admin.reports.items.preset.hasCompoundCreator": "Has compound dc.creator",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasCompoundCreator": "Has compound dc.creator",
+
+  // "admin.reports.items.preset.hasUrlInDescription": "Has URL in dc.description",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasUrlInDescription": "Has URL in dc.description",
+
+  // "admin.reports.items.preset.hasFullTextInProvenance": "Has full text in dc.description.provenance",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasFullTextInProvenance": "Has full text in dc.description.provenance",
+
+  // "admin.reports.items.preset.hasNonFullTextInProvenance": "Has non-full text in dc.description.provenance",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasNonFullTextInProvenance": "Has non-full text in dc.description.provenance",
+
+  // "admin.reports.items.preset.hasEmptyMetadata": "Has empty metadata",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasEmptyMetadata": "Has empty metadata",
+
+  // "admin.reports.items.preset.hasUnbreakingDataInDescription": "Has unbreaking metadata in description",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasUnbreakingDataInDescription": "Has unbreaking metadata in description",
+
+  // "admin.reports.items.preset.hasXmlEntityInMetadata": "Has XML entity in metadata",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasXmlEntityInMetadata": "Has XML entity in metadata",
+
+  // "admin.reports.items.preset.hasNonAsciiCharInMetadata": "Has non-ascii character in metadata",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasNonAsciiCharInMetadata": "Has non-ascii character in metadata",
+
+  // "admin.reports.items.number": "No.",
+  // TODO New key - Add a translation
+  "admin.reports.items.number": "No.",
+
+  // "admin.reports.items.id": "UUID",
+  // TODO New key - Add a translation
+  "admin.reports.items.id": "UUID",
+
+  // "admin.reports.items.collection": "Collection",
+  // TODO New key - Add a translation
+  "admin.reports.items.collection": "Collection",
+
+  // "admin.reports.items.handle": "URI",
+  // TODO New key - Add a translation
+  "admin.reports.items.handle": "URI",
+
+  // "admin.reports.items.title": "Title",
+  // TODO New key - Add a translation
+  "admin.reports.items.title": "Title",
+
+  // "admin.reports.commons.filters": "Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters": "Filters",
+
+  // "admin.reports.commons.additional-data": "Additional data to return",
+  // TODO New key - Add a translation
+  "admin.reports.commons.additional-data": "Additional data to return",
+
+  // "admin.reports.commons.previous-page": "Prev Page",
+  // TODO New key - Add a translation
+  "admin.reports.commons.previous-page": "Prev Page",
+
+  // "admin.reports.commons.next-page": "Next Page",
+  // TODO New key - Add a translation
+  "admin.reports.commons.next-page": "Next Page",
+
+  // "admin.reports.commons.page": "Page",
+  // TODO New key - Add a translation
+  "admin.reports.commons.page": "Page",
+
+  // "admin.reports.commons.of": "of",
+  // TODO New key - Add a translation
+  "admin.reports.commons.of": "of",
+
+  // "admin.reports.commons.export": "Export for Metadata Update",
+  // TODO New key - Add a translation
+  "admin.reports.commons.export": "Export for Metadata Update",
+
+  // "admin.reports.commons.filters.deselect_all": "Deselect all filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.deselect_all": "Deselect all filters",
+
+  // "admin.reports.commons.filters.select_all": "Select all filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.select_all": "Select all filters",
+
+  // "admin.reports.commons.filters.matches_all": "Matches all specified filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.matches_all": "Matches all specified filters",
+
+  // "admin.reports.commons.filters.property": "Item Property Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property": "Item Property Filters",
+
+  // "admin.reports.commons.filters.property.is_item": "Is Item - always true",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.is_item": "Is Item - always true",
+
+  // "admin.reports.commons.filters.property.is_withdrawn": "Withdrawn Items",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.is_withdrawn": "Withdrawn Items",
+
+  // "admin.reports.commons.filters.property.is_not_withdrawn": "Available Items - Not Withdrawn",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.is_not_withdrawn": "Available Items - Not Withdrawn",
+
+  // "admin.reports.commons.filters.property.is_discoverable": "Discoverable Items - Not Private",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.is_discoverable": "Discoverable Items - Not Private",
+
+  // "admin.reports.commons.filters.property.is_not_discoverable": "Not Discoverable - Private Item",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.is_not_discoverable": "Not Discoverable - Private Item",
+
+  // "admin.reports.commons.filters.bitstream": "Basic Bitstream Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream": "Basic Bitstream Filters",
+
+  // "admin.reports.commons.filters.bitstream.has_multiple_originals": "Item has Multiple Original Bitstreams",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream.has_multiple_originals": "Item has Multiple Original Bitstreams",
+
+  // "admin.reports.commons.filters.bitstream.has_no_originals": "Item has No Original Bitstreams",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream.has_no_originals": "Item has No Original Bitstreams",
+
+  // "admin.reports.commons.filters.bitstream.has_one_original": "Item has One Original Bitstream",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream.has_one_original": "Item has One Original Bitstream",
+
+  // "admin.reports.commons.filters.bitstream_mime": "Bitstream Filters by MIME Type",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime": "Bitstream Filters by MIME Type",
+
+  // "admin.reports.commons.filters.bitstream_mime.has_doc_original": "Item has a Doc Original Bitstream (PDF, Office, Text, HTML, XML, etc)",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_doc_original": "Item has a Doc Original Bitstream (PDF, Office, Text, HTML, XML, etc)",
+
+  // "admin.reports.commons.filters.bitstream_mime.has_image_original": "Item has an Image Original Bitstream",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_image_original": "Item has an Image Original Bitstream",
+
+  // "admin.reports.commons.filters.bitstream_mime.has_unsupp_type": "Has Other Bitstream Types (not Doc or Image)",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_unsupp_type": "Has Other Bitstream Types (not Doc or Image)",
+
+  // "admin.reports.commons.filters.bitstream_mime.has_mixed_original": "Item has multiple types of Original Bitstreams (Doc, Image, Other)",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_mixed_original": "Item has multiple types of Original Bitstreams (Doc, Image, Other)",
+
+  // "admin.reports.commons.filters.bitstream_mime.has_pdf_original": "Item has a PDF Original Bitstream",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_pdf_original": "Item has a PDF Original Bitstream",
+
+  // "admin.reports.commons.filters.bitstream_mime.has_jpg_original": "Item has JPG Original Bitstream",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_jpg_original": "Item has JPG Original Bitstream",
+
+  // "admin.reports.commons.filters.bitstream_mime.has_small_pdf": "Has unusually small PDF",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_small_pdf": "Has unusually small PDF",
+
+  // "admin.reports.commons.filters.bitstream_mime.has_large_pdf": "Has unusually large PDF",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_large_pdf": "Has unusually large PDF",
+
+  // "admin.reports.commons.filters.bitstream_mime.has_doc_without_text": "Has document bitstream without TEXT item",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_doc_without_text": "Has document bitstream without TEXT item",
+
+  // "admin.reports.commons.filters.mime": "Supported MIME Type Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.mime": "Supported MIME Type Filters",
+
+  // "admin.reports.commons.filters.mime.has_only_supp_image_type": "Item Image Bitstreams are Supported",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.mime.has_only_supp_image_type": "Item Image Bitstreams are Supported",
+
+  // "admin.reports.commons.filters.mime.has_unsupp_image_type": "Item has Image Bitstream that is Unsupported",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.mime.has_unsupp_image_type": "Item has Image Bitstream that is Unsupported",
+
+  // "admin.reports.commons.filters.mime.has_only_supp_doc_type": "Item Document Bitstreams are Supported",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.mime.has_only_supp_doc_type": "Item Document Bitstreams are Supported",
+
+  // "admin.reports.commons.filters.mime.has_unsupp_doc_type": "Item has Document Bitstream that is Unsupported",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.mime.has_unsupp_doc_type": "Item has Document Bitstream that is Unsupported",
+
+  // "admin.reports.commons.filters.bundle": "Bitstream Bundle Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle": "Bitstream Bundle Filters",
+
+  // "admin.reports.commons.filters.bundle.has_unsupported_bundle": "Has bitstream in an unsupported bundle",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_unsupported_bundle": "Has bitstream in an unsupported bundle",
+
+  // "admin.reports.commons.filters.bundle.has_small_thumbnail": "Has unusually small thumbnail",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_small_thumbnail": "Has unusually small thumbnail",
+
+  // "admin.reports.commons.filters.bundle.has_original_without_thumbnail": "Has original bitstream without thumbnail",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_original_without_thumbnail": "Has original bitstream without thumbnail",
+
+  // "admin.reports.commons.filters.bundle.has_invalid_thumbnail_name": "Has invalid thumbnail name (assumes one thumbnail for each original)",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_invalid_thumbnail_name": "Has invalid thumbnail name (assumes one thumbnail for each original)",
+
+  // "admin.reports.commons.filters.bundle.has_non_generated_thumb": "Has non-generated thumbnail",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_non_generated_thumb": "Has non-generated thumbnail",
+
+  // "admin.reports.commons.filters.bundle.no_license": "Doesn't have a license",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.no_license": "Doesn't have a license",
+
+  // "admin.reports.commons.filters.bundle.has_license_documentation": "Has documentation in the license bundle",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_license_documentation": "Has documentation in the license bundle",
+
+  // "admin.reports.commons.filters.permission": "Permission Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission": "Permission Filters",
+
+  // "admin.reports.commons.filters.permission.has_restricted_original": "Item has Restricted Original Bitstream",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_original": "Item has Restricted Original Bitstream",
+
+  // "admin.reports.commons.filters.permission.has_restricted_original.tooltip": "Item has at least one original bitstream that is not accessible to Anonymous user",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_original.tooltip": "Item has at least one original bitstream that is not accessible to Anonymous user",
+
+  // "admin.reports.commons.filters.permission.has_restricted_thumbnail": "Item has Restricted Thumbnail",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_thumbnail": "Item has Restricted Thumbnail",
+
+  // "admin.reports.commons.filters.permission.has_restricted_thumbnail.tooltip": "Item has at least one thumbnail that is not accessible to Anonymous user",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_thumbnail.tooltip": "Item has at least one thumbnail that is not accessible to Anonymous user",
+
+  // "admin.reports.commons.filters.permission.has_restricted_metadata": "Item has Restricted Metadata",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_metadata": "Item has Restricted Metadata",
+
+  // "admin.reports.commons.filters.permission.has_restricted_metadata.tooltip": "Item has metadata that is not accessible to Anonymous user",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_metadata.tooltip": "Item has metadata that is not accessible to Anonymous user",
 
   // "admin.search.breadcrumbs": "Administrative Search",
-  // TODO New key - Add a translation
-  "admin.search.breadcrumbs": "Administrative Search",
+  "admin.search.breadcrumbs": "بحث إداري",
 
   // "admin.search.collection.edit": "Edit",
-  // TODO New key - Add a translation
-  "admin.search.collection.edit": "Edit",
+  "admin.search.collection.edit": "تحرير",
 
   // "admin.search.community.edit": "Edit",
-  // TODO New key - Add a translation
-  "admin.search.community.edit": "Edit",
+  "admin.search.community.edit": "تحرير",
 
   // "admin.search.item.delete": "Delete",
-  // TODO New key - Add a translation
-  "admin.search.item.delete": "Delete",
+  "admin.search.item.delete": "حذف",
 
   // "admin.search.item.edit": "Edit",
-  // TODO New key - Add a translation
-  "admin.search.item.edit": "Edit",
+  "admin.search.item.edit": "تحرير",
 
-  // "admin.search.item.make-private": "Make Private",
-  // TODO New key - Add a translation
-  "admin.search.item.make-private": "Make Private",
+  // "admin.search.item.make-private": "Make non-discoverable",
+  "admin.search.item.make-private": "اجعله غير قابل للاكتشاف",
 
-  // "admin.search.item.make-public": "Make Public",
-  // TODO New key - Add a translation
-  "admin.search.item.make-public": "Make Public",
+  // "admin.search.item.make-public": "Make discoverable",
+  "admin.search.item.make-public": "اجعله قابل للاكتشاف",
 
   // "admin.search.item.move": "Move",
-  // TODO New key - Add a translation
-  "admin.search.item.move": "Move",
+  "admin.search.item.move": "نقل",
 
   // "admin.search.item.reinstate": "Reinstate",
-  // TODO New key - Add a translation
-  "admin.search.item.reinstate": "Reinstate",
+  "admin.search.item.reinstate": "إعادة تعيين",
 
   // "admin.search.item.withdraw": "Withdraw",
-  // TODO New key - Add a translation
-  "admin.search.item.withdraw": "Withdraw",
+  "admin.search.item.withdraw": "سحب",
 
   // "admin.search.title": "Administrative Search",
-  // TODO New key - Add a translation
-  "admin.search.title": "Administrative Search",
+  "admin.search.title": "بحث إداري",
 
   // "administrativeView.search.results.head": "Administrative Search",
-  // TODO New key - Add a translation
-  "administrativeView.search.results.head": "Administrative Search",
-
-
-
+  "administrativeView.search.results.head": "بحث إداري",
 
   // "admin.workflow.breadcrumbs": "Administer Workflow",
-  // TODO New key - Add a translation
-  "admin.workflow.breadcrumbs": "Administer Workflow",
+  "admin.workflow.breadcrumbs": "أدر سير العمل",
 
   // "admin.workflow.title": "Administer Workflow",
-  // TODO New key - Add a translation
-  "admin.workflow.title": "Administer Workflow",
+  "admin.workflow.title": "أدر سير العمل",
 
   // "admin.workflow.item.workflow": "Workflow",
-  // TODO New key - Add a translation
-  "admin.workflow.item.workflow": "Workflow",
+  "admin.workflow.item.workflow": "سير العمل",
+
+  // "admin.workflow.item.workspace": "Workspace",
+  "admin.workflow.item.workspace": "مساحة العمل",
 
   // "admin.workflow.item.delete": "Delete",
-  // TODO New key - Add a translation
-  "admin.workflow.item.delete": "Delete",
+  "admin.workflow.item.delete": "حذف",
 
   // "admin.workflow.item.send-back": "Send back",
-  // TODO New key - Add a translation
-  "admin.workflow.item.send-back": "Send back",
+  "admin.workflow.item.send-back": "إعادة إرسال",
 
+  // "admin.workflow.item.policies": "Policies",
+  "admin.workflow.item.policies": "السياسات",
 
+  // "admin.workflow.item.supervision": "Supervision",
+  "admin.workflow.item.supervision": "الإشراف",
 
   // "admin.metadata-import.breadcrumbs": "Import Metadata",
-  // TODO New key - Add a translation
-  "admin.metadata-import.breadcrumbs": "Import Metadata",
+  "admin.metadata-import.breadcrumbs": "استيراد الميتاداتا",
+
+  // "admin.batch-import.breadcrumbs": "Import Batch",
+  "admin.batch-import.breadcrumbs": "استيراد الدفعة",
 
   // "admin.metadata-import.title": "Import Metadata",
-  // TODO New key - Add a translation
-  "admin.metadata-import.title": "Import Metadata",
+  "admin.metadata-import.title": "استيراد الميتاداتا",
+
+  // "admin.batch-import.title": "Import Batch",
+  "admin.batch-import.title": "استيراد الدفعة",
 
   // "admin.metadata-import.page.header": "Import Metadata",
-  // TODO New key - Add a translation
-  "admin.metadata-import.page.header": "Import Metadata",
+  "admin.metadata-import.page.header": "استيراد الميتاداتا",
+
+  // "admin.batch-import.page.header": "Import Batch",
+  "admin.batch-import.page.header": "استيراد الدفعة",
 
   // "admin.metadata-import.page.help": "You can drop or browse CSV files that contain batch metadata operations on files here",
-  // TODO New key - Add a translation
-  "admin.metadata-import.page.help": "You can drop or browse CSV files that contain batch metadata operations on files here",
+  "admin.metadata-import.page.help": "يمكنك إفلات أو استعراض ملفات CSV التي تحتوي على عمليات ميتاداتا بالدفعة على الملفات من هنا",
+
+  // "admin.batch-import.page.help": "Select the Collection to import into. Then, drop or browse to a Simple Archive Format (SAF) zip file that includes the Items to import",
+  "admin.batch-import.page.help": "حدد الحاوية المراد الاستيراد إليها. بعد ذلك، قم بإسقاط أو تصفح ملف مضغوط بتنسيق أرشيف بسيط (SAF) يتضمن المواد المراد استيرادها",
+
+  // "admin.batch-import.page.toggle.help": "It is possible to perform import either with file upload or via URL, use above toggle to set the input source",
+  "admin.batch-import.page.toggle.help": "من الممكن إجراء الاستيراد إما عن طريق تحميل الملف أو عبر عنوان URL، استخدم التبديل أعلاه لتعيين مصدر الإدخال",
 
   // "admin.metadata-import.page.dropMsg": "Drop a metadata CSV to import",
-  // TODO New key - Add a translation
-  "admin.metadata-import.page.dropMsg": "Drop a metadata CSV to import",
+  "admin.metadata-import.page.dropMsg": "قم بإسقاط ملف CSV للميتاداتا لاستيراده",
+
+  // "admin.batch-import.page.dropMsg": "Drop a batch ZIP to import",
+  "admin.batch-import.page.dropMsg": "قم بإسقاط ZIP الدفعة المراد استيرادها",
 
   // "admin.metadata-import.page.dropMsgReplace": "Drop to replace the metadata CSV to import",
-  // TODO New key - Add a translation
-  "admin.metadata-import.page.dropMsgReplace": "Drop to replace the metadata CSV to import",
+  "admin.metadata-import.page.dropMsgReplace": "قم بالإسقاط لاستبدال ملف CSV للميتاداتا المراد استيراده",
 
-  // "admin.metadata-import.page.button.return": "Return",
-  // TODO New key - Add a translation
-  "admin.metadata-import.page.button.return": "Return",
+  // "admin.batch-import.page.dropMsgReplace": "Drop to replace the batch ZIP to import",
+  "admin.batch-import.page.dropMsgReplace": "قم بالإسقاط لاستبدال ZIP الدفعة المراد استيرادها",
+
+  // "admin.metadata-import.page.button.return": "Back",
+  "admin.metadata-import.page.button.return": "رجوع",
 
   // "admin.metadata-import.page.button.proceed": "Proceed",
-  // TODO New key - Add a translation
-  "admin.metadata-import.page.button.proceed": "Proceed",
+  "admin.metadata-import.page.button.proceed": "متابعة",
+
+  // "admin.metadata-import.page.button.select-collection": "Select Collection",
+  "admin.metadata-import.page.button.select-collection": "حدد الحاوية",
 
   // "admin.metadata-import.page.error.addFile": "Select file first!",
-  // TODO New key - Add a translation
-  "admin.metadata-import.page.error.addFile": "Select file first!",
+  "admin.metadata-import.page.error.addFile": "حدد ملف أولاً!",
 
+  // "admin.metadata-import.page.error.addFileUrl": "Insert file URL first!",
+  "admin.metadata-import.page.error.addFileUrl": "أدخل عنوان URL للملف أولاً!",
 
+  // "admin.batch-import.page.error.addFile": "Select ZIP file first!",
+  "admin.batch-import.page.error.addFile": "حدد ملف ZIP أولاً!",
 
+  // "admin.metadata-import.page.toggle.upload": "Upload",
+  "admin.metadata-import.page.toggle.upload": "تحميل",
+
+  // "admin.metadata-import.page.toggle.url": "URL",
+  "admin.metadata-import.page.toggle.url": "عنوان URL",
+
+  // "admin.metadata-import.page.urlMsg": "Insert the batch ZIP url to import",
+  "admin.metadata-import.page.urlMsg": "قم بإدخال عنوان url لملف ZIP الخاص بالدفعة لاستيراده",
+
+  // "admin.metadata-import.page.validateOnly": "Validate Only",
+  "admin.metadata-import.page.validateOnly": "التحقق فقط",
+
+  // "admin.metadata-import.page.validateOnly.hint": "When selected, the uploaded CSV will be validated. You will receive a report of detected changes, but no changes will be saved.",
+  "admin.metadata-import.page.validateOnly.hint": "عند التحديد، سيتم التحقق من صحة ملف CSV الذي تم تحميله. ستتلقى تقريراً بالتغييرات التي تم اكتشافها، ولكن لن يتم حفظ أي تغييرات.",
+
+  // "advanced-workflow-action.rating.form.rating.label": "Rating",
+  "advanced-workflow-action.rating.form.rating.label": "التقييم",
+
+  // "advanced-workflow-action.rating.form.rating.error": "You must rate the item",
+  "advanced-workflow-action.rating.form.rating.error": "يجب عليك تقييم هذه المادة",
+
+  // "advanced-workflow-action.rating.form.review.label": "Review",
+  "advanced-workflow-action.rating.form.review.label": "مراجعة",
+
+  // "advanced-workflow-action.rating.form.review.error": "You must enter a review to submit this rating",
+  "advanced-workflow-action.rating.form.review.error": "يجب عليك إدخال مراجعة لتقديم هذا التقييم",
+
+  // "advanced-workflow-action.rating.description": "Please select a rating below",
+  "advanced-workflow-action.rating.description": "يرجى تحديد التقييم أدناه",
+
+  // "advanced-workflow-action.rating.description-requiredDescription": "Please select a rating below and also add a review",
+  "advanced-workflow-action.rating.description-requiredDescription": "يرجى تحديد التقييم أدناه وإضافة مراجعة",
+
+  // "advanced-workflow-action.select-reviewer.description-single": "Please select a single reviewer below before submitting",
+  "advanced-workflow-action.select-reviewer.description-single": "يرجى اختيار مراجع واحد أدناه قبل التقديم",
+
+  // "advanced-workflow-action.select-reviewer.description-multiple": "Please select one or more reviewers below before submitting",
+  "advanced-workflow-action.select-reviewer.description-multiple": "يرجى اختيار مراجع واحد أو أكثر أدناه قبل التقديم",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.head": "EPeople",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.head": "أشخاص إلكترونيين",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.head": "Add EPeople",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.head": "إضافة أشخاص إلكترونيين",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.button.see-all": "Browse All",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.button.see-all": "استعراض الكل",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.headMembers": "Current Members",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.headMembers": "الأعضاء الحاليين",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.button": "Search",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.button": "بحث",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.id": "ID",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.id": "المعرّف",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.name": "Name",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.name": "الاسم",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.identity": "Identity",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.identity": "الهوية",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.email": "Email",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.email": "البريد الإلكتروني",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.netid": "NetID",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.netid": "NetID",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.edit": "Remove / Add",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.edit": "إزالة / إضافة",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.edit.buttons.remove": "Remove member with name \"{{name}}\"",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.edit.buttons.remove": "إزالة عضو باسم \"{{name}}\"",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.success.addMember": "Successfully added member: \"{{name}}\"",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.success.addMember": "تمت إضافة العضو: \"{{name}}\"بنجاح",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.failure.addMember": "Failed to add member: \"{{name}}\"",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.failure.addMember": "فشل إضافة العضو: \"{{name}}\"",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.success.deleteMember": "Successfully deleted member: \"{{name}}\"",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.success.deleteMember": "تم حذف العضو: \"{{name}}\"بنجاح",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.failure.deleteMember": "Failed to delete member: \"{{name}}\"",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.failure.deleteMember": "فشل حذف العضو: \"{{name}}\"",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.edit.buttons.add": "Add member with name \"{{name}}\"",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.edit.buttons.add": "إضافة عضو باسم \"{{name}}\"",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.failure.noActiveGroup": "No current active group, submit a name first.",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.failure.noActiveGroup": "لا توجد مجموعة نشطة حالياً، قم بتقديم الاسم أولاً.",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.no-members-yet": "No members in group yet, search and add.",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.no-members-yet": "لا يوجد أعضاء في المجموعة حتى الآن، قم بالبحث والإضافة.",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.no-items": "No EPeople found in that search",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.no-items": "لم يتم العثور على أي أشخاص إلكترونيين في هذا البحث",
+
+  // "advanced-workflow-action.select-reviewer.no-reviewer-selected.error": "No reviewer selected.",
+  "advanced-workflow-action.select-reviewer.no-reviewer-selected.error": "لم يتم تحديد أي مراجع.",
+
+  // "admin.batch-import.page.validateOnly.hint": "When selected, the uploaded ZIP will be validated. You will receive a report of detected changes, but no changes will be saved.",
+  "admin.batch-import.page.validateOnly.hint": "عند التحديد، سيتم التحقق من صحة الملف المضغوط الذي تم تحميله. ستتلقى تقريراً بالتغييرات التي تم اكتشافها، ولكن لن يتم حفظ أي تغييرات.",
+
+  // "admin.batch-import.page.remove": "remove",
+  "admin.batch-import.page.remove": "إزالة",
 
   // "auth.errors.invalid-user": "Invalid email address or password.",
-  // TODO New key - Add a translation
-  "auth.errors.invalid-user": "Invalid email address or password.",
+  "auth.errors.invalid-user": "عنوان البريد الإلكتروني أو كلمة المرور غير صالحة.",
 
   // "auth.messages.expired": "Your session has expired. Please log in again.",
-  // TODO New key - Add a translation
-  "auth.messages.expired": "Your session has expired. Please log in again.",
+  "auth.messages.expired": "لقد انتهت جلستك. يرجى تسجيل الدخول مرة أخرى.",
 
+  // "auth.messages.token-refresh-failed": "Refreshing your session token failed. Please log in again.",
+  "auth.messages.token-refresh-failed": "فشل تحديث الرمز المميز لجلستك. يرجى تسجيل الدخول مرة أخرى.",
 
+  // "bitstream.download.page": "Now downloading {{bitstream}}...",
+  "bitstream.download.page": "جاري الآن تنزيل {{bitstream}}...",
+
+  // "bitstream.download.page.back": "Back",
+  "bitstream.download.page.back": "رجوع",
+
+  // "bitstream.edit.authorizations.link": "Edit bitstream's Policies",
+  "bitstream.edit.authorizations.link": "تحرير سياسات تدفق البت",
+
+  // "bitstream.edit.authorizations.title": "Edit bitstream's Policies",
+  "bitstream.edit.authorizations.title": "تحرير سياسات تدفق البت",
+
+  // "bitstream.edit.return": "Back",
+  "bitstream.edit.return": "رجوع",
 
   // "bitstream.edit.bitstream": "Bitstream: ",
-  // TODO New key - Add a translation
-  "bitstream.edit.bitstream": "Bitstream: ",
+  "bitstream.edit.bitstream": "تدفق البت: ",
 
   // "bitstream.edit.form.description.hint": "Optionally, provide a brief description of the file, for example \"<i>Main article</i>\" or \"<i>Experiment data readings</i>\".",
-  // TODO New key - Add a translation
-  "bitstream.edit.form.description.hint": "Optionally, provide a brief description of the file, for example \"<i>Main article</i>\" or \"<i>Experiment data readings</i>\".",
+  "bitstream.edit.form.description.hint": "اختيارياً، قم بتقديم وصف مختصر للملف، على سبيل المثال \"<i>المقال الرئيسي</i>\" أو \"<i>قراءات بيانات التجربة</i>\".",
 
   // "bitstream.edit.form.description.label": "Description",
-  // TODO New key - Add a translation
-  "bitstream.edit.form.description.label": "Description",
+  "bitstream.edit.form.description.label": "الوصف",
 
   // "bitstream.edit.form.embargo.hint": "The first day from which access is allowed. <b>This date cannot be modified on this form.</b> To set an embargo date for a bitstream, go to the <i>Item Status</i> tab, click <i>Authorizations...</i>, create or edit the bitstream's <i>READ</i> policy, and set the <i>Start Date</i> as desired.",
-  // TODO New key - Add a translation
-  "bitstream.edit.form.embargo.hint": "The first day from which access is allowed. <b>This date cannot be modified on this form.</b> To set an embargo date for a bitstream, go to the <i>Item Status</i> tab, click <i>Authorizations...</i>, create or edit the bitstream's <i>READ</i> policy, and set the <i>Start Date</i> as desired.",
+  "bitstream.edit.form.embargo.hint": "أول يوم يسمح منه الوصول. <b>لا يمكن تعديل هذا التاريخ في هذا النموذج.</b> لتعيين تاريخ حظر لتدفق بت، قم بالذهاب إلى تبويب <i> حالة المادة</i>، وقم بالنقر على <i>تصاريح...</i>، إنشاء أو تحرير سياسة <i>READ</i> الخاصة بتدفق البت، وتعيين <i> تاريخ البدء</i> حسب الرغبة.",
 
   // "bitstream.edit.form.embargo.label": "Embargo until specific date",
-  // TODO New key - Add a translation
-  "bitstream.edit.form.embargo.label": "Embargo until specific date",
+  "bitstream.edit.form.embargo.label": "حظر حتى تاريخ محدد",
 
   // "bitstream.edit.form.fileName.hint": "Change the filename for the bitstream. Note that this will change the display bitstream URL, but old links will still resolve as long as the sequence ID does not change.",
-  // TODO New key - Add a translation
-  "bitstream.edit.form.fileName.hint": "Change the filename for the bitstream. Note that this will change the display bitstream URL, but old links will still resolve as long as the sequence ID does not change.",
+  "bitstream.edit.form.fileName.hint": "تغيير اسم الملف لتدفق البت. لاحظ أن هذا سيؤدي إلى تغيير عنوان URL لدفق البت المعروض، لكن الروابط القديمة ستظل تحل طالما لم يتغير معرف التسلسل.",
 
   // "bitstream.edit.form.fileName.label": "Filename",
-  // TODO New key - Add a translation
-  "bitstream.edit.form.fileName.label": "Filename",
+  "bitstream.edit.form.fileName.label": "اسم الملف",
 
   // "bitstream.edit.form.newFormat.label": "Describe new format",
-  // TODO New key - Add a translation
-  "bitstream.edit.form.newFormat.label": "Describe new format",
+  "bitstream.edit.form.newFormat.label": "وصف التنسيق الجديد",
 
   // "bitstream.edit.form.newFormat.hint": "The application you used to create the file, and the version number (for example, \"<i>ACMESoft SuperApp version 1.5</i>\").",
-  // TODO New key - Add a translation
-  "bitstream.edit.form.newFormat.hint": "The application you used to create the file, and the version number (for example, \"<i>ACMESoft SuperApp version 1.5</i>\").",
+  "bitstream.edit.form.newFormat.hint": "التطبيق الذي قمت باستخدامه لإنشاء الملف، ورقم الإصدار (على سبيل المثال: \"<i>ACMESoft SuperApp الإصدار 1.5</i>\").",
 
-  // "bitstream.edit.form.primaryBitstream.label": "Primary bitstream",
-  // TODO New key - Add a translation
-  "bitstream.edit.form.primaryBitstream.label": "Primary bitstream",
+  // "bitstream.edit.form.primaryBitstream.label": "Primary File",
+  "bitstream.edit.form.primaryBitstream.label": "تدفق البت الرئيسي",
 
   // "bitstream.edit.form.selectedFormat.hint": "If the format is not in the above list, <b>select \"format not in list\" above</b> and describe it under \"Describe new format\".",
-  // TODO New key - Add a translation
-  "bitstream.edit.form.selectedFormat.hint": "If the format is not in the above list, <b>select \"format not in list\" above</b> and describe it under \"Describe new format\".",
+  "bitstream.edit.form.selectedFormat.hint": "إذا لم يكن التنسيق موجوداً في القائمة أعلاه، <b>قم بتحديد \"التنسيق غير موجود في القائمة\" أعلاه</b> وقم بوصفه أدنى  \"وصف تنسيق جديد\".",
 
   // "bitstream.edit.form.selectedFormat.label": "Selected Format",
-  // TODO New key - Add a translation
-  "bitstream.edit.form.selectedFormat.label": "Selected Format",
+  "bitstream.edit.form.selectedFormat.label": "التنسيق المحدد",
 
   // "bitstream.edit.form.selectedFormat.unknown": "Format not in list",
-  // TODO New key - Add a translation
-  "bitstream.edit.form.selectedFormat.unknown": "Format not in list",
+  "bitstream.edit.form.selectedFormat.unknown": "التنسيق غير موجود في القائمة",
 
   // "bitstream.edit.notifications.error.format.title": "An error occurred saving the bitstream's format",
-  // TODO New key - Add a translation
-  "bitstream.edit.notifications.error.format.title": "An error occurred saving the bitstream's format",
+  "bitstream.edit.notifications.error.format.title": "لقد حدث خطأ أثناء حفظ تنسيق تدفق البت",
+
+  // "bitstream.edit.notifications.error.primaryBitstream.title": "An error occurred saving the primary bitstream",
+  "bitstream.edit.notifications.error.primaryBitstream.title": "حدث خطأ أثناء حفظ تدفق البت الرئيسي",
+
+  // "bitstream.edit.form.iiifLabel.label": "IIIF Label",
+  "bitstream.edit.form.iiifLabel.label": "ملصق تسمية IIIF",
+
+  // "bitstream.edit.form.iiifLabel.hint": "Canvas label for this image. If not provided default label will be used.",
+  "bitstream.edit.form.iiifLabel.hint": "تسمية Canvas لهذه الصورة. إذا لم يتم توفير التسمية الافتراضية سيتم استخدامها.",
+
+  // "bitstream.edit.form.iiifToc.label": "IIIF Table of Contents",
+  "bitstream.edit.form.iiifToc.label": "جدول محتويات IIIF",
+
+  // "bitstream.edit.form.iiifToc.hint": "Adding text here makes this the start of a new table of contents range.",
+  "bitstream.edit.form.iiifToc.hint": "إن إضافة نص هنا تجعل هذا بداية لنطاق جدول محتويات جديد.",
+
+  // "bitstream.edit.form.iiifWidth.label": "IIIF Canvas Width",
+  "bitstream.edit.form.iiifWidth.label": "عرض IIIF Canvas",
+
+  // "bitstream.edit.form.iiifWidth.hint": "The canvas width should usually match the image width.",
+  "bitstream.edit.form.iiifWidth.hint": "يجب أن يتطابق عرض Canvas عادةً مع عرض الصورة.",
+
+  // "bitstream.edit.form.iiifHeight.label": "IIIF Canvas Height",
+  "bitstream.edit.form.iiifHeight.label": "ارتفاع Canvas IIIF",
+
+  // "bitstream.edit.form.iiifHeight.hint": "The canvas height should usually match the image height.",
+  "bitstream.edit.form.iiifHeight.hint": "يجب أن يتطابق ارتفاع Canvas عادةً مع ارتفاع الصورة.",
 
   // "bitstream.edit.notifications.saved.content": "Your changes to this bitstream were saved.",
-  // TODO New key - Add a translation
-  "bitstream.edit.notifications.saved.content": "Your changes to this bitstream were saved.",
+  "bitstream.edit.notifications.saved.content": "تم حفظ التغييرات التي أجريتها على تدفق البت هذا.",
 
   // "bitstream.edit.notifications.saved.title": "Bitstream saved",
-  // TODO New key - Add a translation
-  "bitstream.edit.notifications.saved.title": "Bitstream saved",
+  "bitstream.edit.notifications.saved.title": "تم حفظ تدفق البت",
 
   // "bitstream.edit.title": "Edit bitstream",
-  // TODO New key - Add a translation
-  "bitstream.edit.title": "Edit bitstream",
+  "bitstream.edit.title": "تحرير تدفق البت",
 
+  // "bitstream-request-a-copy.alert.canDownload1": "You already have access to this file. If you want to download the file, click ",
+  "bitstream-request-a-copy.alert.canDownload1": "لديك بالفعل حق الوصول إلى هذا الملف. إذا كنت تريد تنزيل الملف، انقر ",
 
+  // "bitstream-request-a-copy.alert.canDownload2": "here",
+  "bitstream-request-a-copy.alert.canDownload2": "هنا",
+
+  // "bitstream-request-a-copy.header": "Request a copy of the file",
+  "bitstream-request-a-copy.header": "طلب نسخة من الملف",
+
+  // "bitstream-request-a-copy.intro": "Enter the following information to request a copy for the following item: ",
+  "bitstream-request-a-copy.intro": "قم بإدخال المعلومات التالية لطلب نسخة للمادة التالية: ",
+
+  // "bitstream-request-a-copy.intro.bitstream.one": "Requesting the following file: ",
+  "bitstream-request-a-copy.intro.bitstream.one": "جاري طلب الملف التالي: ",
+
+  // "bitstream-request-a-copy.intro.bitstream.all": "Requesting all files. ",
+  "bitstream-request-a-copy.intro.bitstream.all": "طلب كل الملفات. ",
+
+  // "bitstream-request-a-copy.name.label": "Name *",
+  "bitstream-request-a-copy.name.label": "الاسم *",
+
+  // "bitstream-request-a-copy.name.error": "The name is required",
+  "bitstream-request-a-copy.name.error": "الاسم مطلوب",
+
+  // "bitstream-request-a-copy.email.label": "Your email address *",
+  "bitstream-request-a-copy.email.label": "عنوان بريدك  الإلكتروني *",
+
+  // "bitstream-request-a-copy.email.hint": "This email address is used for sending the file.",
+  "bitstream-request-a-copy.email.hint": "يتم استخدام عنوان هذا البريد الإلكتروني لإرسال الملف.",
+
+  // "bitstream-request-a-copy.email.error": "Please enter a valid email address.",
+  "bitstream-request-a-copy.email.error": "يرجى إدخال عنوان بريد إلكتروني صالح.",
+
+  // "bitstream-request-a-copy.allfiles.label": "Files",
+  "bitstream-request-a-copy.allfiles.label": "ملفات",
+
+  // "bitstream-request-a-copy.files-all-false.label": "Only the requested file",
+  "bitstream-request-a-copy.files-all-false.label": "الملف المطلوب فقط",
+
+  // "bitstream-request-a-copy.files-all-true.label": "All files (of this item) in restricted access",
+  "bitstream-request-a-copy.files-all-true.label": "كل الملفات (لهذه المادة) في الوصول المقيد",
+
+  // "bitstream-request-a-copy.message.label": "Message",
+  "bitstream-request-a-copy.message.label": "رسالة",
+
+  // "bitstream-request-a-copy.return": "Back",
+  "bitstream-request-a-copy.return": "رجوع",
+
+  // "bitstream-request-a-copy.submit": "Request copy",
+  "bitstream-request-a-copy.submit": "طلب نسخة",
+
+  // "bitstream-request-a-copy.submit.success": "The item request was submitted successfully.",
+  "bitstream-request-a-copy.submit.success": "تم تقديم طلب المادة بنجاح.",
+
+  // "bitstream-request-a-copy.submit.error": "Something went wrong with submitting the item request.",
+  "bitstream-request-a-copy.submit.error": "حدث خطأ ما أثناء تقديم طلب المادة.",
+
+  // "browse.back.all-results": "All browse results",
+  "browse.back.all-results": "جميع نتائج الاستعراض",
 
   // "browse.comcol.by.author": "By Author",
-  // TODO New key - Add a translation
-  "browse.comcol.by.author": "By Author",
+  "browse.comcol.by.author": "حسب المؤلف",
 
   // "browse.comcol.by.dateissued": "By Issue Date",
-  // TODO New key - Add a translation
-  "browse.comcol.by.dateissued": "By Issue Date",
+  "browse.comcol.by.dateissued": "حسب تاريخ الإصدار",
 
   // "browse.comcol.by.subject": "By Subject",
-  // TODO New key - Add a translation
-  "browse.comcol.by.subject": "By Subject",
+  "browse.comcol.by.subject": "حسب الموضوع",
+
+  // "browse.comcol.by.srsc": "By Subject Category",
+  "browse.comcol.by.srsc": "حسب فئة الموضوع",
+
+  // "browse.comcol.by.nsi": "By Norwegian Science Index",
+  "browse.comcol.by.nsi": "حسب فهرس العلوم النرويجي",
 
   // "browse.comcol.by.title": "By Title",
-  // TODO New key - Add a translation
-  "browse.comcol.by.title": "By Title",
+  "browse.comcol.by.title": "حسب العنوان",
 
   // "browse.comcol.head": "Browse",
-  // TODO New key - Add a translation
-  "browse.comcol.head": "Browse",
+  "browse.comcol.head": "استعراض",
 
   // "browse.empty": "No items to show.",
-  // TODO New key - Add a translation
-  "browse.empty": "No items to show.",
+  "browse.empty": "لا توجد مواد للعرض.",
 
   // "browse.metadata.author": "Author",
-  // TODO New key - Add a translation
-  "browse.metadata.author": "Author",
+  "browse.metadata.author": "المؤلف",
 
   // "browse.metadata.dateissued": "Issue Date",
-  // TODO New key - Add a translation
-  "browse.metadata.dateissued": "Issue Date",
+  "browse.metadata.dateissued": "تاريخ الإصدار",
 
   // "browse.metadata.subject": "Subject",
-  // TODO New key - Add a translation
-  "browse.metadata.subject": "Subject",
+  "browse.metadata.subject": "الموضوع",
 
   // "browse.metadata.title": "Title",
-  // TODO New key - Add a translation
-  "browse.metadata.title": "Title",
+  "browse.metadata.title": "العنوان",
+
+  // "browse.metadata.srsc": "Subject Category",
+  "browse.metadata.srsc": "فئة الموضوع",
 
   // "browse.metadata.author.breadcrumbs": "Browse by Author",
-  // TODO New key - Add a translation
-  "browse.metadata.author.breadcrumbs": "Browse by Author",
+  "browse.metadata.author.breadcrumbs": "استعراض حسب المؤلف",
 
   // "browse.metadata.dateissued.breadcrumbs": "Browse by Date",
-  // TODO New key - Add a translation
-  "browse.metadata.dateissued.breadcrumbs": "Browse by Date",
+  "browse.metadata.dateissued.breadcrumbs": "استعراض حسب التاريخ",
 
   // "browse.metadata.subject.breadcrumbs": "Browse by Subject",
-  // TODO New key - Add a translation
-  "browse.metadata.subject.breadcrumbs": "Browse by Subject",
+  "browse.metadata.subject.breadcrumbs": "استعراض حسب الموضوع",
+
+  // "browse.metadata.srsc.breadcrumbs": "Browse by Subject Category",
+  "browse.metadata.srsc.breadcrumbs": "استعراض حسب فئة الموضوع",
+
+  // "browse.metadata.nsi.breadcrumbs": "Browse by Norwegian Science Index",
+  "browse.metadata.nsi.breadcrumbs": "استعراض حسب فهرس العلوم النرويجي",
 
   // "browse.metadata.title.breadcrumbs": "Browse by Title",
-  // TODO New key - Add a translation
-  "browse.metadata.title.breadcrumbs": "Browse by Title",
+  "browse.metadata.title.breadcrumbs": "استعراض حسب العنوان",
+
+  // "pagination.next.button": "Next",
+  "pagination.next.button": "التالي",
+
+  // "pagination.previous.button": "Previous",
+  "pagination.previous.button": "السابق",
+
+  // "pagination.next.button.disabled.tooltip": "No more pages of results",
+  "pagination.next.button.disabled.tooltip": "لا مزيد من الصفحات من النتائج",
+
+  // "browse.startsWith": ", starting with {{ startsWith }}",
+  "browse.startsWith": ", يبدأ بـ {{ startsWith }}",
 
   // "browse.startsWith.choose_start": "(Choose start)",
-  // TODO New key - Add a translation
-  "browse.startsWith.choose_start": "(Choose start)",
+  "browse.startsWith.choose_start": "(اختر الشهر)",
 
   // "browse.startsWith.choose_year": "(Choose year)",
-  // TODO New key - Add a translation
-  "browse.startsWith.choose_year": "(Choose year)",
+  "browse.startsWith.choose_year": "(اختر السنة)",
 
-  // "browse.startsWith.jump": "Jump to a point in the index:",
-  // TODO New key - Add a translation
-  "browse.startsWith.jump": "Jump to a point in the index:",
+  // "browse.startsWith.choose_year.label": "Choose the issue year",
+  "browse.startsWith.choose_year.label": "اختر سنة الإصدار",
+
+  // "browse.startsWith.jump": "Filter results by year or month",
+  "browse.startsWith.jump": "تنقيح النتائج حسب السنة أو الشهر",
 
   // "browse.startsWith.months.april": "April",
-  // TODO New key - Add a translation
-  "browse.startsWith.months.april": "April",
+  "browse.startsWith.months.april": "أبريل",
 
   // "browse.startsWith.months.august": "August",
-  // TODO New key - Add a translation
-  "browse.startsWith.months.august": "August",
+  "browse.startsWith.months.august": "أغسطس",
 
   // "browse.startsWith.months.december": "December",
-  // TODO New key - Add a translation
-  "browse.startsWith.months.december": "December",
+  "browse.startsWith.months.december": "ديسمبر",
 
   // "browse.startsWith.months.february": "February",
-  // TODO New key - Add a translation
-  "browse.startsWith.months.february": "February",
+  "browse.startsWith.months.february": "فبراير",
 
   // "browse.startsWith.months.january": "January",
-  // TODO New key - Add a translation
-  "browse.startsWith.months.january": "January",
+  "browse.startsWith.months.january": "يناير",
 
   // "browse.startsWith.months.july": "July",
-  // TODO New key - Add a translation
-  "browse.startsWith.months.july": "July",
+  "browse.startsWith.months.july": "يوليو",
 
   // "browse.startsWith.months.june": "June",
-  // TODO New key - Add a translation
-  "browse.startsWith.months.june": "June",
+  "browse.startsWith.months.june": "يونيو",
 
   // "browse.startsWith.months.march": "March",
-  // TODO New key - Add a translation
-  "browse.startsWith.months.march": "March",
+  "browse.startsWith.months.march": "مارس",
 
   // "browse.startsWith.months.may": "May",
-  // TODO New key - Add a translation
-  "browse.startsWith.months.may": "May",
+  "browse.startsWith.months.may": "مايو",
 
   // "browse.startsWith.months.none": "(Choose month)",
-  // TODO New key - Add a translation
-  "browse.startsWith.months.none": "(Choose month)",
+  "browse.startsWith.months.none": "(اختر الشهر)",
+
+  // "browse.startsWith.months.none.label": "Choose the issue month",
+  "browse.startsWith.months.none.label": "اختر تاريخ الإصدار",
 
   // "browse.startsWith.months.november": "November",
-  // TODO New key - Add a translation
-  "browse.startsWith.months.november": "November",
+  "browse.startsWith.months.november": "نوفمبر",
 
   // "browse.startsWith.months.october": "October",
-  // TODO New key - Add a translation
-  "browse.startsWith.months.october": "October",
+  "browse.startsWith.months.october": "أكتوبر",
 
   // "browse.startsWith.months.september": "September",
-  // TODO New key - Add a translation
-  "browse.startsWith.months.september": "September",
+  "browse.startsWith.months.september": "سبتمبر",
 
-  // "browse.startsWith.submit": "Go",
-  // TODO New key - Add a translation
-  "browse.startsWith.submit": "Go",
+  // "browse.startsWith.submit": "Browse",
+  "browse.startsWith.submit": "استعراض",
 
-  // "browse.startsWith.type_date": "Or type in a date (year-month):",
-  // TODO New key - Add a translation
-  "browse.startsWith.type_date": "Or type in a date (year-month):",
+  // "browse.startsWith.type_date": "Filter results by date",
+  "browse.startsWith.type_date": "تنقيح النتائج حسب التاريخ",
 
-  // "browse.startsWith.type_text": "Or enter first few letters:",
-  // TODO New key - Add a translation
-  "browse.startsWith.type_text": "Or enter first few letters:",
+  // "browse.startsWith.type_date.label": "Or type in a date (year-month) and click on the Browse button",
+  "browse.startsWith.type_date.label": "أو قم بكتابة تاريخ (السنة - الشهر) والنقر على زر استعراض.",
 
-  // "browse.title": "Browsing {{ collection }} by {{ field }} {{ value }}",
-  // TODO New key - Add a translation
-  "browse.title": "Browsing {{ collection }} by {{ field }} {{ value }}",
+  // "browse.startsWith.type_text": "Filter results by typing the first few letters",
+  "browse.startsWith.type_text": "تنقيح النتائج عن طريق كتابة الأحرف الأولى",
 
+  // "browse.startsWith.input": "Filter",
+  "browse.startsWith.input": "منقح",
+
+  // "browse.taxonomy.button": "Browse",
+  "browse.taxonomy.button": "استعراض",
+
+  // "browse.title": "Browsing by {{ field }}{{ startsWith }} {{ value }}",
+  "browse.title": "استعراض حسب {{ field }}{{ startsWith }} {{ value }}",
+
+  // "browse.title.page": "Browsing by {{ field }} {{ value }}",
+  "browse.title.page": "استعراض حسب {{ field }} {{ value }}",
+
+  // "search.browse.item-back": "Back to Results",
+  "search.browse.item-back": "العودة إلى النتائج",
 
   // "chips.remove": "Remove chip",
-  // TODO New key - Add a translation
-  "chips.remove": "Remove chip",
+  "chips.remove": "إزالة الشريحة",
 
+  // "claimed-approved-search-result-list-element.title": "Approved",
+  "claimed-approved-search-result-list-element.title": "مقبول",
 
+  // "claimed-declined-search-result-list-element.title": "Rejected, sent back to submitter",
+  "claimed-declined-search-result-list-element.title": "تم الرفض، وتمت الإعادة إلى مقدم الطلب",
+
+  // "claimed-declined-task-search-result-list-element.title": "Declined, sent back to Review Manager's workflow",
+  "claimed-declined-task-search-result-list-element.title": "تم الرفض، وتمت الإعادة إلى سير عمل مدير المراجعة",
+
+  // "collection.browse.logo": "Browse for a collection logo",
+  "collection.browse.logo": "استعراض للحصول على شعار للحاوية",
 
   // "collection.create.head": "Create a Collection",
-  // TODO New key - Add a translation
-  "collection.create.head": "Create a Collection",
+  "collection.create.head": "إنشاء حاوية",
 
   // "collection.create.notifications.success": "Successfully created the Collection",
-  // TODO New key - Add a translation
-  "collection.create.notifications.success": "Successfully created the Collection",
+  "collection.create.notifications.success": "تم إنشاء الحاوية بنجاح",
 
   // "collection.create.sub-head": "Create a Collection for Community {{ parent }}",
-  // TODO New key - Add a translation
-  "collection.create.sub-head": "Create a Collection for Community {{ parent }}",
+  "collection.create.sub-head": "إنشاء حاوية للمجتمع {{ parent }}",
 
   // "collection.curate.header": "Curate Collection: {{collection}}",
-  // TODO New key - Add a translation
-  "collection.curate.header": "Curate Collection: {{collection}}",
+  "collection.curate.header": "أكرتة الحاوية: {{collection}}",
 
   // "collection.delete.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "collection.delete.cancel": "Cancel",
+  "collection.delete.cancel": "إلغاء",
 
   // "collection.delete.confirm": "Confirm",
-  // TODO New key - Add a translation
-  "collection.delete.confirm": "Confirm",
+  "collection.delete.confirm": "تأكيد",
+
+  // "collection.delete.processing": "Deleting",
+  "collection.delete.processing": "جاري الحذف",
 
   // "collection.delete.head": "Delete Collection",
-  // TODO New key - Add a translation
-  "collection.delete.head": "Delete Collection",
+  "collection.delete.head": "حذف الحاوية",
 
   // "collection.delete.notification.fail": "Collection could not be deleted",
-  // TODO New key - Add a translation
-  "collection.delete.notification.fail": "Collection could not be deleted",
+  "collection.delete.notification.fail": "تعذر حف الحاوية",
 
   // "collection.delete.notification.success": "Successfully deleted collection",
-  // TODO New key - Add a translation
-  "collection.delete.notification.success": "Successfully deleted collection",
+  "collection.delete.notification.success": "تم حذف الحاوية بنجاح",
 
   // "collection.delete.text": "Are you sure you want to delete collection \"{{ dso }}\"",
-  // TODO New key - Add a translation
-  "collection.delete.text": "Are you sure you want to delete collection \"{{ dso }}\"",
-
-
+  "collection.delete.text": "هل أنت متأكد من أنك تريد حذف الحاوية \"{{ dso }}\"",
 
   // "collection.edit.delete": "Delete this collection",
-  // TODO New key - Add a translation
-  "collection.edit.delete": "Delete this collection",
+  "collection.edit.delete": "حذف هذه الحاوية",
 
   // "collection.edit.head": "Edit Collection",
-  // TODO New key - Add a translation
-  "collection.edit.head": "Edit Collection",
+  "collection.edit.head": "تحرير الحاوية",
 
   // "collection.edit.breadcrumbs": "Edit Collection",
-  // TODO New key - Add a translation
-  "collection.edit.breadcrumbs": "Edit Collection",
-
-
+  "collection.edit.breadcrumbs": "تحرير الحاوية",
 
   // "collection.edit.tabs.mapper.head": "Item Mapper",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.mapper.head": "Item Mapper",
+  "collection.edit.tabs.mapper.head": "مخطط المادة",
 
   // "collection.edit.tabs.item-mapper.title": "Collection Edit - Item Mapper",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.item-mapper.title": "Collection Edit - Item Mapper",
+  "collection.edit.tabs.item-mapper.title": "تحرير الحاوية - مخطط المادة",
 
   // "collection.edit.item-mapper.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "collection.edit.item-mapper.cancel": "Cancel",
+  "collection.edit.item-mapper.cancel": "إلغاء",
 
   // "collection.edit.item-mapper.collection": "Collection: \"<b>{{name}}</b>\"",
-  // TODO New key - Add a translation
-  "collection.edit.item-mapper.collection": "Collection: \"<b>{{name}}</b>\"",
+  "collection.edit.item-mapper.collection": "الحاوية: \"<b>{{name}}</b>\"",
 
   // "collection.edit.item-mapper.confirm": "Map selected items",
-  // TODO New key - Add a translation
-  "collection.edit.item-mapper.confirm": "Map selected items",
+  "collection.edit.item-mapper.confirm": "تخطيط المواد المحددة",
 
   // "collection.edit.item-mapper.description": "This is the item mapper tool that allows collection administrators to map items from other collections into this collection. You can search for items from other collections and map them, or browse the list of currently mapped items.",
-  // TODO New key - Add a translation
-  "collection.edit.item-mapper.description": "This is the item mapper tool that allows collection administrators to map items from other collections into this collection. You can search for items from other collections and map them, or browse the list of currently mapped items.",
+  "collection.edit.item-mapper.description": "هذه هي أداة مخطط المادة والتي تتيح لمديري الحاوية بتخطيط مواد من حاويات أخرى إلى هذه الحاوية. يمكنك البحث عن مواد من حاويات أخرى وتخطيطها، أو استعراض قائمة بالمواد المخططة حاليًا.",
 
   // "collection.edit.item-mapper.head": "Item Mapper - Map Items from Other Collections",
-  // TODO New key - Add a translation
-  "collection.edit.item-mapper.head": "Item Mapper - Map Items from Other Collections",
+  "collection.edit.item-mapper.head": "مخطط المادة - تخطيط مواد من حاويات أخرى",
 
   // "collection.edit.item-mapper.no-search": "Please enter a query to search",
-  // TODO New key - Add a translation
-  "collection.edit.item-mapper.no-search": "Please enter a query to search",
+  "collection.edit.item-mapper.no-search": "يرجى إدخال استعلام للبحث",
 
   // "collection.edit.item-mapper.notifications.map.error.content": "Errors occurred for mapping of {{amount}} items.",
-  // TODO New key - Add a translation
-  "collection.edit.item-mapper.notifications.map.error.content": "Errors occurred for mapping of {{amount}} items.",
+  "collection.edit.item-mapper.notifications.map.error.content": "حدثت أخطاء أثناء تخطيط {{amount}} مادة.",
 
   // "collection.edit.item-mapper.notifications.map.error.head": "Mapping errors",
-  // TODO New key - Add a translation
-  "collection.edit.item-mapper.notifications.map.error.head": "Mapping errors",
+  "collection.edit.item-mapper.notifications.map.error.head": "أخطاء التخطيط",
 
   // "collection.edit.item-mapper.notifications.map.success.content": "Successfully mapped {{amount}} items.",
-  // TODO New key - Add a translation
-  "collection.edit.item-mapper.notifications.map.success.content": "Successfully mapped {{amount}} items.",
+  "collection.edit.item-mapper.notifications.map.success.content": "تم تخطيط {{amount}} مادة بنجاح.",
 
   // "collection.edit.item-mapper.notifications.map.success.head": "Mapping completed",
-  // TODO New key - Add a translation
-  "collection.edit.item-mapper.notifications.map.success.head": "Mapping completed",
+  "collection.edit.item-mapper.notifications.map.success.head": "اكتمل التخطيط",
 
   // "collection.edit.item-mapper.notifications.unmap.error.content": "Errors occurred for removing the mappings of {{amount}} items.",
-  // TODO New key - Add a translation
-  "collection.edit.item-mapper.notifications.unmap.error.content": "Errors occurred for removing the mappings of {{amount}} items.",
+  "collection.edit.item-mapper.notifications.unmap.error.content": "حدثت أخطأ أثناء إزالة تخطيطات {{amount}} مادة.",
 
   // "collection.edit.item-mapper.notifications.unmap.error.head": "Remove mapping errors",
-  // TODO New key - Add a translation
-  "collection.edit.item-mapper.notifications.unmap.error.head": "Remove mapping errors",
+  "collection.edit.item-mapper.notifications.unmap.error.head": "أخطاء إزالة التخطيط",
 
   // "collection.edit.item-mapper.notifications.unmap.success.content": "Successfully removed the mappings of {{amount}} items.",
-  // TODO New key - Add a translation
-  "collection.edit.item-mapper.notifications.unmap.success.content": "Successfully removed the mappings of {{amount}} items.",
+  "collection.edit.item-mapper.notifications.unmap.success.content": "تمت إزالة {{amount}} تخطيط مادة بنجاح.",
 
   // "collection.edit.item-mapper.notifications.unmap.success.head": "Remove mapping completed",
-  // TODO New key - Add a translation
-  "collection.edit.item-mapper.notifications.unmap.success.head": "Remove mapping completed",
+  "collection.edit.item-mapper.notifications.unmap.success.head": "اكتملت إزالة التخطيط",
 
   // "collection.edit.item-mapper.remove": "Remove selected item mappings",
-  // TODO New key - Add a translation
-  "collection.edit.item-mapper.remove": "Remove selected item mappings",
+  "collection.edit.item-mapper.remove": "إزالة تخطيطات المادة المحددة",
+
+  // "collection.edit.item-mapper.search-form.placeholder": "Search items...",
+  "collection.edit.item-mapper.search-form.placeholder": "بحث المواد...",
 
   // "collection.edit.item-mapper.tabs.browse": "Browse mapped items",
-  // TODO New key - Add a translation
-  "collection.edit.item-mapper.tabs.browse": "Browse mapped items",
+  "collection.edit.item-mapper.tabs.browse": "استعراض المواد المخططة",
 
   // "collection.edit.item-mapper.tabs.map": "Map new items",
-  // TODO New key - Add a translation
-  "collection.edit.item-mapper.tabs.map": "Map new items",
+  "collection.edit.item-mapper.tabs.map": "تخطيط مواد جديدة",
 
+  // "collection.edit.logo.delete.title": "Delete logo",
+  "collection.edit.logo.delete.title": "حذف الشعار",
 
+  // "collection.edit.logo.delete-undo.title": "Undo delete",
+  "collection.edit.logo.delete-undo.title": "التراجع عن الحذف",
 
   // "collection.edit.logo.label": "Collection logo",
-  // TODO New key - Add a translation
-  "collection.edit.logo.label": "Collection logo",
+  "collection.edit.logo.label": "شعار الحاوية",
 
   // "collection.edit.logo.notifications.add.error": "Uploading Collection logo failed. Please verify the content before retrying.",
-  // TODO New key - Add a translation
-  "collection.edit.logo.notifications.add.error": "Uploading Collection logo failed. Please verify the content before retrying.",
+  "collection.edit.logo.notifications.add.error": "فشل تحميل شعار الحاوية. يرجى التحقق من المحتوى قبل إعادة المحاولة.",
 
   // "collection.edit.logo.notifications.add.success": "Upload Collection logo successful.",
-  // TODO New key - Add a translation
-  "collection.edit.logo.notifications.add.success": "Upload Collection logo successful.",
+  "collection.edit.logo.notifications.add.success": "تم تحميل شعار الحاوية بنجاح.",
 
   // "collection.edit.logo.notifications.delete.success.title": "Logo deleted",
-  // TODO New key - Add a translation
-  "collection.edit.logo.notifications.delete.success.title": "Logo deleted",
+  "collection.edit.logo.notifications.delete.success.title": "تم حذف الشعار",
 
   // "collection.edit.logo.notifications.delete.success.content": "Successfully deleted the collection's logo",
-  // TODO New key - Add a translation
-  "collection.edit.logo.notifications.delete.success.content": "Successfully deleted the collection's logo",
+  "collection.edit.logo.notifications.delete.success.content": "تم حذف شعار الحاوية بنجاح",
 
   // "collection.edit.logo.notifications.delete.error.title": "Error deleting logo",
-  // TODO New key - Add a translation
-  "collection.edit.logo.notifications.delete.error.title": "Error deleting logo",
+  "collection.edit.logo.notifications.delete.error.title": "حدث خطأ أثناء حذف الشعار",
 
   // "collection.edit.logo.upload": "Drop a Collection Logo to upload",
-  // TODO New key - Add a translation
-  "collection.edit.logo.upload": "Drop a Collection Logo to upload",
-
-
+  "collection.edit.logo.upload": "قم بإسقاط شعار الحاوية للتحميل",
 
   // "collection.edit.notifications.success": "Successfully edited the Collection",
-  // TODO New key - Add a translation
-  "collection.edit.notifications.success": "Successfully edited the Collection",
+  "collection.edit.notifications.success": "تم تحرير الحاوية بنجاح",
 
-  // "collection.edit.return": "Return",
-  // TODO New key - Add a translation
-  "collection.edit.return": "Return",
+  // "collection.edit.return": "Back",
+  "collection.edit.return": "رجوع",
 
+  // "collection.edit.tabs.access-control.head": "Access Control",
+  "collection.edit.tabs.access-control.head": "التحكم في الوصول",
 
+  // "collection.edit.tabs.access-control.title": "Collection Edit - Access Control",
+  "collection.edit.tabs.access-control.title": "تحرير الحاوية - التحكم في الوصول",
 
   // "collection.edit.tabs.curate.head": "Curate",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.curate.head": "Curate",
+  "collection.edit.tabs.curate.head": "أكرتة",
 
   // "collection.edit.tabs.curate.title": "Collection Edit - Curate",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.curate.title": "Collection Edit - Curate",
+  "collection.edit.tabs.curate.title": "تحرير الحاوية - أكرتة",
 
   // "collection.edit.tabs.authorizations.head": "Authorizations",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.authorizations.head": "Authorizations",
+  "collection.edit.tabs.authorizations.head": "تصاريح",
 
   // "collection.edit.tabs.authorizations.title": "Collection Edit - Authorizations",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.authorizations.title": "Collection Edit - Authorizations",
+  "collection.edit.tabs.authorizations.title": "تحرير الحاوية - تصاريح",
+
+  // "collection.edit.item.authorizations.load-bundle-button": "Load more bundles",
+  "collection.edit.item.authorizations.load-bundle-button": "تحميل المزيد من الحزم",
+
+  // "collection.edit.item.authorizations.load-more-button": "Load more",
+  "collection.edit.item.authorizations.load-more-button": "تحميل المزيد",
+
+  // "collection.edit.item.authorizations.show-bitstreams-button": "Show bitstream policies for bundle",
+  "collection.edit.item.authorizations.show-bitstreams-button": "عرض سياسات تدفق البت للحزمة",
 
   // "collection.edit.tabs.metadata.head": "Edit Metadata",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.metadata.head": "Edit Metadata",
+  "collection.edit.tabs.metadata.head": "تحرير الميتاداتا",
 
   // "collection.edit.tabs.metadata.title": "Collection Edit - Metadata",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.metadata.title": "Collection Edit - Metadata",
+  "collection.edit.tabs.metadata.title": "تحرير الحاوية - الميتاداتا",
 
   // "collection.edit.tabs.roles.head": "Assign Roles",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.roles.head": "Assign Roles",
+  "collection.edit.tabs.roles.head": "تعيين الأدوار",
 
   // "collection.edit.tabs.roles.title": "Collection Edit - Roles",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.roles.title": "Collection Edit - Roles",
+  "collection.edit.tabs.roles.title": "تحرير الحاوية - الأدوار",
 
   // "collection.edit.tabs.source.external": "This collection harvests its content from an external source",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.source.external": "This collection harvests its content from an external source",
+  "collection.edit.tabs.source.external": "تقوم هذه الحاوية بحصاد محتواها من مصدر خارجي",
 
   // "collection.edit.tabs.source.form.errors.oaiSource.required": "You must provide a set id of the target collection.",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.source.form.errors.oaiSource.required": "You must provide a set id of the target collection.",
+  "collection.edit.tabs.source.form.errors.oaiSource.required": "يجب عليك تقديم معرف حزمة للحاوية المستهدفة.",
 
   // "collection.edit.tabs.source.form.harvestType": "Content being harvested",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.source.form.harvestType": "Content being harvested",
+  "collection.edit.tabs.source.form.harvestType": "المحتوى الجاري حصاده",
 
   // "collection.edit.tabs.source.form.head": "Configure an external source",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.source.form.head": "Configure an external source",
+  "collection.edit.tabs.source.form.head": "تهيئة مصدر خارجي",
 
   // "collection.edit.tabs.source.form.metadataConfigId": "Metadata Format",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.source.form.metadataConfigId": "Metadata Format",
+  "collection.edit.tabs.source.form.metadataConfigId": "تنسيق الميتاداتا",
 
   // "collection.edit.tabs.source.form.oaiSetId": "OAI specific set id",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.source.form.oaiSetId": "OAI specific set id",
+  "collection.edit.tabs.source.form.oaiSetId": "معرف حزمة محددة لمبادرة الأرشيفات المفتوحة",
 
   // "collection.edit.tabs.source.form.oaiSource": "OAI Provider",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.source.form.oaiSource": "OAI Provider",
+  "collection.edit.tabs.source.form.oaiSource": "مقدم خدمة مبادرة الأرشيفات المفتوحة",
 
   // "collection.edit.tabs.source.form.options.harvestType.METADATA_AND_BITSTREAMS": "Harvest metadata and bitstreams (requires ORE support)",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.source.form.options.harvestType.METADATA_AND_BITSTREAMS": "Harvest metadata and bitstreams (requires ORE support)",
+  "collection.edit.tabs.source.form.options.harvestType.METADATA_AND_BITSTREAMS": "حصاد الميتاداتا وتدفقات البت (يتطلب دعم ORE)",
 
   // "collection.edit.tabs.source.form.options.harvestType.METADATA_AND_REF": "Harvest metadata and references to bitstreams (requires ORE support)",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.source.form.options.harvestType.METADATA_AND_REF": "Harvest metadata and references to bitstreams (requires ORE support)",
+  "collection.edit.tabs.source.form.options.harvestType.METADATA_AND_REF": "حصاد الميتاداتا والمراجع إلى تدفقات البت (يتطلب دعم ORE)",
 
   // "collection.edit.tabs.source.form.options.harvestType.METADATA_ONLY": "Harvest metadata only",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.source.form.options.harvestType.METADATA_ONLY": "Harvest metadata only",
+  "collection.edit.tabs.source.form.options.harvestType.METADATA_ONLY": "حصاد الميتاداتا فقط",
 
   // "collection.edit.tabs.source.head": "Content Source",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.source.head": "Content Source",
+  "collection.edit.tabs.source.head": "مصدر المحتوى",
 
   // "collection.edit.tabs.source.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.source.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button",
+  "collection.edit.tabs.source.notifications.discarded.content": "تم تجاهل تغييراتك. لإعادة تعيين تغييراتك قم النقر على زر 'تراجع'",
 
-  // "collection.edit.tabs.source.notifications.discarded.title": "Changed discarded",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.source.notifications.discarded.title": "Changed discarded",
+  // "collection.edit.tabs.source.notifications.discarded.title": "Changes discarded",
+  "collection.edit.tabs.source.notifications.discarded.title": "تم تجاهل التغييرات",
 
   // "collection.edit.tabs.source.notifications.invalid.content": "Your changes were not saved. Please make sure all fields are valid before you save.",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.source.notifications.invalid.content": "Your changes were not saved. Please make sure all fields are valid before you save.",
+  "collection.edit.tabs.source.notifications.invalid.content": "لم يتم حفظ تغييراتك. يرجى التأكد من صحة كل الحقول قبل الحفظ.",
 
   // "collection.edit.tabs.source.notifications.invalid.title": "Metadata invalid",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.source.notifications.invalid.title": "Metadata invalid",
+  "collection.edit.tabs.source.notifications.invalid.title": "الميتاداتا غير صالحة",
 
   // "collection.edit.tabs.source.notifications.saved.content": "Your changes to this collection's content source were saved.",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.source.notifications.saved.content": "Your changes to this collection's content source were saved.",
+  "collection.edit.tabs.source.notifications.saved.content": "تم حفظ تغييراتك على مصدر محتوى هذه الحاوية.",
 
   // "collection.edit.tabs.source.notifications.saved.title": "Content Source saved",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.source.notifications.saved.title": "Content Source saved",
+  "collection.edit.tabs.source.notifications.saved.title": "تم حفظ مصدر المحتوى",
 
   // "collection.edit.tabs.source.title": "Collection Edit - Content Source",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.source.title": "Collection Edit - Content Source",
-
-
+  "collection.edit.tabs.source.title": "تحرير الحاوية - مصدر المحتوى",
 
   // "collection.edit.template.add-button": "Add",
-  // TODO New key - Add a translation
-  "collection.edit.template.add-button": "Add",
+  "collection.edit.template.add-button": "إضافة",
 
   // "collection.edit.template.breadcrumbs": "Item template",
-  // TODO New key - Add a translation
-  "collection.edit.template.breadcrumbs": "Item template",
+  "collection.edit.template.breadcrumbs": "قالب المادة",
 
   // "collection.edit.template.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "collection.edit.template.cancel": "Cancel",
+  "collection.edit.template.cancel": "إلغاء",
 
   // "collection.edit.template.delete-button": "Delete",
-  // TODO New key - Add a translation
-  "collection.edit.template.delete-button": "Delete",
+  "collection.edit.template.delete-button": "حذف",
 
   // "collection.edit.template.edit-button": "Edit",
-  // TODO New key - Add a translation
-  "collection.edit.template.edit-button": "Edit",
+  "collection.edit.template.edit-button": "تحرير",
+
+  // "collection.edit.template.error": "An error occurred retrieving the template item",
+  "collection.edit.template.error": "حدث خطأ أثناء استرداد عنصر القالب",
 
   // "collection.edit.template.head": "Edit Template Item for Collection \"{{ collection }}\"",
-  // TODO New key - Add a translation
-  "collection.edit.template.head": "Edit Template Item for Collection \"{{ collection }}\"",
+  "collection.edit.template.head": "تحرير عنصر القالب للحاوية \"{{ collection }}\"",
 
   // "collection.edit.template.label": "Template item",
-  // TODO New key - Add a translation
-  "collection.edit.template.label": "Template item",
+  "collection.edit.template.label": "عنصر القالب",
+
+  // "collection.edit.template.loading": "Loading template item...",
+  "collection.edit.template.loading": "جاري تحميل عنصر القالب...",
 
   // "collection.edit.template.notifications.delete.error": "Failed to delete the item template",
-  // TODO New key - Add a translation
-  "collection.edit.template.notifications.delete.error": "Failed to delete the item template",
+  "collection.edit.template.notifications.delete.error": "فشل حذف قالب المادة",
 
   // "collection.edit.template.notifications.delete.success": "Successfully deleted the item template",
-  // TODO New key - Add a translation
-  "collection.edit.template.notifications.delete.success": "Successfully deleted the item template",
+  "collection.edit.template.notifications.delete.success": "تم حذف قالب المادة بنجاح",
 
   // "collection.edit.template.title": "Edit Template Item",
-  // TODO New key - Add a translation
-  "collection.edit.template.title": "Edit Template Item",
-
-
+  "collection.edit.template.title": "تحرير عنصر القالب",
 
   // "collection.form.abstract": "Short Description",
-  // TODO New key - Add a translation
-  "collection.form.abstract": "Short Description",
+  "collection.form.abstract": "وصف مختصر",
 
   // "collection.form.description": "Introductory text (HTML)",
-  // TODO New key - Add a translation
-  "collection.form.description": "Introductory text (HTML)",
+  "collection.form.description": "نص تمهيدي (HTML)",
 
   // "collection.form.errors.title.required": "Please enter a collection name",
-  // TODO New key - Add a translation
-  "collection.form.errors.title.required": "Please enter a collection name",
+  "collection.form.errors.title.required": "يرجى إدخال اسم الحاوية",
 
   // "collection.form.license": "License",
-  // TODO New key - Add a translation
-  "collection.form.license": "License",
+  "collection.form.license": "الترخيص",
 
   // "collection.form.provenance": "Provenance",
-  // TODO New key - Add a translation
-  "collection.form.provenance": "Provenance",
+  "collection.form.provenance": "المنشأ",
 
   // "collection.form.rights": "Copyright text (HTML)",
-  // TODO New key - Add a translation
-  "collection.form.rights": "Copyright text (HTML)",
+  "collection.form.rights": "نص حقوق النشر (HTML)",
 
   // "collection.form.tableofcontents": "News (HTML)",
-  // TODO New key - Add a translation
-  "collection.form.tableofcontents": "News (HTML)",
+  "collection.form.tableofcontents": "الأخبار (HTML)",
 
   // "collection.form.title": "Name",
-  // TODO New key - Add a translation
-  "collection.form.title": "Name",
-
+  "collection.form.title": "الاسم",
 
+  // "collection.form.entityType": "Entity Type",
+  "collection.form.entityType": "نوع الكينونة",
 
   // "collection.listelement.badge": "Collection",
+  "collection.listelement.badge": "الحاوية",
+
+  // "collection.logo": "Collection logo",
+  "collection.logo": "شعار الحاوية",
+
+  // "collection.page.browse.search.head": "Search",
   // TODO New key - Add a translation
-  "collection.listelement.badge": "Collection",
-
-
-
-  // "collection.page.browse.recent.head": "Recent Submissions",
-  // TODO New key - Add a translation
-  "collection.page.browse.recent.head": "Recent Submissions",
-
-  // "collection.page.browse.recent.empty": "No items to show",
-  // TODO New key - Add a translation
-  "collection.page.browse.recent.empty": "No items to show",
+  "collection.page.browse.search.head": "Search",
 
   // "collection.page.edit": "Edit this collection",
-  // TODO New key - Add a translation
-  "collection.page.edit": "Edit this collection",
+  "collection.page.edit": "تحرير هذه الحاوية",
 
   // "collection.page.handle": "Permanent URI for this collection",
-  // TODO New key - Add a translation
-  "collection.page.handle": "Permanent URI for this collection",
+  "collection.page.handle": "URI الدائم لهذه الحاوية",
 
   // "collection.page.license": "License",
-  // TODO New key - Add a translation
-  "collection.page.license": "License",
+  "collection.page.license": "الترخيص",
 
   // "collection.page.news": "News",
+  "collection.page.news": "الأخبار",
+
+  // "collection.search.results.head": "Search Results",
   // TODO New key - Add a translation
-  "collection.page.news": "News",
-
-
+  "collection.search.results.head": "Search Results",
 
   // "collection.select.confirm": "Confirm selected",
-  // TODO New key - Add a translation
-  "collection.select.confirm": "Confirm selected",
+  "collection.select.confirm": "تأكيد المحدد",
 
   // "collection.select.empty": "No collections to show",
-  // TODO New key - Add a translation
-  "collection.select.empty": "No collections to show",
+  "collection.select.empty": "لا توجد حاويات للعرض",
+
+  // "collection.select.table.selected": "Selected collections",
+  "collection.select.table.selected": "الحاويات المحددة",
+
+  // "collection.select.table.select": "Select collection",
+  "collection.select.table.select": "تحديد حاوية",
+
+  // "collection.select.table.deselect": "Deselect collection",
+  "collection.select.table.deselect": "إلغاء تحديد حاوية",
 
   // "collection.select.table.title": "Title",
-  // TODO New key - Add a translation
-  "collection.select.table.title": "Title",
+  "collection.select.table.title": "العنوان",
 
+  // "collection.source.controls.head": "Harvest Controls",
+  "collection.source.controls.head": "إعدادات التحكم في الحصاد",
 
+  // "collection.source.controls.test.submit.error": "Something went wrong with initiating the testing of the settings",
+  "collection.source.controls.test.submit.error": "حدث خطأ ما أثناء بدء اختبار الإعدادات",
+
+  // "collection.source.controls.test.failed": "The script to test the settings has failed",
+  "collection.source.controls.test.failed": "فشل البرنامج النصي لاختبار الإعدادات",
+
+  // "collection.source.controls.test.completed": "The script to test the settings has successfully finished",
+  "collection.source.controls.test.completed": "انتهى البرنامج النصي لاختبار الإعدادات بنجاح",
+
+  // "collection.source.controls.test.submit": "Test configuration",
+  "collection.source.controls.test.submit": "اختبار التهيئة",
+
+  // "collection.source.controls.test.running": "Testing configuration...",
+  "collection.source.controls.test.running": "جاري اختبار التهيئة...",
+
+  // "collection.source.controls.import.submit.success": "The import has been successfully initiated",
+  "collection.source.controls.import.submit.success": "تم بدء الاستيراد بنجاح",
+
+  // "collection.source.controls.import.submit.error": "Something went wrong with initiating the import",
+  "collection.source.controls.import.submit.error": "حدث خطأ ما أثناء بدء الاستيراد",
+
+  // "collection.source.controls.import.submit": "Import now",
+  "collection.source.controls.import.submit": "استيراد الآن",
+
+  // "collection.source.controls.import.running": "Importing...",
+  "collection.source.controls.import.running": "جاري الاستيراد...",
+
+  // "collection.source.controls.import.failed": "An error occurred during the import",
+  "collection.source.controls.import.failed": "حدث خطأ أثناء الاستيراد",
+
+  // "collection.source.controls.import.completed": "The import completed",
+  "collection.source.controls.import.completed": "اكتمل الاستيراد",
+
+  // "collection.source.controls.reset.submit.success": "The reset and reimport has been successfully initiated",
+  "collection.source.controls.reset.submit.success": "تم بدء عملية إعادة التعيين وإعادة الاستيراد بنجاح",
+
+  // "collection.source.controls.reset.submit.error": "Something went wrong with initiating the reset and reimport",
+  "collection.source.controls.reset.submit.error": "حدث خطأ ما أثناء بدء إعادة التعيين وإعادة الاستيراد",
+
+  // "collection.source.controls.reset.failed": "An error occurred during the reset and reimport",
+  "collection.source.controls.reset.failed": "حدث خطأ أثناء إعادة التعيين وإعادة الاستيراد",
+
+  // "collection.source.controls.reset.completed": "The reset and reimport completed",
+  "collection.source.controls.reset.completed": "اكتملت عملية إعادة التعيين وإعادة الاستيراد",
+
+  // "collection.source.controls.reset.submit": "Reset and reimport",
+  "collection.source.controls.reset.submit": "إعادة تعيين وإعادة استيراد",
+
+  // "collection.source.controls.reset.running": "Resetting and reimporting...",
+  "collection.source.controls.reset.running": "جاري إعادة التعيين وإعادة الاستيراد...",
+
+  // "collection.source.controls.harvest.status": "Harvest status:",
+  "collection.source.controls.harvest.status": "حالة الحصاد:",
+
+  // "collection.source.controls.harvest.start": "Harvest start time:",
+  "collection.source.controls.harvest.start": "وقت بدء الحصاد:",
+
+  // "collection.source.controls.harvest.last": "Last time harvested:",
+  "collection.source.controls.harvest.last": "آخر مرة تم الحصاد:",
+
+  // "collection.source.controls.harvest.message": "Harvest info:",
+  "collection.source.controls.harvest.message": "معلومات الحصاد:",
+
+  // "collection.source.controls.harvest.no-information": "N/A",
+  "collection.source.controls.harvest.no-information": "غير قابل للتطبيق",
 
   // "collection.source.update.notifications.error.content": "The provided settings have been tested and didn't work.",
-  // TODO New key - Add a translation
-  "collection.source.update.notifications.error.content": "The provided settings have been tested and didn't work.",
+  "collection.source.update.notifications.error.content": "تم اختبار الإعدادات المتوفرة ولم تعملk.",
 
   // "collection.source.update.notifications.error.title": "Server Error",
-  // TODO New key - Add a translation
-  "collection.source.update.notifications.error.title": "Server Error",
+  "collection.source.update.notifications.error.title": "خطأ في الخادم",
 
+  // "communityList.breadcrumbs": "Community List",
+  "communityList.breadcrumbs": "قائمة المجتمعات",
 
-
-  // "communityList.tabTitle": "DSpace - Community List",
-  // TODO New key - Add a translation
-  "communityList.tabTitle": "DSpace - Community List",
+  // "communityList.tabTitle": "Community List",
+  "communityList.tabTitle": "قائمة المجتمعات",
 
   // "communityList.title": "List of Communities",
-  // TODO New key - Add a translation
-  "communityList.title": "List of Communities",
+  "communityList.title": "قائمة المجتمعات",
 
   // "communityList.showMore": "Show More",
+  "communityList.showMore": "عرض المزيد",
+
+  // "communityList.expand": "Expand {{ name }}",
+  "communityList.expand": "توسيع {{ name }}",
+
+  // "communityList.collapse": "Collapse {{ name }}",
+  "communityList.collapse": "طي {{ name }}",
+
+  // "community.browse.logo": "Browse for a community logo",
+  "community.browse.logo": "استعراض للحصول على شعار المجتمع",
+
+  // "community.subcoms-cols.breadcrumbs": "Subcommunities and Collections",
   // TODO New key - Add a translation
-  "communityList.showMore": "Show More",
-
-
+  "community.subcoms-cols.breadcrumbs": "Subcommunities and Collections",
 
   // "community.create.head": "Create a Community",
-  // TODO New key - Add a translation
-  "community.create.head": "Create a Community",
+  "community.create.head": "إنشاء مجتمع",
 
   // "community.create.notifications.success": "Successfully created the Community",
-  // TODO New key - Add a translation
-  "community.create.notifications.success": "Successfully created the Community",
+  "community.create.notifications.success": "تم إنشاء المجتمع بنجاح",
 
   // "community.create.sub-head": "Create a Sub-Community for Community {{ parent }}",
-  // TODO New key - Add a translation
-  "community.create.sub-head": "Create a Sub-Community for Community {{ parent }}",
+  "community.create.sub-head": "إنشاء مجتمع فرعي للمجتمع {{ parent }}",
 
   // "community.curate.header": "Curate Community: {{community}}",
-  // TODO New key - Add a translation
-  "community.curate.header": "Curate Community: {{community}}",
+  "community.curate.header": "أكرتة المجتمع: {{community}}",
 
   // "community.delete.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "community.delete.cancel": "Cancel",
+  "community.delete.cancel": "إلغاء",
 
   // "community.delete.confirm": "Confirm",
-  // TODO New key - Add a translation
-  "community.delete.confirm": "Confirm",
+  "community.delete.confirm": "تأكيد",
+
+  // "community.delete.processing": "Deleting...",
+  "community.delete.processing": "جاري الحذف...",
 
   // "community.delete.head": "Delete Community",
-  // TODO New key - Add a translation
-  "community.delete.head": "Delete Community",
+  "community.delete.head": "حذف المجتمع",
 
   // "community.delete.notification.fail": "Community could not be deleted",
-  // TODO New key - Add a translation
-  "community.delete.notification.fail": "Community could not be deleted",
+  "community.delete.notification.fail": "تعذر حذف المجتمع",
 
   // "community.delete.notification.success": "Successfully deleted community",
-  // TODO New key - Add a translation
-  "community.delete.notification.success": "Successfully deleted community",
+  "community.delete.notification.success": "تم حذف المجتمع بنجاح",
 
   // "community.delete.text": "Are you sure you want to delete community \"{{ dso }}\"",
-  // TODO New key - Add a translation
-  "community.delete.text": "Are you sure you want to delete community \"{{ dso }}\"",
+  "community.delete.text": "هل أنت متأكد من أنك تريد حذف المجتمع \"{{ dso }}\"",
 
   // "community.edit.delete": "Delete this community",
-  // TODO New key - Add a translation
-  "community.edit.delete": "Delete this community",
+  "community.edit.delete": "حذف هذا المجتمع",
 
   // "community.edit.head": "Edit Community",
-  // TODO New key - Add a translation
-  "community.edit.head": "Edit Community",
+  "community.edit.head": "تحرير المجتمع",
 
   // "community.edit.breadcrumbs": "Edit Community",
-  // TODO New key - Add a translation
-  "community.edit.breadcrumbs": "Edit Community",
+  "community.edit.breadcrumbs": "تحرير المجتمع",
 
+  // "community.edit.logo.delete.title": "Delete logo",
+  "community.edit.logo.delete.title": "حذف الشعار",
+
+  // "community.edit.logo.delete-undo.title": "Undo delete",
+  "community.edit.logo.delete-undo.title": "التراجع عن الحذف",
 
   // "community.edit.logo.label": "Community logo",
-  // TODO New key - Add a translation
-  "community.edit.logo.label": "Community logo",
+  "community.edit.logo.label": "شعار المجتمع",
 
-  // "community.edit.logo.notifications.add.error": "Uploading Community logo failed. Please verify the content before retrying.",
-  // TODO New key - Add a translation
-  "community.edit.logo.notifications.add.error": "Uploading Community logo failed. Please verify the content before retrying.",
+  // "community.edit.logo.notifications.add.error": "Uploading community logo failed. Please verify the content before retrying.",
+  "community.edit.logo.notifications.add.error": "فشل تحميل شعار المجتمع. يرجى التحقق من المحتوى قبل إعادة المحاولة.",
 
-  // "community.edit.logo.notifications.add.success": "Upload Community logo successful.",
-  // TODO New key - Add a translation
-  "community.edit.logo.notifications.add.success": "Upload Community logo successful.",
+  // "community.edit.logo.notifications.add.success": "Upload community logo successful.",
+  "community.edit.logo.notifications.add.success": "تم تحميل شعار المجتمع بنجاح.",
 
   // "community.edit.logo.notifications.delete.success.title": "Logo deleted",
-  // TODO New key - Add a translation
-  "community.edit.logo.notifications.delete.success.title": "Logo deleted",
+  "community.edit.logo.notifications.delete.success.title": "تم حذف الشعار",
 
   // "community.edit.logo.notifications.delete.success.content": "Successfully deleted the community's logo",
-  // TODO New key - Add a translation
-  "community.edit.logo.notifications.delete.success.content": "Successfully deleted the community's logo",
+  "community.edit.logo.notifications.delete.success.content": "تم حذف شعار المجتمع بنجاح",
 
   // "community.edit.logo.notifications.delete.error.title": "Error deleting logo",
-  // TODO New key - Add a translation
-  "community.edit.logo.notifications.delete.error.title": "Error deleting logo",
-
-  // "community.edit.logo.upload": "Drop a Community Logo to upload",
-  // TODO New key - Add a translation
-  "community.edit.logo.upload": "Drop a Community Logo to upload",
-
+  "community.edit.logo.notifications.delete.error.title": "حدث خطأ أثناء حذف الشعار",
 
+  // "community.edit.logo.upload": "Drop a community logo to upload",
+  "community.edit.logo.upload": "قم بإسقاط شعار المجتمع للتحميل",
 
   // "community.edit.notifications.success": "Successfully edited the Community",
-  // TODO New key - Add a translation
-  "community.edit.notifications.success": "Successfully edited the Community",
+  "community.edit.notifications.success": "تم تحرير المجتمع بنجاح",
 
   // "community.edit.notifications.unauthorized": "You do not have privileges to make this change",
-  // TODO New key - Add a translation
-  "community.edit.notifications.unauthorized": "You do not have privileges to make this change",
-
-  // "community.edit.notifications.error": "An error occured while editing the Community",
-  // TODO New key - Add a translation
-  "community.edit.notifications.error": "An error occured while editing the Community",
-
-  // "community.edit.return": "Return",
-  // TODO New key - Add a translation
-  "community.edit.return": "Return",
+  "community.edit.notifications.unauthorized": "ليس لديك امتيازات لإجراء هذا التغيير",
 
+  // "community.edit.notifications.error": "An error occured while editing the community",
+  "community.edit.notifications.error": "حدث خطأ أثناء تحرير المجتمع",
 
+  // "community.edit.return": "Back",
+  "community.edit.return": "رجوع",
 
   // "community.edit.tabs.curate.head": "Curate",
-  // TODO New key - Add a translation
-  "community.edit.tabs.curate.head": "Curate",
+  "community.edit.tabs.curate.head": "أكرتة",
 
   // "community.edit.tabs.curate.title": "Community Edit - Curate",
-  // TODO New key - Add a translation
-  "community.edit.tabs.curate.title": "Community Edit - Curate",
+  "community.edit.tabs.curate.title": "تحرير المجتمع - أكرتة",
+
+  // "community.edit.tabs.access-control.head": "Access Control",
+  "community.edit.tabs.access-control.head": "التحكم في الوصول",
+
+  // "community.edit.tabs.access-control.title": "Community Edit - Access Control",
+  "community.edit.tabs.access-control.title": "تحرير المجتمع - التحكم في الوصول",
 
   // "community.edit.tabs.metadata.head": "Edit Metadata",
-  // TODO New key - Add a translation
-  "community.edit.tabs.metadata.head": "Edit Metadata",
+  "community.edit.tabs.metadata.head": "تحرير الميتاداتا",
 
   // "community.edit.tabs.metadata.title": "Community Edit - Metadata",
-  // TODO New key - Add a translation
-  "community.edit.tabs.metadata.title": "Community Edit - Metadata",
+  "community.edit.tabs.metadata.title": "تحرير المجتمع - الميتاداتا",
 
   // "community.edit.tabs.roles.head": "Assign Roles",
-  // TODO New key - Add a translation
-  "community.edit.tabs.roles.head": "Assign Roles",
+  "community.edit.tabs.roles.head": "تعيين أدوار",
 
   // "community.edit.tabs.roles.title": "Community Edit - Roles",
-  // TODO New key - Add a translation
-  "community.edit.tabs.roles.title": "Community Edit - Roles",
+  "community.edit.tabs.roles.title": "تحرير المجتمع - أدوار",
 
   // "community.edit.tabs.authorizations.head": "Authorizations",
-  // TODO New key - Add a translation
-  "community.edit.tabs.authorizations.head": "Authorizations",
+  "community.edit.tabs.authorizations.head": "التصاريح",
 
   // "community.edit.tabs.authorizations.title": "Community Edit - Authorizations",
-  // TODO New key - Add a translation
-  "community.edit.tabs.authorizations.title": "Community Edit - Authorizations",
-
-
+  "community.edit.tabs.authorizations.title": "تحرير المجتمع - التصاريح",
 
   // "community.listelement.badge": "Community",
-  // TODO New key - Add a translation
-  "community.listelement.badge": "Community",
-
+  "community.listelement.badge": "مجتمع",
 
+  // "community.logo": "Community logo",
+  "community.logo": "شعار المجتمع",
 
   // "comcol-role.edit.no-group": "None",
-  // TODO New key - Add a translation
-  "comcol-role.edit.no-group": "None",
+  "comcol-role.edit.no-group": "لا شيء",
 
   // "comcol-role.edit.create": "Create",
-  // TODO New key - Add a translation
-  "comcol-role.edit.create": "Create",
+  "comcol-role.edit.create": "إنشاء",
+
+  // "comcol-role.edit.create.error.title": "Failed to create a group for the '{{ role }}' role",
+  "comcol-role.edit.create.error.title": "فشل إنشاء مجموعة لدور '{{ role }}'",
 
   // "comcol-role.edit.restrict": "Restrict",
-  // TODO New key - Add a translation
-  "comcol-role.edit.restrict": "Restrict",
+  "comcol-role.edit.restrict": "تقييد",
 
   // "comcol-role.edit.delete": "Delete",
-  // TODO New key - Add a translation
-  "comcol-role.edit.delete": "Delete",
+  "comcol-role.edit.delete": "حذف",
 
+  // "comcol-role.edit.delete.error.title": "Failed to delete the '{{ role }}' role's group",
+  "comcol-role.edit.delete.error.title": "فشل حذف مجموعة الدور '{{ role }}'",
 
   // "comcol-role.edit.community-admin.name": "Administrators",
-  // TODO New key - Add a translation
-  "comcol-role.edit.community-admin.name": "Administrators",
+  "comcol-role.edit.community-admin.name": "المسؤولون",
 
   // "comcol-role.edit.collection-admin.name": "Administrators",
-  // TODO New key - Add a translation
-  "comcol-role.edit.collection-admin.name": "Administrators",
-
+  "comcol-role.edit.collection-admin.name": "المسؤولون",
 
   // "comcol-role.edit.community-admin.description": "Community administrators can create sub-communities or collections, and manage or assign management for those sub-communities or collections. In addition, they decide who can submit items to any sub-collections, edit item metadata (after submission), and add (map) existing items from other collections (subject to authorization).",
-  // TODO New key - Add a translation
-  "comcol-role.edit.community-admin.description": "Community administrators can create sub-communities or collections, and manage or assign management for those sub-communities or collections. In addition, they decide who can submit items to any sub-collections, edit item metadata (after submission), and add (map) existing items from other collections (subject to authorization).",
+  "comcol-role.edit.community-admin.description": "يمكن لمديري المجتمع إنشاء مجتمعات فرعية أو حاويات، وإدارة أو تعيين الإدارة لتلك المجتمعات الفرعية أو الحاويات. بالإضافة إلى ذلك، يقومون بتقرير من يمكنه تقديم المواد إلى أي حاويات فرعية، وتحرير ميتاداتا المادة (بعد التقديم)، وإضافة (تخطيط) المواد الحالية من الحاويات الأخرى (تخضع للتصريح).",
 
   // "comcol-role.edit.collection-admin.description": "Collection administrators decide who can submit items to the collection, edit item metadata (after submission), and add (map) existing items from other collections to this collection (subject to authorization for that collection).",
-  // TODO New key - Add a translation
-  "comcol-role.edit.collection-admin.description": "Collection administrators decide who can submit items to the collection, edit item metadata (after submission), and add (map) existing items from other collections to this collection (subject to authorization for that collection).",
-
+  "comcol-role.edit.collection-admin.description": "يقرر مديري الحاوية من يمكنه تقديم المواد إلى الحاوية، وتحريرميتاداتا المادة (بعد التقديم)، وإضافة (تخطيط) المواد الحاوية من الحاويات الأخرى إلى هذه الحاوية (تخضع للتصريح لتلك الحاوية).",
 
   // "comcol-role.edit.submitters.name": "Submitters",
-  // TODO New key - Add a translation
-  "comcol-role.edit.submitters.name": "Submitters",
+  "comcol-role.edit.submitters.name": "المقدمون",
 
   // "comcol-role.edit.submitters.description": "The E-People and Groups that have permission to submit new items to this collection.",
-  // TODO New key - Add a translation
-  "comcol-role.edit.submitters.description": "The E-People and Groups that have permission to submit new items to this collection.",
-
+  "comcol-role.edit.submitters.description": "الأشخاص الإلكترونيين والمجموعات الذين يملكون صلاحية تقديم مواد جديدة إلى هذه الحاوية.",
 
   // "comcol-role.edit.item_read.name": "Default item read access",
-  // TODO New key - Add a translation
-  "comcol-role.edit.item_read.name": "Default item read access",
+  "comcol-role.edit.item_read.name": "وصول قراءة المادة الافتراضي",
 
   // "comcol-role.edit.item_read.description": "E-People and Groups that can read new items submitted to this collection. Changes to this role are not retroactive. Existing items in the system will still be viewable by those who had read access at the time of their addition.",
-  // TODO New key - Add a translation
-  "comcol-role.edit.item_read.description": "E-People and Groups that can read new items submitted to this collection. Changes to this role are not retroactive. Existing items in the system will still be viewable by those who had read access at the time of their addition.",
+  "comcol-role.edit.item_read.description": "الأشخاص الإلكترونيون والمجموعات  الذين يمكنهم قراءة المواد الجديدة التي تم تقديمها إلى هذه الحاوية. التغييرات على هذا الدور ليست بأثر رجعي. ستظل المواد الحالية الموجودة في النظام قابلة للعرض بواسطة أولئك الذين يملكون الوصول للقراءة في وقت إضافتها.",
 
   // "comcol-role.edit.item_read.anonymous-group": "Default read for incoming items is currently set to Anonymous.",
-  // TODO New key - Add a translation
-  "comcol-role.edit.item_read.anonymous-group": "Default read for incoming items is currently set to Anonymous.",
-
+  "comcol-role.edit.item_read.anonymous-group": "تم تعيين القراءة الافتراضية للمواد الواردة حاليًا إلى غير معرف الهوية.",
 
   // "comcol-role.edit.bitstream_read.name": "Default bitstream read access",
-  // TODO New key - Add a translation
-  "comcol-role.edit.bitstream_read.name": "Default bitstream read access",
+  "comcol-role.edit.bitstream_read.name": "وصول قراءة تدفق البت الافتراضي",
 
-  // "comcol-role.edit.bitstream_read.description": "Community administrators can create sub-communities or collections, and manage or assign management for those sub-communities or collections. In addition, they decide who can submit items to any sub-collections, edit item metadata (after submission), and add (map) existing items from other collections (subject to authorization).",
-  // TODO New key - Add a translation
-  "comcol-role.edit.bitstream_read.description": "Community administrators can create sub-communities or collections, and manage or assign management for those sub-communities or collections. In addition, they decide who can submit items to any sub-collections, edit item metadata (after submission), and add (map) existing items from other collections (subject to authorization).",
+  // "comcol-role.edit.bitstream_read.description": "E-People and Groups that can read new bitstreams submitted to this collection. Changes to this role are not retroactive. Existing bitstreams in the system will still be viewable by those who had read access at the time of their addition.",
+  "comcol-role.edit.bitstream_read.description": "يمكن لمديري المجتمع إنشاء مجتمعات فرعية أو حاويات، وإدارة أو تعيين الإدارة لتلك المجتمعات الفرعية أو الحاويات. بالإضافة إلى ذلك، يقومون بتقرير من يمكنه تقديم المواد إلى أي حاويات فرعية، وتحرير ميتاداتا المادة (بعد التقديم)، وإضافة (تخطيط) المواد الحالية من الحاويات الأخرى (تخضع للتصريح).",
 
   // "comcol-role.edit.bitstream_read.anonymous-group": "Default read for incoming bitstreams is currently set to Anonymous.",
-  // TODO New key - Add a translation
-  "comcol-role.edit.bitstream_read.anonymous-group": "Default read for incoming bitstreams is currently set to Anonymous.",
-
+  "comcol-role.edit.bitstream_read.anonymous-group": "تم تعيين القراءة الافتراضية لتدفقات البت الواردة حاليًا إلى غير معرف الهوية.",
 
   // "comcol-role.edit.editor.name": "Editors",
-  // TODO New key - Add a translation
-  "comcol-role.edit.editor.name": "Editors",
+  "comcol-role.edit.editor.name": "المحررون",
 
   // "comcol-role.edit.editor.description": "Editors are able to edit the metadata of incoming submissions, and then accept or reject them.",
-  // TODO New key - Add a translation
-  "comcol-role.edit.editor.description": "Editors are able to edit the metadata of incoming submissions, and then accept or reject them.",
-
+  "comcol-role.edit.editor.description": "يمكن للمحررون تحرير ميتاداتا التقديمات الواردة، ثم قبولها أو رفضها.",
 
   // "comcol-role.edit.finaleditor.name": "Final editors",
-  // TODO New key - Add a translation
-  "comcol-role.edit.finaleditor.name": "Final editors",
+  "comcol-role.edit.finaleditor.name": "المحررون النهائيون",
 
   // "comcol-role.edit.finaleditor.description": "Final editors are able to edit the metadata of incoming submissions, but will not be able to reject them.",
-  // TODO New key - Add a translation
-  "comcol-role.edit.finaleditor.description": "Final editors are able to edit the metadata of incoming submissions, but will not be able to reject them.",
-
+  "comcol-role.edit.finaleditor.description": "يمكن للمحررون النهائيون تحرير ميتاداتا التقديمات الواردة، لكن لا يمكنهم رفضها.",
 
   // "comcol-role.edit.reviewer.name": "Reviewers",
-  // TODO New key - Add a translation
-  "comcol-role.edit.reviewer.name": "Reviewers",
+  "comcol-role.edit.reviewer.name": "المراجعون",
 
   // "comcol-role.edit.reviewer.description": "Reviewers are able to accept or reject incoming submissions. However, they are not able to edit the submission's metadata.",
-  // TODO New key - Add a translation
-  "comcol-role.edit.reviewer.description": "Reviewers are able to accept or reject incoming submissions. However, they are not able to edit the submission's metadata.",
+  "comcol-role.edit.reviewer.description": "يمكن للمراجعين قبول أو رفض التقديمات الواردة. غير أنه لا يمكنهم تحرير ميتاداتا التقديم..",
 
+  // "comcol-role.edit.scorereviewers.name": "Score Reviewers",
+  "comcol-role.edit.scorereviewers.name": "نقاط المراجعين",
 
+  // "comcol-role.edit.scorereviewers.description": "Reviewers are able to give a score to incoming submissions, this will define whether the submission will be rejected or not.",
+  "comcol-role.edit.scorereviewers.description": "يمكن للمراجعين منح نقاط للمشاركات الواردة، وهذا سيحدد ما إذا كان سيتم رفض التقديم أم لا.",
 
   // "community.form.abstract": "Short Description",
-  // TODO New key - Add a translation
-  "community.form.abstract": "Short Description",
+  "community.form.abstract": "وصف مختصر",
 
   // "community.form.description": "Introductory text (HTML)",
-  // TODO New key - Add a translation
-  "community.form.description": "Introductory text (HTML)",
+  "community.form.description": "نص تمهيدي (HTML)",
 
   // "community.form.errors.title.required": "Please enter a community name",
-  // TODO New key - Add a translation
-  "community.form.errors.title.required": "Please enter a community name",
+  "community.form.errors.title.required": "يرجى إدخال اسم مجتمع",
 
   // "community.form.rights": "Copyright text (HTML)",
-  // TODO New key - Add a translation
-  "community.form.rights": "Copyright text (HTML)",
+  "community.form.rights": "نص حقوق النشر (HTML)",
 
   // "community.form.tableofcontents": "News (HTML)",
-  // TODO New key - Add a translation
-  "community.form.tableofcontents": "News (HTML)",
+  "community.form.tableofcontents": "الأخبار (HTML)",
 
   // "community.form.title": "Name",
-  // TODO New key - Add a translation
-  "community.form.title": "Name",
+  "community.form.title": "الاسم",
 
   // "community.page.edit": "Edit this community",
-  // TODO New key - Add a translation
-  "community.page.edit": "Edit this community",
+  "community.page.edit": "تحرير هذا المجتمع",
 
   // "community.page.handle": "Permanent URI for this community",
-  // TODO New key - Add a translation
-  "community.page.handle": "Permanent URI for this community",
+  "community.page.handle": "ال URI الدائم لهذا المجتمع",
 
   // "community.page.license": "License",
-  // TODO New key - Add a translation
-  "community.page.license": "License",
+  "community.page.license": "الترخيص",
 
   // "community.page.news": "News",
-  // TODO New key - Add a translation
-  "community.page.news": "News",
+  "community.page.news": "الأخبار",
 
   // "community.all-lists.head": "Subcommunities and Collections",
+  "community.all-lists.head": "المجتمعات الفرعية والحاويات",
+
+  // "community.search.results.head": "Search Results",
   // TODO New key - Add a translation
-  "community.all-lists.head": "Subcommunities and Collections",
-
-  // "community.sub-collection-list.head": "Collections of this Community",
-  // TODO New key - Add a translation
-  "community.sub-collection-list.head": "Collections of this Community",
-
-  // "community.sub-community-list.head": "Communities of this Community",
-  // TODO New key - Add a translation
-  "community.sub-community-list.head": "Communities of this Community",
+  "community.search.results.head": "Search Results",
 
+  // "community.sub-collection-list.head": "Collections in this Community",
+  "community.sub-collection-list.head": "حاويات هذا المجتمع",
 
+  // "community.sub-community-list.head": "Communities in this Community",
+  "community.sub-community-list.head": "مجتمعات هذا المجتمع",
 
   // "cookies.consent.accept-all": "Accept all",
-  // TODO New key - Add a translation
-  "cookies.consent.accept-all": "Accept all",
+  "cookies.consent.accept-all": "قبول الكل",
 
   // "cookies.consent.accept-selected": "Accept selected",
-  // TODO New key - Add a translation
-  "cookies.consent.accept-selected": "Accept selected",
+  "cookies.consent.accept-selected": "قبول المحدد",
 
   // "cookies.consent.app.opt-out.description": "This app is loaded by default (but you can opt out)",
-  // TODO New key - Add a translation
-  "cookies.consent.app.opt-out.description": "This app is loaded by default (but you can opt out)",
+  "cookies.consent.app.opt-out.description": "تم تحميل هذا التطبيق افتراضياً (لكن يمكنك الانسحاب)",
 
   // "cookies.consent.app.opt-out.title": "(opt-out)",
-  // TODO New key - Add a translation
-  "cookies.consent.app.opt-out.title": "(opt-out)",
+  "cookies.consent.app.opt-out.title": "(انسحاب)",
 
   // "cookies.consent.app.purpose": "purpose",
-  // TODO New key - Add a translation
-  "cookies.consent.app.purpose": "purpose",
+  "cookies.consent.app.purpose": "الغرض",
 
   // "cookies.consent.app.required.description": "This application is always required",
-  // TODO New key - Add a translation
-  "cookies.consent.app.required.description": "This application is always required",
+  "cookies.consent.app.required.description": "هذا التطبيق مطلوب دائماً",
 
   // "cookies.consent.app.required.title": "(always required)",
-  // TODO New key - Add a translation
-  "cookies.consent.app.required.title": "(always required)",
+  "cookies.consent.app.required.title": "(مطلوب دائماً)",
+
+  // "cookies.consent.app.disable-all.description": "Use this switch to enable or disable all services.",
+  "cookies.consent.app.disable-all.description": "استخدم هذا التبديل لتفعيل كل الخدمات أو تعطيلها.",
+
+  // "cookies.consent.app.disable-all.title": "Enable or disable all services",
+  "cookies.consent.app.disable-all.title": "تفعيل أو تعطيل كل الخدمات",
 
   // "cookies.consent.update": "There were changes since your last visit, please update your consent.",
-  // TODO New key - Add a translation
-  "cookies.consent.update": "There were changes since your last visit, please update your consent.",
+  "cookies.consent.update": "لقد حدثت بعض التغييرات منذ زيارتك الأخيرة، يرجى تحديث موافقتك.",
 
   // "cookies.consent.close": "Close",
-  // TODO New key - Add a translation
-  "cookies.consent.close": "Close",
+  "cookies.consent.close": "إغلاق",
 
   // "cookies.consent.decline": "Decline",
-  // TODO New key - Add a translation
-  "cookies.consent.decline": "Decline",
+  "cookies.consent.decline": "رفض",
+
+  // "cookies.consent.ok": "That's ok",
+  "cookies.consent.ok": "لا بأس",
+
+  // "cookies.consent.save": "Save",
+  "cookies.consent.save": "حفظ",
+
+  // "cookies.consent.content-notice.title": "Cookie Consent",
+  "cookies.consent.content-notice.title": "الموافقة على ملفات تعريف الارتباط",
 
   // "cookies.consent.content-notice.description": "We collect and process your personal information for the following purposes: <strong>Authentication, Preferences, Acknowledgement and Statistics</strong>. <br/> To learn more, please read our {privacyPolicy}.",
-  // TODO New key - Add a translation
-  "cookies.consent.content-notice.description": "We collect and process your personal information for the following purposes: <strong>Authentication, Preferences, Acknowledgement and Statistics</strong>. <br/> To learn more, please read our {privacyPolicy}.",
+  "cookies.consent.content-notice.description": "نقوم بجمع ومعالجة معلوماتك الشخصية للأغراض التالية: <strong>الاستيثاق، والتفضيلات، والإقرار، والإحصائيات</strong>. <br/> لمعرفة المزيد، يرجى قراءة {privacyPolicy}.",
+
+  // "cookies.consent.content-notice.description.no-privacy": "We collect and process your personal information for the following purposes: <strong>Authentication, Preferences, Acknowledgement and Statistics</strong>.",
+  "cookies.consent.content-notice.description.no-privacy": "نقوم بجمع ومعالجة معلوماتك الشخصية للأغراض التالية: <strong>الاستيثاق، والتفضيلات، والإقرار، والإحصائيات</strong>.",
 
   // "cookies.consent.content-notice.learnMore": "Customize",
-  // TODO New key - Add a translation
-  "cookies.consent.content-notice.learnMore": "Customize",
+  "cookies.consent.content-notice.learnMore": "تخصيص",
 
   // "cookies.consent.content-modal.description": "Here you can see and customize the information that we collect about you.",
-  // TODO New key - Add a translation
-  "cookies.consent.content-modal.description": "Here you can see and customize the information that we collect about you.",
+  "cookies.consent.content-modal.description": "من هنا يمكنك رؤية وتخصيص المعلومات التي نقوم بجمعها عنك.",
 
   // "cookies.consent.content-modal.privacy-policy.name": "privacy policy",
-  // TODO New key - Add a translation
-  "cookies.consent.content-modal.privacy-policy.name": "privacy policy",
+  "cookies.consent.content-modal.privacy-policy.name": "سياسة الخصوصية",
 
   // "cookies.consent.content-modal.privacy-policy.text": "To learn more, please read our {privacyPolicy}.",
-  // TODO New key - Add a translation
-  "cookies.consent.content-modal.privacy-policy.text": "To learn more, please read our {privacyPolicy}.",
+  "cookies.consent.content-modal.privacy-policy.text": "لمعرفة المزيد، يرجى قراءة {privacyPolicy}.",
 
   // "cookies.consent.content-modal.title": "Information that we collect",
-  // TODO New key - Add a translation
-  "cookies.consent.content-modal.title": "Information that we collect",
+  "cookies.consent.content-modal.title": "المعلومات التي نقوم بجمعها",
 
+  // "cookies.consent.content-modal.services": "services",
+  "cookies.consent.content-modal.services": "خدمات",
 
+  // "cookies.consent.content-modal.service": "service",
+  "cookies.consent.content-modal.service": "خدمة",
 
   // "cookies.consent.app.title.authentication": "Authentication",
-  // TODO New key - Add a translation
-  "cookies.consent.app.title.authentication": "Authentication",
+  "cookies.consent.app.title.authentication": "استيثاق",
 
   // "cookies.consent.app.description.authentication": "Required for signing you in",
-  // TODO New key - Add a translation
-  "cookies.consent.app.description.authentication": "Required for signing you in",
-
+  "cookies.consent.app.description.authentication": "مطلوب لتسجيل دخولك",
 
   // "cookies.consent.app.title.preferences": "Preferences",
-  // TODO New key - Add a translation
-  "cookies.consent.app.title.preferences": "Preferences",
+  "cookies.consent.app.title.preferences": "التفضيلات",
 
   // "cookies.consent.app.description.preferences": "Required for saving your preferences",
-  // TODO New key - Add a translation
-  "cookies.consent.app.description.preferences": "Required for saving your preferences",
-
-
+  "cookies.consent.app.description.preferences": "مطلوب لحفظ تفضيلاتك",
 
   // "cookies.consent.app.title.acknowledgement": "Acknowledgement",
-  // TODO New key - Add a translation
-  "cookies.consent.app.title.acknowledgement": "Acknowledgement",
+  "cookies.consent.app.title.acknowledgement": "إقرار",
 
   // "cookies.consent.app.description.acknowledgement": "Required for saving your acknowledgements and consents",
-  // TODO New key - Add a translation
-  "cookies.consent.app.description.acknowledgement": "Required for saving your acknowledgements and consents",
-
-
+  "cookies.consent.app.description.acknowledgement": "مطلوب لحفظ إقراراتك وموافقاتك",
 
   // "cookies.consent.app.title.google-analytics": "Google Analytics",
-  // TODO New key - Add a translation
-  "cookies.consent.app.title.google-analytics": "Google Analytics",
+  "cookies.consent.app.title.google-analytics": "تحليلات جوجل",
 
   // "cookies.consent.app.description.google-analytics": "Allows us to track statistical data",
-  // TODO New key - Add a translation
   "cookies.consent.app.description.google-analytics": "Allows us to track statistical data",
 
+  // "cookies.consent.app.title.google-recaptcha": "Google reCaptcha",
+  "cookies.consent.app.title.google-recaptcha": "جوجل ريكابتشا",
 
+  // "cookies.consent.app.description.google-recaptcha": "We use google reCAPTCHA service during registration and password recovery",
+  // TODO New key - Add a translation
+  "cookies.consent.app.description.google-recaptcha": "We use google reCAPTCHA service during registration and password recovery",
 
   // "cookies.consent.purpose.functional": "Functional",
-  // TODO New key - Add a translation
-  "cookies.consent.purpose.functional": "Functional",
+  "cookies.consent.purpose.functional": "وظيفي",
 
   // "cookies.consent.purpose.statistical": "Statistical",
-  // TODO New key - Add a translation
-  "cookies.consent.purpose.statistical": "Statistical",
+  "cookies.consent.purpose.statistical": "إحصائي",
 
+  // "cookies.consent.purpose.registration-password-recovery": "Registration and Password recovery",
+  "cookies.consent.purpose.registration-password-recovery": "التسجيل واستعادة كلمة المرور",
 
-  // "curation-task.task.checklinks.label":  "Check Links in Metadata",
-  // TODO New key - Add a translation
-  "curation-task.task.checklinks.label": "Check Links in Metadata",
+  // "cookies.consent.purpose.sharing": "Sharing",
+  "cookies.consent.purpose.sharing": "مشاركة",
+
+  // "curation-task.task.citationpage.label": "Generate Citation Page",
+  "curation-task.task.citationpage.label": "إنشاء صفحة الاقتباس",
+
+  // "curation-task.task.checklinks.label": "Check Links in Metadata",
+  "curation-task.task.checklinks.label": "التحقق من الروابط في الميتاداتا",
 
   // "curation-task.task.noop.label": "NOOP",
-  // TODO New key - Add a translation
-  "curation-task.task.noop.label": "NOOP",
+  "curation-task.task.noop.label": "لا توجد مهمة",
 
   // "curation-task.task.profileformats.label": "Profile Bitstream Formats",
-  // TODO New key - Add a translation
-  "curation-task.task.profileformats.label": "Profile Bitstream Formats",
+  "curation-task.task.profileformats.label": "تنسيقات تدفق بت البروفايل",
 
   // "curation-task.task.requiredmetadata.label": "Check for Required Metadata",
-  // TODO New key - Add a translation
-  "curation-task.task.requiredmetadata.label": "Check for Required Metadata",
+  "curation-task.task.requiredmetadata.label": "التحقق للميتاداتا المطلوبة",
 
   // "curation-task.task.translate.label": "Microsoft Translator",
-  // TODO New key - Add a translation
-  "curation-task.task.translate.label": "Microsoft Translator",
+  "curation-task.task.translate.label": "مترجم ميكروسوفت",
 
   // "curation-task.task.vscan.label": "Virus Scan",
-  // TODO New key - Add a translation
-  "curation-task.task.vscan.label": "Virus Scan",
-
+  "curation-task.task.vscan.label": "مسح الفيروسات",
 
+  // "curation-task.task.registerdoi.label": "Register DOI",
+  "curation-task.task.registerdoi.label": "تسجيل معرف الكائن الرقمي",
 
   // "curation.form.task-select.label": "Task:",
-  // TODO New key - Add a translation
-  "curation.form.task-select.label": "Task:",
+  "curation.form.task-select.label": "المهمة:",
 
   // "curation.form.submit": "Start",
-  // TODO New key - Add a translation
-  "curation.form.submit": "Start",
+  "curation.form.submit": "بدء",
 
   // "curation.form.submit.success.head": "The curation task has been started successfully",
-  // TODO New key - Add a translation
-  "curation.form.submit.success.head": "The curation task has been started successfully",
+  "curation.form.submit.success.head": "تم بدء مهمة الأكرتة بنجاح",
 
   // "curation.form.submit.success.content": "You will be redirected to the corresponding process page.",
-  // TODO New key - Add a translation
-  "curation.form.submit.success.content": "You will be redirected to the corresponding process page.",
+  "curation.form.submit.success.content": "ستتم إعادة توجيهك إلى صفحة العملية المقابلة.",
 
   // "curation.form.submit.error.head": "Running the curation task failed",
-  // TODO New key - Add a translation
-  "curation.form.submit.error.head": "Running the curation task failed",
+  "curation.form.submit.error.head": "فشل تشغيل مهمة الأكرتة",
 
   // "curation.form.submit.error.content": "An error occured when trying to start the curation task.",
-  // TODO New key - Add a translation
-  "curation.form.submit.error.content": "An error occured when trying to start the curation task.",
+  "curation.form.submit.error.content": "حدث خطأ أثناء محاولة بدء مهمة الأكرتة.",
+
+  // "curation.form.submit.error.invalid-handle": "Couldn't determine the handle for this object",
+  "curation.form.submit.error.invalid-handle": "تعذر تحديد هاندل هذا الكائن",
 
   // "curation.form.handle.label": "Handle:",
-  // TODO New key - Add a translation
-  "curation.form.handle.label": "Handle:",
+  "curation.form.handle.label": "هاندل:",
 
   // "curation.form.handle.hint": "Hint: Enter [your-handle-prefix]/0 to run a task across entire site (not all tasks may support this capability)",
-  // TODO New key - Add a translation
-  "curation.form.handle.hint": "Hint: Enter [your-handle-prefix]/0 to run a task across entire site (not all tasks may support this capability)",
+  "curation.form.handle.hint": "تلميح: قم بإدخال [your-handle-prefix]/0 لتشغيل مهمة عبر الموقع بأكمله (قد لا تدعم جميع المهام هذه الإمكانية)",
 
+  // "deny-request-copy.email.message": "Dear {{ recipientName }},\nIn response to your request I regret to inform you that it's not possible to send you a copy of the file(s) you have requested, concerning the document: \"{{ itemUrl }}\" ({{ itemName }}), of which I am an author.\n\nBest regards,\n{{ authorName }} <{{ authorEmail }}>",
+  "deny-request-copy.email.message": "عزيزي {{ recipientName }},\nردًا على طلبك، يؤسفني إبلاغك أنه لا يمكن إرسال نسخة من الملف الذي قمت بطلبه، فيما يتعلق بالوثيقة: \"{{ itemUrl }}\" ({{ itemName }}), والتي قمت بتأليفها.\n\nمع أطيب التحيات,\n{{ authorName }} <{{ authorEmail }}>",
 
+  // "deny-request-copy.email.subject": "Request copy of document",
+  "deny-request-copy.email.subject": "طلب نسخة من وثيقة",
+
+  // "deny-request-copy.error": "An error occurred",
+  "deny-request-copy.error": "لقد حدث خطأ",
+
+  // "deny-request-copy.header": "Deny document copy request",
+  "deny-request-copy.header": "رفض طلب نسخ الوثيقة",
+
+  // "deny-request-copy.intro": "This message will be sent to the applicant of the request",
+  "deny-request-copy.intro": "سيتم إرسال هذه الرسالة إلى مقدم الطلب",
+
+  // "deny-request-copy.success": "Successfully denied item request",
+  "deny-request-copy.success": "تم رفض طلب المادة بنجاح",
+
+  // "dso.name.untitled": "Untitled",
+  "dso.name.untitled": "بدون عنوان",
+
+  // "dso.name.unnamed": "Unnamed",
+  "dso.name.unnamed": "بدون اسم",
 
   // "dso-selector.create.collection.head": "New collection",
-  // TODO New key - Add a translation
-  "dso-selector.create.collection.head": "New collection",
+  "dso-selector.create.collection.head": "حاوية جديدة",
 
   // "dso-selector.create.collection.sub-level": "Create a new collection in",
-  // TODO New key - Add a translation
-  "dso-selector.create.collection.sub-level": "Create a new collection in",
+  "dso-selector.create.collection.sub-level": "إنشاء حاوية جديدة في",
 
   // "dso-selector.create.community.head": "New community",
-  // TODO New key - Add a translation
-  "dso-selector.create.community.head": "New community",
+  "dso-selector.create.community.head": "مجتمع جديد",
+
+  // "dso-selector.create.community.or-divider": "or",
+  "dso-selector.create.community.or-divider": "أو",
 
   // "dso-selector.create.community.sub-level": "Create a new community in",
-  // TODO New key - Add a translation
-  "dso-selector.create.community.sub-level": "Create a new community in",
+  "dso-selector.create.community.sub-level": "إنشاء مجتمع جديد في",
 
   // "dso-selector.create.community.top-level": "Create a new top-level community",
-  // TODO New key - Add a translation
-  "dso-selector.create.community.top-level": "Create a new top-level community",
+  "dso-selector.create.community.top-level": "إنشاء مجتمع مستوى أعلى جديد",
 
   // "dso-selector.create.item.head": "New item",
-  // TODO New key - Add a translation
-  "dso-selector.create.item.head": "New item",
+  "dso-selector.create.item.head": "مادة جديدة",
 
   // "dso-selector.create.item.sub-level": "Create a new item in",
-  // TODO New key - Add a translation
-  "dso-selector.create.item.sub-level": "Create a new item in",
+  "dso-selector.create.item.sub-level": "إنشاء مادة جديدة في",
 
   // "dso-selector.create.submission.head": "New submission",
-  // TODO New key - Add a translation
-  "dso-selector.create.submission.head": "New submission",
+  "dso-selector.create.submission.head": "تقديم جديد",
 
   // "dso-selector.edit.collection.head": "Edit collection",
-  // TODO New key - Add a translation
-  "dso-selector.edit.collection.head": "Edit collection",
+  "dso-selector.edit.collection.head": "تحرير الحاوية",
 
   // "dso-selector.edit.community.head": "Edit community",
-  // TODO New key - Add a translation
-  "dso-selector.edit.community.head": "Edit community",
+  "dso-selector.edit.community.head": "تحرير المجتمع",
 
   // "dso-selector.edit.item.head": "Edit item",
-  // TODO New key - Add a translation
-  "dso-selector.edit.item.head": "Edit item",
+  "dso-selector.edit.item.head": "تحرير المادة",
+
+  // "dso-selector.error.title": "An error occurred searching for a {{ type }}",
+  "dso-selector.error.title": "حدث خطأ أثناء البحث عن {{ type }}",
 
   // "dso-selector.export-metadata.dspaceobject.head": "Export metadata from",
-  // TODO New key - Add a translation
-  "dso-selector.export-metadata.dspaceobject.head": "Export metadata from",
+  "dso-selector.export-metadata.dspaceobject.head": "استيراد ميتاداتا من",
+
+  // "dso-selector.export-batch.dspaceobject.head": "Export Batch (ZIP) from",
+  "dso-selector.export-batch.dspaceobject.head": "استيراد دفعة (ZIP) من",
+
+  // "dso-selector.import-batch.dspaceobject.head": "Import batch from",
+  "dso-selector.import-batch.dspaceobject.head": "استيراد دفعة من",
 
   // "dso-selector.no-results": "No {{ type }} found",
-  // TODO New key - Add a translation
-  "dso-selector.no-results": "No {{ type }} found",
+  "dso-selector.no-results": "لم يتم العثور على {{ type }}",
 
   // "dso-selector.placeholder": "Search for a {{ type }}",
-  // TODO New key - Add a translation
-  "dso-selector.placeholder": "Search for a {{ type }}",
+  "dso-selector.placeholder": "بحث عن {{ type }}",
 
+  // "dso-selector.select.collection.head": "Select a collection",
+  "dso-selector.select.collection.head": "تحديد حاوية",
 
+  // "dso-selector.set-scope.community.head": "Select a search scope",
+  "dso-selector.set-scope.community.head": "تحديد نطاق البحث",
+
+  // "dso-selector.set-scope.community.button": "Search all of DSpace",
+  "dso-selector.set-scope.community.button": "بحث دي سبيس بالكامل",
+
+  // "dso-selector.set-scope.community.or-divider": "or",
+  "dso-selector.set-scope.community.or-divider": "أو",
+
+  // "dso-selector.set-scope.community.input-header": "Search for a community or collection",
+  "dso-selector.set-scope.community.input-header": "البحث عن حاوية أو مجتمع",
+
+  // "dso-selector.claim.item.head": "Profile tips",
+  "dso-selector.claim.item.head": "نصائح الملف الشخصي",
+
+  // "dso-selector.claim.item.body": "These are existing profiles that may be related to you. If you recognize yourself in one of these profiles, select it and on the detail page, among the options, choose to claim it. Otherwise you can create a new profile from scratch using the button below.",
+  "dso-selector.claim.item.body": "هذه هي الملفات الشخصية الموجودة التي قد تكون ذات صلة بك. إذا تعرفت على نفسك في أحد هذه الملفات الشخصية، قم بتحديده وفي صفحة التفاصيل، من بين الخيارات، اختر المطالبة به. بخلاف ذلك، يمكنك إنشاء ملف شخصي جديد من البداية باستخدام الزر أدناه.",
+
+  // "dso-selector.claim.item.not-mine-label": "None of these are mine",
+  "dso-selector.claim.item.not-mine-label": "لا يعود أي من هذا لي",
+
+  // "dso-selector.claim.item.create-from-scratch": "Create a new one",
+  "dso-selector.claim.item.create-from-scratch": "إنشاء واحد جديد",
+
+  // "dso-selector.results-could-not-be-retrieved": "Something went wrong, please refresh again ↻",
+  "dso-selector.results-could-not-be-retrieved": "حدث خطأ ما، يرجى التحديث مرة أخرى ↻",
+
+  // "supervision-group-selector.header": "Supervision Group Selector",
+  "supervision-group-selector.header": "محدد مجموعة الإشراف",
+
+  // "supervision-group-selector.select.type-of-order.label": "Select a type of Order",
+  "supervision-group-selector.select.type-of-order.label": "حدد نوع الرتبة",
+
+  // "supervision-group-selector.select.type-of-order.option.none": "NONE",
+  "supervision-group-selector.select.type-of-order.option.none": "لا شيء",
+
+  // "supervision-group-selector.select.type-of-order.option.editor": "EDITOR",
+  "supervision-group-selector.select.type-of-order.option.editor": "محرر",
+
+  // "supervision-group-selector.select.type-of-order.option.observer": "OBSERVER",
+  "supervision-group-selector.select.type-of-order.option.observer": "مراقب",
+
+  // "supervision-group-selector.select.group.label": "Select a Group",
+  "supervision-group-selector.select.group.label": "حدد مجموعة",
+
+  // "supervision-group-selector.button.cancel": "Cancel",
+  "supervision-group-selector.button.cancel": "إلغاء",
+
+  // "supervision-group-selector.button.save": "Save",
+  "supervision-group-selector.button.save": "حفظ",
+
+  // "supervision-group-selector.select.type-of-order.error": "Please select a type of order",
+  "supervision-group-selector.select.type-of-order.error": "يرجى تحديد نوع الرتبة",
+
+  // "supervision-group-selector.select.group.error": "Please select a group",
+  "supervision-group-selector.select.group.error": "يرجى تحديد مجموعة",
+
+  // "supervision-group-selector.notification.create.success.title": "Successfully created supervision order for group {{ name }}",
+  "supervision-group-selector.notification.create.success.title": "تم إنشاء رتبة الإشراف للمجموعة بنجاح {{ name }}",
+
+  // "supervision-group-selector.notification.create.failure.title": "Error",
+  "supervision-group-selector.notification.create.failure.title": "خطأ",
+
+  // "supervision-group-selector.notification.create.already-existing": "A supervision order already exists on this item for selected group",
+  "supervision-group-selector.notification.create.already-existing": "يوجد بالفعل رتبة إشراف على هذه المادة للمجموعة المحددة",
 
   // "confirmation-modal.export-metadata.header": "Export metadata for {{ dsoName }}",
-  // TODO New key - Add a translation
-  "confirmation-modal.export-metadata.header": "Export metadata for {{ dsoName }}",
+  "confirmation-modal.export-metadata.header": "تصدير الميتاداتا لـ {{ dsoName }}",
 
   // "confirmation-modal.export-metadata.info": "Are you sure you want to export metadata for {{ dsoName }}",
-  // TODO New key - Add a translation
-  "confirmation-modal.export-metadata.info": "Are you sure you want to export metadata for {{ dsoName }}",
+  "confirmation-modal.export-metadata.info": "هل أنت متأكد أنك تريد تصدير الميتاداتا لـ {{ dsoName }}",
 
   // "confirmation-modal.export-metadata.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "confirmation-modal.export-metadata.cancel": "Cancel",
+  "confirmation-modal.export-metadata.cancel": "إلغاء",
 
   // "confirmation-modal.export-metadata.confirm": "Export",
-  // TODO New key - Add a translation
-  "confirmation-modal.export-metadata.confirm": "Export",
+  "confirmation-modal.export-metadata.confirm": "تصدير",
+
+  // "confirmation-modal.export-batch.header": "Export batch (ZIP) for {{ dsoName }}",
+  "confirmation-modal.export-batch.header": "تصدير دفعة (ZIP) لـ {{ dsoName }}",
+
+  // "confirmation-modal.export-batch.info": "Are you sure you want to export batch (ZIP) for {{ dsoName }}",
+  "confirmation-modal.export-batch.info": "هل أنت متأكد أنك تريد تصدير دفعة (ZIP) لـ {{ dsoName }}",
+
+  // "confirmation-modal.export-batch.cancel": "Cancel",
+  "confirmation-modal.export-batch.cancel": "إلغاء",
+
+  // "confirmation-modal.export-batch.confirm": "Export",
+  "confirmation-modal.export-batch.confirm": "تصدير",
 
   // "confirmation-modal.delete-eperson.header": "Delete EPerson \"{{ dsoName }}\"",
-  // TODO New key - Add a translation
-  "confirmation-modal.delete-eperson.header": "Delete EPerson \"{{ dsoName }}\"",
+  "confirmation-modal.delete-eperson.header": "حذف الشخص الإلكتروني \"{{ dsoName }}\"",
 
   // "confirmation-modal.delete-eperson.info": "Are you sure you want to delete EPerson \"{{ dsoName }}\"",
-  // TODO New key - Add a translation
-  "confirmation-modal.delete-eperson.info": "Are you sure you want to delete EPerson \"{{ dsoName }}\"",
+  "confirmation-modal.delete-eperson.info": "هل أنت متأكد من أنك تريد حذف الشخص الإلكتروني \"{{ dsoName }}\"",
 
   // "confirmation-modal.delete-eperson.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "confirmation-modal.delete-eperson.cancel": "Cancel",
+  "confirmation-modal.delete-eperson.cancel": "إلغاء",
 
   // "confirmation-modal.delete-eperson.confirm": "Delete",
-  // TODO New key - Add a translation
-  "confirmation-modal.delete-eperson.confirm": "Delete",
+  "confirmation-modal.delete-eperson.confirm": "حذف",
 
+  // "confirmation-modal.delete-profile.header": "Delete Profile",
+  "confirmation-modal.delete-profile.header": "حذف الملف الشخصي",
+
+  // "confirmation-modal.delete-profile.info": "Are you sure you want to delete your profile",
+  "confirmation-modal.delete-profile.info": "هل أنت متأكد أنك تريد حذف ملف الشخصي الخاص بك",
+
+  // "confirmation-modal.delete-profile.cancel": "Cancel",
+  "confirmation-modal.delete-profile.cancel": "إلغاء",
+
+  // "confirmation-modal.delete-profile.confirm": "Delete",
+  "confirmation-modal.delete-profile.confirm": "حذف",
+
+  // "confirmation-modal.delete-subscription.header": "Delete Subscription",
+  "confirmation-modal.delete-subscription.header": "حذف الاشتراك",
+
+  // "confirmation-modal.delete-subscription.info": "Are you sure you want to delete subscription for \"{{ dsoName }}\"",
+  "confirmation-modal.delete-subscription.info": "هل أنت متأكد من أنك تريد حذف الاشتراك لـ \"{{ dsoName }}\"",
+
+  // "confirmation-modal.delete-subscription.cancel": "Cancel",
+  "confirmation-modal.delete-subscription.cancel": "إلغاء",
+
+  // "confirmation-modal.delete-subscription.confirm": "Delete",
+  "confirmation-modal.delete-subscription.confirm": "حذف",
 
   // "error.bitstream": "Error fetching bitstream",
-  // TODO New key - Add a translation
-  "error.bitstream": "Error fetching bitstream",
+  "error.bitstream": "حدث خطأ أثناء جلب تدفق البت",
 
   // "error.browse-by": "Error fetching items",
-  // TODO New key - Add a translation
-  "error.browse-by": "Error fetching items",
+  "error.browse-by": "حدث خطأ أثناء جلب المواد",
 
   // "error.collection": "Error fetching collection",
-  // TODO New key - Add a translation
-  "error.collection": "Error fetching collection",
+  "error.collection": "حدث خطأ أثناء جلب الحاوية",
 
   // "error.collections": "Error fetching collections",
-  // TODO New key - Add a translation
-  "error.collections": "Error fetching collections",
+  "error.collections": "حدث خطأ أثناء جلب الحاويات",
 
   // "error.community": "Error fetching community",
-  // TODO New key - Add a translation
-  "error.community": "Error fetching community",
+  "error.community": "حدث خطأ أثناء جلب المجتمع",
 
   // "error.identifier": "No item found for the identifier",
-  // TODO New key - Add a translation
-  "error.identifier": "No item found for the identifier",
+  "error.identifier": "لم يتم العثور على أي مادة للمعرف",
 
   // "error.default": "Error",
-  // TODO New key - Add a translation
-  "error.default": "Error",
+  "error.default": "خطأ",
 
   // "error.item": "Error fetching item",
-  // TODO New key - Add a translation
-  "error.item": "Error fetching item",
+  "error.item": "حدث خطأ أثناء جلب المادة",
 
   // "error.items": "Error fetching items",
-  // TODO New key - Add a translation
-  "error.items": "Error fetching items",
+  "error.items": "حدث خطأ أثناء جلب المواد",
 
   // "error.objects": "Error fetching objects",
-  // TODO New key - Add a translation
-  "error.objects": "Error fetching objects",
+  "error.objects": "حدث خطأ أثناء جلب الكائنات",
 
   // "error.recent-submissions": "Error fetching recent submissions",
-  // TODO New key - Add a translation
-  "error.recent-submissions": "Error fetching recent submissions",
+  "error.recent-submissions": "حدث خطأ أثناء جلب أحدث التقديمات",
 
   // "error.search-results": "Error fetching search results",
-  // TODO New key - Add a translation
-  "error.search-results": "Error fetching search results",
+  "error.search-results": "حدث خطأ أثناء جلب نتائج البحث",
+
+  // "error.invalid-search-query": "Search query is not valid. Please check <a href=\"https://solr.apache.org/guide/query-syntax-and-parsing.html\" target=\"_blank\">Solr query syntax</a> best practices for further information about this error.",
+  "error.invalid-search-query": "استعلام البحث غير صالح. يرجى مراجعة <a href=\"https://solr.apache.org/guide/query-syntax-and-parsing.html\" target=\"_blank\">بناء جملة استعلام Solr</a> أفضل الممارسات للحصول على مزيد من المعلومات حول هذا الخطأ.",
 
   // "error.sub-collections": "Error fetching sub-collections",
-  // TODO New key - Add a translation
-  "error.sub-collections": "Error fetching sub-collections",
+  "error.sub-collections": "حدث خطأ أثناء جلب الحاويات الفرعية",
 
   // "error.sub-communities": "Error fetching sub-communities",
-  // TODO New key - Add a translation
-  "error.sub-communities": "Error fetching sub-communities",
+  "error.sub-communities": "حدث خطأ أثناء جلب المجتمعات الفرعية",
 
   // "error.submission.sections.init-form-error": "An error occurred during section initialize, please check your input-form configuration. Details are below : <br> <br>",
-  // TODO New key - Add a translation
-  "error.submission.sections.init-form-error": "An error occurred during section initialize, please check your input-form configuration. Details are below : <br> <br>",
+  "error.submission.sections.init-form-error": "حدث خطأ أثناء تهيئة القسم، يرجى التحقق من تهيئة نموذج الإدخال الخاص بك. التفاصيل أدناه : <br> <br>",
 
   // "error.top-level-communities": "Error fetching top-level communities",
-  // TODO New key - Add a translation
-  "error.top-level-communities": "Error fetching top-level communities",
+  "error.top-level-communities": "حدث خطأ أثناء جلب مجتمعات المستوى الأعلى",
 
   // "error.validation.license.notgranted": "You must grant this license to complete your submission. If you are unable to grant this license at this time you may save your work and return later or remove the submission.",
-  // TODO New key - Add a translation
-  "error.validation.license.notgranted": "You must grant this license to complete your submission. If you are unable to grant this license at this time you may save your work and return later or remove the submission.",
+  "error.validation.license.notgranted": "يجب عليك منح هذا الترخيص لإكمال عملية التقديم الخاصة بك. إذا لم تتمكن من منح هذا الترخيص في هذا الوقت، يمكنك حفظ عملك والعودة لاحقاً أو إزالة التقديم.",
 
   // "error.validation.pattern": "This input is restricted by the current pattern: {{ pattern }}.",
-  // TODO New key - Add a translation
-  "error.validation.pattern": "This input is restricted by the current pattern: {{ pattern }}.",
+  "error.validation.pattern": "هذا الإدخال مقيد بالنمط الحالي: {{ pattern }}.",
 
   // "error.validation.filerequired": "The file upload is mandatory",
-  // TODO New key - Add a translation
-  "error.validation.filerequired": "The file upload is mandatory",
+  "error.validation.filerequired": "تحميل الملف إلزامي",
 
+  // "error.validation.required": "This field is required",
+  "error.validation.required": "هذا الحقل مطلوب",
 
+  // "error.validation.NotValidEmail": "This is not a valid email",
+  "error.validation.NotValidEmail": "البريد الإلكتروني غير صالح",
+
+  // "error.validation.emailTaken": "This email is already taken",
+  "error.validation.emailTaken": "هذا البريد الإلكتروني مأخوذ بالفعل",
+
+  // "error.validation.groupExists": "This group already exists",
+  "error.validation.groupExists": "هذه المجموعة موجودة بالفعل",
+
+  // "error.validation.metadata.name.invalid-pattern": "This field cannot contain dots, commas or spaces. Please use the Element & Qualifier fields instead",
+  "error.validation.metadata.name.invalid-pattern": "لا يمكن أن يحتوي هذا الحقل على نقاط أو فواصل أو مسافات. يرجى استخدام حقول العنصر والمؤهل بدلاً من ذلك",
+
+  // "error.validation.metadata.name.max-length": "This field may not contain more than 32 characters",
+  "error.validation.metadata.name.max-length": "يجب ألا يحتوي هذا الحقل على أكثر من 32 حرفاً",
+
+  // "error.validation.metadata.namespace.max-length": "This field may not contain more than 256 characters",
+  "error.validation.metadata.namespace.max-length": "يجب ألا يحتوي هذا الحقل على أكثر من 256 حرفاًs",
+
+  // "error.validation.metadata.element.invalid-pattern": "This field cannot contain dots, commas or spaces. Please use the Qualifier field instead",
+  "error.validation.metadata.element.invalid-pattern": "لا يمكن أن يحتوي هذا الحقل على نقاط أو فواصل أو مسافات. يرجى استخدام حقل المؤهل بدلاً من ذلك",
+
+  // "error.validation.metadata.element.max-length": "This field may not contain more than 64 characters",
+  "error.validation.metadata.element.max-length": "يجب ألا يحتوي هذا الحقل على أكثر من 64 حرفاً",
+
+  // "error.validation.metadata.qualifier.invalid-pattern": "This field cannot contain dots, commas or spaces",
+  "error.validation.metadata.qualifier.invalid-pattern": "لا يمكن أن يحتوي هذا الحقل على نقاط أو فواصل أو مسافات",
+
+  // "error.validation.metadata.qualifier.max-length": "This field may not contain more than 64 characters",
+  "error.validation.metadata.qualifier.max-length": "يجب ألا يحتوي هذا الحقل على أكثر من 64 حرفاً",
+
+  // "feed.description": "Syndication feed",
+  "feed.description": " ملاحظات Syndication",
+
+  // "file-download-link.restricted": "Restricted bitstream",
+  "file-download-link.restricted": "دفق البت المقيد",
 
   // "file-section.error.header": "Error obtaining files for this item",
-  // TODO New key - Add a translation
-  "file-section.error.header": "Error obtaining files for this item",
-
-
+  "file-section.error.header": "حدث خطأ أثناء الحصول على ملفات لهذه المادة",
 
   // "footer.copyright": "copyright © 2002-{{ year }}",
-  // TODO New key - Add a translation
-  "footer.copyright": "copyright © 2002-{{ year }}",
+  "footer.copyright": "حقوق النشر © 2002-{{ year }}",
 
   // "footer.link.dspace": "DSpace software",
-  // TODO New key - Add a translation
-  "footer.link.dspace": "DSpace software",
+  "footer.link.dspace": "برنامج دي سبيس",
 
   // "footer.link.lyrasis": "LYRASIS",
-  // TODO New key - Add a translation
-  "footer.link.lyrasis": "LYRASIS",
+  "footer.link.lyrasis": "ليراسيس",
 
   // "footer.link.cookies": "Cookie settings",
-  // TODO New key - Add a translation
-  "footer.link.cookies": "Cookie settings",
+  "footer.link.cookies": "إعدادات ملفات تعريف الارتباط",
 
   // "footer.link.privacy-policy": "Privacy policy",
+  "footer.link.privacy-policy": "سياسة الخصوصية",
+
+  // "footer.link.end-user-agreement": "End User Agreement",
+  "footer.link.end-user-agreement": "اتفاقية المستخدم النهائي",
+
+  // "footer.link.feedback": "Send Feedback",
+  "footer.link.feedback": "إرسال الملاحظات",
+
+  // "footer.link.coar-notify-support": "COAR Notify",
   // TODO New key - Add a translation
-  "footer.link.privacy-policy": "Privacy policy",
-
-  // "footer.link.end-user-agreement":"End User Agreement",
-  // TODO New key - Add a translation
-  "footer.link.end-user-agreement": "End User Agreement",
-
-
+  "footer.link.coar-notify-support": "COAR Notify",
 
   // "forgot-email.form.header": "Forgot Password",
-  // TODO New key - Add a translation
-  "forgot-email.form.header": "Forgot Password",
+  "forgot-email.form.header": "هل نسيت كلمة المرور",
 
-  // "forgot-email.form.info": "Enter Register an account to subscribe to collections for email updates, and submit new items to DSpace.",
-  // TODO New key - Add a translation
-  "forgot-email.form.info": "Enter Register an account to subscribe to collections for email updates, and submit new items to DSpace.",
+  // "forgot-email.form.info": "Enter the email address associated with the account.",
+  "forgot-email.form.info": "قم بإدخال عنوان البريد الإلكتروني المرتبط بالحساب.",
 
   // "forgot-email.form.email": "Email Address *",
-  // TODO New key - Add a translation
-  "forgot-email.form.email": "Email Address *",
+  "forgot-email.form.email": "عنوان البريد الإلكتروني *",
 
   // "forgot-email.form.email.error.required": "Please fill in an email address",
-  // TODO New key - Add a translation
-  "forgot-email.form.email.error.required": "Please fill in an email address",
+  "forgot-email.form.email.error.required": "يرجى ملء عنوان البريد الإلكتروني",
 
-  // "forgot-email.form.email.error.pattern": "Please fill in a valid email address",
-  // TODO New key - Add a translation
-  "forgot-email.form.email.error.pattern": "Please fill in a valid email address",
+  // "forgot-email.form.email.error.not-email-form": "Please fill in a valid email address",
+  "forgot-email.form.email.error.not-email-form": "يرجى ملء عنوان بريد إلكتروني صالح",
 
-  // "forgot-email.form.email.hint": "This address will be verified and used as your login name.",
-  // TODO New key - Add a translation
-  "forgot-email.form.email.hint": "This address will be verified and used as your login name.",
+  // "forgot-email.form.email.hint": "An email will be sent to this address with a further instructions.",
+  "forgot-email.form.email.hint": "سيتم إرسال بريد إلكتروني إلى هذا العنوان يتضمن المزيد من التعليمات.",
 
-  // "forgot-email.form.submit": "Submit",
-  // TODO New key - Add a translation
-  "forgot-email.form.submit": "Submit",
+  // "forgot-email.form.submit": "Reset password",
+  "forgot-email.form.submit": "إعادة تعيين كلمة المرور",
 
-  // "forgot-email.form.success.head": "Verification email sent",
-  // TODO New key - Add a translation
-  "forgot-email.form.success.head": "Verification email sent",
+  // "forgot-email.form.success.head": "Password reset email sent",
+  "forgot-email.form.success.head": "تم إرسال رسالة عبر البريد الإلكتروني لإعادة تعيين كلمة المرور",
 
   // "forgot-email.form.success.content": "An email has been sent to {{ email }} containing a special URL and further instructions.",
-  // TODO New key - Add a translation
-  "forgot-email.form.success.content": "An email has been sent to {{ email }} containing a special URL and further instructions.",
-
-  // "forgot-email.form.error.head": "Error when trying to register email",
-  // TODO New key - Add a translation
-  "forgot-email.form.error.head": "Error when trying to register email",
-
-  // "forgot-email.form.error.content": "An error occured when registering the following email address: {{ email }}",
-  // TODO New key - Add a translation
-  "forgot-email.form.error.content": "An error occured when registering the following email address: {{ email }}",
+  "forgot-email.form.success.content": "تم إرسال بريد إلكتروني إلى {{ email }} يحتوي على عنوان URL خاص وتعليمات إضافية.",
 
+  // "forgot-email.form.error.head": "Error when trying to reset password",
+  "forgot-email.form.error.head": "حدث خطأ أثناء محاولة إعادة تعيين كلمة المرور",
 
+  // "forgot-email.form.error.content": "An error occured when attempting to reset the password for the account associated with the following email address: {{ email }}",
+  "forgot-email.form.error.content": "حدث خطأ أثناء محاولة إعادة تعيين كلمة المرور للحساب المرتبط بعنوان البريد الإلكتروني التالي: {{ email }}",
 
   // "forgot-password.title": "Forgot Password",
-  // TODO New key - Add a translation
-  "forgot-password.title": "Forgot Password",
+  "forgot-password.title": "نسيت كلمة المرور",
 
   // "forgot-password.form.head": "Forgot Password",
-  // TODO New key - Add a translation
-  "forgot-password.form.head": "Forgot Password",
+  "forgot-password.form.head": "نسيت كلمة المرور",
 
-  // "forgot-password.form.info": "Enter a new password in the box below, and confirm it by typing it again into the second box. It should be at least six characters long.",
-  // TODO New key - Add a translation
-  "forgot-password.form.info": "Enter a new password in the box below, and confirm it by typing it again into the second box. It should be at least six characters long.",
+  // "forgot-password.form.info": "Enter a new password in the box below, and confirm it by typing it again into the second box.",
+  "forgot-password.form.info": "قم بإدخال كلمة المرور الجديدة في المربع أدناه، وقم بتأكيدها عن طريق كتابتها مرة أخرى في المربع الثاني.",
 
   // "forgot-password.form.card.security": "Security",
-  // TODO New key - Add a translation
-  "forgot-password.form.card.security": "Security",
+  "forgot-password.form.card.security": "الحماية والأمان",
 
   // "forgot-password.form.identification.header": "Identify",
-  // TODO New key - Add a translation
-  "forgot-password.form.identification.header": "Identify",
+  "forgot-password.form.identification.header": "تعريف",
 
   // "forgot-password.form.identification.email": "Email address: ",
-  // TODO New key - Add a translation
-  "forgot-password.form.identification.email": "Email address: ",
+  "forgot-password.form.identification.email": "عنوان البريد الإلكتروني: ",
 
   // "forgot-password.form.label.password": "Password",
-  // TODO New key - Add a translation
-  "forgot-password.form.label.password": "Password",
+  "forgot-password.form.label.password": "كلمة المرور",
 
   // "forgot-password.form.label.passwordrepeat": "Retype to confirm",
-  // TODO New key - Add a translation
-  "forgot-password.form.label.passwordrepeat": "Retype to confirm",
+  "forgot-password.form.label.passwordrepeat": "أعد الكتابة للتأكيد",
 
-  // "forgot-password.form.error.empty-password": "Please enter a password in the box below.",
-  // TODO New key - Add a translation
-  "forgot-password.form.error.empty-password": "Please enter a password in the box below.",
+  // "forgot-password.form.error.empty-password": "Please enter a password in the boxes above.",
+  "forgot-password.form.error.empty-password": "يرجى إدخال كلمة المرور في المربعات أعلاه.",
 
   // "forgot-password.form.error.matching-passwords": "The passwords do not match.",
-  // TODO New key - Add a translation
-  "forgot-password.form.error.matching-passwords": "The passwords do not match.",
-
-  // "forgot-password.form.error.password-length": "The password should be at least 6 characters long.",
-  // TODO New key - Add a translation
-  "forgot-password.form.error.password-length": "The password should be at least 6 characters long.",
+  "forgot-password.form.error.matching-passwords": "كلمات المرور غير متطابقة.",
 
   // "forgot-password.form.notification.error.title": "Error when trying to submit new password",
-  // TODO New key - Add a translation
-  "forgot-password.form.notification.error.title": "Error when trying to submit new password",
+  "forgot-password.form.notification.error.title": "حدث خطأ أثناء محاولة تقديم كلمة المرور الجديدة",
 
   // "forgot-password.form.notification.success.content": "The password reset was successful. You have been logged in as the created user.",
-  // TODO New key - Add a translation
-  "forgot-password.form.notification.success.content": "The password reset was successful. You have been logged in as the created user.",
+  "forgot-password.form.notification.success.content": "تمت إعادة تعيين كلمة المرور بنجاح. لقد قمت بتسجيل الدخول كمستخدم تم إنشاؤه.",
 
   // "forgot-password.form.notification.success.title": "Password reset completed",
-  // TODO New key - Add a translation
-  "forgot-password.form.notification.success.title": "Password reset completed",
+  "forgot-password.form.notification.success.title": "اكتملت إعادة تعيين كلمة المرور",
 
   // "forgot-password.form.submit": "Submit password",
-  // TODO New key - Add a translation
-  "forgot-password.form.submit": "Submit password",
+  "forgot-password.form.submit": "تقديم كلمة المرور",
 
-
-
-  // "form.add": "Add",
-  // TODO New key - Add a translation
-  "form.add": "Add",
+  // "form.add": "Add more",
+  "form.add": "إضافة المزيد",
 
   // "form.add-help": "Click here to add the current entry and to add another one",
-  // TODO New key - Add a translation
-  "form.add-help": "Click here to add the current entry and to add another one",
+  "form.add-help": "انقر هنا لإضافة الإدخال الحالي وإضافة إدخال آخر",
 
   // "form.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "form.cancel": "Cancel",
+  "form.cancel": "إلغاء",
 
   // "form.clear": "Clear",
-  // TODO New key - Add a translation
-  "form.clear": "Clear",
+  "form.clear": "مسح",
 
   // "form.clear-help": "Click here to remove the selected value",
-  // TODO New key - Add a translation
-  "form.clear-help": "Click here to remove the selected value",
+  "form.clear-help": "انقر هنا لإزالة القيمة المحددة",
+
+  // "form.discard": "Discard",
+  "form.discard": "تجاهل",
+
+  // "form.drag": "Drag",
+  "form.drag": "سحب",
 
   // "form.edit": "Edit",
-  // TODO New key - Add a translation
-  "form.edit": "Edit",
+  "form.edit": "تحرير",
 
   // "form.edit-help": "Click here to edit the selected value",
-  // TODO New key - Add a translation
-  "form.edit-help": "Click here to edit the selected value",
+  "form.edit-help": "انقر هنا لتحرير القيمة المحددة",
 
   // "form.first-name": "First name",
-  // TODO New key - Add a translation
-  "form.first-name": "First name",
+  "form.first-name": "الاسم الأول",
 
   // "form.group-collapse": "Collapse",
-  // TODO New key - Add a translation
-  "form.group-collapse": "Collapse",
+  "form.group-collapse": "طي",
 
   // "form.group-collapse-help": "Click here to collapse",
-  // TODO New key - Add a translation
-  "form.group-collapse-help": "Click here to collapse",
+  "form.group-collapse-help": "انقر هنا للطي",
 
   // "form.group-expand": "Expand",
-  // TODO New key - Add a translation
-  "form.group-expand": "Expand",
+  "form.group-expand": "توسيع",
 
   // "form.group-expand-help": "Click here to expand and add more elements",
-  // TODO New key - Add a translation
-  "form.group-expand-help": "Click here to expand and add more elements",
+  "form.group-expand-help": "انقر هنا للتوسيع وإضافة المزيد من العناصر",
 
   // "form.last-name": "Last name",
-  // TODO New key - Add a translation
-  "form.last-name": "Last name",
+  "form.last-name": "اسم العائلة",
 
   // "form.loading": "Loading...",
-  // TODO New key - Add a translation
-  "form.loading": "Loading...",
+  "form.loading": "جاري التحميل...",
 
   // "form.lookup": "Lookup",
-  // TODO New key - Add a translation
-  "form.lookup": "Lookup",
+  "form.lookup": "ابحث عن",
 
   // "form.lookup-help": "Click here to look up an existing relation",
-  // TODO New key - Add a translation
-  "form.lookup-help": "Click here to look up an existing relation",
+  "form.lookup-help": "انقر هنا للبحث عن علاقة حالية",
 
   // "form.no-results": "No results found",
-  // TODO New key - Add a translation
-  "form.no-results": "No results found",
+  "form.no-results": "لم يتم العثور على نتائج",
 
   // "form.no-value": "No value entered",
-  // TODO New key - Add a translation
-  "form.no-value": "No value entered",
+  "form.no-value": "لم يتم إدخال أي قيمة",
+
+  // "form.other-information.email": "Email",
+  "form.other-information.email": "البريد الإلكتروني",
+
+  // "form.other-information.first-name": "First Name",
+  "form.other-information.first-name": "الاسم الأول",
+
+  // "form.other-information.insolr": "In Solr Index",
+  "form.other-information.insolr": "في فهرس سولر",
+
+  // "form.other-information.institution": "Institution",
+  "form.other-information.institution": "المؤسسة",
+
+  // "form.other-information.last-name": "Last Name",
+  "form.other-information.last-name": "اسم العائلة",
+
+  // "form.other-information.orcid": "ORCID",
+  "form.other-information.orcid": "أوركيد",
 
   // "form.remove": "Remove",
-  // TODO New key - Add a translation
-  "form.remove": "Remove",
+  "form.remove": "إزالة",
 
   // "form.save": "Save",
-  // TODO New key - Add a translation
-  "form.save": "Save",
+  "form.save": "حفظ",
 
   // "form.save-help": "Save changes",
-  // TODO New key - Add a translation
-  "form.save-help": "Save changes",
+  "form.save-help": "حفظ التغييرات",
 
   // "form.search": "Search",
-  // TODO New key - Add a translation
-  "form.search": "Search",
+  "form.search": "بحث",
 
   // "form.search-help": "Click here to look for an existing correspondence",
-  // TODO New key - Add a translation
-  "form.search-help": "Click here to look for an existing correspondence",
+  "form.search-help": "انقر هنا للبحث عن المراسلات الحالية",
 
-  // "form.submit": "Submit",
-  // TODO New key - Add a translation
-  "form.submit": "Submit",
+  // "form.submit": "Save",
+  "form.submit": "حفظ",
 
+  // "form.create": "Create",
+  "form.create": "إنشاء",
 
+  // "form.number-picker.decrement": "Decrement {{field}}",
+  "form.number-picker.decrement": "إنقاص {{field}}",
+
+  // "form.number-picker.increment": "Increment {{field}}",
+  "form.number-picker.increment": "زيادة {{field}}",
+
+  // "form.repeatable.sort.tip": "Drop the item in the new position",
+  "form.repeatable.sort.tip": "قم بإسقاط المادة في الموضع الجديد",
+
+  // "grant-deny-request-copy.deny": "Don't send copy",
+  "grant-deny-request-copy.deny": "لا تقم بإرسال نسخة",
+
+  // "grant-deny-request-copy.email.back": "Back",
+  "grant-deny-request-copy.email.back": "رجوع",
+
+  // "grant-deny-request-copy.email.message": "Optional additional message",
+  "grant-deny-request-copy.email.message": "رسالة إضافية اختيارية",
+
+  // "grant-deny-request-copy.email.message.empty": "Please enter a message",
+  "grant-deny-request-copy.email.message.empty": "يرجى إدخال رسالة",
+
+  // "grant-deny-request-copy.email.permissions.info": "You may use this occasion to reconsider the access restrictions on the document, to avoid having to respond to these requests. If you’d like to ask the repository administrators to remove these restrictions, please check the box below.",
+  "grant-deny-request-copy.email.permissions.info": "يمكنك استغلال هذه المناسبة لإعادة النظر في قيود الوصول على الوثيقة، لتجنب الاضطرار إلى الرد على هذه الطلبات. إذا كنت ترغب في مطالبة مديري المستودع بإزالة هذه القيود، فيرجى تحديد المربع أدناه.",
+
+  // "grant-deny-request-copy.email.permissions.label": "Change to open access",
+  "grant-deny-request-copy.email.permissions.label": "تغيير إلى وصول حر",
+
+  // "grant-deny-request-copy.email.send": "Send",
+  "grant-deny-request-copy.email.send": "إرسال",
+
+  // "grant-deny-request-copy.email.subject": "Subject",
+  "grant-deny-request-copy.email.subject": "الموضوع",
+
+  // "grant-deny-request-copy.email.subject.empty": "Please enter a subject",
+  "grant-deny-request-copy.email.subject.empty": "يرجى إدخال موضوع",
+
+  // "grant-deny-request-copy.grant": "Send copy",
+  "grant-deny-request-copy.grant": "إرسال نسخة",
+
+  // "grant-deny-request-copy.header": "Document copy request",
+  "grant-deny-request-copy.header": "طلب نسخة من الوثيقة",
+
+  // "grant-deny-request-copy.home-page": "Take me to the home page",
+  "grant-deny-request-copy.home-page": "انتقل بي إلى الصفحة الرئيسية",
+
+  // "grant-deny-request-copy.intro1": "If you are one of the authors of the document <a href='{{ url }}'>{{ name }}</a>, then please use one of the options below to respond to the user's request.",
+  "grant-deny-request-copy.intro1": "إذا كنت أحد مؤلفي الوثيقة <a href='{{ url }}'>{{ name }}</a>, فيرجى استخدام أحد الخيارات أدناه للرد على طلب المستخدم.",
+
+  // "grant-deny-request-copy.intro2": "After choosing an option, you will be presented with a suggested email reply which you may edit.",
+  "grant-deny-request-copy.intro2": "بعد اختيار أحد الخيارات، سيُعرض عليك رسالة رد مقترحة بالبريد الإلكتروني يمكنك تحريرها.",
+
+  // "grant-deny-request-copy.processed": "This request has already been processed. You can use the button below to get back to the home page.",
+  "grant-deny-request-copy.processed": "تمت معالجة هذا الطلب بالفعل. يمكنك استخدام الزر أدناه للعودة إلى الصفحة الرئيسية.",
+
+  // "grant-request-copy.email.subject": "Request copy of document",
+  "grant-request-copy.email.subject": "طلب نسخة من وثيقة",
+
+  // "grant-request-copy.error": "An error occurred",
+  "grant-request-copy.error": "لقد حدث خطأ",
+
+  // "grant-request-copy.header": "Grant document copy request",
+  "grant-request-copy.header": "طلب منح نسخة من الوثيقة",
+
+  // "grant-request-copy.intro": "A message will be sent to the applicant of the request. The requested document(s) will be attached.",
+  "grant-request-copy.intro": "سيتم إرسال هذه الرسالة إلى مقدم الطلب. وسيتم إرفاق الوثيقة المطلوبة.",
+
+  // "grant-request-copy.success": "Successfully granted item request",
+  "grant-request-copy.success": "تم منح طلب المادة بنجاح",
+
+  // "health.breadcrumbs": "Health",
+  "health.breadcrumbs": "كشف الصحة",
+
+  // "health-page.heading": "Health",
+  "health-page.heading": "كشف الصحة",
+
+  // "health-page.info-tab": "Info",
+  "health-page.info-tab": "معلومات",
+
+  // "health-page.status-tab": "Status",
+  "health-page.status-tab": "الحالة",
+
+  // "health-page.error.msg": "The health check service is temporarily unavailable",
+  "health-page.error.msg": "خدمة الفحص الصحي غير متاحة مؤقتاً",
+
+  // "health-page.property.status": "Status code",
+  "health-page.property.status": "رمز الحالة",
+
+  // "health-page.section.db.title": "Database",
+  "health-page.section.db.title": "قاعدة البيانات",
+
+  // "health-page.section.geoIp.title": "GeoIp",
+  "health-page.section.geoIp.title": "GeoIp",
+
+  // "health-page.section.solrAuthorityCore.title": "Solr: authority core",
+  "health-page.section.solrAuthorityCore.title": "سولر: جوهر الاستناد",
+
+  // "health-page.section.solrOaiCore.title": "Solr: oai core",
+  "health-page.section.solrOaiCore.title": "سولر: جوهر oai",
+
+  // "health-page.section.solrSearchCore.title": "Solr: search core",
+  "health-page.section.solrSearchCore.title": "سولر: جوهر البحث",
+
+  // "health-page.section.solrStatisticsCore.title": "Solr: statistics core",
+  "health-page.section.solrStatisticsCore.title": "سولر: جوهر الإحصائيات",
+
+  // "health-page.section-info.app.title": "Application Backend",
+  "health-page.section-info.app.title": "الواجهة الخلفية للتطبيق",
+
+  // "health-page.section-info.java.title": "Java",
+  "health-page.section-info.java.title": "جافا",
+
+  // "health-page.status": "Status",
+  "health-page.status": "الحالة",
+
+  // "health-page.status.ok.info": "Operational",
+  "health-page.status.ok.info": "تشغيلي",
+
+  // "health-page.status.error.info": "Problems detected",
+  "health-page.status.error.info": "تم الكشف عن مشاكل",
+
+  // "health-page.status.warning.info": "Possible issues detected",
+  "health-page.status.warning.info": "تم الكشف عن مشاكل محتملة",
+
+  // "health-page.title": "Health",
+  "health-page.title": "كشف الصحة",
+
+  // "health-page.section.no-issues": "No issues detected",
+  "health-page.section.no-issues": "لم يتم اكتشاف أي مشكلات",
 
   // "home.description": "",
-  // TODO New key - Add a translation
   "home.description": "",
 
   // "home.breadcrumbs": "Home",
-  // TODO New key - Add a translation
-  "home.breadcrumbs": "Home",
+  "home.breadcrumbs": "الرئيسية",
 
-  // "home.title": "DSpace Angular :: Home",
-  // TODO New key - Add a translation
-  "home.title": "DSpace Angular :: Home",
+  // "home.search-form.placeholder": "Search the repository ...",
+  "home.search-form.placeholder": "بحث المستودع ...",
+
+  // "home.title": "Home",
+  "home.title": "الرئيسية",
 
   // "home.top-level-communities.head": "Communities in DSpace",
-  // TODO New key - Add a translation
-  "home.top-level-communities.head": "Communities in DSpace",
+  "home.top-level-communities.head": "المجتمعات في دي سبيس",
 
   // "home.top-level-communities.help": "Select a community to browse its collections.",
-  // TODO New key - Add a translation
-  "home.top-level-communities.help": "Select a community to browse its collections.",
-
-
+  "home.top-level-communities.help": "قم بتحديد مجتمع لاستعراض حاوياته.",
 
   // "info.end-user-agreement.accept": "I have read and I agree to the End User Agreement",
-  // TODO New key - Add a translation
-  "info.end-user-agreement.accept": "I have read and I agree to the End User Agreement",
+  "info.end-user-agreement.accept": "لقد قمت بقراءة اتفاقية المستخدم النهائي وأوافق عليها",
 
   // "info.end-user-agreement.accept.error": "An error occurred accepting the End User Agreement",
-  // TODO New key - Add a translation
-  "info.end-user-agreement.accept.error": "An error occurred accepting the End User Agreement",
+  "info.end-user-agreement.accept.error": "حدث خطأ أثناء قبول اتفاقية المستخدم النهائي",
 
   // "info.end-user-agreement.accept.success": "Successfully updated the End User Agreement",
-  // TODO New key - Add a translation
-  "info.end-user-agreement.accept.success": "Successfully updated the End User Agreement",
+  "info.end-user-agreement.accept.success": "تم بنجاح تحديث اتفاقية المستخدم النهائي",
 
   // "info.end-user-agreement.breadcrumbs": "End User Agreement",
-  // TODO New key - Add a translation
-  "info.end-user-agreement.breadcrumbs": "End User Agreement",
+  "info.end-user-agreement.breadcrumbs": "اتفاقية المستخدم النهائي",
 
   // "info.end-user-agreement.buttons.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "info.end-user-agreement.buttons.cancel": "Cancel",
+  "info.end-user-agreement.buttons.cancel": "إلغاء",
 
   // "info.end-user-agreement.buttons.save": "Save",
-  // TODO New key - Add a translation
-  "info.end-user-agreement.buttons.save": "Save",
+  "info.end-user-agreement.buttons.save": "حفظ",
 
   // "info.end-user-agreement.head": "End User Agreement",
-  // TODO New key - Add a translation
-  "info.end-user-agreement.head": "End User Agreement",
+  "info.end-user-agreement.head": "اتفاقية المستخدم النهائي",
 
   // "info.end-user-agreement.title": "End User Agreement",
-  // TODO New key - Add a translation
-  "info.end-user-agreement.title": "End User Agreement",
+  "info.end-user-agreement.title": "اتفاقية المستخدم النهائي",
+
+  // "info.end-user-agreement.hosting-country": "the United States",
+  "info.end-user-agreement.hosting-country": "الولايات المتحدة",
 
   // "info.privacy.breadcrumbs": "Privacy Statement",
-  // TODO New key - Add a translation
-  "info.privacy.breadcrumbs": "Privacy Statement",
+  "info.privacy.breadcrumbs": "بيان الخصوصية",
 
   // "info.privacy.head": "Privacy Statement",
-  // TODO New key - Add a translation
-  "info.privacy.head": "Privacy Statement",
+  "info.privacy.head": "بيان الخصوصية",
 
   // "info.privacy.title": "Privacy Statement",
+  "info.privacy.title": "بيان الخصوصية",
+
+  // "info.feedback.breadcrumbs": "Feedback",
+  "info.feedback.breadcrumbs": "ملاحظات",
+
+  // "info.feedback.head": "Feedback",
+  "info.feedback.head": "ملاحظات",
+
+  // "info.feedback.title": "Feedback",
+  "info.feedback.title": "ملاحظات",
+
+  // "info.feedback.info": "Thanks for sharing your feedback about the DSpace system. Your comments are appreciated!",
+  "info.feedback.info": "شكراً لمشاركتنا ملاحظاتك حول نظام دي سبيس. نقدر تعليقاتكم!",
+
+  // "info.feedback.email_help": "This address will be used to follow up on your feedback.",
+  "info.feedback.email_help": "سيتم استخدام هذا البريد الالكتروني لمتابعة ملاحظاتك.",
+
+  // "info.feedback.send": "Send Feedback",
+  "info.feedback.send": "قم بإرسال ملاحظاتك",
+
+  // "info.feedback.comments": "Comments",
+  "info.feedback.comments": "تعليقات",
+
+  // "info.feedback.email-label": "Your Email",
+  "info.feedback.email-label": "البريد الإلكتروني الخاص بك",
+
+  // "info.feedback.create.success": "Feedback Sent Successfully!",
+  "info.feedback.create.success": "تم إرسال الملاحظات بنجاح!",
+
+  // "info.feedback.error.email.required": "A valid email address is required",
+  "info.feedback.error.email.required": "مطلوب عنوان بريد إلكتروني صالح",
+
+  // "info.feedback.error.message.required": "A comment is required",
+  "info.feedback.error.message.required": "مطلوب تعليق",
+
+  // "info.feedback.page-label": "Page",
+  "info.feedback.page-label": "صفحة",
+
+  // "info.feedback.page_help": "The page related to your feedback",
+  "info.feedback.page_help": "الصفحة ذات الصلة بملاحظاتك",
+
+  // "info.coar-notify-support.title": "COAR Notify Support",
   // TODO New key - Add a translation
-  "info.privacy.title": "Privacy Statement",
+  "info.coar-notify-support.title": "COAR Notify Support",
 
-
-
-  // "item.alerts.private": "This item is private",
+  // "info.coar-notify-support.breadcrumbs": "COAR Notify Support",
   // TODO New key - Add a translation
-  "item.alerts.private": "This item is private",
+  "info.coar-notify-support.breadcrumbs": "COAR Notify Support",
+
+  // "item.alerts.private": "This item is non-discoverable",
+  "item.alerts.private": "هذه المادة غير قابلة للاكتشاف",
 
   // "item.alerts.withdrawn": "This item has been withdrawn",
+  "item.alerts.withdrawn": "تم سحب هذه المادة",
+
+  // "item.alerts.reinstate-request": "Request reinstate",
   // TODO New key - Add a translation
-  "item.alerts.withdrawn": "This item has been withdrawn",
-
+  "item.alerts.reinstate-request": "Request reinstate",
 
+  // "quality-assurance.event.table.person-who-requested": "Requested by",
+  // TODO New key - Add a translation
+  "quality-assurance.event.table.person-who-requested": "Requested by",
 
   // "item.edit.authorizations.heading": "With this editor you can view and alter the policies of an item, plus alter policies of individual item components: bundles and bitstreams. Briefly, an item is a container of bundles, and bundles are containers of bitstreams. Containers usually have ADD/REMOVE/READ/WRITE policies, while bitstreams only have READ/WRITE policies.",
-  // TODO New key - Add a translation
-  "item.edit.authorizations.heading": "With this editor you can view and alter the policies of an item, plus alter policies of individual item components: bundles and bitstreams. Briefly, an item is a container of bundles, and bundles are containers of bitstreams. Containers usually have ADD/REMOVE/READ/WRITE policies, while bitstreams only have READ/WRITE policies.",
+  "item.edit.authorizations.heading": "باستخدام هذا المحرر ، يمكنك عرض وتغيير سياسات مادة ما، بالإضافة إلى تغيير سياسات مكونات المادة الفردية: الحزم وتدفق البت. باختصار، المادة عبارة عن حاوية من الحزم، والحزم عبارة عن حاويات لتدفقات البت. للحاويات في المعتاد سياسات ADD/REMOVE/READ/WRITE ، بينما يكون لتدفقات البت سياسات READ/WRITE فقط.",
 
   // "item.edit.authorizations.title": "Edit item's Policies",
-  // TODO New key - Add a translation
-  "item.edit.authorizations.title": "Edit item's Policies",
+  "item.edit.authorizations.title": "تحرير سياسات المادة",
 
-
-
-  // "item.badge.private": "Private",
-  // TODO New key - Add a translation
-  "item.badge.private": "Private",
+  // "item.badge.private": "Non-discoverable",
+  "item.badge.private": "غير قابل للاكتشاف",
 
   // "item.badge.withdrawn": "Withdrawn",
-  // TODO New key - Add a translation
-  "item.badge.withdrawn": "Withdrawn",
-
-
+  "item.badge.withdrawn": "مسحوب",
 
   // "item.bitstreams.upload.bundle": "Bundle",
-  // TODO New key - Add a translation
-  "item.bitstreams.upload.bundle": "Bundle",
+  "item.bitstreams.upload.bundle": "الحزمة",
 
-  // "item.bitstreams.upload.bundle.placeholder": "Select a bundle",
-  // TODO New key - Add a translation
-  "item.bitstreams.upload.bundle.placeholder": "Select a bundle",
+  // "item.bitstreams.upload.bundle.placeholder": "Select a bundle or input new bundle name",
+  "item.bitstreams.upload.bundle.placeholder": "قم بتحديد حزمة أو إدخال اسم حزمة جديدة",
 
   // "item.bitstreams.upload.bundle.new": "Create bundle",
-  // TODO New key - Add a translation
-  "item.bitstreams.upload.bundle.new": "Create bundle",
+  "item.bitstreams.upload.bundle.new": "إنشاء حزمة",
 
   // "item.bitstreams.upload.bundles.empty": "This item doesn't contain any bundles to upload a bitstream to.",
-  // TODO New key - Add a translation
-  "item.bitstreams.upload.bundles.empty": "This item doesn't contain any bundles to upload a bitstream to.",
+  "item.bitstreams.upload.bundles.empty": "لا تحتوي هذه المادة على أية حزم لتحميل تدفقات البت لها.",
 
   // "item.bitstreams.upload.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "item.bitstreams.upload.cancel": "Cancel",
+  "item.bitstreams.upload.cancel": "إلغاء",
 
   // "item.bitstreams.upload.drop-message": "Drop a file to upload",
-  // TODO New key - Add a translation
-  "item.bitstreams.upload.drop-message": "Drop a file to upload",
+  "item.bitstreams.upload.drop-message": "قم بإسقاط ملف لتحميله",
 
   // "item.bitstreams.upload.item": "Item: ",
-  // TODO New key - Add a translation
-  "item.bitstreams.upload.item": "Item: ",
+  "item.bitstreams.upload.item": "المواد: ",
 
   // "item.bitstreams.upload.notifications.bundle.created.content": "Successfully created new bundle.",
-  // TODO New key - Add a translation
-  "item.bitstreams.upload.notifications.bundle.created.content": "Successfully created new bundle.",
+  "item.bitstreams.upload.notifications.bundle.created.content": "تم إنشاء حزمة جديدة بنجاح.",
 
   // "item.bitstreams.upload.notifications.bundle.created.title": "Created bundle",
-  // TODO New key - Add a translation
-  "item.bitstreams.upload.notifications.bundle.created.title": "Created bundle",
+  "item.bitstreams.upload.notifications.bundle.created.title": "الحزمة التي تم إنشاؤها",
 
   // "item.bitstreams.upload.notifications.upload.failed": "Upload failed. Please verify the content before retrying.",
-  // TODO New key - Add a translation
-  "item.bitstreams.upload.notifications.upload.failed": "Upload failed. Please verify the content before retrying.",
+  "item.bitstreams.upload.notifications.upload.failed": "فشل التحميل. يرجى التحقق من المحتوى قبل إعادة المحاولة.",
 
   // "item.bitstreams.upload.title": "Upload bitstream",
-  // TODO New key - Add a translation
-  "item.bitstreams.upload.title": "Upload bitstream",
-
-
+  "item.bitstreams.upload.title": "تحميل تدفق البت",
 
   // "item.edit.bitstreams.bundle.edit.buttons.upload": "Upload",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.bundle.edit.buttons.upload": "Upload",
+  "item.edit.bitstreams.bundle.edit.buttons.upload": "تحميل",
 
   // "item.edit.bitstreams.bundle.displaying": "Currently displaying {{ amount }} bitstreams of {{ total }}.",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.bundle.displaying": "Currently displaying {{ amount }} bitstreams of {{ total }}.",
+  "item.edit.bitstreams.bundle.displaying": "يتم حالياً عرض {{ amount }} تدفقات بت من {{ total }}.",
 
   // "item.edit.bitstreams.bundle.load.all": "Load all ({{ total }})",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.bundle.load.all": "Load all ({{ total }})",
+  "item.edit.bitstreams.bundle.load.all": "تحميل الكل ({{ total }})",
 
   // "item.edit.bitstreams.bundle.load.more": "Load more",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.bundle.load.more": "Load more",
+  "item.edit.bitstreams.bundle.load.more": "تحميل المزيد",
 
   // "item.edit.bitstreams.bundle.name": "BUNDLE: {{ name }}",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.bundle.name": "BUNDLE: {{ name }}",
+  "item.edit.bitstreams.bundle.name": "الحزمة: {{ name }}",
 
   // "item.edit.bitstreams.discard-button": "Discard",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.discard-button": "Discard",
+  "item.edit.bitstreams.discard-button": "تجاهل",
 
   // "item.edit.bitstreams.edit.buttons.download": "Download",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.edit.buttons.download": "Download",
+  "item.edit.bitstreams.edit.buttons.download": "تنزيل",
 
   // "item.edit.bitstreams.edit.buttons.drag": "Drag",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.edit.buttons.drag": "Drag",
+  "item.edit.bitstreams.edit.buttons.drag": "سحب",
 
   // "item.edit.bitstreams.edit.buttons.edit": "Edit",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.edit.buttons.edit": "Edit",
+  "item.edit.bitstreams.edit.buttons.edit": "تحرير",
 
   // "item.edit.bitstreams.edit.buttons.remove": "Remove",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.edit.buttons.remove": "Remove",
+  "item.edit.bitstreams.edit.buttons.remove": "إزالة",
 
   // "item.edit.bitstreams.edit.buttons.undo": "Undo changes",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.edit.buttons.undo": "Undo changes",
+  "item.edit.bitstreams.edit.buttons.undo": "التراجع عن التغييرات",
 
   // "item.edit.bitstreams.empty": "This item doesn't contain any bitstreams. Click the upload button to create one.",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.empty": "This item doesn't contain any bitstreams. Click the upload button to create one.",
+  "item.edit.bitstreams.empty": "لا تحتوي هذه المادة على أية تدفقات بت. انقر على زر التحميل لإنشاء واحد.",
 
   // "item.edit.bitstreams.headers.actions": "Actions",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.headers.actions": "Actions",
+  "item.edit.bitstreams.headers.actions": "إجراءات",
 
   // "item.edit.bitstreams.headers.bundle": "Bundle",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.headers.bundle": "Bundle",
+  "item.edit.bitstreams.headers.bundle": "الحزمة",
 
   // "item.edit.bitstreams.headers.description": "Description",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.headers.description": "Description",
+  "item.edit.bitstreams.headers.description": "الوصف",
 
   // "item.edit.bitstreams.headers.format": "Format",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.headers.format": "Format",
+  "item.edit.bitstreams.headers.format": "التنسيق",
 
   // "item.edit.bitstreams.headers.name": "Name",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.headers.name": "Name",
+  "item.edit.bitstreams.headers.name": "الاسم",
 
   // "item.edit.bitstreams.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button",
+  "item.edit.bitstreams.notifications.discarded.content": "تم تجاهل تغييراتك. لإعادة تعيين تغييراتك قم بالنقر على زر 'تراجع'",
 
   // "item.edit.bitstreams.notifications.discarded.title": "Changes discarded",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.notifications.discarded.title": "Changes discarded",
+  "item.edit.bitstreams.notifications.discarded.title": "تم تجاهل التغييرات",
 
   // "item.edit.bitstreams.notifications.move.failed.title": "Error moving bitstreams",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.notifications.move.failed.title": "Error moving bitstreams",
+  "item.edit.bitstreams.notifications.move.failed.title": "خطأ أثناء نقل تدفقات البت",
 
   // "item.edit.bitstreams.notifications.move.saved.content": "Your move changes to this item's bitstreams and bundles have been saved.",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.notifications.move.saved.content": "Your move changes to this item's bitstreams and bundles have been saved.",
+  "item.edit.bitstreams.notifications.move.saved.content": "تم حفظ تغييرات النقل الخاصة بك على حزم وتدفقات بت هذه المادة.",
 
   // "item.edit.bitstreams.notifications.move.saved.title": "Move changes saved",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.notifications.move.saved.title": "Move changes saved",
+  "item.edit.bitstreams.notifications.move.saved.title": "تم حفظ تغييرات النقل",
 
   // "item.edit.bitstreams.notifications.outdated.content": "The item you're currently working on has been changed by another user. Your current changes are discarded to prevent conflicts",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.notifications.outdated.content": "The item you're currently working on has been changed by another user. Your current changes are discarded to prevent conflicts",
+  "item.edit.bitstreams.notifications.outdated.content": "المادة التي تعمل عليها حالياً تم تغييرها بواسطة مستخدم آخر. تم تجاهل تغييراتك الحالية لتجنب التعارض",
 
   // "item.edit.bitstreams.notifications.outdated.title": "Changes outdated",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.notifications.outdated.title": "Changes outdated",
+  "item.edit.bitstreams.notifications.outdated.title": "انتهت صلاحية التغييرات",
 
   // "item.edit.bitstreams.notifications.remove.failed.title": "Error deleting bitstream",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.notifications.remove.failed.title": "Error deleting bitstream",
+  "item.edit.bitstreams.notifications.remove.failed.title": "خطأ أثناء حذف تدفق البت",
 
   // "item.edit.bitstreams.notifications.remove.saved.content": "Your removal changes to this item's bitstreams have been saved.",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.notifications.remove.saved.content": "Your removal changes to this item's bitstreams have been saved.",
+  "item.edit.bitstreams.notifications.remove.saved.content": "تم حفظ تغييرات الإزالة الخاصة بك على تدفقات بت هذه المادة.",
 
   // "item.edit.bitstreams.notifications.remove.saved.title": "Removal changes saved",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.notifications.remove.saved.title": "Removal changes saved",
+  "item.edit.bitstreams.notifications.remove.saved.title": "تم حفظ تغييرات الإزالة",
 
   // "item.edit.bitstreams.reinstate-button": "Undo",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.reinstate-button": "Undo",
+  "item.edit.bitstreams.reinstate-button": "تراجع",
 
   // "item.edit.bitstreams.save-button": "Save",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.save-button": "Save",
+  "item.edit.bitstreams.save-button": "حفظ",
 
   // "item.edit.bitstreams.upload-button": "Upload",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.upload-button": "Upload",
-
-
+  "item.edit.bitstreams.upload-button": "تحميل",
 
   // "item.edit.delete.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "item.edit.delete.cancel": "Cancel",
+  "item.edit.delete.cancel": "إلغاء",
 
   // "item.edit.delete.confirm": "Delete",
-  // TODO New key - Add a translation
-  "item.edit.delete.confirm": "Delete",
+  "item.edit.delete.confirm": "حذف",
 
   // "item.edit.delete.description": "Are you sure this item should be completely deleted? Caution: At present, no tombstone would be left.",
-  // TODO New key - Add a translation
-  "item.edit.delete.description": "Are you sure this item should be completely deleted? Caution: At present, no tombstone would be left.",
+  "item.edit.delete.description": "هل أنت متأكد من حذف هذه المادة تماماً؟ تحذير: في الوقت الحالي لن تتبقى أي آثار.",
 
   // "item.edit.delete.error": "An error occurred while deleting the item",
-  // TODO New key - Add a translation
-  "item.edit.delete.error": "An error occurred while deleting the item",
+  "item.edit.delete.error": "حدث خطأ أثناء حذف المادة",
 
   // "item.edit.delete.header": "Delete item: {{ id }}",
-  // TODO New key - Add a translation
-  "item.edit.delete.header": "Delete item: {{ id }}",
+  "item.edit.delete.header": "حذف المادة: {{ id }}",
 
   // "item.edit.delete.success": "The item has been deleted",
-  // TODO New key - Add a translation
-  "item.edit.delete.success": "The item has been deleted",
+  "item.edit.delete.success": "تم حذف هذه المادة",
 
   // "item.edit.head": "Edit Item",
-  // TODO New key - Add a translation
-  "item.edit.head": "Edit Item",
+  "item.edit.head": "تحرير المادة",
 
   // "item.edit.breadcrumbs": "Edit Item",
-  // TODO New key - Add a translation
-  "item.edit.breadcrumbs": "Edit Item",
+  "item.edit.breadcrumbs": "تحرير المادة",
 
+  // "item.edit.tabs.disabled.tooltip": "You're not authorized to access this tab",
+  "item.edit.tabs.disabled.tooltip": "غير مصرح لك بالوصول إلى هذا التبويب",
 
   // "item.edit.tabs.mapper.head": "Collection Mapper",
-  // TODO New key - Add a translation
-  "item.edit.tabs.mapper.head": "Collection Mapper",
+  "item.edit.tabs.mapper.head": "مخطط الحاوية",
 
   // "item.edit.tabs.item-mapper.title": "Item Edit - Collection Mapper",
-  // TODO New key - Add a translation
-  "item.edit.tabs.item-mapper.title": "Item Edit - Collection Mapper",
+  "item.edit.tabs.item-mapper.title": "تحرير المادة - مخطط الحاوية",
+
+  // "item.edit.identifiers.doi.status.UNKNOWN": "Unknown",
+  "item.edit.identifiers.doi.status.UNKNOWN": "غير معروف",
+
+  // "item.edit.identifiers.doi.status.TO_BE_REGISTERED": "Queued for registration",
+  "item.edit.identifiers.doi.status.TO_BE_REGISTERED": "في قائمة الانتظار للتسجيل",
+
+  // "item.edit.identifiers.doi.status.TO_BE_RESERVED": "Queued for reservation",
+  "item.edit.identifiers.doi.status.TO_BE_RESERVED": "في قائمة الانتظار للحجز",
+
+  // "item.edit.identifiers.doi.status.IS_REGISTERED": "Registered",
+  "item.edit.identifiers.doi.status.IS_REGISTERED": "مسجل",
+
+  // "item.edit.identifiers.doi.status.IS_RESERVED": "Reserved",
+  "item.edit.identifiers.doi.status.IS_RESERVED": "محجوز",
+
+  // "item.edit.identifiers.doi.status.UPDATE_RESERVED": "Reserved (update queued)",
+  "item.edit.identifiers.doi.status.UPDATE_RESERVED": "محجوز (تحديث قائمة الانتظار)",
+
+  // "item.edit.identifiers.doi.status.UPDATE_REGISTERED": "Registered (update queued)",
+  "item.edit.identifiers.doi.status.UPDATE_REGISTERED": "مسجل (تحديث قائمة الانتظار)",
+
+  // "item.edit.identifiers.doi.status.UPDATE_BEFORE_REGISTRATION": "Queued for update and registration",
+  "item.edit.identifiers.doi.status.UPDATE_BEFORE_REGISTRATION": "في قائمة الانتظار للتحديث والتسجيل",
+
+  // "item.edit.identifiers.doi.status.TO_BE_DELETED": "Queued for deletion",
+  "item.edit.identifiers.doi.status.TO_BE_DELETED": "في قائمة الانتظار للحذف",
+
+  // "item.edit.identifiers.doi.status.DELETED": "Deleted",
+  "item.edit.identifiers.doi.status.DELETED": "تم الحذف",
+
+  // "item.edit.identifiers.doi.status.PENDING": "Pending (not registered)",
+  "item.edit.identifiers.doi.status.PENDING": "في الانتظار (غير مسجل)",
+
+  // "item.edit.identifiers.doi.status.MINTED": "Minted (not registered)",
+  "item.edit.identifiers.doi.status.MINTED": "مسكوك (غير مسجل)",
+
+  // "item.edit.tabs.status.buttons.register-doi.label": "Register a new or pending DOI",
+  "item.edit.tabs.status.buttons.register-doi.label": "تسجيل معرف كائن رقمي جديد أو في الانتظار",
+
+  // "item.edit.tabs.status.buttons.register-doi.button": "Register DOI...",
+  "item.edit.tabs.status.buttons.register-doi.button": "تسجيل معرف كائن رقمي...",
+
+  // "item.edit.register-doi.header": "Register a new or pending DOI",
+  "item.edit.register-doi.header": "تسجيل معرف كائن رقمي جديد أو في الانتظار",
+
+  // "item.edit.register-doi.description": "Review any pending identifiers and item metadata below and click Confirm to proceed with DOI registration, or Cancel to back out",
+  "item.edit.register-doi.description": "قم بمراجعة أي معرفات في الانتظار وميتاداتا المادة أدناه والنقر على تأكيد لمتابعة تسجيل معرف الكائن الرقمي، أو إلغاء للتراجع",
+
+  // "item.edit.register-doi.confirm": "Confirm",
+  "item.edit.register-doi.confirm": "تأكيد",
+
+  // "item.edit.register-doi.cancel": "Cancel",
+  "item.edit.register-doi.cancel": "إلغاء",
+
+  // "item.edit.register-doi.success": "DOI queued for registration successfully.",
+  "item.edit.register-doi.success": "تم وضع معرف الكائن الرقمي في قائمة الانتظار للتسجيل بنجاح.",
+
+  // "item.edit.register-doi.error": "Error registering DOI",
+  "item.edit.register-doi.error": "خطأ في تسجيل معرف الكائن الرقمي",
+
+  // "item.edit.register-doi.to-update": "The following DOI has already been minted and will be queued for registration online",
+  "item.edit.register-doi.to-update": "لقد تم بالفعل سك معرف الكائن الرقمي التالي وسيتم وضعه في قائمة الانتظار للتسجيل عبر الإنترنت",
 
   // "item.edit.item-mapper.buttons.add": "Map item to selected collections",
-  // TODO New key - Add a translation
-  "item.edit.item-mapper.buttons.add": "Map item to selected collections",
+  "item.edit.item-mapper.buttons.add": "تخطيط مادة إلى حاويات محددة",
 
   // "item.edit.item-mapper.buttons.remove": "Remove item's mapping for selected collections",
-  // TODO New key - Add a translation
-  "item.edit.item-mapper.buttons.remove": "Remove item's mapping for selected collections",
+  "item.edit.item-mapper.buttons.remove": "إزالة تحطيط مادة لحاويات محددة",
 
   // "item.edit.item-mapper.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "item.edit.item-mapper.cancel": "Cancel",
+  "item.edit.item-mapper.cancel": "إلغاء",
 
   // "item.edit.item-mapper.description": "This is the item mapper tool that allows administrators to map this item to other collections. You can search for collections and map them, or browse the list of collections the item is currently mapped to.",
-  // TODO New key - Add a translation
-  "item.edit.item-mapper.description": "This is the item mapper tool that allows administrators to map this item to other collections. You can search for collections and map them, or browse the list of collections the item is currently mapped to.",
+  "item.edit.item-mapper.description": "هذه أداة مخطط المادة التي تتيح للمديرين تخطيط هذه المادة إلى حاويات أخرى. يمكنك البحث عن الحاويات وتخطيطها، أو استعراض قائمة بالحاويات التي تم تخطيط هذه المادة لها حالياً.",
 
   // "item.edit.item-mapper.head": "Item Mapper - Map Item to Collections",
-  // TODO New key - Add a translation
-  "item.edit.item-mapper.head": "Item Mapper - Map Item to Collections",
+  "item.edit.item-mapper.head": "مخطط المادة - تخطيط مادة إلى حاويات",
 
   // "item.edit.item-mapper.item": "Item: \"<b>{{name}}</b>\"",
-  // TODO New key - Add a translation
-  "item.edit.item-mapper.item": "Item: \"<b>{{name}}</b>\"",
+  "item.edit.item-mapper.item": "المادة: \"<b>{{name}}</b>\"",
 
   // "item.edit.item-mapper.no-search": "Please enter a query to search",
-  // TODO New key - Add a translation
-  "item.edit.item-mapper.no-search": "Please enter a query to search",
+  "item.edit.item-mapper.no-search": "يرجى إدخال استعلام للبحث",
 
   // "item.edit.item-mapper.notifications.add.error.content": "Errors occurred for mapping of item to {{amount}} collections.",
-  // TODO New key - Add a translation
-  "item.edit.item-mapper.notifications.add.error.content": "Errors occurred for mapping of item to {{amount}} collections.",
+  "item.edit.item-mapper.notifications.add.error.content": "حدثت أخطاء أثناء تخطيط مادة إلى  {{amount}} حاوية.",
 
   // "item.edit.item-mapper.notifications.add.error.head": "Mapping errors",
-  // TODO New key - Add a translation
-  "item.edit.item-mapper.notifications.add.error.head": "Mapping errors",
+  "item.edit.item-mapper.notifications.add.error.head": "أخطاء التخطيط",
 
   // "item.edit.item-mapper.notifications.add.success.content": "Successfully mapped item to {{amount}} collections.",
-  // TODO New key - Add a translation
-  "item.edit.item-mapper.notifications.add.success.content": "Successfully mapped item to {{amount}} collections.",
+  "item.edit.item-mapper.notifications.add.success.content": "تم تخطيط المادة إلى {{amount}} حاوية بنجاح.",
 
   // "item.edit.item-mapper.notifications.add.success.head": "Mapping completed",
-  // TODO New key - Add a translation
-  "item.edit.item-mapper.notifications.add.success.head": "Mapping completed",
+  "item.edit.item-mapper.notifications.add.success.head": "اكتمل التخطيط",
 
   // "item.edit.item-mapper.notifications.remove.error.content": "Errors occurred for the removal of the mapping to {{amount}} collections.",
-  // TODO New key - Add a translation
-  "item.edit.item-mapper.notifications.remove.error.content": "Errors occurred for the removal of the mapping to {{amount}} collections.",
+  "item.edit.item-mapper.notifications.remove.error.content": "حدثت أخطاء أثناء إزالة التخطيط إلى {{amount}} حاوية.",
 
   // "item.edit.item-mapper.notifications.remove.error.head": "Removal of mapping errors",
-  // TODO New key - Add a translation
-  "item.edit.item-mapper.notifications.remove.error.head": "Removal of mapping errors",
+  "item.edit.item-mapper.notifications.remove.error.head": "أخطاء إزالة التخطيط",
 
   // "item.edit.item-mapper.notifications.remove.success.content": "Successfully removed mapping of item to {{amount}} collections.",
-  // TODO New key - Add a translation
-  "item.edit.item-mapper.notifications.remove.success.content": "Successfully removed mapping of item to {{amount}} collections.",
+  "item.edit.item-mapper.notifications.remove.success.content": "تمت إزالة تخطيط المادة إلى {{amount}} حاوية بنجاح.",
 
   // "item.edit.item-mapper.notifications.remove.success.head": "Removal of mapping completed",
-  // TODO New key - Add a translation
-  "item.edit.item-mapper.notifications.remove.success.head": "Removal of mapping completed",
+  "item.edit.item-mapper.notifications.remove.success.head": "اكتملت إزالة التخطيط",
+
+  // "item.edit.item-mapper.search-form.placeholder": "Search collections...",
+  "item.edit.item-mapper.search-form.placeholder": "بحث الحاويات...",
 
   // "item.edit.item-mapper.tabs.browse": "Browse mapped collections",
-  // TODO New key - Add a translation
-  "item.edit.item-mapper.tabs.browse": "Browse mapped collections",
+  "item.edit.item-mapper.tabs.browse": "استعراض الحاويات المخططة",
 
   // "item.edit.item-mapper.tabs.map": "Map new collections",
-  // TODO New key - Add a translation
-  "item.edit.item-mapper.tabs.map": "Map new collections",
-
-
+  "item.edit.item-mapper.tabs.map": "تخطيط حاويات جديدة",
 
   // "item.edit.metadata.add-button": "Add",
-  // TODO New key - Add a translation
-  "item.edit.metadata.add-button": "Add",
+  "item.edit.metadata.add-button": "إضافة",
 
   // "item.edit.metadata.discard-button": "Discard",
+  "item.edit.metadata.discard-button": "تجاهل",
+
+  // "item.edit.metadata.edit.language": "Edit language",
+  "item.edit.metadata.edit.language": "تحرير اللغة",
+
+  // "item.edit.metadata.edit.value": "Edit value",
+  "item.edit.metadata.edit.value": "تحرير القيمة",
+
+  // "item.edit.metadata.edit.authority.key": "Edit authority key",
   // TODO New key - Add a translation
-  "item.edit.metadata.discard-button": "Discard",
+  "item.edit.metadata.edit.authority.key": "Edit authority key",
+
+  // "item.edit.metadata.edit.buttons.confirm": "Confirm",
+  "item.edit.metadata.edit.buttons.confirm": "تأكيد",
+
+  // "item.edit.metadata.edit.buttons.drag": "Drag to reorder",
+  "item.edit.metadata.edit.buttons.drag": "اسحب لإعادة ترتيب",
 
   // "item.edit.metadata.edit.buttons.edit": "Edit",
-  // TODO New key - Add a translation
-  "item.edit.metadata.edit.buttons.edit": "Edit",
+  "item.edit.metadata.edit.buttons.edit": "تحرير",
 
   // "item.edit.metadata.edit.buttons.remove": "Remove",
-  // TODO New key - Add a translation
-  "item.edit.metadata.edit.buttons.remove": "Remove",
+  "item.edit.metadata.edit.buttons.remove": "إزالة",
 
   // "item.edit.metadata.edit.buttons.undo": "Undo changes",
-  // TODO New key - Add a translation
-  "item.edit.metadata.edit.buttons.undo": "Undo changes",
+  "item.edit.metadata.edit.buttons.undo": "تراجع عن التغييرات",
 
   // "item.edit.metadata.edit.buttons.unedit": "Stop editing",
-  // TODO New key - Add a translation
-  "item.edit.metadata.edit.buttons.unedit": "Stop editing",
+  "item.edit.metadata.edit.buttons.unedit": "توقف عن التحرير",
+
+  // "item.edit.metadata.edit.buttons.virtual": "This is a virtual metadata value, i.e. a value inherited from a related entity. It can’t be modified directly. Add or remove the corresponding relationship in the \"Relationships\" tab",
+  "item.edit.metadata.edit.buttons.virtual": "هذه قيمة ميتاداتا افتراضية، أي قيمة موروثة من كينونة ذات صلة. ولا يمكن تعديلها مباشرة. إضافة أو إزالة العلاقة المقابلة في تبويب \"العلاقات\" ",
 
   // "item.edit.metadata.empty": "The item currently doesn't contain any metadata. Click Add to start adding a metadata value.",
-  // TODO New key - Add a translation
-  "item.edit.metadata.empty": "The item currently doesn't contain any metadata. Click Add to start adding a metadata value.",
+  "item.edit.metadata.empty": "لا تحتوي المادة حاليًا على أي ميتاداتا. انقر فوق إضافة لبدء إضافة قيمة ميتاداتا.",
 
   // "item.edit.metadata.headers.edit": "Edit",
-  // TODO New key - Add a translation
-  "item.edit.metadata.headers.edit": "Edit",
+  "item.edit.metadata.headers.edit": "تحرير",
 
   // "item.edit.metadata.headers.field": "Field",
-  // TODO New key - Add a translation
-  "item.edit.metadata.headers.field": "Field",
+  "item.edit.metadata.headers.field": "الحقل",
 
   // "item.edit.metadata.headers.language": "Lang",
-  // TODO New key - Add a translation
-  "item.edit.metadata.headers.language": "Lang",
+  "item.edit.metadata.headers.language": "اللغة",
 
   // "item.edit.metadata.headers.value": "Value",
-  // TODO New key - Add a translation
-  "item.edit.metadata.headers.value": "Value",
+  "item.edit.metadata.headers.value": "القيمة",
+
+  // "item.edit.metadata.metadatafield": "Edit field",
+  "item.edit.metadata.metadatafield": "تحرير الحقل",
+
+  // "item.edit.metadata.metadatafield.error": "An error occurred validating the metadata field",
+  "item.edit.metadata.metadatafield.error": "حدث خطأ أثناء التحقق من صحة حقل الميتاداتا",
 
   // "item.edit.metadata.metadatafield.invalid": "Please choose a valid metadata field",
-  // TODO New key - Add a translation
-  "item.edit.metadata.metadatafield.invalid": "Please choose a valid metadata field",
+  "item.edit.metadata.metadatafield.invalid": "يرجى اختيار حقل ميتاداتا صالح",
 
   // "item.edit.metadata.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button",
-  // TODO New key - Add a translation
-  "item.edit.metadata.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button",
+  "item.edit.metadata.notifications.discarded.content": "تم تجاهل تغييراتك. لإعادة تعيين التغييرات قم بالنقر على زر 'تراجع'",
 
-  // "item.edit.metadata.notifications.discarded.title": "Changed discarded",
-  // TODO New key - Add a translation
-  "item.edit.metadata.notifications.discarded.title": "Changed discarded",
+  // "item.edit.metadata.notifications.discarded.title": "Changes discarded",
+  "item.edit.metadata.notifications.discarded.title": "تم تجاهل التغييرات",
 
   // "item.edit.metadata.notifications.error.title": "An error occurred",
-  // TODO New key - Add a translation
-  "item.edit.metadata.notifications.error.title": "An error occurred",
+  "item.edit.metadata.notifications.error.title": "لقد حدث خطأ",
 
   // "item.edit.metadata.notifications.invalid.content": "Your changes were not saved. Please make sure all fields are valid before you save.",
-  // TODO New key - Add a translation
-  "item.edit.metadata.notifications.invalid.content": "Your changes were not saved. Please make sure all fields are valid before you save.",
+  "item.edit.metadata.notifications.invalid.content": "لم يتم حفظ تغييراتك. يرجى التأكد من صحة جميع الحقول قبل الحفظ.",
 
   // "item.edit.metadata.notifications.invalid.title": "Metadata invalid",
-  // TODO New key - Add a translation
-  "item.edit.metadata.notifications.invalid.title": "Metadata invalid",
+  "item.edit.metadata.notifications.invalid.title": "الميتاداتا غير صالحة",
 
   // "item.edit.metadata.notifications.outdated.content": "The item you're currently working on has been changed by another user. Your current changes are discarded to prevent conflicts",
-  // TODO New key - Add a translation
-  "item.edit.metadata.notifications.outdated.content": "The item you're currently working on has been changed by another user. Your current changes are discarded to prevent conflicts",
+  "item.edit.metadata.notifications.outdated.content": "المادة التي تعمل عليها حالياً تم تغييرها بواسطة مستخدم آخر. تم تجاهل تغييراتك الحالية لتجنب التعارض",
 
-  // "item.edit.metadata.notifications.outdated.title": "Changed outdated",
-  // TODO New key - Add a translation
-  "item.edit.metadata.notifications.outdated.title": "Changed outdated",
+  // "item.edit.metadata.notifications.outdated.title": "Changes outdated",
+  "item.edit.metadata.notifications.outdated.title": "انتهت صلاحية التغييرات",
 
   // "item.edit.metadata.notifications.saved.content": "Your changes to this item's metadata were saved.",
-  // TODO New key - Add a translation
-  "item.edit.metadata.notifications.saved.content": "Your changes to this item's metadata were saved.",
+  "item.edit.metadata.notifications.saved.content": "تم حفظ تغييراتك على ميتاداتا هذه المادة.",
 
   // "item.edit.metadata.notifications.saved.title": "Metadata saved",
-  // TODO New key - Add a translation
-  "item.edit.metadata.notifications.saved.title": "Metadata saved",
+  "item.edit.metadata.notifications.saved.title": "تم حفظ الميتاداتا",
 
   // "item.edit.metadata.reinstate-button": "Undo",
-  // TODO New key - Add a translation
-  "item.edit.metadata.reinstate-button": "Undo",
+  "item.edit.metadata.reinstate-button": "تراجع",
+
+  // "item.edit.metadata.reset-order-button": "Undo reorder",
+  "item.edit.metadata.reset-order-button": "تراجع عن إعادة الترتيب",
 
   // "item.edit.metadata.save-button": "Save",
+  "item.edit.metadata.save-button": "حفظ",
+
+  // "item.edit.metadata.authority.label": "Authority: ",
   // TODO New key - Add a translation
-  "item.edit.metadata.save-button": "Save",
+  "item.edit.metadata.authority.label": "Authority: ",
 
+  // "item.edit.metadata.edit.buttons.open-authority-edition": "Unlock the authority key value for manual editing",
+  // TODO New key - Add a translation
+  "item.edit.metadata.edit.buttons.open-authority-edition": "Unlock the authority key value for manual editing",
 
+  // "item.edit.metadata.edit.buttons.close-authority-edition": "Lock the authority key value for manual editing",
+  // TODO New key - Add a translation
+  "item.edit.metadata.edit.buttons.close-authority-edition": "Lock the authority key value for manual editing",
 
   // "item.edit.modify.overview.field": "Field",
-  // TODO New key - Add a translation
-  "item.edit.modify.overview.field": "Field",
+  "item.edit.modify.overview.field": "حقل",
 
   // "item.edit.modify.overview.language": "Language",
-  // TODO New key - Add a translation
-  "item.edit.modify.overview.language": "Language",
+  "item.edit.modify.overview.language": "اللغة",
 
   // "item.edit.modify.overview.value": "Value",
-  // TODO New key - Add a translation
-  "item.edit.modify.overview.value": "Value",
+  "item.edit.modify.overview.value": "قيمة",
 
+  // "item.edit.move.cancel": "Back",
+  "item.edit.move.cancel": "رجوع",
 
+  // "item.edit.move.save-button": "Save",
+  "item.edit.move.save-button": "حفظ",
 
-  // "item.edit.move.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "item.edit.move.cancel": "Cancel",
+  // "item.edit.move.discard-button": "Discard",
+  "item.edit.move.discard-button": "تجاهل",
 
   // "item.edit.move.description": "Select the collection you wish to move this item to. To narrow down the list of displayed collections, you can enter a search query in the box.",
-  // TODO New key - Add a translation
-  "item.edit.move.description": "Select the collection you wish to move this item to. To narrow down the list of displayed collections, you can enter a search query in the box.",
+  "item.edit.move.description": "اختر الحاوية التي ترغب في نقل هذه المادة لها. لتضييق قائمة الحاويات المعروضة، يمكنك إدخال استعلام بحث في المربع.",
 
   // "item.edit.move.error": "An error occurred when attempting to move the item",
-  // TODO New key - Add a translation
-  "item.edit.move.error": "An error occurred when attempting to move the item",
+  "item.edit.move.error": "حدث خطأ أثناء محاولة نقل المادة",
 
   // "item.edit.move.head": "Move item: {{id}}",
-  // TODO New key - Add a translation
-  "item.edit.move.head": "Move item: {{id}}",
+  "item.edit.move.head": "نقل المادة: {{id}}",
 
   // "item.edit.move.inheritpolicies.checkbox": "Inherit policies",
-  // TODO New key - Add a translation
-  "item.edit.move.inheritpolicies.checkbox": "Inherit policies",
+  "item.edit.move.inheritpolicies.checkbox": "توريث السياسات",
 
   // "item.edit.move.inheritpolicies.description": "Inherit the default policies of the destination collection",
-  // TODO New key - Add a translation
-  "item.edit.move.inheritpolicies.description": "Inherit the default policies of the destination collection",
+  "item.edit.move.inheritpolicies.description": "توريث السياسات الافتراضية للحاوية المقصودة",
+
+  // "item.edit.move.inheritpolicies.tooltip": "Warning: When enabled, the read access policy for the item and any files associated with the item will be replaced by the default read access policy of the collection. This cannot be undone.",
+  "item.edit.move.inheritpolicies.tooltip": "تحذير: عند التفعيل، سيتم استبدال سياسة الوصول للقراءة الخاصة بالمادة وأي ملفات مرتبطة بالمادة بسياسة الوصول للقراءة الافتراضية للحاوية. لا يمكن التراجع عنه هذا الإجراء.",
 
   // "item.edit.move.move": "Move",
-  // TODO New key - Add a translation
-  "item.edit.move.move": "Move",
+  "item.edit.move.move": "نقل",
 
   // "item.edit.move.processing": "Moving...",
-  // TODO New key - Add a translation
-  "item.edit.move.processing": "Moving...",
+  "item.edit.move.processing": "جاري النقل...",
 
   // "item.edit.move.search.placeholder": "Enter a search query to look for collections",
-  // TODO New key - Add a translation
-  "item.edit.move.search.placeholder": "Enter a search query to look for collections",
+  "item.edit.move.search.placeholder": "قم بإدخال استعلام بحث للبحث عن حاويات",
 
   // "item.edit.move.success": "The item has been moved successfully",
-  // TODO New key - Add a translation
-  "item.edit.move.success": "The item has been moved successfully",
+  "item.edit.move.success": "تم نقل المادة بنجاح",
 
   // "item.edit.move.title": "Move item",
-  // TODO New key - Add a translation
-  "item.edit.move.title": "Move item",
-
-
+  "item.edit.move.title": "نقل المادة",
 
   // "item.edit.private.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "item.edit.private.cancel": "Cancel",
+  "item.edit.private.cancel": "إلغاء",
 
-  // "item.edit.private.confirm": "Make it Private",
-  // TODO New key - Add a translation
-  "item.edit.private.confirm": "Make it Private",
+  // "item.edit.private.confirm": "Make it non-discoverable",
+  "item.edit.private.confirm": "اجعلها غير قابلة للاكتشاف",
 
-  // "item.edit.private.description": "Are you sure this item should be made private in the archive?",
-  // TODO New key - Add a translation
-  "item.edit.private.description": "Are you sure this item should be made private in the archive?",
+  // "item.edit.private.description": "Are you sure this item should be made non-discoverable in the archive?",
+  "item.edit.private.description": "هل أنت متأكد من أن هذه المادة يجب أن تكون غير قابلة للاكتشاف في الأرشيف؟",
 
-  // "item.edit.private.error": "An error occurred while making the item private",
-  // TODO New key - Add a translation
-  "item.edit.private.error": "An error occurred while making the item private",
-
-  // "item.edit.private.header": "Make item private: {{ id }}",
-  // TODO New key - Add a translation
-  "item.edit.private.header": "Make item private: {{ id }}",
-
-  // "item.edit.private.success": "The item is now private",
-  // TODO New key - Add a translation
-  "item.edit.private.success": "The item is now private",
+  // "item.edit.private.error": "An error occurred while making the item non-discoverable",
+  "item.edit.private.error": "حدث خطأ أثناء جعل المادة غير قابلة للاكتشاف",
 
+  // "item.edit.private.header": "Make item non-discoverable: {{ id }}",
+  "item.edit.private.header": "اجعل المادة غير قابلة للاكتشاف: {{ id }}",
 
+  // "item.edit.private.success": "The item is now non-discoverable",
+  "item.edit.private.success": "المادة الآن غير قابلة للاكتشاف",
 
   // "item.edit.public.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "item.edit.public.cancel": "Cancel",
+  "item.edit.public.cancel": "إلغاء",
 
-  // "item.edit.public.confirm": "Make it Public",
-  // TODO New key - Add a translation
-  "item.edit.public.confirm": "Make it Public",
+  // "item.edit.public.confirm": "Make it discoverable",
+  "item.edit.public.confirm": "اجعلها قابلة للاكتشاف",
 
-  // "item.edit.public.description": "Are you sure this item should be made public in the archive?",
-  // TODO New key - Add a translation
-  "item.edit.public.description": "Are you sure this item should be made public in the archive?",
+  // "item.edit.public.description": "Are you sure this item should be made discoverable in the archive?",
+  "item.edit.public.description": "هل أنت متأكد من أنه يجب جعل هذه المادة قابلة للاكتشاف في الأرشيف؟",
 
-  // "item.edit.public.error": "An error occurred while making the item public",
-  // TODO New key - Add a translation
-  "item.edit.public.error": "An error occurred while making the item public",
-
-  // "item.edit.public.header": "Make item public: {{ id }}",
-  // TODO New key - Add a translation
-  "item.edit.public.header": "Make item public: {{ id }}",
-
-  // "item.edit.public.success": "The item is now public",
-  // TODO New key - Add a translation
-  "item.edit.public.success": "The item is now public",
+  // "item.edit.public.error": "An error occurred while making the item discoverable",
+  "item.edit.public.error": "حدث خطأ أثناء جعل المادة قابلة للاكتشاف",
 
+  // "item.edit.public.header": "Make item discoverable: {{ id }}",
+  "item.edit.public.header": "اجعل المادة قابلة للاكتشاف: {{ id }}",
 
+  // "item.edit.public.success": "The item is now discoverable",
+  "item.edit.public.success": "المادة الآن قابلة للاكتشاف",
 
   // "item.edit.reinstate.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "item.edit.reinstate.cancel": "Cancel",
+  "item.edit.reinstate.cancel": "إلغاء",
 
   // "item.edit.reinstate.confirm": "Reinstate",
-  // TODO New key - Add a translation
-  "item.edit.reinstate.confirm": "Reinstate",
+  "item.edit.reinstate.confirm": "إعادة تعيين",
 
   // "item.edit.reinstate.description": "Are you sure this item should be reinstated to the archive?",
-  // TODO New key - Add a translation
-  "item.edit.reinstate.description": "Are you sure this item should be reinstated to the archive?",
+  "item.edit.reinstate.description": "هل أنت متأكد من إعادة تعيين هذه المادة إلى الأرشيف؟",
 
   // "item.edit.reinstate.error": "An error occurred while reinstating the item",
-  // TODO New key - Add a translation
-  "item.edit.reinstate.error": "An error occurred while reinstating the item",
+  "item.edit.reinstate.error": "حدث خطأ أثناء إعادة تعيين المادة",
 
   // "item.edit.reinstate.header": "Reinstate item: {{ id }}",
-  // TODO New key - Add a translation
-  "item.edit.reinstate.header": "Reinstate item: {{ id }}",
+  "item.edit.reinstate.header": "إعادة تعيين المادة: {{ id }}",
 
   // "item.edit.reinstate.success": "The item was reinstated successfully",
-  // TODO New key - Add a translation
-  "item.edit.reinstate.success": "The item was reinstated successfully",
-
-
+  "item.edit.reinstate.success": "تمت إعادة تعيين المادة بنجاح",
 
   // "item.edit.relationships.discard-button": "Discard",
-  // TODO New key - Add a translation
-  "item.edit.relationships.discard-button": "Discard",
+  "item.edit.relationships.discard-button": "تجاهل",
 
   // "item.edit.relationships.edit.buttons.add": "Add",
-  // TODO New key - Add a translation
-  "item.edit.relationships.edit.buttons.add": "Add",
+  "item.edit.relationships.edit.buttons.add": "إضافة",
 
   // "item.edit.relationships.edit.buttons.remove": "Remove",
-  // TODO New key - Add a translation
-  "item.edit.relationships.edit.buttons.remove": "Remove",
+  "item.edit.relationships.edit.buttons.remove": "إزالة",
 
   // "item.edit.relationships.edit.buttons.undo": "Undo changes",
-  // TODO New key - Add a translation
-  "item.edit.relationships.edit.buttons.undo": "Undo changes",
+  "item.edit.relationships.edit.buttons.undo": "تراجع عن التغييرات",
 
   // "item.edit.relationships.no-relationships": "No relationships",
-  // TODO New key - Add a translation
-  "item.edit.relationships.no-relationships": "No relationships",
+  "item.edit.relationships.no-relationships": "لا توجد علاقات",
 
   // "item.edit.relationships.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button",
-  // TODO New key - Add a translation
-  "item.edit.relationships.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button",
+  "item.edit.relationships.notifications.discarded.content": "تم تجاهل تغييراتك. لإعادة تعيين التغييرات قم بالنقر على زر  'تراجع'",
 
   // "item.edit.relationships.notifications.discarded.title": "Changes discarded",
-  // TODO New key - Add a translation
-  "item.edit.relationships.notifications.discarded.title": "Changes discarded",
+  "item.edit.relationships.notifications.discarded.title": "تم تجاهل التغييرات",
 
   // "item.edit.relationships.notifications.failed.title": "Error editing relationships",
-  // TODO New key - Add a translation
-  "item.edit.relationships.notifications.failed.title": "Error editing relationships",
+  "item.edit.relationships.notifications.failed.title": "حدث خطأ أثناء تحرير العلاقات",
 
   // "item.edit.relationships.notifications.outdated.content": "The item you're currently working on has been changed by another user. Your current changes are discarded to prevent conflicts",
-  // TODO New key - Add a translation
-  "item.edit.relationships.notifications.outdated.content": "The item you're currently working on has been changed by another user. Your current changes are discarded to prevent conflicts",
+  "item.edit.relationships.notifications.outdated.content": "المادة التي تعمل عليها حالياً تم تغييرها بواسطة مستخدم آخر. تم تجاهل تغييراتك الحالية لتجنب التعارض",
 
   // "item.edit.relationships.notifications.outdated.title": "Changes outdated",
-  // TODO New key - Add a translation
-  "item.edit.relationships.notifications.outdated.title": "Changes outdated",
+  "item.edit.relationships.notifications.outdated.title": "انتهت صلاحية التغييرات",
 
   // "item.edit.relationships.notifications.saved.content": "Your changes to this item's relationships were saved.",
-  // TODO New key - Add a translation
-  "item.edit.relationships.notifications.saved.content": "Your changes to this item's relationships were saved.",
+  "item.edit.relationships.notifications.saved.content": "تم حفظ تغييراتك على علاقات هذه المادة.",
 
   // "item.edit.relationships.notifications.saved.title": "Relationships saved",
-  // TODO New key - Add a translation
-  "item.edit.relationships.notifications.saved.title": "Relationships saved",
+  "item.edit.relationships.notifications.saved.title": "تم حفظ العلاقات",
 
   // "item.edit.relationships.reinstate-button": "Undo",
-  // TODO New key - Add a translation
-  "item.edit.relationships.reinstate-button": "Undo",
+  "item.edit.relationships.reinstate-button": "تراجع",
 
   // "item.edit.relationships.save-button": "Save",
-  // TODO New key - Add a translation
-  "item.edit.relationships.save-button": "Save",
+  "item.edit.relationships.save-button": "حفظ",
 
   // "item.edit.relationships.no-entity-type": "Add 'dspace.entity.type' metadata to enable relationships for this item",
-  // TODO New key - Add a translation
-  "item.edit.relationships.no-entity-type": "Add 'dspace.entity.type' metadata to enable relationships for this item",
-
+  "item.edit.relationships.no-entity-type": "قم بإضافة ميتاداتا 'dspace.entity.type' لتفعيل العلاقات لهذه المادة",
 
+  // "item.edit.return": "Back",
+  "item.edit.return": "رجوع",
 
   // "item.edit.tabs.bitstreams.head": "Bitstreams",
-  // TODO New key - Add a translation
-  "item.edit.tabs.bitstreams.head": "Bitstreams",
+  "item.edit.tabs.bitstreams.head": "تدفقات البت",
 
   // "item.edit.tabs.bitstreams.title": "Item Edit - Bitstreams",
-  // TODO New key - Add a translation
-  "item.edit.tabs.bitstreams.title": "Item Edit - Bitstreams",
+  "item.edit.tabs.bitstreams.title": "تحرير المادة - تدفقات البت",
 
   // "item.edit.tabs.curate.head": "Curate",
-  // TODO New key - Add a translation
-  "item.edit.tabs.curate.head": "Curate",
+  "item.edit.tabs.curate.head": "أكرتة",
 
   // "item.edit.tabs.curate.title": "Item Edit - Curate",
-  // TODO New key - Add a translation
-  "item.edit.tabs.curate.title": "Item Edit - Curate",
+  "item.edit.tabs.curate.title": "تحرير المادة - أكرتة",
+
+  // "item.edit.curate.title": "Curate Item: {{item}}",
+  "item.edit.curate.title": "أكرتة المادة: {{item}}",
+
+  // "item.edit.tabs.access-control.head": "Access Control",
+  "item.edit.tabs.access-control.head": "التحكم في الوصول",
+
+  // "item.edit.tabs.access-control.title": "Item Edit - Access Control",
+  "item.edit.tabs.access-control.title": "تحرير المادة - التحكم في الوصول",
 
   // "item.edit.tabs.metadata.head": "Metadata",
-  // TODO New key - Add a translation
-  "item.edit.tabs.metadata.head": "Metadata",
+  "item.edit.tabs.metadata.head": "الميتاداتا",
 
   // "item.edit.tabs.metadata.title": "Item Edit -  Metadata",
-  // TODO New key - Add a translation
-  "item.edit.tabs.metadata.title": "Item Edit -  Metadata",
+  "item.edit.tabs.metadata.title": "تحرير المادة -  الميتاداتا",
 
   // "item.edit.tabs.relationships.head": "Relationships",
-  // TODO New key - Add a translation
-  "item.edit.tabs.relationships.head": "Relationships",
+  "item.edit.tabs.relationships.head": "العلاقات",
 
   // "item.edit.tabs.relationships.title": "Item Edit - Relationships",
-  // TODO New key - Add a translation
-  "item.edit.tabs.relationships.title": "Item Edit - Relationships",
+  "item.edit.tabs.relationships.title": "تحرير الماة - العلاقات",
 
   // "item.edit.tabs.status.buttons.authorizations.button": "Authorizations...",
-  // TODO New key - Add a translation
-  "item.edit.tabs.status.buttons.authorizations.button": "Authorizations...",
+  "item.edit.tabs.status.buttons.authorizations.button": "تصاريح...",
 
   // "item.edit.tabs.status.buttons.authorizations.label": "Edit item's authorization policies",
-  // TODO New key - Add a translation
-  "item.edit.tabs.status.buttons.authorizations.label": "Edit item's authorization policies",
+  "item.edit.tabs.status.buttons.authorizations.label": "تحرير سياسات تصاريح المادة",
 
   // "item.edit.tabs.status.buttons.delete.button": "Permanently delete",
-  // TODO New key - Add a translation
-  "item.edit.tabs.status.buttons.delete.button": "Permanently delete",
+  "item.edit.tabs.status.buttons.delete.button": "حذف نهائي",
 
   // "item.edit.tabs.status.buttons.delete.label": "Completely expunge item",
-  // TODO New key - Add a translation
-  "item.edit.tabs.status.buttons.delete.label": "Completely expunge item",
+  "item.edit.tabs.status.buttons.delete.label": "شطب المادة تماماً",
 
   // "item.edit.tabs.status.buttons.mappedCollections.button": "Mapped collections",
-  // TODO New key - Add a translation
-  "item.edit.tabs.status.buttons.mappedCollections.button": "Mapped collections",
+  "item.edit.tabs.status.buttons.mappedCollections.button": "حاويات مخططة",
 
   // "item.edit.tabs.status.buttons.mappedCollections.label": "Manage mapped collections",
-  // TODO New key - Add a translation
-  "item.edit.tabs.status.buttons.mappedCollections.label": "Manage mapped collections",
+  "item.edit.tabs.status.buttons.mappedCollections.label": "أدر الحاويات المخططة",
 
   // "item.edit.tabs.status.buttons.move.button": "Move this Item to a different Collection",
-  // TODO New key - Add a translation
-  "item.edit.tabs.status.buttons.move.button": "Mover éste ítem a una colección distinta",
+  "item.edit.tabs.status.buttons.move.button": "نقل هذه المادة إلى حاوية مختلفة",
 
   // "item.edit.tabs.status.buttons.move.label": "Move item to another collection",
-  // TODO New key - Add a translation
-  "item.edit.tabs.status.buttons.move.label": "Move item to another collection",
+  "item.edit.tabs.status.buttons.move.label": "نقل هذه المادة إلى حاوية مختلفة",
 
-  // "item.edit.tabs.status.buttons.private.button": "Make it private...",
-  // TODO New key - Add a translation
-  "item.edit.tabs.status.buttons.private.button": "Make it private...",
+  // "item.edit.tabs.status.buttons.private.button": "Make it non-discoverable...",
+  "item.edit.tabs.status.buttons.private.button": "اجعلها غير قابلة للاكتشاف...",
 
-  // "item.edit.tabs.status.buttons.private.label": "Make item private",
-  // TODO New key - Add a translation
-  "item.edit.tabs.status.buttons.private.label": "Make item private",
+  // "item.edit.tabs.status.buttons.private.label": "Make item non-discoverable",
+  "item.edit.tabs.status.buttons.private.label": "اجعل المادة غير قابلة للاكتشاف",
 
-  // "item.edit.tabs.status.buttons.public.button": "Make it public...",
-  // TODO New key - Add a translation
-  "item.edit.tabs.status.buttons.public.button": "Make it public...",
+  // "item.edit.tabs.status.buttons.public.button": "Make it discoverable...",
+  "item.edit.tabs.status.buttons.public.button": "اجعلها قابلة للاكتشاف...",
 
-  // "item.edit.tabs.status.buttons.public.label": "Make item public",
-  // TODO New key - Add a translation
-  "item.edit.tabs.status.buttons.public.label": "Make item public",
+  // "item.edit.tabs.status.buttons.public.label": "Make item discoverable",
+  "item.edit.tabs.status.buttons.public.label": "اجعل المادة قابلة للاكتشاف",
 
   // "item.edit.tabs.status.buttons.reinstate.button": "Reinstate...",
-  // TODO New key - Add a translation
-  "item.edit.tabs.status.buttons.reinstate.button": "Reinstate...",
+  "item.edit.tabs.status.buttons.reinstate.button": "إعادة تعيين...",
 
   // "item.edit.tabs.status.buttons.reinstate.label": "Reinstate item into the repository",
-  // TODO New key - Add a translation
-  "item.edit.tabs.status.buttons.reinstate.label": "Reinstate item into the repository",
+  "item.edit.tabs.status.buttons.reinstate.label": "إعادة تعيين المادة في المستودع",
+
+  // "item.edit.tabs.status.buttons.unauthorized": "You're not authorized to perform this action",
+  "item.edit.tabs.status.buttons.unauthorized": "غير مصرح لك بالقيام بهذا الإجراء",
 
   // "item.edit.tabs.status.buttons.withdraw.button": "Withdraw this item",
-  // TODO New key - Add a translation
-  "item.edit.tabs.status.buttons.withdraw.button": "Retirar éste ítem",
+  "item.edit.tabs.status.buttons.withdraw.button": "سحب هذه المادة",
 
   // "item.edit.tabs.status.buttons.withdraw.label": "Withdraw item from the repository",
-  // TODO New key - Add a translation
-  "item.edit.tabs.status.buttons.withdraw.label": "Withdraw item from the repository",
+  "item.edit.tabs.status.buttons.withdraw.label": "سحب هذه المادة من المستودع",
 
   // "item.edit.tabs.status.description": "Welcome to the item management page. From here you can withdraw, reinstate, move or delete the item. You may also update or add new metadata / bitstreams on the other tabs.",
-  // TODO New key - Add a translation
-  "item.edit.tabs.status.description": "Welcome to the item management page. From here you can withdraw, reinstate, move or delete the item. You may also update or add new metadata / bitstreams on the other tabs.",
+  "item.edit.tabs.status.description": "مرحباً بك في صفحة إدارة المادة. من هنا يمكنك سحب المادة، أو إعادة تعيينها، أو نقلها أو حذفها. كما يمكنك تحديث أو إضافة ميتاداتا/ تدفقات بت جديدة في التبويبات الأخرى.",
 
   // "item.edit.tabs.status.head": "Status",
-  // TODO New key - Add a translation
-  "item.edit.tabs.status.head": "Status",
+  "item.edit.tabs.status.head": "الحالة",
 
   // "item.edit.tabs.status.labels.handle": "Handle",
-  // TODO New key - Add a translation
-  "item.edit.tabs.status.labels.handle": "Handle",
+  "item.edit.tabs.status.labels.handle": "هاندل",
 
   // "item.edit.tabs.status.labels.id": "Item Internal ID",
-  // TODO New key - Add a translation
-  "item.edit.tabs.status.labels.id": "Item Internal ID",
+  "item.edit.tabs.status.labels.id": "معرّف المادة الداخلي",
 
   // "item.edit.tabs.status.labels.itemPage": "Item Page",
-  // TODO New key - Add a translation
-  "item.edit.tabs.status.labels.itemPage": "Item Page",
+  "item.edit.tabs.status.labels.itemPage": "صفحة المادة",
 
   // "item.edit.tabs.status.labels.lastModified": "Last Modified",
-  // TODO New key - Add a translation
-  "item.edit.tabs.status.labels.lastModified": "Last Modified",
+  "item.edit.tabs.status.labels.lastModified": "آخر تعديل",
 
   // "item.edit.tabs.status.title": "Item Edit -  Status",
-  // TODO New key - Add a translation
-  "item.edit.tabs.status.title": "Item Edit -  Status",
+  "item.edit.tabs.status.title": "تحرير المادة -  الحالة",
 
   // "item.edit.tabs.versionhistory.head": "Version History",
-  // TODO New key - Add a translation
-  "item.edit.tabs.versionhistory.head": "Version History",
+  "item.edit.tabs.versionhistory.head": "سجل الإصدارة",
 
   // "item.edit.tabs.versionhistory.title": "Item Edit - Version History",
-  // TODO New key - Add a translation
-  "item.edit.tabs.versionhistory.title": "Item Edit - Version History",
+  "item.edit.tabs.versionhistory.title": "تحرير المادة - سجل الإصدارة",
 
   // "item.edit.tabs.versionhistory.under-construction": "Editing or adding new versions is not yet possible in this user interface.",
-  // TODO New key - Add a translation
-  "item.edit.tabs.versionhistory.under-construction": "Editing or adding new versions is not yet possible in this user interface.",
+  "item.edit.tabs.versionhistory.under-construction": "تحرير أو إضافة إصدارات جديدة ليس ممكناً بعد في واجهة المستخدم هذه..",
 
   // "item.edit.tabs.view.head": "View Item",
-  // TODO New key - Add a translation
-  "item.edit.tabs.view.head": "View Item",
+  "item.edit.tabs.view.head": "عرض المادة",
 
   // "item.edit.tabs.view.title": "Item Edit -  View",
-  // TODO New key - Add a translation
-  "item.edit.tabs.view.title": "Item Edit -  View",
-
-
+  "item.edit.tabs.view.title": "تحرير المادة -  عرض",
 
   // "item.edit.withdraw.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "item.edit.withdraw.cancel": "Cancel",
+  "item.edit.withdraw.cancel": "إلغاء",
 
   // "item.edit.withdraw.confirm": "Withdraw",
-  // TODO New key - Add a translation
-  "item.edit.withdraw.confirm": "Withdraw",
+  "item.edit.withdraw.confirm": "سحب",
 
   // "item.edit.withdraw.description": "Are you sure this item should be withdrawn from the archive?",
-  // TODO New key - Add a translation
-  "item.edit.withdraw.description": "Are you sure this item should be withdrawn from the archive?",
+  "item.edit.withdraw.description": "هل أنت متأكد من ضرورة سحب هذه المادة من الأرشيف؟",
 
   // "item.edit.withdraw.error": "An error occurred while withdrawing the item",
-  // TODO New key - Add a translation
-  "item.edit.withdraw.error": "An error occurred while withdrawing the item",
+  "item.edit.withdraw.error": "حدث خطأ أثناء سحب المادة",
 
   // "item.edit.withdraw.header": "Withdraw item: {{ id }}",
-  // TODO New key - Add a translation
-  "item.edit.withdraw.header": "Withdraw item: {{ id }}",
+  "item.edit.withdraw.header": "سحب المادة: {{ id }}",
 
   // "item.edit.withdraw.success": "The item was withdrawn successfully",
-  // TODO New key - Add a translation
-  "item.edit.withdraw.success": "The item was withdrawn successfully",
-
+  "item.edit.withdraw.success": "تم سحب المادة بنجاح",
 
+  // "item.orcid.return": "Back",
+  "item.orcid.return": "رجوع",
 
   // "item.listelement.badge": "Item",
-  // TODO New key - Add a translation
-  "item.listelement.badge": "Item",
+  "item.listelement.badge": "المادة",
 
   // "item.page.description": "Description",
-  // TODO New key - Add a translation
-  "item.page.description": "Description",
+  "item.page.description": "الوصف",
 
   // "item.page.journal-issn": "Journal ISSN",
-  // TODO New key - Add a translation
-  "item.page.journal-issn": "Journal ISSN",
+  "item.page.journal-issn": "ردمد الدورية",
 
   // "item.page.journal-title": "Journal Title",
-  // TODO New key - Add a translation
-  "item.page.journal-title": "Journal Title",
+  "item.page.journal-title": "عنوان الدورية",
 
   // "item.page.publisher": "Publisher",
-  // TODO New key - Add a translation
-  "item.page.publisher": "Publisher",
+  "item.page.publisher": "الناشر",
 
   // "item.page.titleprefix": "Item: ",
-  // TODO New key - Add a translation
-  "item.page.titleprefix": "Item: ",
+  "item.page.titleprefix": "المادة: ",
 
   // "item.page.volume-title": "Volume Title",
-  // TODO New key - Add a translation
-  "item.page.volume-title": "Volume Title",
+  "item.page.volume-title": "عنوان المجلد",
 
   // "item.search.results.head": "Item Search Results",
+  "item.search.results.head": "نتائج بحث المواد",
+
+  // "item.search.title": "Item Search",
+  "item.search.title": "بحث المواد",
+
+  // "item.truncatable-part.show-more": "Show more",
+  "item.truncatable-part.show-more": "عرض المواد",
+
+  // "item.truncatable-part.show-less": "Collapse",
+  "item.truncatable-part.show-less": "طي",
+
+  // "item.qa-event-notification.check.notification-info": "There are {{num}} pending suggestions related to your account",
   // TODO New key - Add a translation
-  "item.search.results.head": "Item Search Results",
+  "item.qa-event-notification.check.notification-info": "There are {{num}} pending suggestions related to your account",
 
-  // "item.search.title": "DSpace Angular :: Item Search",
+  // "item.qa-event-notification-info.check.button": "View",
   // TODO New key - Add a translation
-  "item.search.title": "DSpace Angular :: Item Search",
+  "item.qa-event-notification-info.check.button": "View",
 
+  // "mydspace.qa-event-notification.check.notification-info": "There are {{num}} pending suggestions related to your account",
+  // TODO New key - Add a translation
+  "mydspace.qa-event-notification.check.notification-info": "There are {{num}} pending suggestions related to your account",
 
+  // "mydspace.qa-event-notification-info.check.button": "View",
+  // TODO New key - Add a translation
+  "mydspace.qa-event-notification-info.check.button": "View",
+
+  // "workflow-item.search.result.delete-supervision.modal.header": "Delete Supervision Order",
+  "workflow-item.search.result.delete-supervision.modal.header": "حذف أمر الإشراف",
+
+  // "workflow-item.search.result.delete-supervision.modal.info": "Are you sure you want to delete Supervision Order",
+  "workflow-item.search.result.delete-supervision.modal.info": "هل أنت متأكد من أنك تريد حذف أمر الإشراف",
+
+  // "workflow-item.search.result.delete-supervision.modal.cancel": "Cancel",
+  "workflow-item.search.result.delete-supervision.modal.cancel": "إلغاء",
+
+  // "workflow-item.search.result.delete-supervision.modal.confirm": "Delete",
+  "workflow-item.search.result.delete-supervision.modal.confirm": "حذف",
+
+  // "workflow-item.search.result.notification.deleted.success": "Successfully deleted supervision order \"{{name}}\"",
+  "workflow-item.search.result.notification.deleted.success": "تم حذف أمر الإشراف بنجاح \"{{name}}\"",
+
+  // "workflow-item.search.result.notification.deleted.failure": "Failed to delete supervision order \"{{name}}\"",
+  "workflow-item.search.result.notification.deleted.failure": "فشل في حذف أمر الإشراف \"{{name}}\"",
+
+  // "workflow-item.search.result.list.element.supervised-by": "Supervised by:",
+  "workflow-item.search.result.list.element.supervised-by": "تحت إشراف:",
+
+  // "workflow-item.search.result.list.element.supervised.remove-tooltip": "Remove supervision group",
+  "workflow-item.search.result.list.element.supervised.remove-tooltip": "إزالة مجموعة الإشراف",
+
+  // "confidence.indicator.help-text.accepted": "This authority value has been confirmed as accurate by an interactive user",
+  // TODO New key - Add a translation
+  "confidence.indicator.help-text.accepted": "This authority value has been confirmed as accurate by an interactive user",
+
+  // "confidence.indicator.help-text.uncertain": "Value is singular and valid but has not been seen and accepted by a human so it is still uncertain",
+  // TODO New key - Add a translation
+  "confidence.indicator.help-text.uncertain": "Value is singular and valid but has not been seen and accepted by a human so it is still uncertain",
+
+  // "confidence.indicator.help-text.ambiguous": "There are multiple matching authority values of equal validity",
+  // TODO New key - Add a translation
+  "confidence.indicator.help-text.ambiguous": "There are multiple matching authority values of equal validity",
+
+  // "confidence.indicator.help-text.notfound": "There are no matching answers in the authority",
+  // TODO New key - Add a translation
+  "confidence.indicator.help-text.notfound": "There are no matching answers in the authority",
+
+  // "confidence.indicator.help-text.failed": "The authority encountered an internal failure",
+  // TODO New key - Add a translation
+  "confidence.indicator.help-text.failed": "The authority encountered an internal failure",
+
+  // "confidence.indicator.help-text.rejected": "The authority recommends this submission be rejected",
+  // TODO New key - Add a translation
+  "confidence.indicator.help-text.rejected": "The authority recommends this submission be rejected",
+
+  // "confidence.indicator.help-text.novalue": "No reasonable confidence value was returned from the authority",
+  // TODO New key - Add a translation
+  "confidence.indicator.help-text.novalue": "No reasonable confidence value was returned from the authority",
+
+  // "confidence.indicator.help-text.unset": "Confidence was never recorded for this value",
+  // TODO New key - Add a translation
+  "confidence.indicator.help-text.unset": "Confidence was never recorded for this value",
+
+  // "confidence.indicator.help-text.unknown": "Unknown confidence value",
+  // TODO New key - Add a translation
+  "confidence.indicator.help-text.unknown": "Unknown confidence value",
 
   // "item.page.abstract": "Abstract",
-  // TODO New key - Add a translation
-  "item.page.abstract": "Abstract",
+  "item.page.abstract": "خلاصة",
 
   // "item.page.author": "Authors",
-  // TODO New key - Add a translation
-  "item.page.author": "Authors",
+  "item.page.author": "المؤلفين",
 
   // "item.page.citation": "Citation",
-  // TODO New key - Add a translation
-  "item.page.citation": "Citation",
+  "item.page.citation": "اقتباس",
 
   // "item.page.collections": "Collections",
-  // TODO New key - Add a translation
-  "item.page.collections": "Collections",
+  "item.page.collections": "الحاويات",
+
+  // "item.page.collections.loading": "Loading...",
+  "item.page.collections.loading": "جاري التحميل...",
+
+  // "item.page.collections.load-more": "Load more",
+  "item.page.collections.load-more": "تحميل المزيد",
 
   // "item.page.date": "Date",
-  // TODO New key - Add a translation
-  "item.page.date": "Date",
+  "item.page.date": "التاريخ",
 
   // "item.page.edit": "Edit this item",
-  // TODO New key - Add a translation
-  "item.page.edit": "Edit this item",
+  "item.page.edit": "تحرير هذه المادة",
 
   // "item.page.files": "Files",
-  // TODO New key - Add a translation
-  "item.page.files": "Files",
+  "item.page.files": "ملفات",
 
   // "item.page.filesection.description": "Description:",
-  // TODO New key - Add a translation
-  "item.page.filesection.description": "Description:",
+  "item.page.filesection.description": "الوصف:",
 
   // "item.page.filesection.download": "Download",
-  // TODO New key - Add a translation
-  "item.page.filesection.download": "Download",
+  "item.page.filesection.download": "تنزيل",
 
   // "item.page.filesection.format": "Format:",
-  // TODO New key - Add a translation
-  "item.page.filesection.format": "Format:",
+  "item.page.filesection.format": "تنسيق:",
 
   // "item.page.filesection.name": "Name:",
-  // TODO New key - Add a translation
-  "item.page.filesection.name": "Name:",
+  "item.page.filesection.name": "الاسم:",
 
   // "item.page.filesection.size": "Size:",
-  // TODO New key - Add a translation
-  "item.page.filesection.size": "Size:",
+  "item.page.filesection.size": "الحجم:",
 
   // "item.page.journal.search.title": "Articles in this journal",
-  // TODO New key - Add a translation
-  "item.page.journal.search.title": "Articles in this journal",
+  "item.page.journal.search.title": "مقالات في هذه الدورية",
 
   // "item.page.link.full": "Full item page",
-  // TODO New key - Add a translation
-  "item.page.link.full": "Full item page",
+  "item.page.link.full": "صفحة المادة الكاملة",
 
   // "item.page.link.simple": "Simple item page",
-  // TODO New key - Add a translation
-  "item.page.link.simple": "Simple item page",
+  "item.page.link.simple": "صفحة المادة البسيطة",
+
+  // "item.page.orcid.title": "ORCID",
+  "item.page.orcid.title": "أوركيد",
+
+  // "item.page.orcid.tooltip": "Open ORCID setting page",
+  "item.page.orcid.tooltip": "فتح صفحة إعداد أوركيد",
 
   // "item.page.person.search.title": "Articles by this author",
-  // TODO New key - Add a translation
-  "item.page.person.search.title": "Articles by this author",
+  "item.page.person.search.title": "مقالات بواسطة هذا المؤلف",
 
   // "item.page.related-items.view-more": "Show {{ amount }} more",
-  // TODO New key - Add a translation
-  "item.page.related-items.view-more": "Show {{ amount }} more",
+  "item.page.related-items.view-more": "إظهار {{ amount }} أكثر",
 
   // "item.page.related-items.view-less": "Hide last {{ amount }}",
-  // TODO New key - Add a translation
-  "item.page.related-items.view-less": "Hide last {{ amount }}",
+  "item.page.related-items.view-less": "إخفاء آخر {{ amount }}",
 
   // "item.page.relationships.isAuthorOfPublication": "Publications",
-  // TODO New key - Add a translation
-  "item.page.relationships.isAuthorOfPublication": "Publications",
+  "item.page.relationships.isAuthorOfPublication": "المنشورات",
 
   // "item.page.relationships.isJournalOfPublication": "Publications",
-  // TODO New key - Add a translation
-  "item.page.relationships.isJournalOfPublication": "Publications",
+  "item.page.relationships.isJournalOfPublication": "المنشورات",
 
   // "item.page.relationships.isOrgUnitOfPerson": "Authors",
-  // TODO New key - Add a translation
-  "item.page.relationships.isOrgUnitOfPerson": "Authors",
+  "item.page.relationships.isOrgUnitOfPerson": "المؤلفين",
 
   // "item.page.relationships.isOrgUnitOfProject": "Research Projects",
-  // TODO New key - Add a translation
-  "item.page.relationships.isOrgUnitOfProject": "Research Projects",
+  "item.page.relationships.isOrgUnitOfProject": "مشاريع البحث",
 
   // "item.page.subject": "Keywords",
-  // TODO New key - Add a translation
-  "item.page.subject": "Keywords",
+  "item.page.subject": "كلمات رئيسية",
 
   // "item.page.uri": "URI",
-  // TODO New key - Add a translation
   "item.page.uri": "URI",
 
   // "item.page.bitstreams.view-more": "Show more",
-  // TODO New key - Add a translation
-  "item.page.bitstreams.view-more": "Show more",
+  "item.page.bitstreams.view-more": "عرض المزيد",
 
   // "item.page.bitstreams.collapse": "Collapse",
-  // TODO New key - Add a translation
-  "item.page.bitstreams.collapse": "Collapse",
+  "item.page.bitstreams.collapse": "طي",
 
-  // "item.page.filesection.original.bundle" : "Original bundle",
+  // "item.page.bitstreams.primary": "Primary",
   // TODO New key - Add a translation
-  "item.page.filesection.original.bundle": "Original bundle",
+  "item.page.bitstreams.primary": "Primary",
 
-  // "item.page.filesection.license.bundle" : "License bundle",
+  // "item.page.filesection.original.bundle": "Original bundle",
+  "item.page.filesection.original.bundle": "الحزمة الرئيسية",
+
+  // "item.page.filesection.license.bundle": "License bundle",
+  "item.page.filesection.license.bundle": "حزمة الترخيص",
+
+  // "item.page.return": "Back",
+  "item.page.return": "رجوع",
+
+  // "item.page.version.create": "Create new version",
+  "item.page.version.create": "إنشاء إصدارة جديدة",
+
+  // "item.page.withdrawn": "Request a withdrawal for this item",
   // TODO New key - Add a translation
-  "item.page.filesection.license.bundle": "License bundle",
+  "item.page.withdrawn": "Request a withdrawal for this item",
+
+  // "item.page.reinstate": "Request reinstatement",
+  // TODO New key - Add a translation
+  "item.page.reinstate": "Request reinstatement",
+
+  // "item.page.version.hasDraft": "A new version cannot be created because there is an inprogress submission in the version history",
+  "item.page.version.hasDraft": "لا يمكن إنشاء إصدارة جديدة نظراً لوجود تقديم قيد التقدم في سجل الإصدارة",
+
+  // "item.page.claim.button": "Claim",
+  "item.page.claim.button": "مطالبة",
+
+  // "item.page.claim.tooltip": "Claim this item as profile",
+  "item.page.claim.tooltip": "المطالبة بهذه المادة كملف شخصي",
+
+  // "item.page.image.alt.ROR": "ROR logo",
+  "item.page.image.alt.ROR": "ROR شعار",
 
   // "item.preview.dc.identifier.uri": "Identifier:",
-  // TODO New key - Add a translation
-  "item.preview.dc.identifier.uri": "Identifier:",
+  "item.preview.dc.identifier.uri": "المعرف:",
 
   // "item.preview.dc.contributor.author": "Authors:",
-  // TODO New key - Add a translation
-  "item.preview.dc.contributor.author": "Authors:",
+  "item.preview.dc.contributor.author": "المؤلفين:",
 
   // "item.preview.dc.date.issued": "Published date:",
-  // TODO New key - Add a translation
-  "item.preview.dc.date.issued": "Published date:",
+  "item.preview.dc.date.issued": "تاريخ النشر:",
 
   // "item.preview.dc.description.abstract": "Abstract:",
-  // TODO New key - Add a translation
-  "item.preview.dc.description.abstract": "Abstract:",
+  "item.preview.dc.description.abstract": "مستخلص:",
 
   // "item.preview.dc.identifier.other": "Other identifier:",
-  // TODO New key - Add a translation
-  "item.preview.dc.identifier.other": "Other identifier:",
+  "item.preview.dc.identifier.other": "معرف آخر:",
 
   // "item.preview.dc.language.iso": "Language:",
-  // TODO New key - Add a translation
-  "item.preview.dc.language.iso": "Language:",
+  "item.preview.dc.language.iso": "اللغة:",
 
   // "item.preview.dc.subject": "Subjects:",
-  // TODO New key - Add a translation
-  "item.preview.dc.subject": "Subjects:",
+  "item.preview.dc.subject": "الموضوعات:",
 
   // "item.preview.dc.title": "Title:",
-  // TODO New key - Add a translation
-  "item.preview.dc.title": "Title:",
+  "item.preview.dc.title": "العنوان:",
+
+  // "item.preview.dc.type": "Type:",
+  "item.preview.dc.type": "النوع:",
+
+  // "item.preview.oaire.citation.issue": "Issue",
+  "item.preview.oaire.citation.issue": "العدد",
+
+  // "item.preview.oaire.citation.volume": "Volume",
+  "item.preview.oaire.citation.volume": "المجلد",
+
+  // "item.preview.dc.relation.issn": "ISSN",
+  "item.preview.dc.relation.issn": "ISSN",
+
+  // "item.preview.dc.identifier.isbn": "ISBN",
+  "item.preview.dc.identifier.isbn": "ISBN",
+
+  // "item.preview.dc.identifier": "Identifier:",
+  "item.preview.dc.identifier": "المعرف:",
+
+  // "item.preview.dc.relation.ispartof": "Journal or Series",
+  "item.preview.dc.relation.ispartof": "الدورية",
+
+  // "item.preview.dc.identifier.doi": "DOI",
+  "item.preview.dc.identifier.doi": "معرف الكائن الرقمي",
+
+  // "item.preview.dc.publisher": "Publisher:",
+  "item.preview.dc.publisher": "الناشر:",
 
   // "item.preview.person.familyName": "Surname:",
-  // TODO New key - Add a translation
-  "item.preview.person.familyName": "Surname:",
+  "item.preview.person.familyName": "اللقب:",
 
   // "item.preview.person.givenName": "Name:",
-  // TODO New key - Add a translation
-  "item.preview.person.givenName": "Name:",
+  "item.preview.person.givenName": "الاسم:",
 
   // "item.preview.person.identifier.orcid": "ORCID:",
-  // TODO New key - Add a translation
-  "item.preview.person.identifier.orcid": "ORCID:",
+  "item.preview.person.identifier.orcid": "أوركيد:",
 
+  // "item.preview.project.funder.name": "Funder:",
+  "item.preview.project.funder.name": "الممول:",
+
+  // "item.preview.project.funder.identifier": "Funder Identifier:",
+  "item.preview.project.funder.identifier": "معرف الممول:",
+
+  // "item.preview.oaire.awardNumber": "Funding ID:",
+  "item.preview.oaire.awardNumber": "معرف التمويل:",
+
+  // "item.preview.dc.title.alternative": "Acronym:",
+  "item.preview.dc.title.alternative": "الحروف المختصرة:",
+
+  // "item.preview.dc.coverage.spatial": "Jurisdiction:",
+  "item.preview.dc.coverage.spatial": "الاختصاص القضائي:",
+
+  // "item.preview.oaire.fundingStream": "Funding Stream:",
+  "item.preview.oaire.fundingStream": "تدفق التمويل:",
+
+  // "item.preview.oairecerif.identifier.url": "URL",
+  "item.preview.oairecerif.identifier.url": "عنوان URL",
+
+  // "item.preview.organization.address.addressCountry": "Country",
+  "item.preview.organization.address.addressCountry": "البلد",
+
+  // "item.preview.organization.foundingDate": "Founding Date",
+  "item.preview.organization.foundingDate": "تاريخ التأسيس",
+
+  // "item.preview.organization.identifier.crossrefid": "Crossref ID",
+  "item.preview.organization.identifier.crossrefid": "Crossref معرف",
+
+  // "item.preview.organization.identifier.isni": "ISNI",
+  "item.preview.organization.identifier.isni": "ISNI",
+
+  // "item.preview.organization.identifier.ror": "ROR ID",
+  "item.preview.organization.identifier.ror": "ROR معرف",
+
+  // "item.preview.organization.legalName": "Legal Name",
+  "item.preview.organization.legalName": "الاسم القانوني",
+
+  // "item.preview.dspace.entity.type": "Entity Type:",
+  // TODO New key - Add a translation
+  "item.preview.dspace.entity.type": "Entity Type:",
 
   // "item.select.confirm": "Confirm selected",
-  // TODO New key - Add a translation
-  "item.select.confirm": "Confirm selected",
+  "item.select.confirm": "تأكيد المحدد",
 
   // "item.select.empty": "No items to show",
-  // TODO New key - Add a translation
-  "item.select.empty": "No items to show",
+  "item.select.empty": "لا توجد مواد للعرض",
+
+  // "item.select.table.selected": "Selected items",
+  "item.select.table.selected": "المواد المحددة",
+
+  // "item.select.table.select": "Select item",
+  "item.select.table.select": "تحديد المادة",
+
+  // "item.select.table.deselect": "Deselect item",
+  "item.select.table.deselect": "إلغاء تحديد المادة",
 
   // "item.select.table.author": "Author",
-  // TODO New key - Add a translation
-  "item.select.table.author": "Author",
+  "item.select.table.author": "المؤلف",
 
   // "item.select.table.collection": "Collection",
-  // TODO New key - Add a translation
-  "item.select.table.collection": "Collection",
+  "item.select.table.collection": "الحاوية",
 
   // "item.select.table.title": "Title",
-  // TODO New key - Add a translation
-  "item.select.table.title": "Title",
-
+  "item.select.table.title": "العنوان",
 
   // "item.version.history.empty": "There are no other versions for this item yet.",
-  // TODO New key - Add a translation
-  "item.version.history.empty": "There are no other versions for this item yet.",
+  "item.version.history.empty": "لا توجد إصدارات أخرى لهذه المادة حتى الآن.",
 
   // "item.version.history.head": "Version History",
-  // TODO New key - Add a translation
-  "item.version.history.head": "Version History",
+  "item.version.history.head": "سجل الإصدارة",
 
-  // "item.version.history.return": "Return",
-  // TODO New key - Add a translation
-  "item.version.history.return": "Return",
+  // "item.version.history.return": "Back",
+  "item.version.history.return": "رجوع",
 
   // "item.version.history.selected": "Selected version",
-  // TODO New key - Add a translation
-  "item.version.history.selected": "Selected version",
+  "item.version.history.selected": "افصدارة المحددة",
+
+  // "item.version.history.selected.alert": "You are currently viewing version {{version}} of the item.",
+  "item.version.history.selected.alert": "أنت حالياً تقوم بعرض الإصدارة {{version}} للمادة.",
 
   // "item.version.history.table.version": "Version",
-  // TODO New key - Add a translation
-  "item.version.history.table.version": "Version",
+  "item.version.history.table.version": "الإصدارة",
 
   // "item.version.history.table.item": "Item",
-  // TODO New key - Add a translation
-  "item.version.history.table.item": "Item",
+  "item.version.history.table.item": "المادة",
 
   // "item.version.history.table.editor": "Editor",
-  // TODO New key - Add a translation
-  "item.version.history.table.editor": "Editor",
+  "item.version.history.table.editor": "المحرر",
 
   // "item.version.history.table.date": "Date",
-  // TODO New key - Add a translation
-  "item.version.history.table.date": "Date",
+  "item.version.history.table.date": "التاريخ",
 
   // "item.version.history.table.summary": "Summary",
-  // TODO New key - Add a translation
-  "item.version.history.table.summary": "Summary",
+  "item.version.history.table.summary": "الملخص",
 
+  // "item.version.history.table.workspaceItem": "Workspace item",
+  "item.version.history.table.workspaceItem": "مادة نطاق العمل",
 
+  // "item.version.history.table.workflowItem": "Workflow item",
+  "item.version.history.table.workflowItem": "مادة سير العمل",
+
+  // "item.version.history.table.actions": "Action",
+  "item.version.history.table.actions": "الإجراء",
+
+  // "item.version.history.table.action.editWorkspaceItem": "Edit workspace item",
+  "item.version.history.table.action.editWorkspaceItem": "تحرير مادة نطاق العمل",
+
+  // "item.version.history.table.action.editSummary": "Edit summary",
+  "item.version.history.table.action.editSummary": "تحرير الملخص",
+
+  // "item.version.history.table.action.saveSummary": "Save summary edits",
+  "item.version.history.table.action.saveSummary": "حفظ تعديلات الملخص",
+
+  // "item.version.history.table.action.discardSummary": "Discard summary edits",
+  "item.version.history.table.action.discardSummary": "تجاهل تعديلات الملخص",
+
+  // "item.version.history.table.action.newVersion": "Create new version from this one",
+  "item.version.history.table.action.newVersion": "إنشاء إصدارة جديدة من هذه الإصدارة",
+
+  // "item.version.history.table.action.deleteVersion": "Delete version",
+  "item.version.history.table.action.deleteVersion": "حذف الإصدارة",
+
+  // "item.version.history.table.action.hasDraft": "A new version cannot be created because there is an inprogress submission in the version history",
+  "item.version.history.table.action.hasDraft": "لا يمكن إنشاء إصدارة جديدة نظراً لوجود تقديم قيد التقدم في سجل الإصدارة",
 
   // "item.version.notice": "This is not the latest version of this item. The latest version can be found <a href='{{destination}}'>here</a>.",
+  "item.version.notice": "هذه ليست آخر إصدارة من هذه المادة. يمكن العثور على آخر إصدارة من <a href='{{destination}}'>هنا</a>.",
+
+  // "item.version.create.modal.header": "New version",
+  "item.version.create.modal.header": "إصدارة جديدة",
+
+  // "item.qa.withdrawn.modal.header": "Request withdrawal",
   // TODO New key - Add a translation
-  "item.version.notice": "This is not the latest version of this item. The latest version can be found <a href='{{destination}}'>here</a>.",
+  "item.qa.withdrawn.modal.header": "Request withdrawal",
 
+  // "item.qa.reinstate.modal.header": "Request reinstate",
+  // TODO New key - Add a translation
+  "item.qa.reinstate.modal.header": "Request reinstate",
 
+  // "item.qa.reinstate.create.modal.header": "New version",
+  // TODO New key - Add a translation
+  "item.qa.reinstate.create.modal.header": "New version",
+
+  // "item.version.create.modal.text": "Create a new version for this item",
+  "item.version.create.modal.text": "إنشاء إصدارة جديدة لهذه المادة",
+
+  // "item.version.create.modal.text.startingFrom": "starting from version {{version}}",
+  "item.version.create.modal.text.startingFrom": "بدءاً من الإصدارة {{version}}",
+
+  // "item.version.create.modal.button.confirm": "Create",
+  "item.version.create.modal.button.confirm": "إنشاء",
+
+  // "item.version.create.modal.button.confirm.tooltip": "Create new version",
+  "item.version.create.modal.button.confirm.tooltip": "إنشاء إصدارة جديدة",
+
+  // "item.qa.withdrawn-reinstate.modal.button.confirm.tooltip": "Send request",
+  // TODO New key - Add a translation
+  "item.qa.withdrawn-reinstate.modal.button.confirm.tooltip": "Send request",
+
+  // "qa-withdrown.create.modal.button.confirm": "Withdraw",
+  // TODO New key - Add a translation
+  "qa-withdrown.create.modal.button.confirm": "Withdraw",
+
+  // "qa-reinstate.create.modal.button.confirm": "Reinstate",
+  // TODO New key - Add a translation
+  "qa-reinstate.create.modal.button.confirm": "Reinstate",
+
+  // "item.version.create.modal.button.cancel": "Cancel",
+  "item.version.create.modal.button.cancel": "إلغاء",
+
+  // "item.qa.withdrawn-reinstate.create.modal.button.cancel": "Cancel",
+  // TODO New key - Add a translation
+  "item.qa.withdrawn-reinstate.create.modal.button.cancel": "Cancel",
+
+  // "item.version.create.modal.button.cancel.tooltip": "Do not create new version",
+  "item.version.create.modal.button.cancel.tooltip": "لا تقم بإنشاء إصدارة جديدة",
+
+  // "item.qa.withdrawn-reinstate.create.modal.button.cancel.tooltip": "Do not send request",
+  // TODO New key - Add a translation
+  "item.qa.withdrawn-reinstate.create.modal.button.cancel.tooltip": "Do not send request",
+
+  // "item.version.create.modal.form.summary.label": "Summary",
+  "item.version.create.modal.form.summary.label": "الملخص",
+
+  // "qa-withdrawn.create.modal.form.summary.label": "You are requesting to withdraw this item",
+  // TODO New key - Add a translation
+  "qa-withdrawn.create.modal.form.summary.label": "You are requesting to withdraw this item",
+
+  // "qa-withdrawn.create.modal.form.summary2.label": "Please enter the reason for the withdrawal",
+  // TODO New key - Add a translation
+  "qa-withdrawn.create.modal.form.summary2.label": "Please enter the reason for the withdrawal",
+
+  // "qa-reinstate.create.modal.form.summary.label": "You are requesting to reinstate this item",
+  // TODO New key - Add a translation
+  "qa-reinstate.create.modal.form.summary.label": "You are requesting to reinstate this item",
+
+  // "qa-reinstate.create.modal.form.summary2.label": "Please enter the reason for the reinstatment",
+  // TODO New key - Add a translation
+  "qa-reinstate.create.modal.form.summary2.label": "Please enter the reason for the reinstatment",
+
+  // "item.version.create.modal.form.summary.placeholder": "Insert the summary for the new version",
+  "item.version.create.modal.form.summary.placeholder": "قم بإدخال ملخص الإصدارة الجديدة",
+
+  // "qa-withdrown.modal.form.summary.placeholder": "Enter the reason for the withdrawal",
+  // TODO New key - Add a translation
+  "qa-withdrown.modal.form.summary.placeholder": "Enter the reason for the withdrawal",
+
+  // "qa-reinstate.modal.form.summary.placeholder": "Enter the reason for the reinstatement",
+  // TODO New key - Add a translation
+  "qa-reinstate.modal.form.summary.placeholder": "Enter the reason for the reinstatement",
+
+  // "item.version.create.modal.submitted.header": "Creating new version...",
+  "item.version.create.modal.submitted.header": "إنشاء إصدارة جديدة...",
+
+  // "item.qa.withdrawn.modal.submitted.header": "Sending withdrawn request...",
+  // TODO New key - Add a translation
+  "item.qa.withdrawn.modal.submitted.header": "Sending withdrawn request...",
+
+  // "correction-type.manage-relation.action.notification.reinstate": "Reinstate request sent.",
+  // TODO New key - Add a translation
+  "correction-type.manage-relation.action.notification.reinstate": "Reinstate request sent.",
+
+  // "correction-type.manage-relation.action.notification.withdrawn": "Withdraw request sent.",
+  // TODO New key - Add a translation
+  "correction-type.manage-relation.action.notification.withdrawn": "Withdraw request sent.",
+
+  // "item.version.create.modal.submitted.text": "The new version is being created. This may take some time if the item has a lot of relationships.",
+  "item.version.create.modal.submitted.text": "جاري إنشاء الإصدارة الجديدة. قد يستغرق هذا بعض الوقت إذا كان لهذه المادة الكثير من العلاقات.",
+
+  // "item.version.create.notification.success": "New version has been created with version number {{version}}",
+  "item.version.create.notification.success": "تم إنشاء إصدارة جديدة برقم الإصدار {{version}}",
+
+  // "item.version.create.notification.failure": "New version has not been created",
+  "item.version.create.notification.failure": "لم يتم إنشاء إصدارة جديدة",
+
+  // "item.version.create.notification.inProgress": "A new version cannot be created because there is an inprogress submission in the version history",
+  "item.version.create.notification.inProgress": "لا يمكن إنشاء إصدارة جديدة نظراً لوجود تقديم قيد التقدم في سجل الإصدارة",
+
+  // "item.version.delete.modal.header": "Delete version",
+  "item.version.delete.modal.header": "حذف الإصدارة",
+
+  // "item.version.delete.modal.text": "Do you want to delete version {{version}}?",
+  "item.version.delete.modal.text": "هل ترغب في حذف الإصدارة {{version}}؟",
+
+  // "item.version.delete.modal.button.confirm": "Delete",
+  "item.version.delete.modal.button.confirm": "حذف",
+
+  // "item.version.delete.modal.button.confirm.tooltip": "Delete this version",
+  "item.version.delete.modal.button.confirm.tooltip": "حذف هذه الإصدارة",
+
+  // "item.version.delete.modal.button.cancel": "Cancel",
+  "item.version.delete.modal.button.cancel": "إلغاء",
+
+  // "item.version.delete.modal.button.cancel.tooltip": "Do not delete this version",
+  "item.version.delete.modal.button.cancel.tooltip": "لا تقم بحذف هذه الإصدارة",
+
+  // "item.version.delete.notification.success": "Version number {{version}} has been deleted",
+  "item.version.delete.notification.success": "تم حذف الإصدارة رقم {{version}}",
+
+  // "item.version.delete.notification.failure": "Version number {{version}} has not been deleted",
+  "item.version.delete.notification.failure": "لم يتم حذف الإصدارة رقم {{version}}",
+
+  // "item.version.edit.notification.success": "The summary of version number {{version}} has been changed",
+  "item.version.edit.notification.success": "تم تغيير ملخص الإصدارة رقم {{version}}",
+
+  // "item.version.edit.notification.failure": "The summary of version number {{version}} has not been changed",
+  "item.version.edit.notification.failure": "لم يتم تغيير ملخص الإصدارة رقم {{version}}",
+
+  // "itemtemplate.edit.metadata.add-button": "Add",
+  "itemtemplate.edit.metadata.add-button": "إضافة",
+
+  // "itemtemplate.edit.metadata.discard-button": "Discard",
+  "itemtemplate.edit.metadata.discard-button": "تجاهل",
+
+  // "itemtemplate.edit.metadata.edit.language": "Edit language",
+  "itemtemplate.edit.metadata.edit.language": "تحرير اللغة",
+
+  // "itemtemplate.edit.metadata.edit.value": "Edit value",
+  "itemtemplate.edit.metadata.edit.value": "تحرير القيمة",
+
+  // "itemtemplate.edit.metadata.edit.buttons.confirm": "Confirm",
+  "itemtemplate.edit.metadata.edit.buttons.confirm": "تأكيد",
+
+  // "itemtemplate.edit.metadata.edit.buttons.drag": "Drag to reorder",
+  "itemtemplate.edit.metadata.edit.buttons.drag": "اسحب لإعادة الترتيب",
+
+  // "itemtemplate.edit.metadata.edit.buttons.edit": "Edit",
+  "itemtemplate.edit.metadata.edit.buttons.edit": "تحرير",
+
+  // "itemtemplate.edit.metadata.edit.buttons.remove": "Remove",
+  "itemtemplate.edit.metadata.edit.buttons.remove": "إزالة",
+
+  // "itemtemplate.edit.metadata.edit.buttons.undo": "Undo changes",
+  "itemtemplate.edit.metadata.edit.buttons.undo": "تراجع عن التغييرات",
+
+  // "itemtemplate.edit.metadata.edit.buttons.unedit": "Stop editing",
+  "itemtemplate.edit.metadata.edit.buttons.unedit": "إيقاف التحرير",
+
+  // "itemtemplate.edit.metadata.empty": "The item template currently doesn't contain any metadata. Click Add to start adding a metadata value.",
+  "itemtemplate.edit.metadata.empty": "قالب العنصر حاليًا لا يحتوي على أي ميتاداتا. انقر فوق إضافة لبدء إضافة قيمة ميتاداتا.",
+
+  // "itemtemplate.edit.metadata.headers.edit": "Edit",
+  "itemtemplate.edit.metadata.headers.edit": "تحرير",
+
+  // "itemtemplate.edit.metadata.headers.field": "Field",
+  "itemtemplate.edit.metadata.headers.field": "الحقل",
+
+  // "itemtemplate.edit.metadata.headers.language": "Lang",
+  "itemtemplate.edit.metadata.headers.language": "اللغة",
+
+  // "itemtemplate.edit.metadata.headers.value": "Value",
+  "itemtemplate.edit.metadata.headers.value": "القيمة",
+
+  // "itemtemplate.edit.metadata.metadatafield": "Edit field",
+  "itemtemplate.edit.metadata.metadatafield": "تحرير الحقل",
+
+  // "itemtemplate.edit.metadata.metadatafield.error": "An error occurred validating the metadata field",
+  "itemtemplate.edit.metadata.metadatafield.error": "حدث خطأ أثناء التحقق من حقل الميتاداتا",
+
+  // "itemtemplate.edit.metadata.metadatafield.invalid": "Please choose a valid metadata field",
+  "itemtemplate.edit.metadata.metadatafield.invalid": "يرجى اختيار حقل ميتاداتا صالح",
+
+  // "itemtemplate.edit.metadata.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button",
+  "itemtemplate.edit.metadata.notifications.discarded.content": "تم تجاهل التغييرات التي أجريتها. لاستعادة التغييرات، قم بالنقر على زر 'تراجع' ",
+
+  // "itemtemplate.edit.metadata.notifications.discarded.title": "Changes discarded",
+  "itemtemplate.edit.metadata.notifications.discarded.title": "تم تجاهل التغييرات",
+
+  // "itemtemplate.edit.metadata.notifications.error.title": "An error occurred",
+  "itemtemplate.edit.metadata.notifications.error.title": "حدث خطأ",
+
+  // "itemtemplate.edit.metadata.notifications.invalid.content": "Your changes were not saved. Please make sure all fields are valid before you save.",
+  "itemtemplate.edit.metadata.notifications.invalid.content": "لم يتم حفظ التغييرات. يرجى التأكد من أن جميع الحقول صالحة قبل الحفظ.",
+
+  // "itemtemplate.edit.metadata.notifications.invalid.title": "Metadata invalid",
+  "itemtemplate.edit.metadata.notifications.invalid.title": "الميتاداتا غير صالحة",
+
+  // "itemtemplate.edit.metadata.notifications.outdated.content": "The item template you're currently working on has been changed by another user. Your current changes are discarded to prevent conflicts",
+  "itemtemplate.edit.metadata.notifications.outdated.content": "تم تغيير قالب المادة الذي تعمل عليه حالياً بواسطة مستخدم آخر. تم تجاهل التغييرات الحالية لمنع التعارضات",
+
+  // "itemtemplate.edit.metadata.notifications.outdated.title": "Changes outdated",
+  "itemtemplate.edit.metadata.notifications.outdated.title": "انتهت صلاحية التغييرات",
+
+  // "itemtemplate.edit.metadata.notifications.saved.content": "Your changes to this item template's metadata were saved.",
+  "itemtemplate.edit.metadata.notifications.saved.content": "تم حفظ التغييرات التي أجريتها على الميتاداتا لقالب المادة هذا.",
+
+  // "itemtemplate.edit.metadata.notifications.saved.title": "Metadata saved",
+  "itemtemplate.edit.metadata.notifications.saved.title": "تم حفظ الميتاداتا",
+
+  // "itemtemplate.edit.metadata.reinstate-button": "Undo",
+  "itemtemplate.edit.metadata.reinstate-button": "تراجع",
+
+  // "itemtemplate.edit.metadata.reset-order-button": "Undo reorder",
+  "itemtemplate.edit.metadata.reset-order-button": "التراجع عن إعادة الترتيب",
+
+  // "itemtemplate.edit.metadata.save-button": "Save",
+  "itemtemplate.edit.metadata.save-button": "حفظ",
 
   // "journal.listelement.badge": "Journal",
-  // TODO New key - Add a translation
-  "journal.listelement.badge": "Journal",
+  "journal.listelement.badge": "الدورية",
 
   // "journal.page.description": "Description",
-  // TODO New key - Add a translation
-  "journal.page.description": "Description",
+  "journal.page.description": "الوصف",
 
   // "journal.page.edit": "Edit this item",
-  // TODO New key - Add a translation
-  "journal.page.edit": "Edit this item",
+  "journal.page.edit": "تحرير هذه المادة",
 
   // "journal.page.editor": "Editor-in-Chief",
-  // TODO New key - Add a translation
-  "journal.page.editor": "Editor-in-Chief",
+  "journal.page.editor": "رئيس التحرير",
 
   // "journal.page.issn": "ISSN",
-  // TODO New key - Add a translation
   "journal.page.issn": "ISSN",
 
   // "journal.page.publisher": "Publisher",
-  // TODO New key - Add a translation
-  "journal.page.publisher": "Publisher",
+  "journal.page.publisher": "الناشر",
 
   // "journal.page.titleprefix": "Journal: ",
-  // TODO New key - Add a translation
-  "journal.page.titleprefix": "Journal: ",
+  "journal.page.titleprefix": "الدورية: ",
 
   // "journal.search.results.head": "Journal Search Results",
-  // TODO New key - Add a translation
-  "journal.search.results.head": "Journal Search Results",
-
-  // "journal.search.title": "DSpace Angular :: Journal Search",
-  // TODO New key - Add a translation
-  "journal.search.title": "DSpace Angular :: Journal Search",
+  "journal.search.results.head": "نتائج بحث الدورية",
 
+  // "journal-relationships.search.results.head": "Journal Search Results",
+  "journal-relationships.search.results.head": "نتائج بحث الدورية",
 
+  // "journal.search.title": "Journal Search",
+  "journal.search.title": "بحث الدورية",
 
   // "journalissue.listelement.badge": "Journal Issue",
-  // TODO New key - Add a translation
-  "journalissue.listelement.badge": "Journal Issue",
+  "journalissue.listelement.badge": "عدد الدورية",
 
   // "journalissue.page.description": "Description",
-  // TODO New key - Add a translation
-  "journalissue.page.description": "Description",
+  "journalissue.page.description": "الوصف",
 
   // "journalissue.page.edit": "Edit this item",
-  // TODO New key - Add a translation
-  "journalissue.page.edit": "Edit this item",
+  "journalissue.page.edit": "تحرير هذه المادة",
 
   // "journalissue.page.issuedate": "Issue Date",
-  // TODO New key - Add a translation
-  "journalissue.page.issuedate": "Issue Date",
+  "journalissue.page.issuedate": "تاريخ العدد",
 
   // "journalissue.page.journal-issn": "Journal ISSN",
-  // TODO New key - Add a translation
-  "journalissue.page.journal-issn": "Journal ISSN",
+  "journalissue.page.journal-issn": "ردمد الدورية",
 
   // "journalissue.page.journal-title": "Journal Title",
-  // TODO New key - Add a translation
-  "journalissue.page.journal-title": "Journal Title",
+  "journalissue.page.journal-title": "عنوان الدورية",
 
   // "journalissue.page.keyword": "Keywords",
-  // TODO New key - Add a translation
-  "journalissue.page.keyword": "Keywords",
+  "journalissue.page.keyword": "كلمات رئيسية",
 
   // "journalissue.page.number": "Number",
-  // TODO New key - Add a translation
-  "journalissue.page.number": "Number",
+  "journalissue.page.number": "رقم",
 
   // "journalissue.page.titleprefix": "Journal Issue: ",
-  // TODO New key - Add a translation
-  "journalissue.page.titleprefix": "Journal Issue: ",
-
+  "journalissue.page.titleprefix": "عدد الدورية: ",
 
+  // "journalissue.search.results.head": "Journal Issue Search Results",
+  "journalissue.search.results.head": "نتائج بحث عدد الدورية",
 
   // "journalvolume.listelement.badge": "Journal Volume",
-  // TODO New key - Add a translation
-  "journalvolume.listelement.badge": "Journal Volume",
+  "journalvolume.listelement.badge": "مجلد الدورية",
 
   // "journalvolume.page.description": "Description",
-  // TODO New key - Add a translation
-  "journalvolume.page.description": "Description",
+  "journalvolume.page.description": "الوصف",
 
   // "journalvolume.page.edit": "Edit this item",
-  // TODO New key - Add a translation
-  "journalvolume.page.edit": "Edit this item",
+  "journalvolume.page.edit": "تحرير هذه المادة",
 
   // "journalvolume.page.issuedate": "Issue Date",
-  // TODO New key - Add a translation
-  "journalvolume.page.issuedate": "Issue Date",
+  "journalvolume.page.issuedate": "تاريخ الإصدار",
 
   // "journalvolume.page.titleprefix": "Journal Volume: ",
-  // TODO New key - Add a translation
-  "journalvolume.page.titleprefix": "Journal Volume: ",
+  "journalvolume.page.titleprefix": "مجلد دورية: ",
 
   // "journalvolume.page.volume": "Volume",
-  // TODO New key - Add a translation
-  "journalvolume.page.volume": "Volume",
+  "journalvolume.page.volume": "المجلد",
 
+  // "journalvolume.search.results.head": "Journal Volume Search Results",
+  "journalvolume.search.results.head": "نتائج بحث مجلد الدورية",
 
+  // "iiifsearchable.listelement.badge": "Document Media",
+  "iiifsearchable.listelement.badge": "وسائط الوثائق",
+
+  // "iiifsearchable.page.titleprefix": "Document: ",
+  "iiifsearchable.page.titleprefix": "الوثيقة: ",
+
+  // "iiifsearchable.page.doi": "Permanent Link: ",
+  "iiifsearchable.page.doi": "الرابط الدائم: ",
+
+  // "iiifsearchable.page.issue": "Issue: ",
+  "iiifsearchable.page.issue": "العدد: ",
+
+  // "iiifsearchable.page.description": "Description: ",
+  "iiifsearchable.page.description": "الوصف: ",
+
+  // "iiifviewer.fullscreen.notice": "Use full screen for better viewing.",
+  "iiifviewer.fullscreen.notice": "استخدم الشاشة الكاملة لمشاهدة أفضل.",
+
+  // "iiif.listelement.badge": "Image Media",
+  "iiif.listelement.badge": "وسائط الصور",
+
+  // "iiif.page.titleprefix": "Image: ",
+  "iiif.page.titleprefix": "الصورة: ",
+
+  // "iiif.page.doi": "Permanent Link: ",
+  "iiif.page.doi": "الرابط الدائم: ",
+
+  // "iiif.page.issue": "Issue: ",
+  "iiif.page.issue": "العدد: ",
+
+  // "iiif.page.description": "Description: ",
+  "iiif.page.description": "الوصف: ",
 
   // "loading.bitstream": "Loading bitstream...",
-  // TODO New key - Add a translation
-  "loading.bitstream": "Loading bitstream...",
+  "loading.bitstream": "جاري تحميل تدفق البت...",
 
   // "loading.bitstreams": "Loading bitstreams...",
-  // TODO New key - Add a translation
-  "loading.bitstreams": "Loading bitstreams...",
+  "loading.bitstreams": "جاري تحميل تدفقات البت...",
 
   // "loading.browse-by": "Loading items...",
-  // TODO New key - Add a translation
-  "loading.browse-by": "Loading items...",
+  "loading.browse-by": "جاري تحميل المواد...",
 
   // "loading.browse-by-page": "Loading page...",
-  // TODO New key - Add a translation
-  "loading.browse-by-page": "Loading page...",
+  "loading.browse-by-page": "جاري تحميل الصفحة...",
 
   // "loading.collection": "Loading collection...",
-  // TODO New key - Add a translation
-  "loading.collection": "Loading collection...",
+  "loading.collection": "جاري تحميل الحاوية...",
 
   // "loading.collections": "Loading collections...",
-  // TODO New key - Add a translation
-  "loading.collections": "Loading collections...",
+  "loading.collections": "جاري تحميل الحاويات...",
 
   // "loading.content-source": "Loading content source...",
-  // TODO New key - Add a translation
-  "loading.content-source": "Loading content source...",
+  "loading.content-source": "جاري تحميل مصدر المحتوى...",
 
   // "loading.community": "Loading community...",
-  // TODO New key - Add a translation
-  "loading.community": "Loading community...",
+  "loading.community": "جاري تحميل المجتمع...",
 
   // "loading.default": "Loading...",
-  // TODO New key - Add a translation
-  "loading.default": "Loading...",
+  "loading.default": "جاري التحميل...",
 
   // "loading.item": "Loading item...",
-  // TODO New key - Add a translation
-  "loading.item": "Loading item...",
+  "loading.item": "جاري تحميل المادة...",
 
   // "loading.items": "Loading items...",
-  // TODO New key - Add a translation
-  "loading.items": "Loading items...",
+  "loading.items": "جاري تحميل المواد...",
 
   // "loading.mydspace-results": "Loading items...",
-  // TODO New key - Add a translation
-  "loading.mydspace-results": "Loading items...",
+  "loading.mydspace-results": "جاري تحميل المواد...",
 
   // "loading.objects": "Loading...",
-  // TODO New key - Add a translation
-  "loading.objects": "Loading...",
+  "loading.objects": "جاري التحميل...",
 
   // "loading.recent-submissions": "Loading recent submissions...",
-  // TODO New key - Add a translation
-  "loading.recent-submissions": "Loading recent submissions...",
+  "loading.recent-submissions": "جاري تحميل أحدث التقديمات...",
 
   // "loading.search-results": "Loading search results...",
-  // TODO New key - Add a translation
-  "loading.search-results": "Loading search results...",
+  "loading.search-results": "جاري تحميل نتائج البحث...",
 
   // "loading.sub-collections": "Loading sub-collections...",
-  // TODO New key - Add a translation
-  "loading.sub-collections": "Loading sub-collections...",
+  "loading.sub-collections": "جاري تحميل الحاويات الفرعية...",
 
   // "loading.sub-communities": "Loading sub-communities...",
-  // TODO New key - Add a translation
-  "loading.sub-communities": "Loading sub-communities...",
+  "loading.sub-communities": "جاري تحميل المجتمعات الفرعية...",
 
   // "loading.top-level-communities": "Loading top-level communities...",
-  // TODO New key - Add a translation
-  "loading.top-level-communities": "Loading top-level communities...",
-
-
+  "loading.top-level-communities": "جاري تحميل مجتمعات المستوى الأعلى...",
 
   // "login.form.email": "Email address",
-  // TODO New key - Add a translation
-  "login.form.email": "Email address",
+  "login.form.email": "عنوان البريد الإلكتروني",
 
   // "login.form.forgot-password": "Have you forgotten your password?",
-  // TODO New key - Add a translation
-  "login.form.forgot-password": "Have you forgotten your password?",
+  "login.form.forgot-password": "هل نسيت كلمة المرور؟",
 
   // "login.form.header": "Please log in to DSpace",
-  // TODO New key - Add a translation
-  "login.form.header": "Please log in to DSpace",
+  "login.form.header": "يرجى تسجيل الدخول إلى دي سبيس",
 
   // "login.form.new-user": "New user? Click here to register.",
-  // TODO New key - Add a translation
-  "login.form.new-user": "New user? Click here to register.",
+  "login.form.new-user": "مستخدم جديد؟ اضغط هنا للتسجيل.",
 
-  // "login.form.or-divider": "or",
-  // TODO New key - Add a translation
-  "login.form.or-divider": "or",
+  // "login.form.oidc": "Log in with OIDC",
+  "login.form.oidc": "تسجيل الدخول باستخدام أوركيد",
+
+  // "login.form.orcid": "Log in with ORCID",
+  "login.form.orcid": "تسجيل الدخول باستخدام أوركيد",
 
   // "login.form.password": "Password",
-  // TODO New key - Add a translation
-  "login.form.password": "Password",
+  "login.form.password": "كلمة المرور",
 
   // "login.form.shibboleth": "Log in with Shibboleth",
-  // TODO New key - Add a translation
-  "login.form.shibboleth": "Log in with Shibboleth",
+  "login.form.shibboleth": "تسجيل الدخول باستخدام Shibboleth",
 
   // "login.form.submit": "Log in",
-  // TODO New key - Add a translation
-  "login.form.submit": "Log in",
+  "login.form.submit": "تسجيل الدخول",
 
   // "login.title": "Login",
-  // TODO New key - Add a translation
-  "login.title": "Login",
+  "login.title": "تسجيل الدخول",
 
   // "login.breadcrumbs": "Login",
-  // TODO New key - Add a translation
-  "login.breadcrumbs": "Login",
-
-
+  "login.breadcrumbs": "تسجيل الدخول",
 
   // "logout.form.header": "Log out from DSpace",
-  // TODO New key - Add a translation
-  "logout.form.header": "Log out from DSpace",
+  "logout.form.header": "تسجيل الخروج من دي سبيس",
 
   // "logout.form.submit": "Log out",
-  // TODO New key - Add a translation
-  "logout.form.submit": "Log out",
+  "logout.form.submit": "خروج",
 
   // "logout.title": "Logout",
+  "logout.title": "خروج",
+
+  // "menu.header.nav.description": "Admin navigation bar",
   // TODO New key - Add a translation
-  "logout.title": "Logout",
+  "menu.header.nav.description": "Admin navigation bar",
 
-
-
-  // "menu.header.admin": "Admin",
-  // TODO New key - Add a translation
-  "menu.header.admin": "Admin",
+  // "menu.header.admin": "Management",
+  "menu.header.admin": "إدارة",
 
   // "menu.header.image.logo": "Repository logo",
-  // TODO New key - Add a translation
-  "menu.header.image.logo": "Repository logo",
-
+  "menu.header.image.logo": "شعار المستودع",
 
+  // "menu.header.admin.description": "Management menu",
+  "menu.header.admin.description": "قائمة الإدارة",
 
   // "menu.section.access_control": "Access Control",
-  // TODO New key - Add a translation
-  "menu.section.access_control": "Access Control",
+  "menu.section.access_control": "التحكم في الوصول",
 
   // "menu.section.access_control_authorizations": "Authorizations",
-  // TODO New key - Add a translation
-  "menu.section.access_control_authorizations": "Authorizations",
+  "menu.section.access_control_authorizations": "تصاريح",
+
+  // "menu.section.access_control_bulk": "Bulk Access Management",
+  "menu.section.access_control_bulk": "إدارة الوصول بالجملة",
 
   // "menu.section.access_control_groups": "Groups",
-  // TODO New key - Add a translation
-  "menu.section.access_control_groups": "Groups",
+  "menu.section.access_control_groups": "مجموعات",
 
   // "menu.section.access_control_people": "People",
+  "menu.section.access_control_people": "أشخاص",
+
+  // "menu.section.reports": "Reports",
   // TODO New key - Add a translation
-  "menu.section.access_control_people": "People",
+  "menu.section.reports": "Reports",
 
+  // "menu.section.reports.collections": "Filtered Collections",
+  // TODO New key - Add a translation
+  "menu.section.reports.collections": "Filtered Collections",
 
+  // "menu.section.reports.queries": "Metadata Query",
+  // TODO New key - Add a translation
+  "menu.section.reports.queries": "Metadata Query",
 
   // "menu.section.admin_search": "Admin Search",
-  // TODO New key - Add a translation
-  "menu.section.admin_search": "Admin Search",
-
-
+  "menu.section.admin_search": "بحث إداري",
 
   // "menu.section.browse_community": "This Community",
-  // TODO New key - Add a translation
-  "menu.section.browse_community": "This Community",
+  "menu.section.browse_community": "هذا المجتمع",
 
   // "menu.section.browse_community_by_author": "By Author",
-  // TODO New key - Add a translation
-  "menu.section.browse_community_by_author": "By Author",
+  "menu.section.browse_community_by_author": "حسب المؤلف",
 
   // "menu.section.browse_community_by_issue_date": "By Issue Date",
-  // TODO New key - Add a translation
-  "menu.section.browse_community_by_issue_date": "By Issue Date",
+  "menu.section.browse_community_by_issue_date": "حسب تاريخ الإصدار",
 
   // "menu.section.browse_community_by_title": "By Title",
-  // TODO New key - Add a translation
-  "menu.section.browse_community_by_title": "By Title",
+  "menu.section.browse_community_by_title": "حسب العنوان",
 
   // "menu.section.browse_global": "All of DSpace",
-  // TODO New key - Add a translation
-  "menu.section.browse_global": "All of DSpace",
+  "menu.section.browse_global": "كل دي سبيس",
 
   // "menu.section.browse_global_by_author": "By Author",
-  // TODO New key - Add a translation
-  "menu.section.browse_global_by_author": "By Author",
+  "menu.section.browse_global_by_author": "حسب المؤلف",
 
   // "menu.section.browse_global_by_dateissued": "By Issue Date",
-  // TODO New key - Add a translation
-  "menu.section.browse_global_by_dateissued": "By Issue Date",
+  "menu.section.browse_global_by_dateissued": "حسب تاريخ الإصدار",
 
   // "menu.section.browse_global_by_subject": "By Subject",
-  // TODO New key - Add a translation
-  "menu.section.browse_global_by_subject": "By Subject",
+  "menu.section.browse_global_by_subject": "حسب الموضوع",
+
+  // "menu.section.browse_global_by_srsc": "By Subject Category",
+  "menu.section.browse_global_by_srsc": "حسب فئة الموضوع",
+
+  // "menu.section.browse_global_by_nsi": "By Norwegian Science Index",
+  "menu.section.browse_global_by_nsi": "حسب فهرس العلوم النرويجي",
 
   // "menu.section.browse_global_by_title": "By Title",
-  // TODO New key - Add a translation
-  "menu.section.browse_global_by_title": "By Title",
+  "menu.section.browse_global_by_title": "حسب العنوان",
 
   // "menu.section.browse_global_communities_and_collections": "Communities & Collections",
-  // TODO New key - Add a translation
-  "menu.section.browse_global_communities_and_collections": "Communities & Collections",
-
-
+  "menu.section.browse_global_communities_and_collections": "المجتمعات والحاويات",
 
   // "menu.section.control_panel": "Control Panel",
-  // TODO New key - Add a translation
-  "menu.section.control_panel": "Control Panel",
+  "menu.section.control_panel": "لوحة التحكم",
 
   // "menu.section.curation_task": "Curation Task",
-  // TODO New key - Add a translation
-  "menu.section.curation_task": "Curation Task",
-
-
+  "menu.section.curation_task": "مهمة الأكرتة",
 
   // "menu.section.edit": "Edit",
-  // TODO New key - Add a translation
-  "menu.section.edit": "Edit",
+  "menu.section.edit": "تحرير",
 
   // "menu.section.edit_collection": "Collection",
-  // TODO New key - Add a translation
-  "menu.section.edit_collection": "Collection",
+  "menu.section.edit_collection": "حاوية",
 
   // "menu.section.edit_community": "Community",
-  // TODO New key - Add a translation
-  "menu.section.edit_community": "Community",
+  "menu.section.edit_community": "مجتمع",
 
   // "menu.section.edit_item": "Item",
-  // TODO New key - Add a translation
-  "menu.section.edit_item": "Item",
-
-
+  "menu.section.edit_item": "مادة",
 
   // "menu.section.export": "Export",
-  // TODO New key - Add a translation
-  "menu.section.export": "Export",
+  "menu.section.export": "تصدير",
 
   // "menu.section.export_collection": "Collection",
-  // TODO New key - Add a translation
-  "menu.section.export_collection": "Collection",
+  "menu.section.export_collection": "حاوية",
 
   // "menu.section.export_community": "Community",
-  // TODO New key - Add a translation
-  "menu.section.export_community": "Community",
+  "menu.section.export_community": "مجتمع",
 
   // "menu.section.export_item": "Item",
-  // TODO New key - Add a translation
-  "menu.section.export_item": "Item",
+  "menu.section.export_item": "مادة",
 
   // "menu.section.export_metadata": "Metadata",
-  // TODO New key - Add a translation
-  "menu.section.export_metadata": "Metadata",
-
+  "menu.section.export_metadata": "ميتاداتا",
 
+  // "menu.section.export_batch": "Batch Export (ZIP)",
+  "menu.section.export_batch": "تصدير بالدفعة (ZIP)",
 
   // "menu.section.icon.access_control": "Access Control menu section",
+  "menu.section.icon.access_control": "قسم قائمة التحكم في الوصول",
+
+  // "menu.section.icon.reports": "Reports menu section",
   // TODO New key - Add a translation
-  "menu.section.icon.access_control": "Access Control menu section",
+  "menu.section.icon.reports": "Reports menu section",
 
   // "menu.section.icon.admin_search": "Admin search menu section",
-  // TODO New key - Add a translation
-  "menu.section.icon.admin_search": "Admin search menu section",
+  "menu.section.icon.admin_search": "قسم قائمة البحث الإداري",
 
   // "menu.section.icon.control_panel": "Control Panel menu section",
-  // TODO New key - Add a translation
-  "menu.section.icon.control_panel": "Control Panel menu section",
+  "menu.section.icon.control_panel": "قسم قائمة لوحة التحكم",
 
-  // "menu.section.icon.curation_task": "Curation Task menu section",
-  // TODO New key - Add a translation
-  "menu.section.icon.curation_task": "Curation Task menu section",
+  // "menu.section.icon.curation_tasks": "Curation Task menu section",
+  "menu.section.icon.curation_tasks": "قسم قائمة مهمة الأكرتة",
 
   // "menu.section.icon.edit": "Edit menu section",
-  // TODO New key - Add a translation
-  "menu.section.icon.edit": "Edit menu section",
+  "menu.section.icon.edit": "قسم قائمة التحرير",
 
   // "menu.section.icon.export": "Export menu section",
-  // TODO New key - Add a translation
-  "menu.section.icon.export": "Export menu section",
+  "menu.section.icon.export": "قسم قائمة التصدير",
 
   // "menu.section.icon.find": "Find menu section",
-  // TODO New key - Add a translation
-  "menu.section.icon.find": "Find menu section",
+  "menu.section.icon.find": "قسم قائمة البحث",
+
+  // "menu.section.icon.health": "Health check menu section",
+  "menu.section.icon.health": "قسم قائمة التحقق من الصحة",
 
   // "menu.section.icon.import": "Import menu section",
-  // TODO New key - Add a translation
-  "menu.section.icon.import": "Import menu section",
+  "menu.section.icon.import": "قسم قائمة الاستيراد",
 
   // "menu.section.icon.new": "New menu section",
-  // TODO New key - Add a translation
-  "menu.section.icon.new": "New menu section",
+  "menu.section.icon.new": "قسم قائمة جديد",
 
   // "menu.section.icon.pin": "Pin sidebar",
-  // TODO New key - Add a translation
-  "menu.section.icon.pin": "Pin sidebar",
+  "menu.section.icon.pin": "تدبيس الشريط الجانبي",
 
-  // "menu.section.icon.processes": "Processes menu section",
-  // TODO New key - Add a translation
-  "menu.section.icon.processes": "Processes menu section",
+  // "menu.section.icon.processes": "Processes Health",
+  "menu.section.icon.processes": "قسم قائمة العمليات",
 
   // "menu.section.icon.registries": "Registries menu section",
-  // TODO New key - Add a translation
-  "menu.section.icon.registries": "Registries menu section",
+  "menu.section.icon.registries": "قسم قائمة السجلات",
 
   // "menu.section.icon.statistics_task": "Statistics Task menu section",
-  // TODO New key - Add a translation
-  "menu.section.icon.statistics_task": "Statistics Task menu section",
+  "menu.section.icon.statistics_task": "قسم قائمة مهام الإحصائيات",
+
+  // "menu.section.icon.workflow": "Administer workflow menu section",
+  "menu.section.icon.workflow": "قسم قائمة إدارة عمليات سير العمل",
 
   // "menu.section.icon.unpin": "Unpin sidebar",
-  // TODO New key - Add a translation
-  "menu.section.icon.unpin": "Unpin sidebar",
-
+  "menu.section.icon.unpin": "إلغاء تدبيس الشريط الجانبي",
 
+  // "menu.section.icon.notifications": "Notifications menu section",
+  "menu.section.icon.notifications": "قسم قائمة الإشعارات",
 
   // "menu.section.import": "Import",
-  // TODO New key - Add a translation
-  "menu.section.import": "Import",
+  "menu.section.import": "استيراد",
 
   // "menu.section.import_batch": "Batch Import (ZIP)",
-  // TODO New key - Add a translation
-  "menu.section.import_batch": "Batch Import (ZIP)",
+  "menu.section.import_batch": "استيراد بالدفعة (ملف مضغوط)",
 
   // "menu.section.import_metadata": "Metadata",
-  // TODO New key - Add a translation
-  "menu.section.import_metadata": "Metadata",
-
-
+  "menu.section.import_metadata": "ميتاداتا",
 
   // "menu.section.new": "New",
-  // TODO New key - Add a translation
-  "menu.section.new": "New",
+  "menu.section.new": "جديد",
 
   // "menu.section.new_collection": "Collection",
-  // TODO New key - Add a translation
-  "menu.section.new_collection": "Collection",
+  "menu.section.new_collection": "حاوية",
 
   // "menu.section.new_community": "Community",
-  // TODO New key - Add a translation
-  "menu.section.new_community": "Community",
+  "menu.section.new_community": "مجتمع",
 
   // "menu.section.new_item": "Item",
-  // TODO New key - Add a translation
-  "menu.section.new_item": "Item",
+  "menu.section.new_item": "مادة",
 
   // "menu.section.new_item_version": "Item Version",
-  // TODO New key - Add a translation
-  "menu.section.new_item_version": "Item Version",
+  "menu.section.new_item_version": "إصدارة المادة",
 
   // "menu.section.new_process": "Process",
+  "menu.section.new_process": "عملية",
+
+  // "menu.section.notifications": "Notifications",
+  "menu.section.notifications": "الإشعارات",
+
+  // "menu.section.quality-assurance": "Quality Assurance",
+  "menu.section.quality-assurance": "ضمان الجودة",
+
+  // "menu.section.notifications_publication-claim": "Publication Claim",
   // TODO New key - Add a translation
-  "menu.section.new_process": "Process",
-
-
+  "menu.section.notifications_publication-claim": "Publication Claim",
 
   // "menu.section.pin": "Pin sidebar",
-  // TODO New key - Add a translation
-  "menu.section.pin": "Pin sidebar",
+  "menu.section.pin": "تدبيس الشريط الجانبي",
 
   // "menu.section.unpin": "Unpin sidebar",
-  // TODO New key - Add a translation
-  "menu.section.unpin": "Unpin sidebar",
-
-
+  "menu.section.unpin": "إلغاء تدبيس الشريط الجانبي",
 
   // "menu.section.processes": "Processes",
-  // TODO New key - Add a translation
-  "menu.section.processes": "Processes",
-
+  "menu.section.processes": "العمليات",
 
+  // "menu.section.health": "Health",
+  "menu.section.health": "كشف الصحة",
 
   // "menu.section.registries": "Registries",
-  // TODO New key - Add a translation
-  "menu.section.registries": "Registries",
+  "menu.section.registries": "السجلات",
 
   // "menu.section.registries_format": "Format",
-  // TODO New key - Add a translation
-  "menu.section.registries_format": "Format",
+  "menu.section.registries_format": "التنسيق",
 
   // "menu.section.registries_metadata": "Metadata",
-  // TODO New key - Add a translation
-  "menu.section.registries_metadata": "Metadata",
-
-
+  "menu.section.registries_metadata": "الميتاداتا",
 
   // "menu.section.statistics": "Statistics",
-  // TODO New key - Add a translation
-  "menu.section.statistics": "Statistics",
+  "menu.section.statistics": "الإحصائيات",
 
   // "menu.section.statistics_task": "Statistics Task",
-  // TODO New key - Add a translation
-  "menu.section.statistics_task": "Statistics Task",
-
-
+  "menu.section.statistics_task": "مهمة الإحصائيات",
 
   // "menu.section.toggle.access_control": "Toggle Access Control section",
+  "menu.section.toggle.access_control": "قسم التحكم في الوصول للبدل",
+
+  // "menu.section.toggle.reports": "Toggle Reports section",
   // TODO New key - Add a translation
-  "menu.section.toggle.access_control": "Toggle Access Control section",
+  "menu.section.toggle.reports": "Toggle Reports section",
 
   // "menu.section.toggle.control_panel": "Toggle Control Panel section",
-  // TODO New key - Add a translation
-  "menu.section.toggle.control_panel": "Toggle Control Panel section",
+  "menu.section.toggle.control_panel": "قسم لوحة التحكم في البدل",
 
   // "menu.section.toggle.curation_task": "Toggle Curation Task section",
-  // TODO New key - Add a translation
-  "menu.section.toggle.curation_task": "Toggle Curation Task section",
+  "menu.section.toggle.curation_task": "قسم مهمة أكرتة البدل",
 
   // "menu.section.toggle.edit": "Toggle Edit section",
-  // TODO New key - Add a translation
-  "menu.section.toggle.edit": "Toggle Edit section",
+  "menu.section.toggle.edit": "قسم تحرير البدل",
 
   // "menu.section.toggle.export": "Toggle Export section",
-  // TODO New key - Add a translation
-  "menu.section.toggle.export": "Toggle Export section",
+  "menu.section.toggle.export": "قسم تصدير البدل",
 
   // "menu.section.toggle.find": "Toggle Find section",
-  // TODO New key - Add a translation
-  "menu.section.toggle.find": "Toggle Find section",
+  "menu.section.toggle.find": "قسم بحث البدل",
 
   // "menu.section.toggle.import": "Toggle Import section",
-  // TODO New key - Add a translation
-  "menu.section.toggle.import": "Toggle Import section",
+  "menu.section.toggle.import": "قسم استيراد البدل",
 
   // "menu.section.toggle.new": "Toggle New section",
-  // TODO New key - Add a translation
-  "menu.section.toggle.new": "Toggle New section",
+  "menu.section.toggle.new": "قسم بدل جديد",
 
   // "menu.section.toggle.registries": "Toggle Registries section",
-  // TODO New key - Add a translation
-  "menu.section.toggle.registries": "Toggle Registries section",
+  "menu.section.toggle.registries": "قسم سجلات البدل",
 
   // "menu.section.toggle.statistics_task": "Toggle Statistics Task section",
-  // TODO New key - Add a translation
-  "menu.section.toggle.statistics_task": "Toggle Statistics Task section",
-
+  "menu.section.toggle.statistics_task": "قسم مهمة إحصائيات البدل",
 
   // "menu.section.workflow": "Administer Workflow",
-  // TODO New key - Add a translation
-  "menu.section.workflow": "Administer Workflow",
+  "menu.section.workflow": "أدر سير العمل",
 
+  // "metadata-export-search.tooltip": "Export search results as CSV",
+  "metadata-export-search.tooltip": "تصدير نتائج البحث كملف CSV",
+
+  // "metadata-export-search.submit.success": "The export was started successfully",
+  "metadata-export-search.submit.success": "تم بدء التصدير بنجاح",
+
+  // "metadata-export-search.submit.error": "Starting the export has failed",
+  "metadata-export-search.submit.error": "فشل بدء التصدير",
+
+  // "mydspace.breadcrumbs": "MyDSpace",
+  "mydspace.breadcrumbs": "ماي دي سبيس",
 
   // "mydspace.description": "",
-  // TODO New key - Add a translation
   "mydspace.description": "",
 
-  // "mydspace.general.text-here": "here",
-  // TODO New key - Add a translation
-  "mydspace.general.text-here": "here",
-
   // "mydspace.messages.controller-help": "Select this option to send a message to item's submitter.",
-  // TODO New key - Add a translation
-  "mydspace.messages.controller-help": "Select this option to send a message to item's submitter.",
+  "mydspace.messages.controller-help": "حدد هذا الخيار لإرسال رسالة إلى مقدم المادة.",
 
   // "mydspace.messages.description-placeholder": "Insert your message here...",
-  // TODO New key - Add a translation
-  "mydspace.messages.description-placeholder": "Insert your message here...",
+  "mydspace.messages.description-placeholder": "قم بإدخال رسالتك هنا...",
 
   // "mydspace.messages.hide-msg": "Hide message",
-  // TODO New key - Add a translation
-  "mydspace.messages.hide-msg": "Hide message",
+  "mydspace.messages.hide-msg": "إخفاء الرسالة",
 
   // "mydspace.messages.mark-as-read": "Mark as read",
-  // TODO New key - Add a translation
-  "mydspace.messages.mark-as-read": "Mark as read",
+  "mydspace.messages.mark-as-read": "حدد كمقروء",
 
   // "mydspace.messages.mark-as-unread": "Mark as unread",
-  // TODO New key - Add a translation
-  "mydspace.messages.mark-as-unread": "Mark as unread",
+  "mydspace.messages.mark-as-unread": "حدد كغير مقروء",
 
   // "mydspace.messages.no-content": "No content.",
-  // TODO New key - Add a translation
-  "mydspace.messages.no-content": "No content.",
+  "mydspace.messages.no-content": "لا يوجد محتوى.",
 
   // "mydspace.messages.no-messages": "No messages yet.",
-  // TODO New key - Add a translation
-  "mydspace.messages.no-messages": "No messages yet.",
+  "mydspace.messages.no-messages": "لا توجد رسائل بعد.",
 
   // "mydspace.messages.send-btn": "Send",
-  // TODO New key - Add a translation
-  "mydspace.messages.send-btn": "Send",
+  "mydspace.messages.send-btn": "إرسال",
 
   // "mydspace.messages.show-msg": "Show message",
-  // TODO New key - Add a translation
-  "mydspace.messages.show-msg": "Show message",
+  "mydspace.messages.show-msg": "عرض الرسالة",
 
   // "mydspace.messages.subject-placeholder": "Subject...",
-  // TODO New key - Add a translation
-  "mydspace.messages.subject-placeholder": "Subject...",
+  "mydspace.messages.subject-placeholder": "الموضوع...",
 
   // "mydspace.messages.submitter-help": "Select this option to send a message to controller.",
-  // TODO New key - Add a translation
-  "mydspace.messages.submitter-help": "Select this option to send a message to controller.",
+  "mydspace.messages.submitter-help": "حدد هذا الخيار لإرسال رسالة إلى وحدة التحكم.",
 
   // "mydspace.messages.title": "Messages",
-  // TODO New key - Add a translation
-  "mydspace.messages.title": "Messages",
+  "mydspace.messages.title": "الرسائل",
 
   // "mydspace.messages.to": "To",
-  // TODO New key - Add a translation
-  "mydspace.messages.to": "To",
+  "mydspace.messages.to": "إلى",
 
   // "mydspace.new-submission": "New submission",
-  // TODO New key - Add a translation
-  "mydspace.new-submission": "New submission",
+  "mydspace.new-submission": "تقديم جديد",
 
   // "mydspace.new-submission-external": "Import metadata from external source",
-  // TODO New key - Add a translation
-  "mydspace.new-submission-external": "Import metadata from external source",
+  "mydspace.new-submission-external": "استيراد الميتاداتا من مصدر خارجي",
 
   // "mydspace.new-submission-external-short": "Import metadata",
-  // TODO New key - Add a translation
-  "mydspace.new-submission-external-short": "Import metadata",
+  "mydspace.new-submission-external-short": "استيراد الميتاداتا",
 
   // "mydspace.results.head": "Your submissions",
-  // TODO New key - Add a translation
-  "mydspace.results.head": "Your submissions",
+  "mydspace.results.head": "تقديماتك",
 
   // "mydspace.results.no-abstract": "No Abstract",
-  // TODO New key - Add a translation
-  "mydspace.results.no-abstract": "No Abstract",
+  "mydspace.results.no-abstract": "لا يوجد مستخلص",
 
   // "mydspace.results.no-authors": "No Authors",
-  // TODO New key - Add a translation
-  "mydspace.results.no-authors": "No Authors",
+  "mydspace.results.no-authors": "لا يوجد مؤلفين",
 
   // "mydspace.results.no-collections": "No Collections",
-  // TODO New key - Add a translation
-  "mydspace.results.no-collections": "No Collections",
+  "mydspace.results.no-collections": "لا توجد حاويات",
 
   // "mydspace.results.no-date": "No Date",
-  // TODO New key - Add a translation
-  "mydspace.results.no-date": "No Date",
+  "mydspace.results.no-date": "لا يوجد تاريخ",
 
   // "mydspace.results.no-files": "No Files",
-  // TODO New key - Add a translation
-  "mydspace.results.no-files": "No Files",
+  "mydspace.results.no-files": "لا توجد ملفات",
 
   // "mydspace.results.no-results": "There were no items to show",
-  // TODO New key - Add a translation
-  "mydspace.results.no-results": "There were no items to show",
+  "mydspace.results.no-results": "لا توجد مواد للعرض",
 
   // "mydspace.results.no-title": "No title",
-  // TODO New key - Add a translation
-  "mydspace.results.no-title": "No title",
+  "mydspace.results.no-title": "لا يوجد عنوان",
 
-  // "mydspace.results.no-uri": "No Uri",
-  // TODO New key - Add a translation
-  "mydspace.results.no-uri": "No Uri",
+  // "mydspace.results.no-uri": "No URI",
+  "mydspace.results.no-uri": "لا يوجد Uri",
 
-  // "mydspace.show.workflow": "All tasks",
-  // TODO New key - Add a translation
-  "mydspace.show.workflow": "All tasks",
+  // "mydspace.search-form.placeholder": "Search in MyDSpace...",
+  "mydspace.search-form.placeholder": "بحث في ما دي سبيس...",
 
-  // "mydspace.show.workspace": "Your Submissions",
-  // TODO New key - Add a translation
-  "mydspace.show.workspace": "Your Submissions",
+  // "mydspace.show.workflow": "Workflow tasks",
+  "mydspace.show.workflow": "مهام سير العمل",
 
-  // "mydspace.status.archived": "Archived",
-  // TODO New key - Add a translation
-  "mydspace.status.archived": "Archived",
+  // "mydspace.show.workspace": "Your submissions",
+  "mydspace.show.workspace": "تقديماتك",
 
-  // "mydspace.status.validation": "Validation",
-  // TODO New key - Add a translation
-  "mydspace.status.validation": "Validation",
+  // "mydspace.show.supervisedWorkspace": "Supervised items",
+  "mydspace.show.supervisedWorkspace": "مواد تحت الإشراف",
 
-  // "mydspace.status.waiting-for-controller": "Waiting for controller",
-  // TODO New key - Add a translation
-  "mydspace.status.waiting-for-controller": "Waiting for controller",
+  // "mydspace.status.mydspaceArchived": "Archived",
+  "mydspace.status.mydspaceArchived": "في الأرشيف",
 
-  // "mydspace.status.workflow": "Workflow",
-  // TODO New key - Add a translation
-  "mydspace.status.workflow": "Workflow",
+  // "mydspace.status.mydspaceValidation": "Validation",
+  "mydspace.status.mydspaceValidation": "تحقق",
 
-  // "mydspace.status.workspace": "Workspace",
-  // TODO New key - Add a translation
-  "mydspace.status.workspace": "Workspace",
+  // "mydspace.status.mydspaceWaitingController": "Waiting for reviewer",
+  "mydspace.status.mydspaceWaitingController": "في انتظار المتحكم",
+
+  // "mydspace.status.mydspaceWorkflow": "Workflow",
+  "mydspace.status.mydspaceWorkflow": "سير العمل",
+
+  // "mydspace.status.mydspaceWorkspace": "Workspace",
+  "mydspace.status.mydspaceWorkspace": "مساحة العمل",
 
   // "mydspace.title": "MyDSpace",
-  // TODO New key - Add a translation
-  "mydspace.title": "MyDSpace",
+  "mydspace.title": "ماي دي سبيس",
 
   // "mydspace.upload.upload-failed": "Error creating new workspace. Please verify the content uploaded before retry.",
-  // TODO New key - Add a translation
-  "mydspace.upload.upload-failed": "Error creating new workspace. Please verify the content uploaded before retry.",
+  "mydspace.upload.upload-failed": "خطأ اثناء إنشاء نطاق عمل جديد. يرجى التأكد من المحتوى المرفوع قبل إعادة المحاولة.",
 
   // "mydspace.upload.upload-failed-manyentries": "Unprocessable file. Detected too many entries but allowed only one for file.",
-  // TODO New key - Add a translation
-  "mydspace.upload.upload-failed-manyentries": "Unprocessable file. Detected too many entries but allowed only one for file.",
+  "mydspace.upload.upload-failed-manyentries": "ملف غير قابل للمعالجة. تم اكتشاف عدد كبير جدًا من المدخلات ولكن تم السماح بإدخال واحد فقط للملف.",
 
   // "mydspace.upload.upload-failed-moreonefile": "Unprocessable request. Only one file is allowed.",
-  // TODO New key - Add a translation
-  "mydspace.upload.upload-failed-moreonefile": "Unprocessable request. Only one file is allowed.",
+  "mydspace.upload.upload-failed-moreonefile": "طلب غير قابل للمعالجة. يسمح بملف واحد فقط.",
 
   // "mydspace.upload.upload-multiple-successful": "{{qty}} new workspace items created.",
-  // TODO New key - Add a translation
-  "mydspace.upload.upload-multiple-successful": "{{qty}} new workspace items created.",
-
-  // "mydspace.upload.upload-successful": "New workspace item created. Click {{here}} for edit it.",
-  // TODO New key - Add a translation
-  "mydspace.upload.upload-successful": "New workspace item created. Click {{here}} for edit it.",
+  "mydspace.upload.upload-multiple-successful": "تم إنشاء {{qty}} مادة نطاق عمل جديدة.",
 
   // "mydspace.view-btn": "View",
+  "mydspace.view-btn": "عرض",
+
+  // "nav.expandable-navbar-section-suffix": "(submenu)",
   // TODO New key - Add a translation
-  "mydspace.view-btn": "View",
+  "nav.expandable-navbar-section-suffix": "(submenu)",
 
+  // "notification.suggestion": "We found <b>{{count}} publications</b> in the {{source}} that seems to be related to your profile.<br>",
+  // TODO New key - Add a translation
+  "notification.suggestion": "We found <b>{{count}} publications</b> in the {{source}} that seems to be related to your profile.<br>",
 
+  // "notification.suggestion.review": "review the suggestions",
+  // TODO New key - Add a translation
+  "notification.suggestion.review": "review the suggestions",
+
+  // "notification.suggestion.please": "Please",
+  // TODO New key - Add a translation
+  "notification.suggestion.please": "Please",
 
   // "nav.browse.header": "All of DSpace",
-  // TODO New key - Add a translation
-  "nav.browse.header": "All of DSpace",
+  "nav.browse.header": "كل دي سبيس",
 
   // "nav.community-browse.header": "By Community",
-  // TODO New key - Add a translation
-  "nav.community-browse.header": "By Community",
+  "nav.community-browse.header": "حسب المجتمع",
+
+  // "nav.context-help-toggle": "Toggle context help",
+  "nav.context-help-toggle": "مساعدة تبديل السياق",
 
   // "nav.language": "Language switch",
-  // TODO New key - Add a translation
-  "nav.language": "Language switch",
+  "nav.language": "تبديل اللغة",
 
   // "nav.login": "Log In",
-  // TODO New key - Add a translation
-  "nav.login": "Log In",
+  "nav.login": "تسجيل الدخول",
+
+  // "nav.user-profile-menu-and-logout": "User profile menu and log out",
+  "nav.user-profile-menu-and-logout": "قائمة ملف تعريف المستخدم وتسجيل الخروج",
 
   // "nav.logout": "Log Out",
-  // TODO New key - Add a translation
-  "nav.logout": "Log Out",
+  "nav.logout": "خروج",
+
+  // "nav.main.description": "Main navigation bar",
+  "nav.main.description": "شريط التصفح الرئيسي",
 
   // "nav.mydspace": "MyDSpace",
-  // TODO New key - Add a translation
-  "nav.mydspace": "MyDSpace",
+  "nav.mydspace": "ماي دي سبيس",
 
   // "nav.profile": "Profile",
-  // TODO New key - Add a translation
-  "nav.profile": "Profile",
+  "nav.profile": "الملف الشخصي",
 
   // "nav.search": "Search",
-  // TODO New key - Add a translation
-  "nav.search": "Search",
+  "nav.search": "بحث",
+
+  // "nav.search.button": "Submit search",
+  "nav.search.button": "تقديم بحث",
 
   // "nav.statistics.header": "Statistics",
-  // TODO New key - Add a translation
-  "nav.statistics.header": "Statistics",
+  "nav.statistics.header": "الإحصائيات",
 
   // "nav.stop-impersonating": "Stop impersonating EPerson",
+  "nav.stop-impersonating": "التوقف عن التصرف كشخص إلكتروني",
+
+  // "nav.subscriptions": "Subscriptions",
+  "nav.subscriptions": "الاشتراكات",
+
+  // "nav.toggle": "Toggle navigation",
+  "nav.toggle": "تبديل التصفح",
+
+  // "nav.user.description": "User profile bar",
+  "nav.user.description": "شريط ملف تعريف المستخدم",
+
+  // "none.listelement.badge": "Item",
+  "none.listelement.badge": "المادة",
+
+  // "quality-assurance.title": "Quality Assurance",
+  "quality-assurance.title": "ضمان الجودة",
+
+  // "quality-assurance.topics.description": "Below you can see all the topics received from the subscriptions to {{source}}.",
+  "quality-assurance.topics.description": "أدناه يمكنك رؤية جميع المواضيع الواردة من الاشتراكات في {{source}}.",
+
+  // "quality-assurance.source.description": "Below you can see all the notification's sources.",
+  "quality-assurance.source.description": "أدناه يمكنك رؤية جميع مصادر الإشعارات.",
+
+  // "quality-assurance.topics": "Current Topics",
+  "quality-assurance.topics": "المواضيع الحالية",
+
+  // "quality-assurance.source": "Current Sources",
+  "quality-assurance.source": "المصادر الحالية",
+
+  // "quality-assurance.table.topic": "Topic",
+  "quality-assurance.table.topic": "الموضوع",
+
+  // "quality-assurance.table.source": "Source",
+  "quality-assurance.table.source": "المصدر",
+
+  // "quality-assurance.table.last-event": "Last Event",
+  "quality-assurance.table.last-event": "آخر فعالية",
+
+  // "quality-assurance.table.actions": "Actions",
+  "quality-assurance.table.actions": "إجراءات",
+
+  // "quality-assurance.source-list.button.detail": "Show topics for {{param}}",
   // TODO New key - Add a translation
-  "nav.stop-impersonating": "Stop impersonating EPerson",
+  "quality-assurance.source-list.button.detail": "Show topics for {{param}}",
 
+  // "quality-assurance.topics-list.button.detail": "Show suggestions for {{param}}",
+  // TODO New key - Add a translation
+  "quality-assurance.topics-list.button.detail": "Show suggestions for {{param}}",
 
+  // "quality-assurance.noTopics": "No topics found.",
+  "quality-assurance.noTopics": "لم يتم العثور على مواضيع.",
+
+  // "quality-assurance.noSource": "No sources found.",
+  "quality-assurance.noSource": "لم يتم العثور على مصادر.",
+
+  // "notifications.events.title": "Quality Assurance Suggestions",
+  "notifications.events.title": "اقتراحات ضمان الجودة",
+
+  // "quality-assurance.topic.error.service.retrieve": "An error occurred while loading the Quality Assurance topics",
+  "quality-assurance.topic.error.service.retrieve": "حدث خطأ أثناء تحميل موضوعات ضمان الجودة",
+
+  // "quality-assurance.source.error.service.retrieve": "An error occurred while loading the Quality Assurance source",
+  "quality-assurance.source.error.service.retrieve": "حدث خطأ أثناء تحميل مصدر ضمان الجودة",
+
+  // "quality-assurance.loading": "Loading ...",
+  "quality-assurance.loading": "جاري التحميل ...",
+
+  // "quality-assurance.events.topic": "Topic:",
+  "quality-assurance.events.topic": "الموضوع:",
+
+  // "quality-assurance.noEvents": "No suggestions found.",
+  "quality-assurance.noEvents": "لم يتم العثور على أي اقتراحات.",
+
+  // "quality-assurance.event.table.trust": "Trust",
+  "quality-assurance.event.table.trust": "ثقة",
+
+  // "quality-assurance.event.table.publication": "Publication",
+  "quality-assurance.event.table.publication": "النشر",
+
+  // "quality-assurance.event.table.details": "Details",
+  "quality-assurance.event.table.details": "تفاصيل",
+
+  // "quality-assurance.event.table.project-details": "Project details",
+  "quality-assurance.event.table.project-details": "تفاصيل المشروع",
+
+  // "quality-assurance.event.table.reasons": "Reasons",
+  // TODO New key - Add a translation
+  "quality-assurance.event.table.reasons": "Reasons",
+
+  // "quality-assurance.event.table.actions": "Actions",
+  "quality-assurance.event.table.actions": "إجراءات",
+
+  // "quality-assurance.event.action.accept": "Accept suggestion",
+  "quality-assurance.event.action.accept": "قبول الاقتراح",
+
+  // "quality-assurance.event.action.ignore": "Ignore suggestion",
+  "quality-assurance.event.action.ignore": "تجاهل الاقتراح",
+
+  // "quality-assurance.event.action.undo": "DELETE",
+  // TODO New key - Add a translation
+  "quality-assurance.event.action.undo": "DELETE",
+
+  // "quality-assurance.event.action.reject": "Reject suggestion",
+  "quality-assurance.event.action.reject": "رفض الاقتراح",
+
+  // "quality-assurance.event.action.import": "Import project and accept suggestion",
+  "quality-assurance.event.action.import": "استيراد المشروع وقبول الاقتراح",
+
+  // "quality-assurance.event.table.pidtype": "PID Type:",
+  "quality-assurance.event.table.pidtype": "PID نوع:",
+
+  // "quality-assurance.event.table.pidvalue": "PID Value:",
+  "quality-assurance.event.table.pidvalue": "PID قيمة:",
+
+  // "quality-assurance.event.table.subjectValue": "Subject Value:",
+  "quality-assurance.event.table.subjectValue": "قيمة الموضوع:",
+
+  // "quality-assurance.event.table.abstract": "Abstract:",
+  "quality-assurance.event.table.abstract": "خلاصة:",
+
+  // "quality-assurance.event.table.suggestedProject": "OpenAIRE Suggested Project data",
+  "quality-assurance.event.table.suggestedProject": "بيانات المشروع المقترحة من OpenAIRE",
+
+  // "quality-assurance.event.table.project": "Project title:",
+  "quality-assurance.event.table.project": "عنوان المشروع:",
+
+  // "quality-assurance.event.table.acronym": "Acronym:",
+  "quality-assurance.event.table.acronym": "حروف مختصرة:",
+
+  // "quality-assurance.event.table.code": "Code:",
+  "quality-assurance.event.table.code": "رمز:",
+
+  // "quality-assurance.event.table.funder": "Funder:",
+  "quality-assurance.event.table.funder": "الممول:",
+
+  // "quality-assurance.event.table.fundingProgram": "Funding program:",
+  "quality-assurance.event.table.fundingProgram": "برنامج التمويل:",
+
+  // "quality-assurance.event.table.jurisdiction": "Jurisdiction:",
+  "quality-assurance.event.table.jurisdiction": "الاختصاص القضائي:",
+
+  // "quality-assurance.events.back": "Back to topics",
+  "quality-assurance.events.back": "رجوع إلى المواضيع",
+
+  // "quality-assurance.events.back-to-sources": "Back to sources",
+  // TODO New key - Add a translation
+  "quality-assurance.events.back-to-sources": "Back to sources",
+
+  // "quality-assurance.event.table.less": "Show less",
+  "quality-assurance.event.table.less": "عرض أقل",
+
+  // "quality-assurance.event.table.more": "Show more",
+  "quality-assurance.event.table.more": "عرض المزيد",
+
+  // "quality-assurance.event.project.found": "Bound to the local record:",
+  "quality-assurance.event.project.found": "ربط بالتسجيلة المحلية:",
+
+  // "quality-assurance.event.project.notFound": "No local record found",
+  "quality-assurance.event.project.notFound": "لم يتم العثور على تسجيلة محلية",
+
+  // "quality-assurance.event.sure": "Are you sure?",
+  "quality-assurance.event.sure": "هل أنت متأكد؟",
+
+  // "quality-assurance.event.ignore.description": "This operation can't be undone. Ignore this suggestion?",
+  "quality-assurance.event.ignore.description": "لا يمكن التراجع عن هذه العملية. تجاهل هذا الاقتراح؟",
+
+  // "quality-assurance.event.undo.description": "This operation can't be undone!",
+  // TODO New key - Add a translation
+  "quality-assurance.event.undo.description": "This operation can't be undone!",
+
+  // "quality-assurance.event.reject.description": "This operation can't be undone. Reject this suggestion?",
+  "quality-assurance.event.reject.description": "لا يمكن التراجع عن هذه العملية. هل ترفض هذا الاقتراح؟",
+
+  // "quality-assurance.event.accept.description": "No DSpace project selected. A new project will be created based on the suggestion data.",
+  "quality-assurance.event.accept.description": "لم يتم تحديد أي مشروع دي سبيس. سيتم إنشاء مشروع جديد بناءً على بيانات الاقتراح.",
+
+  // "quality-assurance.event.action.cancel": "Cancel",
+  "quality-assurance.event.action.cancel": "إلغاء",
+
+  // "quality-assurance.event.action.saved": "Your decision has been saved successfully.",
+  "quality-assurance.event.action.saved": "لقد تم حفظ قرارك بنجاح.",
+
+  // "quality-assurance.event.action.error": "An error has occurred. Your decision has not been saved.",
+  "quality-assurance.event.action.error": "حدث خطأ. لم يتم حفظ قرارك.",
+
+  // "quality-assurance.event.modal.project.title": "Choose a project to bound",
+  "quality-assurance.event.modal.project.title": "اختر مشروعاً للربط",
+
+  // "quality-assurance.event.modal.project.publication": "Publication:",
+  "quality-assurance.event.modal.project.publication": "النشر:",
+
+  // "quality-assurance.event.modal.project.bountToLocal": "Bound to the local record:",
+  "quality-assurance.event.modal.project.bountToLocal": "ربط بالتسجيلة المحلية:",
+
+  // "quality-assurance.event.modal.project.select": "Project search",
+  "quality-assurance.event.modal.project.select": "بحث المشروع",
+
+  // "quality-assurance.event.modal.project.search": "Search",
+  "quality-assurance.event.modal.project.search": "بحث",
+
+  // "quality-assurance.event.modal.project.clear": "Clear",
+  "quality-assurance.event.modal.project.clear": "مسح",
+
+  // "quality-assurance.event.modal.project.cancel": "Cancel",
+  "quality-assurance.event.modal.project.cancel": "إلغاء",
+
+  // "quality-assurance.event.modal.project.bound": "Bound project",
+  "quality-assurance.event.modal.project.bound": "ربط المشروع",
+
+  // "quality-assurance.event.modal.project.remove": "Remove",
+  "quality-assurance.event.modal.project.remove": "إزالة",
+
+  // "quality-assurance.event.modal.project.placeholder": "Enter a project name",
+  "quality-assurance.event.modal.project.placeholder": "قم بإدخال اسم المشروع",
+
+  // "quality-assurance.event.modal.project.notFound": "No project found.",
+  "quality-assurance.event.modal.project.notFound": "لم يتم العثور على مشروع.",
+
+  // "quality-assurance.event.project.bounded": "The project has been linked successfully.",
+  "quality-assurance.event.project.bounded": "تم ربط المشروع بنجاح.",
+
+  // "quality-assurance.event.project.removed": "The project has been successfully unlinked.",
+  "quality-assurance.event.project.removed": "تم إلغاء ربط المشروع بنجاح.",
+
+  // "quality-assurance.event.project.error": "An error has occurred. No operation performed.",
+  "quality-assurance.event.project.error": "حدث خطأ. لم يتم تنفيذ أي عملية.",
+
+  // "quality-assurance.event.reason": "Reason",
+  "quality-assurance.event.reason": "السبب",
 
   // "orgunit.listelement.badge": "Organizational Unit",
-  // TODO New key - Add a translation
-  "orgunit.listelement.badge": "Organizational Unit",
+  "orgunit.listelement.badge": "وحدة مؤسسية",
+
+  // "orgunit.listelement.no-title": "Untitled",
+  "orgunit.listelement.no-title": "بدون عنوان",
 
   // "orgunit.page.city": "City",
-  // TODO New key - Add a translation
-  "orgunit.page.city": "City",
+  "orgunit.page.city": "المدينة",
 
   // "orgunit.page.country": "Country",
-  // TODO New key - Add a translation
-  "orgunit.page.country": "Country",
+  "orgunit.page.country": "البلد",
 
   // "orgunit.page.dateestablished": "Date established",
-  // TODO New key - Add a translation
-  "orgunit.page.dateestablished": "Date established",
+  "orgunit.page.dateestablished": "تاريخ التأسيس",
 
   // "orgunit.page.description": "Description",
-  // TODO New key - Add a translation
-  "orgunit.page.description": "Description",
+  "orgunit.page.description": "الوصف",
 
   // "orgunit.page.edit": "Edit this item",
-  // TODO New key - Add a translation
-  "orgunit.page.edit": "Edit this item",
+  "orgunit.page.edit": "تحرير هذه المادة",
 
   // "orgunit.page.id": "ID",
-  // TODO New key - Add a translation
-  "orgunit.page.id": "ID",
+  "orgunit.page.id": "المعرف",
 
   // "orgunit.page.titleprefix": "Organizational Unit: ",
-  // TODO New key - Add a translation
-  "orgunit.page.titleprefix": "Organizational Unit: ",
+  "orgunit.page.titleprefix": "الوحدة المؤسسية: ",
 
+  // "orgunit.page.ror": "ROR Identifier",
+  "orgunit.page.ror": "ROR معرف",
 
+  // "pagination.options.description": "Pagination options",
+  "pagination.options.description": "خيارات ترقيم الصفحات",
 
   // "pagination.results-per-page": "Results Per Page",
-  // TODO New key - Add a translation
-  "pagination.results-per-page": "Results Per Page",
+  "pagination.results-per-page": "النتائج لكل صفحة",
 
   // "pagination.showing.detail": "{{ range }} of {{ total }}",
-  // TODO New key - Add a translation
-  "pagination.showing.detail": "{{ range }} of {{ total }}",
+  "pagination.showing.detail": "{{ range }} من {{ total }}",
 
   // "pagination.showing.label": "Now showing ",
-  // TODO New key - Add a translation
-  "pagination.showing.label": "Now showing ",
+  "pagination.showing.label": "يظهر الآن  ",
 
   // "pagination.sort-direction": "Sort Options",
-  // TODO New key - Add a translation
-  "pagination.sort-direction": "Sort Options",
-
-
+  "pagination.sort-direction": "خيارات الفرز",
 
   // "person.listelement.badge": "Person",
-  // TODO New key - Add a translation
-  "person.listelement.badge": "Person",
+  "person.listelement.badge": "شخص",
 
   // "person.listelement.no-title": "No name found",
-  // TODO New key - Add a translation
-  "person.listelement.no-title": "No name found",
+  "person.listelement.no-title": "لم يتم العثور على أسماء",
 
   // "person.page.birthdate": "Birth Date",
-  // TODO New key - Add a translation
-  "person.page.birthdate": "Birth Date",
+  "person.page.birthdate": "تاريخ الميلاد الميلادي",
 
   // "person.page.edit": "Edit this item",
-  // TODO New key - Add a translation
-  "person.page.edit": "Edit this item",
+  "person.page.edit": "تحرير هذه المادة",
 
   // "person.page.email": "Email Address",
-  // TODO New key - Add a translation
-  "person.page.email": "Email Address",
+  "person.page.email": "عنوان البريد الإلكتروني",
 
   // "person.page.firstname": "First Name",
   // TODO New key - Add a translation
   "person.page.firstname": "First Name",
 
   // "person.page.jobtitle": "Job Title",
-  // TODO New key - Add a translation
-  "person.page.jobtitle": "Job Title",
+  "person.page.jobtitle": "المسمي الوظيفي",
 
   // "person.page.lastname": "Last Name",
-  // TODO New key - Add a translation
-  "person.page.lastname": "Last Name",
+  "person.page.lastname": "اسم العائلة",
+
+  // "person.page.name": "Name",
+  "person.page.name": "الاسم",
 
   // "person.page.link.full": "Show all metadata",
-  // TODO New key - Add a translation
-  "person.page.link.full": "Show all metadata",
+  "person.page.link.full": "عرض كل الميتاداتا",
 
   // "person.page.orcid": "ORCID",
-  // TODO New key - Add a translation
-  "person.page.orcid": "ORCID",
+  "person.page.orcid": "أوركيد",
 
   // "person.page.staffid": "Staff ID",
-  // TODO New key - Add a translation
-  "person.page.staffid": "Staff ID",
+  "person.page.staffid": "معرف الموظف",
 
   // "person.page.titleprefix": "Person: ",
-  // TODO New key - Add a translation
-  "person.page.titleprefix": "Person: ",
+  "person.page.titleprefix": "الشخص: ",
 
   // "person.search.results.head": "Person Search Results",
-  // TODO New key - Add a translation
-  "person.search.results.head": "Person Search Results",
-
-  // "person.search.title": "DSpace Angular :: Person Search",
-  // TODO New key - Add a translation
-  "person.search.title": "DSpace Angular :: Person Search",
+  "person.search.results.head": "نتائج بحث الشخص",
 
+  // "person-relationships.search.results.head": "Person Search Results",
+  "person-relationships.search.results.head": "نتائج بحث الشخص",
 
+  // "person.search.title": "Person Search",
+  "person.search.title": "بحث الشخص",
 
   // "process.new.select-parameters": "Parameters",
-  // TODO New key - Add a translation
-  "process.new.select-parameters": "Parameters",
+  "process.new.select-parameters": "المتغيرات",
+
+  // "process.new.select-parameter": "Select parameter",
+  "process.new.select-parameter": "تحديد متغير",
+
+  // "process.new.add-parameter": "Add a parameter...",
+  "process.new.add-parameter": "إضافة متغير...",
+
+  // "process.new.delete-parameter": "Delete parameter",
+  "process.new.delete-parameter": "حذف متغير",
+
+  // "process.new.parameter.label": "Parameter value",
+  "process.new.parameter.label": "قيمة المتغير",
 
   // "process.new.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "process.new.cancel": "Cancel",
+  "process.new.cancel": "إلغاء",
 
-  // "process.new.submit": "Submit",
-  // TODO New key - Add a translation
-  "process.new.submit": "Submit",
+  // "process.new.submit": "Save",
+  "process.new.submit": "حفظ",
 
   // "process.new.select-script": "Script",
-  // TODO New key - Add a translation
-  "process.new.select-script": "Script",
+  "process.new.select-script": "نص",
 
   // "process.new.select-script.placeholder": "Choose a script...",
-  // TODO New key - Add a translation
-  "process.new.select-script.placeholder": "Choose a script...",
+  "process.new.select-script.placeholder": "اختر نص...",
 
   // "process.new.select-script.required": "Script is required",
-  // TODO New key - Add a translation
-  "process.new.select-script.required": "Script is required",
+  "process.new.select-script.required": "النص مطلوب",
 
   // "process.new.parameter.file.upload-button": "Select file...",
-  // TODO New key - Add a translation
-  "process.new.parameter.file.upload-button": "Select file...",
+  "process.new.parameter.file.upload-button": "اختر ملف...",
 
   // "process.new.parameter.file.required": "Please select a file",
-  // TODO New key - Add a translation
-  "process.new.parameter.file.required": "Please select a file",
+  "process.new.parameter.file.required": "يرجى تحديد ملف",
 
   // "process.new.parameter.string.required": "Parameter value is required",
-  // TODO New key - Add a translation
-  "process.new.parameter.string.required": "Parameter value is required",
+  "process.new.parameter.string.required": "قيمة المتغير مطلوبة",
 
   // "process.new.parameter.type.value": "value",
-  // TODO New key - Add a translation
-  "process.new.parameter.type.value": "value",
+  "process.new.parameter.type.value": "القيمة",
 
   // "process.new.parameter.type.file": "file",
-  // TODO New key - Add a translation
-  "process.new.parameter.type.file": "file",
+  "process.new.parameter.type.file": "ملف",
 
   // "process.new.parameter.required.missing": "The following parameters are required but still missing:",
-  // TODO New key - Add a translation
-  "process.new.parameter.required.missing": "The following parameters are required but still missing:",
+  "process.new.parameter.required.missing": "المتغيرات التالية مطلوبة ولكنها لا تزال ناقصة:",
 
   // "process.new.notification.success.title": "Success",
-  // TODO New key - Add a translation
-  "process.new.notification.success.title": "Success",
+  "process.new.notification.success.title": "نجاح",
 
   // "process.new.notification.success.content": "The process was successfully created",
-  // TODO New key - Add a translation
-  "process.new.notification.success.content": "The process was successfully created",
+  "process.new.notification.success.content": "تم إنشاء العملية بنجاح",
 
   // "process.new.notification.error.title": "Error",
-  // TODO New key - Add a translation
-  "process.new.notification.error.title": "Error",
+  "process.new.notification.error.title": "خطأ",
 
   // "process.new.notification.error.content": "An error occurred while creating this process",
-  // TODO New key - Add a translation
-  "process.new.notification.error.content": "An error occurred while creating this process",
+  "process.new.notification.error.content": "حدث خطأ أثناء إنشاء العملية",
+
+  // "process.new.notification.error.max-upload.content": "The file exceeds the maximum upload size",
+  "process.new.notification.error.max-upload.content": "يتجاوز الملف الحد الأقصى لحجم التحميل",
 
   // "process.new.header": "Create a new process",
-  // TODO New key - Add a translation
-  "process.new.header": "Create a new process",
+  "process.new.header": "إنشاء عملية جديدة",
 
   // "process.new.title": "Create a new process",
-  // TODO New key - Add a translation
-  "process.new.title": "Create a new process",
+  "process.new.title": "إنشاء عملية جديدة",
 
   // "process.new.breadcrumbs": "Create a new process",
-  // TODO New key - Add a translation
-  "process.new.breadcrumbs": "Create a new process",
+  "process.new.breadcrumbs": "إنشاء عملية جديدة",
 
+  // "process.detail.arguments": "Arguments",
+  "process.detail.arguments": "حجج",
 
+  // "process.detail.arguments.empty": "This process doesn't contain any arguments",
+  "process.detail.arguments.empty": "لا تحتوي هذه العملية على أي حجج",
 
-  // "process.detail.arguments" : "Arguments",
-  // TODO New key - Add a translation
-  "process.detail.arguments": "Arguments",
+  // "process.detail.back": "Back",
+  "process.detail.back": "رجوع",
 
-  // "process.detail.arguments.empty" : "This process doesn't contain any arguments",
-  // TODO New key - Add a translation
-  "process.detail.arguments.empty": "This process doesn't contain any arguments",
-
-  // "process.detail.back" : "Back",
-  // TODO New key - Add a translation
-  "process.detail.back": "Back",
-
-  // "process.detail.output" : "Process Output",
-  // TODO New key - Add a translation
-  "process.detail.output": "Process Output",
+  // "process.detail.output": "Process Output",
+  "process.detail.output": "مخرجات العملية",
 
   // "process.detail.logs.button": "Retrieve process output",
-  // TODO New key - Add a translation
-  "process.detail.logs.button": "Retrieve process output",
+  "process.detail.logs.button": "استرجاع مخرجات العملية",
 
   // "process.detail.logs.loading": "Retrieving",
-  // TODO New key - Add a translation
-  "process.detail.logs.loading": "Retrieving",
+  "process.detail.logs.loading": "استرجاع",
 
   // "process.detail.logs.none": "This process has no output",
+  "process.detail.logs.none": "لا توجد مخرجات لهذه العملية",
+
+  // "process.detail.output-files": "Output Files",
+  "process.detail.output-files": "ملفات الإخراج",
+
+  // "process.detail.output-files.empty": "This process doesn't contain any output files",
+  "process.detail.output-files.empty": "لا تحتوي هذه العملية على أي ملفات إخراج",
+
+  // "process.detail.script": "Script",
+  "process.detail.script": "النص",
+
+  // "process.detail.title": "Process: {{ id }} - {{ name }}",
+  "process.detail.title": "العملية: {{ id }} - {{ name }}",
+
+  // "process.detail.start-time": "Start time",
+  "process.detail.start-time": "وقت البدء",
+
+  // "process.detail.end-time": "Finish time",
+  "process.detail.end-time": "وقت الانتهاء",
+
+  // "process.detail.status": "Status",
+  "process.detail.status": "الحالة",
+
+  // "process.detail.create": "Create similar process",
+  "process.detail.create": "إنشاء عملية مماثلة",
+
+  // "process.detail.actions": "Actions",
+  "process.detail.actions": "إجراءات",
+
+  // "process.detail.delete.button": "Delete process",
+  "process.detail.delete.button": "حذف العملية",
+
+  // "process.detail.delete.header": "Delete process",
+  "process.detail.delete.header": "حذف العملية",
+
+  // "process.detail.delete.body": "Are you sure you want to delete the current process?",
+  "process.detail.delete.body": "هل أنت متأكد من أنك تريد حذف العملية الحالية؟",
+
+  // "process.detail.delete.cancel": "Cancel",
+  "process.detail.delete.cancel": "إلغاء",
+
+  // "process.detail.delete.confirm": "Delete process",
+  "process.detail.delete.confirm": "حذف العملية",
+
+  // "process.detail.delete.success": "The process was successfully deleted.",
+  "process.detail.delete.success": "تم حذف العملية بنجاح.",
+
+  // "process.detail.delete.error": "Something went wrong when deleting the process",
+  "process.detail.delete.error": "حدث خطأ ما أثناء حذف العملية",
+
+  // "process.detail.refreshing": "Auto-refreshing…",
   // TODO New key - Add a translation
-  "process.detail.logs.none": "This process has no output",
+  "process.detail.refreshing": "Auto-refreshing…",
 
-  // "process.detail.output-files" : "Output Files",
+  // "process.overview.table.completed.info": "Finish time (UTC)",
   // TODO New key - Add a translation
-  "process.detail.output-files": "Output Files",
+  "process.overview.table.completed.info": "Finish time (UTC)",
 
-  // "process.detail.output-files.empty" : "This process doesn't contain any output files",
+  // "process.overview.table.completed.title": "Succeeded processes",
   // TODO New key - Add a translation
-  "process.detail.output-files.empty": "This process doesn't contain any output files",
+  "process.overview.table.completed.title": "Succeeded processes",
 
-  // "process.detail.script" : "Script",
+  // "process.overview.table.empty": "No matching processes found.",
   // TODO New key - Add a translation
-  "process.detail.script": "Script",
+  "process.overview.table.empty": "No matching processes found.",
 
-  // "process.detail.title" : "Process: {{ id }} - {{ name }}",
+  // "process.overview.table.failed.info": "Finish time (UTC)",
   // TODO New key - Add a translation
-  "process.detail.title": "Process: {{ id }} - {{ name }}",
+  "process.overview.table.failed.info": "Finish time (UTC)",
 
-  // "process.detail.start-time" : "Start time",
+  // "process.overview.table.failed.title": "Failed processes",
   // TODO New key - Add a translation
-  "process.detail.start-time": "Start time",
+  "process.overview.table.failed.title": "Failed processes",
 
-  // "process.detail.end-time" : "Finish time",
+  // "process.overview.table.finish": "Finish time (UTC)",
+  "process.overview.table.finish": "وقت الانتهاء (التوقيت العالمي)",
+
+  // "process.overview.table.id": "Process ID",
+  "process.overview.table.id": "معرف العملية",
+
+  // "process.overview.table.name": "Name",
+  "process.overview.table.name": "الاسم",
+
+  // "process.overview.table.running.info": "Start time (UTC)",
   // TODO New key - Add a translation
-  "process.detail.end-time": "Finish time",
+  "process.overview.table.running.info": "Start time (UTC)",
 
-  // "process.detail.status" : "Status",
+  // "process.overview.table.running.title": "Running processes",
   // TODO New key - Add a translation
-  "process.detail.status": "Status",
+  "process.overview.table.running.title": "Running processes",
 
-  // "process.detail.create" : "Create similar process",
+  // "process.overview.table.scheduled.info": "Creation time (UTC)",
   // TODO New key - Add a translation
-  "process.detail.create": "Create similar process",
+  "process.overview.table.scheduled.info": "Creation time (UTC)",
 
-
-
-  // "process.overview.table.finish" : "Finish time",
+  // "process.overview.table.scheduled.title": "Scheduled processes",
   // TODO New key - Add a translation
-  "process.overview.table.finish": "Finish time",
+  "process.overview.table.scheduled.title": "Scheduled processes",
 
-  // "process.overview.table.id" : "Process ID",
-  // TODO New key - Add a translation
-  "process.overview.table.id": "Process ID",
+  // "process.overview.table.start": "Start time (UTC)",
+  "process.overview.table.start": "وقت البدء (التوقيت العالمي)",
 
-  // "process.overview.table.name" : "Name",
-  // TODO New key - Add a translation
-  "process.overview.table.name": "Name",
+  // "process.overview.table.status": "Status",
+  "process.overview.table.status": "الحالة",
 
-  // "process.overview.table.start" : "Start time",
-  // TODO New key - Add a translation
-  "process.overview.table.start": "Start time",
-
-  // "process.overview.table.status" : "Status",
-  // TODO New key - Add a translation
-  "process.overview.table.status": "Status",
-
-  // "process.overview.table.user" : "User",
-  // TODO New key - Add a translation
-  "process.overview.table.user": "User",
+  // "process.overview.table.user": "User",
+  "process.overview.table.user": "المستخدم",
 
   // "process.overview.title": "Processes Overview",
-  // TODO New key - Add a translation
-  "process.overview.title": "Processes Overview",
+  "process.overview.title": "نظرة عامة على العمليات",
 
   // "process.overview.breadcrumbs": "Processes Overview",
-  // TODO New key - Add a translation
-  "process.overview.breadcrumbs": "Processes Overview",
+  "process.overview.breadcrumbs": "نظرة عامة على العمليات",
 
   // "process.overview.new": "New",
-  // TODO New key - Add a translation
-  "process.overview.new": "New",
+  "process.overview.new": "جديد",
 
+  // "process.overview.table.actions": "Actions",
+  "process.overview.table.actions": "إجراءات",
+
+  // "process.overview.delete": "Delete {{count}} processes",
+  "process.overview.delete": "حذف {{count}} عملية",
+
+  // "process.overview.delete-process": "Delete process",
+  "process.overview.delete-process": "حذف العملية",
+
+  // "process.overview.delete.clear": "Clear delete selection",
+  "process.overview.delete.clear": "مسح تحديد الحذف",
+
+  // "process.overview.delete.processing": "{{count}} process(es) are being deleted. Please wait for the deletion to fully complete. Note that this can take a while.",
+  "process.overview.delete.processing": "يجري حذف {{count}} عملية. يرجى الانتظار حتى يكتمل الحذف بالكامل. لاحظ أن ذلك قد يستغرق بعض الوقت.",
+
+  // "process.overview.delete.body": "Are you sure you want to delete {{count}} process(es)?",
+  "process.overview.delete.body": "هل أنت متأكد أنك تريد حذف {{count}} عملية؟",
+
+  // "process.overview.delete.header": "Delete processes",
+  "process.overview.delete.header": "حذف العمليات",
+
+  // "process.bulk.delete.error.head": "Error on deleteing process",
+  "process.bulk.delete.error.head": "خطأ في عملية الحذف",
+
+  // "process.bulk.delete.error.body": "The process with ID {{processId}} could not be deleted. The remaining processes will continue being deleted. ",
+  "process.bulk.delete.error.body": "لا يمكن حذف العملية ذات المعرف {{processId}}. وسيستمر حذف العمليات المتبقية. ",
+
+  // "process.bulk.delete.success": "{{count}} process(es) have been succesfully deleted",
+  "process.bulk.delete.success": "تم حذف {{count}} عملية بنجاح",
 
   // "profile.breadcrumbs": "Update Profile",
-  // TODO New key - Add a translation
-  "profile.breadcrumbs": "Update Profile",
+  "profile.breadcrumbs": "تحديث الملف الشخصي",
 
   // "profile.card.identify": "Identify",
-  // TODO New key - Add a translation
-  "profile.card.identify": "Identify",
+  "profile.card.identify": "تعريف",
 
   // "profile.card.security": "Security",
-  // TODO New key - Add a translation
-  "profile.card.security": "Security",
+  "profile.card.security": "الحماية والأمان",
 
-  // "profile.form.submit": "Update Profile",
-  // TODO New key - Add a translation
-  "profile.form.submit": "Update Profile",
+  // "profile.form.submit": "Save",
+  "profile.form.submit": "حفظ",
 
   // "profile.groups.head": "Authorization groups you belong to",
-  // TODO New key - Add a translation
-  "profile.groups.head": "Authorization groups you belong to",
+  "profile.groups.head": "مجموعات التفويض التي تنتمي إليها",
 
-  // "profile.head": "Update Profile",
-  // TODO New key - Add a translation
-  "profile.head": "Update Profile",
+  // "profile.special.groups.head": "Authorization special groups you belong to",
+  "profile.special.groups.head": "مجموعات التفويض الخاصة التي تنتمي إليها",
 
   // "profile.metadata.form.error.firstname.required": "First Name is required",
-  // TODO New key - Add a translation
-  "profile.metadata.form.error.firstname.required": "First Name is required",
+  "profile.metadata.form.error.firstname.required": "الاسم الأول مطلوب",
 
   // "profile.metadata.form.error.lastname.required": "Last Name is required",
-  // TODO New key - Add a translation
-  "profile.metadata.form.error.lastname.required": "Last Name is required",
+  "profile.metadata.form.error.lastname.required": "اسم العائلة مطلوب",
 
   // "profile.metadata.form.label.email": "Email Address",
-  // TODO New key - Add a translation
-  "profile.metadata.form.label.email": "Email Address",
+  "profile.metadata.form.label.email": "عنوان البريد الإلكتروني",
 
   // "profile.metadata.form.label.firstname": "First Name",
-  // TODO New key - Add a translation
-  "profile.metadata.form.label.firstname": "First Name",
+  "profile.metadata.form.label.firstname": "الاسم الأول",
 
   // "profile.metadata.form.label.language": "Language",
-  // TODO New key - Add a translation
-  "profile.metadata.form.label.language": "Language",
+  "profile.metadata.form.label.language": "اللغة",
 
   // "profile.metadata.form.label.lastname": "Last Name",
-  // TODO New key - Add a translation
-  "profile.metadata.form.label.lastname": "Last Name",
+  "profile.metadata.form.label.lastname": "اسم العائلة",
 
   // "profile.metadata.form.label.phone": "Contact Telephone",
-  // TODO New key - Add a translation
-  "profile.metadata.form.label.phone": "Contact Telephone",
+  "profile.metadata.form.label.phone": "هاتف الاتصال",
 
   // "profile.metadata.form.notifications.success.content": "Your changes to the profile were saved.",
-  // TODO New key - Add a translation
-  "profile.metadata.form.notifications.success.content": "Your changes to the profile were saved.",
+  "profile.metadata.form.notifications.success.content": "تم حفظ التغييرات التي أجريتها على الملف الشخصي.",
 
   // "profile.metadata.form.notifications.success.title": "Profile saved",
-  // TODO New key - Add a translation
-  "profile.metadata.form.notifications.success.title": "Profile saved",
+  "profile.metadata.form.notifications.success.title": "تم حفظ الملف الشخصي",
 
   // "profile.notifications.warning.no-changes.content": "No changes were made to the Profile.",
-  // TODO New key - Add a translation
-  "profile.notifications.warning.no-changes.content": "No changes were made to the Profile.",
+  "profile.notifications.warning.no-changes.content": "لم يتم إجراء أي تغييرات على الملف الشخصي.",
 
   // "profile.notifications.warning.no-changes.title": "No changes",
-  // TODO New key - Add a translation
-  "profile.notifications.warning.no-changes.title": "No changes",
+  "profile.notifications.warning.no-changes.title": "لا توجد تغييرات",
 
   // "profile.security.form.error.matching-passwords": "The passwords do not match.",
-  // TODO New key - Add a translation
-  "profile.security.form.error.matching-passwords": "The passwords do not match.",
+  "profile.security.form.error.matching-passwords": "كلمات المرور غير متطابقة.",
 
-  // "profile.security.form.error.password-length": "The password should be at least 6 characters long.",
-  // TODO New key - Add a translation
-  "profile.security.form.error.password-length": "The password should be at least 6 characters long.",
-
-  // "profile.security.form.info": "Optionally, you can enter a new password in the box below, and confirm it by typing it again into the second box. It should be at least six characters long.",
-  // TODO New key - Add a translation
-  "profile.security.form.info": "Optionally, you can enter a new password in the box below, and confirm it by typing it again into the second box. It should be at least six characters long.",
+  // "profile.security.form.info": "Optionally, you can enter a new password in the box below, and confirm it by typing it again into the second box.",
+  "profile.security.form.info": "اختيارياً، يمكنك إدخال كلمة مرور جديدة في المربع أدناه، وتأكيدها عن طريق كتابتها مرة أخرى في المربع الثاني.",
 
   // "profile.security.form.label.password": "Password",
-  // TODO New key - Add a translation
-  "profile.security.form.label.password": "Password",
+  "profile.security.form.label.password": "كلمة المرور",
 
   // "profile.security.form.label.passwordrepeat": "Retype to confirm",
-  // TODO New key - Add a translation
-  "profile.security.form.label.passwordrepeat": "Retype to confirm",
+  "profile.security.form.label.passwordrepeat": "أعد الكتابة للتأكيد",
+
+  // "profile.security.form.label.current-password": "Current password",
+  "profile.security.form.label.current-password": "كلمة المرور الحالية",
 
   // "profile.security.form.notifications.success.content": "Your changes to the password were saved.",
-  // TODO New key - Add a translation
-  "profile.security.form.notifications.success.content": "Your changes to the password were saved.",
+  "profile.security.form.notifications.success.content": "تم حفظ التغييرات التي أجريتها على كلمة المرور.",
 
   // "profile.security.form.notifications.success.title": "Password saved",
-  // TODO New key - Add a translation
-  "profile.security.form.notifications.success.title": "Password saved",
+  "profile.security.form.notifications.success.title": "تم حفظ كلمة المرور",
 
   // "profile.security.form.notifications.error.title": "Error changing passwords",
-  // TODO New key - Add a translation
-  "profile.security.form.notifications.error.title": "Error changing passwords",
+  "profile.security.form.notifications.error.title": "حدث خطأ أثناء تغيير كلمات المرور",
 
-  // "profile.security.form.notifications.error.not-long-enough": "The password has to be at least 6 characters long.",
-  // TODO New key - Add a translation
-  "profile.security.form.notifications.error.not-long-enough": "The password has to be at least 6 characters long.",
+  // "profile.security.form.notifications.error.change-failed": "An error occurred while trying to change the password. Please check if the current password is correct.",
+  "profile.security.form.notifications.error.change-failed": "حدث خطأ أثناء محاولة تغيير كلمة المرور. يرجى التحقق مما إذا كانت كلمة المرور الحالية صحيحة.",
 
   // "profile.security.form.notifications.error.not-same": "The provided passwords are not the same.",
-  // TODO New key - Add a translation
-  "profile.security.form.notifications.error.not-same": "The provided passwords are not the same.",
+  "profile.security.form.notifications.error.not-same": "كلمات المرور المقدمة مختلفة.",
+
+  // "profile.security.form.notifications.error.general": "Please fill required fields of security form.",
+  "profile.security.form.notifications.error.general": "يرجى ملء الحقول المطلوبة في نموذج الحماية والأمان.",
 
   // "profile.title": "Update Profile",
-  // TODO New key - Add a translation
-  "profile.title": "Update Profile",
-
+  "profile.title": "تحديث الملف الشخصي",
 
+  // "profile.card.researcher": "Researcher Profile",
+  "profile.card.researcher": "الملف الشخصي للباحث",
 
   // "project.listelement.badge": "Research Project",
-  // TODO New key - Add a translation
-  "project.listelement.badge": "Research Project",
+  "project.listelement.badge": "مشروع الباحث",
 
   // "project.page.contributor": "Contributors",
-  // TODO New key - Add a translation
-  "project.page.contributor": "Contributors",
+  "project.page.contributor": "المساهمون",
 
   // "project.page.description": "Description",
-  // TODO New key - Add a translation
-  "project.page.description": "Description",
+  "project.page.description": "الوصف",
 
   // "project.page.edit": "Edit this item",
-  // TODO New key - Add a translation
-  "project.page.edit": "Edit this item",
+  "project.page.edit": "تحرير هذه المادة",
 
   // "project.page.expectedcompletion": "Expected Completion",
-  // TODO New key - Add a translation
-  "project.page.expectedcompletion": "Expected Completion",
+  "project.page.expectedcompletion": "الإكمال المتوقع",
 
   // "project.page.funder": "Funders",
-  // TODO New key - Add a translation
-  "project.page.funder": "Funders",
+  "project.page.funder": "الممولين",
 
   // "project.page.id": "ID",
-  // TODO New key - Add a translation
-  "project.page.id": "ID",
+  "project.page.id": "المعرف",
 
   // "project.page.keyword": "Keywords",
-  // TODO New key - Add a translation
-  "project.page.keyword": "Keywords",
+  "project.page.keyword": "كلمات رئيسية",
 
   // "project.page.status": "Status",
-  // TODO New key - Add a translation
-  "project.page.status": "Status",
+  "project.page.status": "الحالة",
 
   // "project.page.titleprefix": "Research Project: ",
-  // TODO New key - Add a translation
-  "project.page.titleprefix": "Research Project: ",
+  "project.page.titleprefix": "مشورع البحث: ",
 
   // "project.search.results.head": "Project Search Results",
-  // TODO New key - Add a translation
-  "project.search.results.head": "Project Search Results",
-
+  "project.search.results.head": "نتائج بحث المشروع",
 
+  // "project-relationships.search.results.head": "Project Search Results",
+  "project-relationships.search.results.head": "نتائج بحث المشروع",
 
   // "publication.listelement.badge": "Publication",
-  // TODO New key - Add a translation
-  "publication.listelement.badge": "Publication",
+  "publication.listelement.badge": "النشر",
 
   // "publication.page.description": "Description",
-  // TODO New key - Add a translation
-  "publication.page.description": "Description",
+  "publication.page.description": "الوصف",
 
   // "publication.page.edit": "Edit this item",
-  // TODO New key - Add a translation
-  "publication.page.edit": "Edit this item",
+  "publication.page.edit": "تحرير هذه المادة",
 
   // "publication.page.journal-issn": "Journal ISSN",
-  // TODO New key - Add a translation
-  "publication.page.journal-issn": "Journal ISSN",
+  "publication.page.journal-issn": "ردمد الدورية",
 
   // "publication.page.journal-title": "Journal Title",
-  // TODO New key - Add a translation
-  "publication.page.journal-title": "Journal Title",
+  "publication.page.journal-title": "عنوان الدورية",
 
   // "publication.page.publisher": "Publisher",
-  // TODO New key - Add a translation
-  "publication.page.publisher": "Publisher",
+  "publication.page.publisher": "الناشر",
 
   // "publication.page.titleprefix": "Publication: ",
-  // TODO New key - Add a translation
-  "publication.page.titleprefix": "Publication: ",
+  "publication.page.titleprefix": "المنشور: ",
 
   // "publication.page.volume-title": "Volume Title",
-  // TODO New key - Add a translation
-  "publication.page.volume-title": "Volume Title",
+  "publication.page.volume-title": "عنوان المجلد",
 
   // "publication.search.results.head": "Publication Search Results",
-  // TODO New key - Add a translation
-  "publication.search.results.head": "Publication Search Results",
+  "publication.search.results.head": "نتائج بحث المنشور",
 
-  // "publication.search.title": "DSpace Angular :: Publication Search",
-  // TODO New key - Add a translation
-  "publication.search.title": "DSpace Angular :: Publication Search",
+  // "publication-relationships.search.results.head": "Publication Search Results",
+  "publication-relationships.search.results.head": "نتائج بحث المنشور",
 
+  // "publication.search.title": "Publication Search",
+  "publication.search.title": "بحث المنشور",
+
+  // "media-viewer.next": "Next",
+  "media-viewer.next": "التالي",
+
+  // "media-viewer.previous": "Previous",
+  "media-viewer.previous": "السابق",
+
+  // "media-viewer.playlist": "Playlist",
+  "media-viewer.playlist": "قائمة التشغيل",
+
+  // "suggestion.loading": "Loading ...",
+  // TODO New key - Add a translation
+  "suggestion.loading": "Loading ...",
+
+  // "suggestion.title": "Publication Claim",
+  // TODO New key - Add a translation
+  "suggestion.title": "Publication Claim",
+
+  // "suggestion.title.breadcrumbs": "Publication Claim",
+  // TODO New key - Add a translation
+  "suggestion.title.breadcrumbs": "Publication Claim",
+
+  // "suggestion.targets.description": "Below you can see all the suggestions ",
+  // TODO New key - Add a translation
+  "suggestion.targets.description": "Below you can see all the suggestions ",
+
+  // "suggestion.targets": "Current Suggestions",
+  // TODO New key - Add a translation
+  "suggestion.targets": "Current Suggestions",
+
+  // "suggestion.table.name": "Researcher Name",
+  // TODO New key - Add a translation
+  "suggestion.table.name": "Researcher Name",
+
+  // "suggestion.table.actions": "Actions",
+  // TODO New key - Add a translation
+  "suggestion.table.actions": "Actions",
+
+  // "suggestion.button.review": "Review {{ total }} suggestion(s)",
+  // TODO New key - Add a translation
+  "suggestion.button.review": "Review {{ total }} suggestion(s)",
+
+  // "suggestion.button.review.title": "Review {{ total }} suggestion(s) for ",
+  // TODO New key - Add a translation
+  "suggestion.button.review.title": "Review {{ total }} suggestion(s) for ",
+
+  // "suggestion.noTargets": "No target found.",
+  // TODO New key - Add a translation
+  "suggestion.noTargets": "No target found.",
+
+  // "suggestion.target.error.service.retrieve": "An error occurred while loading the Suggestion targets",
+  // TODO New key - Add a translation
+  "suggestion.target.error.service.retrieve": "An error occurred while loading the Suggestion targets",
+
+  // "suggestion.evidence.type": "Type",
+  // TODO New key - Add a translation
+  "suggestion.evidence.type": "Type",
+
+  // "suggestion.evidence.score": "Score",
+  // TODO New key - Add a translation
+  "suggestion.evidence.score": "Score",
+
+  // "suggestion.evidence.notes": "Notes",
+  // TODO New key - Add a translation
+  "suggestion.evidence.notes": "Notes",
+
+  // "suggestion.approveAndImport": "Approve & import",
+  // TODO New key - Add a translation
+  "suggestion.approveAndImport": "Approve & import",
+
+  // "suggestion.approveAndImport.success": "The suggestion has been imported successfully. <a href='{{ url }}'>View.</a>",
+  // TODO New key - Add a translation
+  "suggestion.approveAndImport.success": "The suggestion has been imported successfully. <a href='{{ url }}'>View.</a>",
+
+  // "suggestion.approveAndImport.bulk": "Approve & import Selected",
+  // TODO New key - Add a translation
+  "suggestion.approveAndImport.bulk": "Approve & import Selected",
+
+  // "suggestion.approveAndImport.bulk.success": "{{ count }} suggestions have been imported successfully ",
+  // TODO New key - Add a translation
+  "suggestion.approveAndImport.bulk.success": "{{ count }} suggestions have been imported successfully ",
+
+  // "suggestion.approveAndImport.bulk.error": "{{ count }} suggestions haven't been imported due to unexpected server errors",
+  // TODO New key - Add a translation
+  "suggestion.approveAndImport.bulk.error": "{{ count }} suggestions haven't been imported due to unexpected server errors",
+
+  // "suggestion.ignoreSuggestion": "Ignore Suggestion",
+  // TODO New key - Add a translation
+  "suggestion.ignoreSuggestion": "Ignore Suggestion",
+
+  // "suggestion.ignoreSuggestion.success": "The suggestion has been discarded",
+  // TODO New key - Add a translation
+  "suggestion.ignoreSuggestion.success": "The suggestion has been discarded",
+
+  // "suggestion.ignoreSuggestion.bulk": "Ignore Suggestion Selected",
+  // TODO New key - Add a translation
+  "suggestion.ignoreSuggestion.bulk": "Ignore Suggestion Selected",
+
+  // "suggestion.ignoreSuggestion.bulk.success": "{{ count }} suggestions have been discarded ",
+  // TODO New key - Add a translation
+  "suggestion.ignoreSuggestion.bulk.success": "{{ count }} suggestions have been discarded ",
+
+  // "suggestion.ignoreSuggestion.bulk.error": "{{ count }} suggestions haven't been discarded due to unexpected server errors",
+  // TODO New key - Add a translation
+  "suggestion.ignoreSuggestion.bulk.error": "{{ count }} suggestions haven't been discarded due to unexpected server errors",
+
+  // "suggestion.seeEvidence": "See evidence",
+  // TODO New key - Add a translation
+  "suggestion.seeEvidence": "See evidence",
+
+  // "suggestion.hideEvidence": "Hide evidence",
+  // TODO New key - Add a translation
+  "suggestion.hideEvidence": "Hide evidence",
+
+  // "suggestion.suggestionFor": "Suggestions for",
+  // TODO New key - Add a translation
+  "suggestion.suggestionFor": "Suggestions for",
+
+  // "suggestion.suggestionFor.breadcrumb": "Suggestions for {{ name }}",
+  // TODO New key - Add a translation
+  "suggestion.suggestionFor.breadcrumb": "Suggestions for {{ name }}",
+
+  // "suggestion.source.openaire": "OpenAIRE Graph",
+  // TODO New key - Add a translation
+  "suggestion.source.openaire": "OpenAIRE Graph",
+
+  // "suggestion.from.source": "from the ",
+  // TODO New key - Add a translation
+  "suggestion.from.source": "from the ",
+
+  // "suggestion.count.missing": "You have no publication claims left",
+  // TODO New key - Add a translation
+  "suggestion.count.missing": "You have no publication claims left",
+
+  // "suggestion.totalScore": "Total Score",
+  // TODO New key - Add a translation
+  "suggestion.totalScore": "Total Score",
+
+  // "suggestion.type.openaire": "OpenAIRE",
+  // TODO New key - Add a translation
+  "suggestion.type.openaire": "OpenAIRE",
 
   // "register-email.title": "New user registration",
-  // TODO New key - Add a translation
-  "register-email.title": "New user registration",
+  "register-email.title": "تسجيل مستخدم جديد",
 
   // "register-page.create-profile.header": "Create Profile",
-  // TODO New key - Add a translation
-  "register-page.create-profile.header": "Create Profile",
+  "register-page.create-profile.header": "إنشاء ملف شخصي",
 
   // "register-page.create-profile.identification.header": "Identify",
-  // TODO New key - Add a translation
-  "register-page.create-profile.identification.header": "Identify",
+  "register-page.create-profile.identification.header": "تعريف",
 
   // "register-page.create-profile.identification.email": "Email Address",
-  // TODO New key - Add a translation
-  "register-page.create-profile.identification.email": "Email Address",
+  "register-page.create-profile.identification.email": "عنوان البريد الإلكتروني",
 
   // "register-page.create-profile.identification.first-name": "First Name *",
-  // TODO New key - Add a translation
-  "register-page.create-profile.identification.first-name": "First Name *",
+  "register-page.create-profile.identification.first-name": "الاسم الأول *",
 
   // "register-page.create-profile.identification.first-name.error": "Please fill in a First Name",
-  // TODO New key - Add a translation
-  "register-page.create-profile.identification.first-name.error": "Please fill in a First Name",
+  "register-page.create-profile.identification.first-name.error": "يرجى إدخال الاسم الأول",
 
   // "register-page.create-profile.identification.last-name": "Last Name *",
-  // TODO New key - Add a translation
-  "register-page.create-profile.identification.last-name": "Last Name *",
+  "register-page.create-profile.identification.last-name": "اسم العائلة *",
 
   // "register-page.create-profile.identification.last-name.error": "Please fill in a Last Name",
-  // TODO New key - Add a translation
-  "register-page.create-profile.identification.last-name.error": "Please fill in a Last Name",
+  "register-page.create-profile.identification.last-name.error": "يرجى إدخال اسم العائلة",
 
   // "register-page.create-profile.identification.contact": "Contact Telephone",
-  // TODO New key - Add a translation
-  "register-page.create-profile.identification.contact": "Contact Telephone",
+  "register-page.create-profile.identification.contact": "الهاتف",
 
   // "register-page.create-profile.identification.language": "Language",
-  // TODO New key - Add a translation
-  "register-page.create-profile.identification.language": "Language",
+  "register-page.create-profile.identification.language": "اللغة",
 
   // "register-page.create-profile.security.header": "Security",
-  // TODO New key - Add a translation
-  "register-page.create-profile.security.header": "Security",
+  "register-page.create-profile.security.header": "الحماية والأمان",
 
-  // "register-page.create-profile.security.info": "Please enter a password in the box below, and confirm it by typing it again into the second box. It should be at least six characters long.",
-  // TODO New key - Add a translation
-  "register-page.create-profile.security.info": "Please enter a password in the box below, and confirm it by typing it again into the second box. It should be at least six characters long.",
+  // "register-page.create-profile.security.info": "Please enter a password in the box below, and confirm it by typing it again into the second box.",
+  "register-page.create-profile.security.info": "يرجى إدخال كلمة المرور في المربع أدناه، وتأكيدها عن طريق كتابتها مرة أخرى في المربع الثاني. يجب أن تتكون من ستة أحرف على الأقل.",
 
   // "register-page.create-profile.security.label.password": "Password *",
-  // TODO New key - Add a translation
-  "register-page.create-profile.security.label.password": "Password *",
+  "register-page.create-profile.security.label.password": "كلمة المرور *",
 
   // "register-page.create-profile.security.label.passwordrepeat": "Retype to confirm *",
-  // TODO New key - Add a translation
-  "register-page.create-profile.security.label.passwordrepeat": "Retype to confirm *",
+  "register-page.create-profile.security.label.passwordrepeat": "أعد الكتابة للتأكيد *",
 
   // "register-page.create-profile.security.error.empty-password": "Please enter a password in the box below.",
-  // TODO New key - Add a translation
-  "register-page.create-profile.security.error.empty-password": "Please enter a password in the box below.",
+  "register-page.create-profile.security.error.empty-password": "يرجى إدخال كلمة المرور في المربع أدناه.",
 
   // "register-page.create-profile.security.error.matching-passwords": "The passwords do not match.",
-  // TODO New key - Add a translation
-  "register-page.create-profile.security.error.matching-passwords": "The passwords do not match.",
-
-  // "register-page.create-profile.security.error.password-length": "The password should be at least 6 characters long.",
-  // TODO New key - Add a translation
-  "register-page.create-profile.security.error.password-length": "The password should be at least 6 characters long.",
+  "register-page.create-profile.security.error.matching-passwords": "كلمتي المرور التي قمت بإدخالهما غير متطابقتين.",
 
   // "register-page.create-profile.submit": "Complete Registration",
-  // TODO New key - Add a translation
-  "register-page.create-profile.submit": "Complete Registration",
+  "register-page.create-profile.submit": "اكتمل التسجيل",
 
   // "register-page.create-profile.submit.error.content": "Something went wrong while registering a new user.",
-  // TODO New key - Add a translation
-  "register-page.create-profile.submit.error.content": "Something went wrong while registering a new user.",
+  "register-page.create-profile.submit.error.content": "حدث خطأ ما أثناء تسجيل مستخدم جديد.",
 
   // "register-page.create-profile.submit.error.head": "Registration failed",
-  // TODO New key - Add a translation
-  "register-page.create-profile.submit.error.head": "Registration failed",
+  "register-page.create-profile.submit.error.head": "فشل التسجيل",
 
   // "register-page.create-profile.submit.success.content": "The registration was successful. You have been logged in as the created user.",
-  // TODO New key - Add a translation
-  "register-page.create-profile.submit.success.content": "The registration was successful. You have been logged in as the created user.",
+  "register-page.create-profile.submit.success.content": "تم التسجيل بنجاح. لقد قمت بتسجيل الدخول كالمستخدم الذي تم إنشاؤه.",
 
   // "register-page.create-profile.submit.success.head": "Registration completed",
-  // TODO New key - Add a translation
-  "register-page.create-profile.submit.success.head": "Registration completed",
-
+  "register-page.create-profile.submit.success.head": "اكتمل التسجيل",
 
   // "register-page.registration.header": "New user registration",
-  // TODO New key - Add a translation
-  "register-page.registration.header": "New user registration",
+  "register-page.registration.header": "تسجيل مستخدم جديد",
 
   // "register-page.registration.info": "Register an account to subscribe to collections for email updates, and submit new items to DSpace.",
-  // TODO New key - Add a translation
-  "register-page.registration.info": "Register an account to subscribe to collections for email updates, and submit new items to DSpace.",
+  "register-page.registration.info": "قم بتسجيل حساب للاشتراك في حاويات لتحديثات البريد الإلكتروني، وتقديم مواد جديدة إلى دي سبيس.",
 
   // "register-page.registration.email": "Email Address *",
-  // TODO New key - Add a translation
-  "register-page.registration.email": "Email Address *",
+  "register-page.registration.email": "عنوان البريد الإلكتروني *",
 
   // "register-page.registration.email.error.required": "Please fill in an email address",
-  // TODO New key - Add a translation
-  "register-page.registration.email.error.required": "Please fill in an email address",
+  "register-page.registration.email.error.required": "يرجى إدخال عنوان البريد الإلكتروني",
 
-  // "register-page.registration.email.error.pattern": "Please fill in a valid email address",
-  // TODO New key - Add a translation
-  "register-page.registration.email.error.pattern": "Please fill in a valid email address",
+  // "register-page.registration.email.error.not-email-form": "Please fill in a valid email address.",
+  "register-page.registration.email.error.not-email-form": "يرجى إدخال عنوان بريد إلكتروني صالح.",
+
+  // "register-page.registration.email.error.not-valid-domain": "Use email with allowed domains: {{ domains }}",
+  "register-page.registration.email.error.not-valid-domain": "استخدم البريد الإلكتروني بالنطاقات المسموح بها: {{ domains }}",
 
   // "register-page.registration.email.hint": "This address will be verified and used as your login name.",
-  // TODO New key - Add a translation
-  "register-page.registration.email.hint": "This address will be verified and used as your login name.",
+  "register-page.registration.email.hint": "سيتم التحقق من هذا العنوان واستخدامه كاسم تسجيل الدخول الخاص بك.",
 
   // "register-page.registration.submit": "Register",
-  // TODO New key - Add a translation
-  "register-page.registration.submit": "Register",
+  "register-page.registration.submit": "تسجيل",
 
   // "register-page.registration.success.head": "Verification email sent",
-  // TODO New key - Add a translation
-  "register-page.registration.success.head": "Verification email sent",
+  "register-page.registration.success.head": "تم إرسال رسالة تأكيد البريد الإلكتروني",
 
   // "register-page.registration.success.content": "An email has been sent to {{ email }} containing a special URL and further instructions.",
-  // TODO New key - Add a translation
-  "register-page.registration.success.content": "An email has been sent to {{ email }} containing a special URL and further instructions.",
+  "register-page.registration.success.content": "تم إرسال رسالة بريد إلكتروني إلى {{ email }} تحتوي على عنوان URL خاص والمزيد من التعلميات.",
 
   // "register-page.registration.error.head": "Error when trying to register email",
-  // TODO New key - Add a translation
-  "register-page.registration.error.head": "Error when trying to register email",
+  "register-page.registration.error.head": "خطأ أثناء محاولة تسجيل البريد الإلكتروني",
 
   // "register-page.registration.error.content": "An error occured when registering the following email address: {{ email }}",
-  // TODO New key - Add a translation
-  "register-page.registration.error.content": "An error occured when registering the following email address: {{ email }}",
+  "register-page.registration.error.content": "حدث خطأ أثناء تسجيل عنوان البريد الإلكتروني التالي: {{ email }}",
 
+  // "register-page.registration.error.recaptcha": "Error when trying to authenticate with recaptcha",
+  "register-page.registration.error.recaptcha": "حدث خطأ أثناء محاولة الاستيثاق باستخدام recaptcha",
 
+  // "register-page.registration.google-recaptcha.must-accept-cookies": "In order to register you must accept the <b>Registration and Password recovery</b> (Google reCaptcha) cookies.",
+  "register-page.registration.google-recaptcha.must-accept-cookies": "للتسجيل، يجب عليك قبول ملفات تعريف ارتباط <b>التسجيل واستعادة كلمة المرور</b> (جوجل reCaptcha).",
+
+  // "register-page.registration.error.maildomain": "This email address is not on the list of domains who can register. Allowed domains are {{ domains }}",
+  "register-page.registration.error.maildomain": "عنوان البريد الإلكتروني غير موجود في قائمة النطاقات التي يمكنها التسجيل. النطاقات المسموح بها هي {{ domains }}",
+
+  // "register-page.registration.google-recaptcha.open-cookie-settings": "Open cookie settings",
+  "register-page.registration.google-recaptcha.open-cookie-settings": "فتح إعدادات ملفات تعريف الارتباط",
+
+  // "register-page.registration.google-recaptcha.notification.title": "Google reCaptcha",
+  "register-page.registration.google-recaptcha.notification.title": "جوجل reCaptcha",
+
+  // "register-page.registration.google-recaptcha.notification.message.error": "An error occurred during reCaptcha verification",
+  "register-page.registration.google-recaptcha.notification.message.error": "حدث خطأ أثناء التحقق من reCaptcha",
+
+  // "register-page.registration.google-recaptcha.notification.message.expired": "Verification expired. Please verify again.",
+  "register-page.registration.google-recaptcha.notification.message.expired": "انتهت صلاحية التحقق. يرجى التحقق مرة أخرى.",
+
+  // "register-page.registration.info.maildomain": "Accounts can be registered for mail addresses of the domains",
+  "register-page.registration.info.maildomain": "يمكن تسجيل الحسابات لعناوين البريد للنطاقات",
 
   // "relationships.add.error.relationship-type.content": "No suitable match could be found for relationship type {{ type }} between the two items",
-  // TODO New key - Add a translation
-  "relationships.add.error.relationship-type.content": "No suitable match could be found for relationship type {{ type }} between the two items",
+  "relationships.add.error.relationship-type.content": "لا يمكن العثور على تطابق مناسب لنوع العلاقة {{ type }} بين المادتين",
 
   // "relationships.add.error.server.content": "The server returned an error",
-  // TODO New key - Add a translation
-  "relationships.add.error.server.content": "The server returned an error",
+  "relationships.add.error.server.content": "لقد أعاد الخادم خطأ",
 
   // "relationships.add.error.title": "Unable to add relationship",
-  // TODO New key - Add a translation
-  "relationships.add.error.title": "Unable to add relationship",
+  "relationships.add.error.title": "غير قادر على إضافة العلاقة",
 
   // "relationships.isAuthorOf": "Authors",
-  // TODO New key - Add a translation
-  "relationships.isAuthorOf": "Authors",
+  "relationships.isAuthorOf": "المؤلفين",
 
   // "relationships.isAuthorOf.Person": "Authors (persons)",
-  // TODO New key - Add a translation
-  "relationships.isAuthorOf.Person": "Authors (persons)",
+  "relationships.isAuthorOf.Person": "المؤلفين (أشخاص)",
 
   // "relationships.isAuthorOf.OrgUnit": "Authors (organizational units)",
-  // TODO New key - Add a translation
-  "relationships.isAuthorOf.OrgUnit": "Authors (organizational units)",
+  "relationships.isAuthorOf.OrgUnit": "المؤلفين (وحدات مؤسسية)",
 
   // "relationships.isIssueOf": "Journal Issues",
-  // TODO New key - Add a translation
-  "relationships.isIssueOf": "Journal Issues",
+  "relationships.isIssueOf": "أعداد الدورية",
+
+  // "relationships.isIssueOf.JournalIssue": "Journal Issue",
+  "relationships.isIssueOf.JournalIssue": "عدد الدورية",
 
   // "relationships.isJournalIssueOf": "Journal Issue",
-  // TODO New key - Add a translation
-  "relationships.isJournalIssueOf": "Journal Issue",
+  "relationships.isJournalIssueOf": "عدد الدورية",
 
   // "relationships.isJournalOf": "Journals",
-  // TODO New key - Add a translation
-  "relationships.isJournalOf": "Journals",
+  "relationships.isJournalOf": "الدوريات",
+
+  // "relationships.isJournalVolumeOf": "Journal Volume",
+  "relationships.isJournalVolumeOf": "مجلد الدورية",
 
   // "relationships.isOrgUnitOf": "Organizational Units",
-  // TODO New key - Add a translation
-  "relationships.isOrgUnitOf": "Organizational Units",
+  "relationships.isOrgUnitOf": "وحدات مؤسسية",
 
   // "relationships.isPersonOf": "Authors",
-  // TODO New key - Add a translation
-  "relationships.isPersonOf": "Authors",
+  "relationships.isPersonOf": "المؤلفين",
 
   // "relationships.isProjectOf": "Research Projects",
-  // TODO New key - Add a translation
-  "relationships.isProjectOf": "Research Projects",
+  "relationships.isProjectOf": "مشروعات البحث",
 
   // "relationships.isPublicationOf": "Publications",
-  // TODO New key - Add a translation
-  "relationships.isPublicationOf": "Publications",
+  "relationships.isPublicationOf": "منشورات",
 
   // "relationships.isPublicationOfJournalIssue": "Articles",
-  // TODO New key - Add a translation
-  "relationships.isPublicationOfJournalIssue": "Articles",
+  "relationships.isPublicationOfJournalIssue": "مقالات",
 
   // "relationships.isSingleJournalOf": "Journal",
-  // TODO New key - Add a translation
-  "relationships.isSingleJournalOf": "Journal",
+  "relationships.isSingleJournalOf": "الدورية",
 
   // "relationships.isSingleVolumeOf": "Journal Volume",
-  // TODO New key - Add a translation
-  "relationships.isSingleVolumeOf": "Journal Volume",
+  "relationships.isSingleVolumeOf": "مجلد الدورية",
 
   // "relationships.isVolumeOf": "Journal Volumes",
-  // TODO New key - Add a translation
-  "relationships.isVolumeOf": "Journal Volumes",
+  "relationships.isVolumeOf": "مجلدات الدورية",
+
+  // "relationships.isVolumeOf.JournalVolume": "Journal Volume",
+  "relationships.isVolumeOf.JournalVolume": "مجلد الدورية",
 
   // "relationships.isContributorOf": "Contributors",
-  // TODO New key - Add a translation
-  "relationships.isContributorOf": "Contributors",
+  "relationships.isContributorOf": "المساهمين",
 
+  // "relationships.isContributorOf.OrgUnit": "Contributor (Organizational Unit)",
+  "relationships.isContributorOf.OrgUnit": "المساهم (وحدة مؤسسية)",
 
+  // "relationships.isContributorOf.Person": "Contributor",
+  "relationships.isContributorOf.Person": "المساهم",
+
+  // "relationships.isFundingAgencyOf.OrgUnit": "Funder",
+  "relationships.isFundingAgencyOf.OrgUnit": "الممول",
+
+  // "repository.image.logo": "Repository logo",
+  "repository.image.logo": "شعار المستودع",
+
+  // "repository.title": "DSpace Repository",
+  "repository.title": "مستودع دي سبيس",
+
+  // "repository.title.prefix": "DSpace Repository :: ",
+  "repository.title.prefix": "مستودع دي سبيس :: ",
 
   // "resource-policies.add.button": "Add",
-  // TODO New key - Add a translation
-  "resource-policies.add.button": "Add",
+  "resource-policies.add.button": "إضافة",
 
   // "resource-policies.add.for.": "Add a new policy",
-  // TODO New key - Add a translation
-  "resource-policies.add.for.": "Add a new policy",
+  "resource-policies.add.for.": "إضافة سياسة جديدة",
 
   // "resource-policies.add.for.bitstream": "Add a new Bitstream policy",
-  // TODO New key - Add a translation
-  "resource-policies.add.for.bitstream": "Add a new Bitstream policy",
+  "resource-policies.add.for.bitstream": "إضافة سياسة تدفق بت جديدة",
 
   // "resource-policies.add.for.bundle": "Add a new Bundle policy",
-  // TODO New key - Add a translation
-  "resource-policies.add.for.bundle": "Add a new Bundle policy",
+  "resource-policies.add.for.bundle": "إضافة سياسة حزمة جديدة",
 
   // "resource-policies.add.for.item": "Add a new Item policy",
-  // TODO New key - Add a translation
-  "resource-policies.add.for.item": "Add a new Item policy",
+  "resource-policies.add.for.item": "إضافة سياسة مادة جديدة",
 
   // "resource-policies.add.for.community": "Add a new Community policy",
-  // TODO New key - Add a translation
-  "resource-policies.add.for.community": "Add a new Community policy",
+  "resource-policies.add.for.community": "إضافة سياسة مجتمع جديدة",
 
   // "resource-policies.add.for.collection": "Add a new Collection policy",
-  // TODO New key - Add a translation
-  "resource-policies.add.for.collection": "Add a new Collection policy",
+  "resource-policies.add.for.collection": "إضافة سياسة حاوية جديدة",
 
   // "resource-policies.create.page.heading": "Create new resource policy for ",
-  // TODO New key - Add a translation
-  "resource-policies.create.page.heading": "Create new resource policy for ",
+  "resource-policies.create.page.heading": "إنشاء سياسة موارد جديدة لـ ",
 
   // "resource-policies.create.page.failure.content": "An error occurred while creating the resource policy.",
-  // TODO New key - Add a translation
-  "resource-policies.create.page.failure.content": "An error occurred while creating the resource policy.",
+  "resource-policies.create.page.failure.content": "حدث خطأ أثناء إنشاء سياسة الموارد.",
 
   // "resource-policies.create.page.success.content": "Operation successful",
-  // TODO New key - Add a translation
-  "resource-policies.create.page.success.content": "Operation successful",
+  "resource-policies.create.page.success.content": "تمت العملية بنجاح",
 
   // "resource-policies.create.page.title": "Create new resource policy",
-  // TODO New key - Add a translation
-  "resource-policies.create.page.title": "Create new resource policy",
+  "resource-policies.create.page.title": "إنشاء سياسة موارد جديدة",
 
   // "resource-policies.delete.btn": "Delete selected",
-  // TODO New key - Add a translation
-  "resource-policies.delete.btn": "Delete selected",
+  "resource-policies.delete.btn": "حذف المحدد",
 
   // "resource-policies.delete.btn.title": "Delete selected resource policies",
-  // TODO New key - Add a translation
-  "resource-policies.delete.btn.title": "Delete selected resource policies",
+  "resource-policies.delete.btn.title": "حذف سياسات الموارد المحددة",
 
   // "resource-policies.delete.failure.content": "An error occurred while deleting selected resource policies.",
-  // TODO New key - Add a translation
-  "resource-policies.delete.failure.content": "An error occurred while deleting selected resource policies.",
+  "resource-policies.delete.failure.content": "حدث خطأ أثناء حذف سياسات المورد المحددة.",
 
   // "resource-policies.delete.success.content": "Operation successful",
-  // TODO New key - Add a translation
-  "resource-policies.delete.success.content": "Operation successful",
+  "resource-policies.delete.success.content": "عملية ناجحة",
 
   // "resource-policies.edit.page.heading": "Edit resource policy ",
-  // TODO New key - Add a translation
-  "resource-policies.edit.page.heading": "Edit resource policy ",
+  "resource-policies.edit.page.heading": "تحرير سياسة المورد ",
 
   // "resource-policies.edit.page.failure.content": "An error occurred while editing the resource policy.",
-  // TODO New key - Add a translation
-  "resource-policies.edit.page.failure.content": "An error occurred while editing the resource policy.",
+  "resource-policies.edit.page.failure.content": "حدث خطأ أثناء تحرير سياسة المورد.",
+
+  // "resource-policies.edit.page.target-failure.content": "An error occurred while editing the target (ePerson or group) of the resource policy.",
+  "resource-policies.edit.page.target-failure.content": "حدث خطأ أثناء تحرير الهدف (الشخص الإلكتروني أو المجموعة) لسياسة الموارد.",
+
+  // "resource-policies.edit.page.other-failure.content": "An error occurred while editing the resource policy. The target (ePerson or group) has been successfully updated.",
+  "resource-policies.edit.page.other-failure.content": "حدث خطأ أثناء تحرير سياسة الموارد. تم تحديث الهدف (الشخص الإلكتروني أو المجموعة) بنجاح.",
 
   // "resource-policies.edit.page.success.content": "Operation successful",
-  // TODO New key - Add a translation
-  "resource-policies.edit.page.success.content": "Operation successful",
+  "resource-policies.edit.page.success.content": "عملية ناجحة",
 
   // "resource-policies.edit.page.title": "Edit resource policy",
-  // TODO New key - Add a translation
-  "resource-policies.edit.page.title": "Edit resource policy",
+  "resource-policies.edit.page.title": "تحرير سياسة المورد",
 
   // "resource-policies.form.action-type.label": "Select the action type",
-  // TODO New key - Add a translation
-  "resource-policies.form.action-type.label": "Select the action type",
+  "resource-policies.form.action-type.label": "تحديد نوع الإجراء",
 
   // "resource-policies.form.action-type.required": "You must select the resource policy action.",
-  // TODO New key - Add a translation
-  "resource-policies.form.action-type.required": "You must select the resource policy action.",
+  "resource-policies.form.action-type.required": "يجب عليك تحديد إجراء سياسة المورد.",
 
   // "resource-policies.form.eperson-group-list.label": "The eperson or group that will be granted the permission",
-  // TODO New key - Add a translation
-  "resource-policies.form.eperson-group-list.label": "The eperson or group that will be granted the permission",
+  "resource-policies.form.eperson-group-list.label": "الشخص الإلكتروني أو المجموعة التي سيتم منحها هذه الصلاحية",
 
   // "resource-policies.form.eperson-group-list.select.btn": "Select",
-  // TODO New key - Add a translation
-  "resource-policies.form.eperson-group-list.select.btn": "Select",
+  "resource-policies.form.eperson-group-list.select.btn": "تحديد",
 
   // "resource-policies.form.eperson-group-list.tab.eperson": "Search for a ePerson",
-  // TODO New key - Add a translation
-  "resource-policies.form.eperson-group-list.tab.eperson": "Search for a ePerson",
+  "resource-policies.form.eperson-group-list.tab.eperson": "بحث عن شخص إلكتروني",
 
   // "resource-policies.form.eperson-group-list.tab.group": "Search for a group",
-  // TODO New key - Add a translation
-  "resource-policies.form.eperson-group-list.tab.group": "Search for a group",
+  "resource-policies.form.eperson-group-list.tab.group": "بحث عن مجموعة",
 
   // "resource-policies.form.eperson-group-list.table.headers.action": "Action",
-  // TODO New key - Add a translation
-  "resource-policies.form.eperson-group-list.table.headers.action": "Action",
+  "resource-policies.form.eperson-group-list.table.headers.action": "إجراء",
 
   // "resource-policies.form.eperson-group-list.table.headers.id": "ID",
-  // TODO New key - Add a translation
-  "resource-policies.form.eperson-group-list.table.headers.id": "ID",
+  "resource-policies.form.eperson-group-list.table.headers.id": "المعرف",
 
   // "resource-policies.form.eperson-group-list.table.headers.name": "Name",
-  // TODO New key - Add a translation
-  "resource-policies.form.eperson-group-list.table.headers.name": "Name",
+  "resource-policies.form.eperson-group-list.table.headers.name": "الاسم",
+
+  // "resource-policies.form.eperson-group-list.modal.header": "Cannot change type",
+  "resource-policies.form.eperson-group-list.modal.header": "لا يمكن تغيير النوع",
+
+  // "resource-policies.form.eperson-group-list.modal.text1.toGroup": "It is not possible to replace an ePerson with a group.",
+  "resource-policies.form.eperson-group-list.modal.text1.toGroup": "لا يمكن استبدال الشخص الإلكتروني بمجموعة.",
+
+  // "resource-policies.form.eperson-group-list.modal.text1.toEPerson": "It is not possible to replace a group with an ePerson.",
+  "resource-policies.form.eperson-group-list.modal.text1.toEPerson": "لا يمكن استبدال مجموعة بشخص إلكتروني.",
+
+  // "resource-policies.form.eperson-group-list.modal.text2": "Delete the current resource policy and create a new one with the desired type.",
+  "resource-policies.form.eperson-group-list.modal.text2": "قم بحذف سياسة الموارد الحالية وإنشاء سياسة جديدة بالنوع المطلوب.",
+
+  // "resource-policies.form.eperson-group-list.modal.close": "Ok",
+  "resource-policies.form.eperson-group-list.modal.close": "موافق",
 
   // "resource-policies.form.date.end.label": "End Date",
-  // TODO New key - Add a translation
-  "resource-policies.form.date.end.label": "End Date",
+  "resource-policies.form.date.end.label": "تاريخ الانتهاء",
 
   // "resource-policies.form.date.start.label": "Start Date",
-  // TODO New key - Add a translation
-  "resource-policies.form.date.start.label": "Start Date",
+  "resource-policies.form.date.start.label": "تاريخ البدء",
 
   // "resource-policies.form.description.label": "Description",
-  // TODO New key - Add a translation
-  "resource-policies.form.description.label": "Description",
+  "resource-policies.form.description.label": "الوصف",
 
   // "resource-policies.form.name.label": "Name",
+  "resource-policies.form.name.label": "الاسم",
+
+  //"resource-policies.form.name.hint": "Max 30 characters",
   // TODO New key - Add a translation
-  "resource-policies.form.name.label": "Name",
+  "resource-policies.form.name.hint": "Max 30 characters",
 
   // "resource-policies.form.policy-type.label": "Select the policy type",
-  // TODO New key - Add a translation
-  "resource-policies.form.policy-type.label": "Select the policy type",
+  "resource-policies.form.policy-type.label": "حدد نوع السياسة",
 
   // "resource-policies.form.policy-type.required": "You must select the resource policy type.",
-  // TODO New key - Add a translation
-  "resource-policies.form.policy-type.required": "You must select the resource policy type.",
+  "resource-policies.form.policy-type.required": "يجب عليك تحديد نوع سياسة الموارد.",
 
   // "resource-policies.table.headers.action": "Action",
-  // TODO New key - Add a translation
-  "resource-policies.table.headers.action": "Action",
+  "resource-policies.table.headers.action": "إجراء",
 
   // "resource-policies.table.headers.date.end": "End Date",
-  // TODO New key - Add a translation
-  "resource-policies.table.headers.date.end": "End Date",
+  "resource-policies.table.headers.date.end": "تاريخ الانتهاء",
 
   // "resource-policies.table.headers.date.start": "Start Date",
-  // TODO New key - Add a translation
-  "resource-policies.table.headers.date.start": "Start Date",
+  "resource-policies.table.headers.date.start": "تاريخ البدء",
 
   // "resource-policies.table.headers.edit": "Edit",
-  // TODO New key - Add a translation
-  "resource-policies.table.headers.edit": "Edit",
+  "resource-policies.table.headers.edit": "تحرير",
 
   // "resource-policies.table.headers.edit.group": "Edit group",
-  // TODO New key - Add a translation
-  "resource-policies.table.headers.edit.group": "Edit group",
+  "resource-policies.table.headers.edit.group": "تحرير المجموعة",
 
   // "resource-policies.table.headers.edit.policy": "Edit policy",
-  // TODO New key - Add a translation
-  "resource-policies.table.headers.edit.policy": "Edit policy",
+  "resource-policies.table.headers.edit.policy": "تحرير السياسة",
 
   // "resource-policies.table.headers.eperson": "EPerson",
-  // TODO New key - Add a translation
-  "resource-policies.table.headers.eperson": "EPerson",
+  "resource-policies.table.headers.eperson": "شخص إلكتروني",
 
   // "resource-policies.table.headers.group": "Group",
-  // TODO New key - Add a translation
-  "resource-policies.table.headers.group": "Group",
+  "resource-policies.table.headers.group": "المجموعة",
+
+  // "resource-policies.table.headers.select-all": "Select all",
+  "resource-policies.table.headers.select-all": "تحديد الكل",
+
+  // "resource-policies.table.headers.deselect-all": "Deselect all",
+  "resource-policies.table.headers.deselect-all": "إلغاء تحديد الكل",
+
+  // "resource-policies.table.headers.select": "Select",
+  "resource-policies.table.headers.select": "تحديد",
+
+  // "resource-policies.table.headers.deselect": "Deselect",
+  "resource-policies.table.headers.deselect": "إلغاء تحديد",
 
   // "resource-policies.table.headers.id": "ID",
-  // TODO New key - Add a translation
-  "resource-policies.table.headers.id": "ID",
+  "resource-policies.table.headers.id": "المعرف",
 
   // "resource-policies.table.headers.name": "Name",
-  // TODO New key - Add a translation
-  "resource-policies.table.headers.name": "Name",
+  "resource-policies.table.headers.name": "الاسم",
 
   // "resource-policies.table.headers.policyType": "type",
-  // TODO New key - Add a translation
-  "resource-policies.table.headers.policyType": "type",
+  "resource-policies.table.headers.policyType": "النوع",
 
   // "resource-policies.table.headers.title.for.bitstream": "Policies for Bitstream",
-  // TODO New key - Add a translation
-  "resource-policies.table.headers.title.for.bitstream": "Policies for Bitstream",
+  "resource-policies.table.headers.title.for.bitstream": "سياسات تدفق البت",
 
   // "resource-policies.table.headers.title.for.bundle": "Policies for Bundle",
-  // TODO New key - Add a translation
-  "resource-policies.table.headers.title.for.bundle": "Policies for Bundle",
+  "resource-policies.table.headers.title.for.bundle": "سياسات الحزمة",
 
   // "resource-policies.table.headers.title.for.item": "Policies for Item",
-  // TODO New key - Add a translation
-  "resource-policies.table.headers.title.for.item": "Policies for Item",
+  "resource-policies.table.headers.title.for.item": "سياسات المادة",
 
   // "resource-policies.table.headers.title.for.community": "Policies for Community",
-  // TODO New key - Add a translation
-  "resource-policies.table.headers.title.for.community": "Policies for Community",
+  "resource-policies.table.headers.title.for.community": "سياسات المجتمع",
 
   // "resource-policies.table.headers.title.for.collection": "Policies for Collection",
-  // TODO New key - Add a translation
-  "resource-policies.table.headers.title.for.collection": "Policies for Collection",
-
+  "resource-policies.table.headers.title.for.collection": "سياسات الحاوية",
 
+  // "root.skip-to-content": "Skip to main content",
+  "root.skip-to-content": "انتقل إلى المحتوى الرئيسي",
 
   // "search.description": "",
-  // TODO New key - Add a translation
   "search.description": "",
 
   // "search.switch-configuration.title": "Show",
-  // TODO New key - Add a translation
-  "search.switch-configuration.title": "Show",
+  "search.switch-configuration.title": "عرض",
 
-  // "search.title": "DSpace Angular :: Search",
-  // TODO New key - Add a translation
-  "search.title": "DSpace Angular :: Search",
+  // "search.title": "Search",
+  "search.title": "بحث",
 
   // "search.breadcrumbs": "Search",
-  // TODO New key - Add a translation
-  "search.breadcrumbs": "Search",
+  "search.breadcrumbs": "بحث",
 
+  // "search.search-form.placeholder": "Search the repository ...",
+  "search.search-form.placeholder": "بحث المستودع ...",
+
+  // "search.filters.remove": "Remove filter of type {{ type }} with value {{ value }}",
+  "search.filters.remove": "إزالة المنقح من النوع {{ type }} بقيمة {{ value }}",
 
   // "search.filters.applied.f.author": "Author",
-  // TODO New key - Add a translation
-  "search.filters.applied.f.author": "Author",
+  "search.filters.applied.f.author": "المؤلف",
 
   // "search.filters.applied.f.dateIssued.max": "End date",
-  // TODO New key - Add a translation
-  "search.filters.applied.f.dateIssued.max": "End date",
+  "search.filters.applied.f.dateIssued.max": "تاريخ الانتهاء",
 
   // "search.filters.applied.f.dateIssued.min": "Start date",
-  // TODO New key - Add a translation
-  "search.filters.applied.f.dateIssued.min": "Start date",
+  "search.filters.applied.f.dateIssued.min": "تاريخ البدء",
 
   // "search.filters.applied.f.dateSubmitted": "Date submitted",
-  // TODO New key - Add a translation
-  "search.filters.applied.f.dateSubmitted": "Date submitted",
+  "search.filters.applied.f.dateSubmitted": "تاريخ التقديم",
 
-  // "search.filters.applied.f.discoverable": "Private",
-  // TODO New key - Add a translation
-  "search.filters.applied.f.discoverable": "Private",
+  // "search.filters.applied.f.discoverable": "Non-discoverable",
+  "search.filters.applied.f.discoverable": "غير قابل للاكتشاف",
 
   // "search.filters.applied.f.entityType": "Item Type",
-  // TODO New key - Add a translation
-  "search.filters.applied.f.entityType": "Item Type",
+  "search.filters.applied.f.entityType": "نوع المادة",
 
   // "search.filters.applied.f.has_content_in_original_bundle": "Has files",
-  // TODO New key - Add a translation
-  "search.filters.applied.f.has_content_in_original_bundle": "Has files",
+  "search.filters.applied.f.has_content_in_original_bundle": "بها ملفات",
 
   // "search.filters.applied.f.itemtype": "Type",
-  // TODO New key - Add a translation
-  "search.filters.applied.f.itemtype": "Type",
+  "search.filters.applied.f.itemtype": "النوع",
 
   // "search.filters.applied.f.namedresourcetype": "Status",
-  // TODO New key - Add a translation
-  "search.filters.applied.f.namedresourcetype": "Status",
+  "search.filters.applied.f.namedresourcetype": "الحالة",
 
   // "search.filters.applied.f.subject": "Subject",
-  // TODO New key - Add a translation
-  "search.filters.applied.f.subject": "Subject",
+  "search.filters.applied.f.subject": "الموضع",
 
   // "search.filters.applied.f.submitter": "Submitter",
-  // TODO New key - Add a translation
-  "search.filters.applied.f.submitter": "Submitter",
+  "search.filters.applied.f.submitter": "المقدم",
 
   // "search.filters.applied.f.jobTitle": "Job Title",
-  // TODO New key - Add a translation
-  "search.filters.applied.f.jobTitle": "Job Title",
+  "search.filters.applied.f.jobTitle": "المسمى الوظيفي",
 
   // "search.filters.applied.f.birthDate.max": "End birth date",
-  // TODO New key - Add a translation
-  "search.filters.applied.f.birthDate.max": "End birth date",
+  "search.filters.applied.f.birthDate.max": "نهاية تاريخ الميلاد",
 
   // "search.filters.applied.f.birthDate.min": "Start birth date",
-  // TODO New key - Add a translation
-  "search.filters.applied.f.birthDate.min": "Start birth date",
+  "search.filters.applied.f.birthDate.min": "بداية تاريخ الميلاد",
+
+  // "search.filters.applied.f.supervisedBy": "Supervised by",
+  "search.filters.applied.f.supervisedBy": "تحت إشراف",
 
   // "search.filters.applied.f.withdrawn": "Withdrawn",
-  // TODO New key - Add a translation
-  "search.filters.applied.f.withdrawn": "Withdrawn",
-
-
+  "search.filters.applied.f.withdrawn": "مسحوب",
 
   // "search.filters.filter.author.head": "Author",
-  // TODO New key - Add a translation
-  "search.filters.filter.author.head": "Author",
+  "search.filters.filter.author.head": "المؤلف",
 
   // "search.filters.filter.author.placeholder": "Author name",
-  // TODO New key - Add a translation
-  "search.filters.filter.author.placeholder": "Author name",
+  "search.filters.filter.author.placeholder": "اسم المؤلف",
+
+  // "search.filters.filter.author.label": "Search author name",
+  "search.filters.filter.author.label": "بحث اسم المؤلف",
 
   // "search.filters.filter.birthDate.head": "Birth Date",
-  // TODO New key - Add a translation
-  "search.filters.filter.birthDate.head": "Birth Date",
+  "search.filters.filter.birthDate.head": "تاريخ الميلاد",
 
   // "search.filters.filter.birthDate.placeholder": "Birth Date",
-  // TODO New key - Add a translation
-  "search.filters.filter.birthDate.placeholder": "Birth Date",
+  "search.filters.filter.birthDate.placeholder": "تاريخ الميلاد",
+
+  // "search.filters.filter.birthDate.label": "Search birth date",
+  "search.filters.filter.birthDate.label": "بحث تاريخ الميلاد",
+
+  // "search.filters.filter.collapse": "Collapse filter",
+  "search.filters.filter.collapse": "طي المنقح",
 
   // "search.filters.filter.creativeDatePublished.head": "Date Published",
-  // TODO New key - Add a translation
-  "search.filters.filter.creativeDatePublished.head": "Date Published",
+  "search.filters.filter.creativeDatePublished.head": "تاريخ النشر",
 
   // "search.filters.filter.creativeDatePublished.placeholder": "Date Published",
-  // TODO New key - Add a translation
-  "search.filters.filter.creativeDatePublished.placeholder": "Date Published",
+  "search.filters.filter.creativeDatePublished.placeholder": "تاريخ النشر",
+
+  // "search.filters.filter.creativeDatePublished.label": "Search date published",
+  "search.filters.filter.creativeDatePublished.label": "بحث تاريخ النشر",
 
   // "search.filters.filter.creativeWorkEditor.head": "Editor",
-  // TODO New key - Add a translation
-  "search.filters.filter.creativeWorkEditor.head": "Editor",
+  "search.filters.filter.creativeWorkEditor.head": "المحرر",
 
   // "search.filters.filter.creativeWorkEditor.placeholder": "Editor",
-  // TODO New key - Add a translation
-  "search.filters.filter.creativeWorkEditor.placeholder": "Editor",
+  "search.filters.filter.creativeWorkEditor.placeholder": "المحرر",
+
+  // "search.filters.filter.creativeWorkEditor.label": "Search editor",
+  "search.filters.filter.creativeWorkEditor.label": "بحث المحرر",
 
   // "search.filters.filter.creativeWorkKeywords.head": "Subject",
-  // TODO New key - Add a translation
-  "search.filters.filter.creativeWorkKeywords.head": "Subject",
+  "search.filters.filter.creativeWorkKeywords.head": "الموضوع",
 
   // "search.filters.filter.creativeWorkKeywords.placeholder": "Subject",
-  // TODO New key - Add a translation
-  "search.filters.filter.creativeWorkKeywords.placeholder": "Subject",
+  "search.filters.filter.creativeWorkKeywords.placeholder": "الموضوع",
+
+  // "search.filters.filter.creativeWorkKeywords.label": "Search subject",
+  "search.filters.filter.creativeWorkKeywords.label": "بحث الموضوع",
 
   // "search.filters.filter.creativeWorkPublisher.head": "Publisher",
-  // TODO New key - Add a translation
-  "search.filters.filter.creativeWorkPublisher.head": "Publisher",
+  "search.filters.filter.creativeWorkPublisher.head": "الناشر",
 
   // "search.filters.filter.creativeWorkPublisher.placeholder": "Publisher",
-  // TODO New key - Add a translation
-  "search.filters.filter.creativeWorkPublisher.placeholder": "Publisher",
+  "search.filters.filter.creativeWorkPublisher.placeholder": "الناشر",
+
+  // "search.filters.filter.creativeWorkPublisher.label": "Search publisher",
+  "search.filters.filter.creativeWorkPublisher.label": "بحث الناشر",
 
   // "search.filters.filter.dateIssued.head": "Date",
-  // TODO New key - Add a translation
-  "search.filters.filter.dateIssued.head": "Date",
+  "search.filters.filter.dateIssued.head": "التاريخ",
 
-  // "search.filters.filter.dateIssued.max.placeholder": "Minimum Date",
-  // TODO New key - Add a translation
-  "search.filters.filter.dateIssued.max.placeholder": "Minimum Date",
+  // "search.filters.filter.dateIssued.max.placeholder": "Maximum Date",
+  "search.filters.filter.dateIssued.max.placeholder": "الحد الأقصى للتاريخ",
 
-  // "search.filters.filter.dateIssued.min.placeholder": "Maximum Date",
-  // TODO New key - Add a translation
-  "search.filters.filter.dateIssued.min.placeholder": "Maximum Date",
+  // "search.filters.filter.dateIssued.max.label": "End",
+  "search.filters.filter.dateIssued.max.label": "انتهاء",
+
+  // "search.filters.filter.dateIssued.min.placeholder": "Minimum Date",
+  "search.filters.filter.dateIssued.min.placeholder": "الحد الأدنى للتاريخ",
+
+  // "search.filters.filter.dateIssued.min.label": "Start",
+  "search.filters.filter.dateIssued.min.label": "البدء",
 
   // "search.filters.filter.dateSubmitted.head": "Date submitted",
-  // TODO New key - Add a translation
-  "search.filters.filter.dateSubmitted.head": "Date submitted",
+  "search.filters.filter.dateSubmitted.head": "تاريخ التقديم",
 
   // "search.filters.filter.dateSubmitted.placeholder": "Date submitted",
-  // TODO New key - Add a translation
-  "search.filters.filter.dateSubmitted.placeholder": "Date submitted",
+  "search.filters.filter.dateSubmitted.placeholder": "تاريخ التقديم",
 
-  // "search.filters.filter.discoverable.head": "Private",
-  // TODO New key - Add a translation
-  "search.filters.filter.discoverable.head": "Private",
+  // "search.filters.filter.dateSubmitted.label": "Search date submitted",
+  "search.filters.filter.dateSubmitted.label": "بحث تاريخ التقديم",
+
+  // "search.filters.filter.discoverable.head": "Non-discoverable",
+  "search.filters.filter.discoverable.head": "غير قابل للاكتشاف",
 
   // "search.filters.filter.withdrawn.head": "Withdrawn",
-  // TODO New key - Add a translation
-  "search.filters.filter.withdrawn.head": "Withdrawn",
+  "search.filters.filter.withdrawn.head": "مسحوب",
 
   // "search.filters.filter.entityType.head": "Item Type",
-  // TODO New key - Add a translation
-  "search.filters.filter.entityType.head": "Item Type",
+  "search.filters.filter.entityType.head": "نوع المادة",
 
   // "search.filters.filter.entityType.placeholder": "Item Type",
-  // TODO New key - Add a translation
-  "search.filters.filter.entityType.placeholder": "Item Type",
+  "search.filters.filter.entityType.placeholder": "نوع المادة",
+
+  // "search.filters.filter.entityType.label": "Search item type",
+  "search.filters.filter.entityType.label": "بحث نوع المادة",
+
+  // "search.filters.filter.expand": "Expand filter",
+  "search.filters.filter.expand": "توسيع المنقح",
 
   // "search.filters.filter.has_content_in_original_bundle.head": "Has files",
-  // TODO New key - Add a translation
-  "search.filters.filter.has_content_in_original_bundle.head": "Has files",
+  "search.filters.filter.has_content_in_original_bundle.head": "بها ملفات",
 
   // "search.filters.filter.itemtype.head": "Type",
-  // TODO New key - Add a translation
-  "search.filters.filter.itemtype.head": "Type",
+  "search.filters.filter.itemtype.head": "النوع",
 
   // "search.filters.filter.itemtype.placeholder": "Type",
-  // TODO New key - Add a translation
-  "search.filters.filter.itemtype.placeholder": "Type",
+  "search.filters.filter.itemtype.placeholder": "النوع",
+
+  // "search.filters.filter.itemtype.label": "Search type",
+  "search.filters.filter.itemtype.label": "بحث النوع",
 
   // "search.filters.filter.jobTitle.head": "Job Title",
-  // TODO New key - Add a translation
-  "search.filters.filter.jobTitle.head": "Job Title",
+  "search.filters.filter.jobTitle.head": "المسمى الوظيفي",
 
   // "search.filters.filter.jobTitle.placeholder": "Job Title",
-  // TODO New key - Add a translation
-  "search.filters.filter.jobTitle.placeholder": "Job Title",
+  "search.filters.filter.jobTitle.placeholder": "المسمى الوظيفي",
+
+  // "search.filters.filter.jobTitle.label": "Search job title",
+  "search.filters.filter.jobTitle.label": "بحث المسمى الوظيفي",
 
   // "search.filters.filter.knowsLanguage.head": "Known language",
-  // TODO New key - Add a translation
-  "search.filters.filter.knowsLanguage.head": "Known language",
+  "search.filters.filter.knowsLanguage.head": "لغة معروفة",
 
   // "search.filters.filter.knowsLanguage.placeholder": "Known language",
-  // TODO New key - Add a translation
-  "search.filters.filter.knowsLanguage.placeholder": "Known language",
+  "search.filters.filter.knowsLanguage.placeholder": "لغة معروفة",
+
+  // "search.filters.filter.knowsLanguage.label": "Search known language",
+  "search.filters.filter.knowsLanguage.label": "بحث لغة معروفة",
 
   // "search.filters.filter.namedresourcetype.head": "Status",
-  // TODO New key - Add a translation
-  "search.filters.filter.namedresourcetype.head": "Status",
+  "search.filters.filter.namedresourcetype.head": "الحالة",
 
   // "search.filters.filter.namedresourcetype.placeholder": "Status",
-  // TODO New key - Add a translation
-  "search.filters.filter.namedresourcetype.placeholder": "Status",
+  "search.filters.filter.namedresourcetype.placeholder": "الحالة",
+
+  // "search.filters.filter.namedresourcetype.label": "Search status",
+  "search.filters.filter.namedresourcetype.label": "بحث الحالة",
 
   // "search.filters.filter.objectpeople.head": "People",
-  // TODO New key - Add a translation
-  "search.filters.filter.objectpeople.head": "People",
+  "search.filters.filter.objectpeople.head": "أشخاص",
 
   // "search.filters.filter.objectpeople.placeholder": "People",
-  // TODO New key - Add a translation
-  "search.filters.filter.objectpeople.placeholder": "People",
+  "search.filters.filter.objectpeople.placeholder": "أشخاص",
+
+  // "search.filters.filter.objectpeople.label": "Search people",
+  "search.filters.filter.objectpeople.label": "بحث الأشخاص",
 
   // "search.filters.filter.organizationAddressCountry.head": "Country",
-  // TODO New key - Add a translation
-  "search.filters.filter.organizationAddressCountry.head": "Country",
+  "search.filters.filter.organizationAddressCountry.head": "البلد",
 
   // "search.filters.filter.organizationAddressCountry.placeholder": "Country",
-  // TODO New key - Add a translation
-  "search.filters.filter.organizationAddressCountry.placeholder": "Country",
+  "search.filters.filter.organizationAddressCountry.placeholder": "البلد",
+
+  // "search.filters.filter.organizationAddressCountry.label": "Search country",
+  "search.filters.filter.organizationAddressCountry.label": "بحث البلد",
 
   // "search.filters.filter.organizationAddressLocality.head": "City",
-  // TODO New key - Add a translation
-  "search.filters.filter.organizationAddressLocality.head": "City",
+  "search.filters.filter.organizationAddressLocality.head": "المدينة",
 
   // "search.filters.filter.organizationAddressLocality.placeholder": "City",
-  // TODO New key - Add a translation
-  "search.filters.filter.organizationAddressLocality.placeholder": "City",
+  "search.filters.filter.organizationAddressLocality.placeholder": "المدينة",
+
+  // "search.filters.filter.organizationAddressLocality.label": "Search city",
+  "search.filters.filter.organizationAddressLocality.label": "بحث المدينة",
 
   // "search.filters.filter.organizationFoundingDate.head": "Date Founded",
-  // TODO New key - Add a translation
-  "search.filters.filter.organizationFoundingDate.head": "Date Founded",
+  "search.filters.filter.organizationFoundingDate.head": "تاريخ التأسيس",
 
   // "search.filters.filter.organizationFoundingDate.placeholder": "Date Founded",
-  // TODO New key - Add a translation
-  "search.filters.filter.organizationFoundingDate.placeholder": "Date Founded",
+  "search.filters.filter.organizationFoundingDate.placeholder": "تاريخ التأسيس",
+
+  // "search.filters.filter.organizationFoundingDate.label": "Search date founded",
+  "search.filters.filter.organizationFoundingDate.label": "بحث تاريخ التأسيس",
 
   // "search.filters.filter.scope.head": "Scope",
-  // TODO New key - Add a translation
-  "search.filters.filter.scope.head": "Scope",
+  "search.filters.filter.scope.head": "النطاق",
 
   // "search.filters.filter.scope.placeholder": "Scope filter",
-  // TODO New key - Add a translation
-  "search.filters.filter.scope.placeholder": "Scope filter",
+  "search.filters.filter.scope.placeholder": "منقح النطاق",
+
+  // "search.filters.filter.scope.label": "Search scope filter",
+  "search.filters.filter.scope.label": "منقح نطاق البحث",
 
   // "search.filters.filter.show-less": "Collapse",
-  // TODO New key - Add a translation
-  "search.filters.filter.show-less": "Collapse",
+  "search.filters.filter.show-less": "طي",
 
   // "search.filters.filter.show-more": "Show more",
-  // TODO New key - Add a translation
-  "search.filters.filter.show-more": "Show more",
+  "search.filters.filter.show-more": "عرض المزيد",
 
   // "search.filters.filter.subject.head": "Subject",
-  // TODO New key - Add a translation
-  "search.filters.filter.subject.head": "Subject",
+  "search.filters.filter.subject.head": "الموضوع",
 
   // "search.filters.filter.subject.placeholder": "Subject",
-  // TODO New key - Add a translation
-  "search.filters.filter.subject.placeholder": "Subject",
+  "search.filters.filter.subject.placeholder": "الموضوع",
+
+  // "search.filters.filter.subject.label": "Search subject",
+  "search.filters.filter.subject.label": "بحث الموضوع",
 
   // "search.filters.filter.submitter.head": "Submitter",
-  // TODO New key - Add a translation
-  "search.filters.filter.submitter.head": "Submitter",
+  "search.filters.filter.submitter.head": "المقدم",
 
   // "search.filters.filter.submitter.placeholder": "Submitter",
-  // TODO New key - Add a translation
-  "search.filters.filter.submitter.placeholder": "Submitter",
+  "search.filters.filter.submitter.placeholder": "المقدم",
 
+  // "search.filters.filter.submitter.label": "Search submitter",
+  "search.filters.filter.submitter.label": "مقدم البحث",
 
+  // "search.filters.filter.show-tree": "Browse {{ name }} tree",
+  "search.filters.filter.show-tree": "استعراض شجرة {{ name }}",
+
+  // "search.filters.filter.funding.head": "Funding",
+  "search.filters.filter.funding.head": "التمويل",
+
+  // "search.filters.filter.funding.placeholder": "Funding",
+  "search.filters.filter.funding.placeholder": "التمويل",
+
+  // "search.filters.filter.supervisedBy.head": "Supervised By",
+  "search.filters.filter.supervisedBy.head": "تحت إشراف",
+
+  // "search.filters.filter.supervisedBy.placeholder": "Supervised By",
+  "search.filters.filter.supervisedBy.placeholder": "تحت إشراف",
+
+  // "search.filters.filter.supervisedBy.label": "Search Supervised By",
+  "search.filters.filter.supervisedBy.label": "البحث تحت إشراف",
 
   // "search.filters.entityType.JournalIssue": "Journal Issue",
-  // TODO New key - Add a translation
-  "search.filters.entityType.JournalIssue": "Journal Issue",
+  "search.filters.entityType.JournalIssue": "عدد الدورية",
 
   // "search.filters.entityType.JournalVolume": "Journal Volume",
-  // TODO New key - Add a translation
-  "search.filters.entityType.JournalVolume": "Journal Volume",
+  "search.filters.entityType.JournalVolume": "مجلد الدورية",
 
   // "search.filters.entityType.OrgUnit": "Organizational Unit",
+  "search.filters.entityType.OrgUnit": "وحدة مؤسسية",
+
+  // "search.filters.entityType.Person": "Person",
   // TODO New key - Add a translation
-  "search.filters.entityType.OrgUnit": "Organizational Unit",
+  "search.filters.entityType.Person": "Person",
+
+  // "search.filters.entityType.Project": "Project",
+  // TODO New key - Add a translation
+  "search.filters.entityType.Project": "Project",
+
+  // "search.filters.entityType.Publication": "Publication",
+  // TODO New key - Add a translation
+  "search.filters.entityType.Publication": "Publication",
 
   // "search.filters.has_content_in_original_bundle.true": "Yes",
-  // TODO New key - Add a translation
-  "search.filters.has_content_in_original_bundle.true": "Yes",
+  "search.filters.has_content_in_original_bundle.true": "نعم",
 
   // "search.filters.has_content_in_original_bundle.false": "No",
-  // TODO New key - Add a translation
-  "search.filters.has_content_in_original_bundle.false": "No",
+  "search.filters.has_content_in_original_bundle.false": "لا",
 
   // "search.filters.discoverable.true": "No",
-  // TODO New key - Add a translation
-  "search.filters.discoverable.true": "No",
+  "search.filters.discoverable.true": "لا",
 
   // "search.filters.discoverable.false": "Yes",
-  // TODO New key - Add a translation
-  "search.filters.discoverable.false": "Yes",
+  "search.filters.discoverable.false": "نعم",
+
+  // "search.filters.namedresourcetype.Archived": "Archived",
+  "search.filters.namedresourcetype.Archived": "مؤرشف",
+
+  // "search.filters.namedresourcetype.Validation": "Validation",
+  "search.filters.namedresourcetype.Validation": "التحقق من الصحة",
+
+  // "search.filters.namedresourcetype.Waiting for Controller": "Waiting for reviewer",
+  "search.filters.namedresourcetype.Waiting for Controller": "في انتظار المراجع",
+
+  // "search.filters.namedresourcetype.Workflow": "Workflow",
+  "search.filters.namedresourcetype.Workflow": "سير العمل",
+
+  // "search.filters.namedresourcetype.Workspace": "Workspace",
+  "search.filters.namedresourcetype.Workspace": "مساحة العمل",
 
   // "search.filters.withdrawn.true": "Yes",
-  // TODO New key - Add a translation
-  "search.filters.withdrawn.true": "Yes",
+  "search.filters.withdrawn.true": "نعم",
 
   // "search.filters.withdrawn.false": "No",
-  // TODO New key - Add a translation
-  "search.filters.withdrawn.false": "No",
-
+  "search.filters.withdrawn.false": "لا",
 
   // "search.filters.head": "Filters",
-  // TODO New key - Add a translation
-  "search.filters.head": "Filters",
+  "search.filters.head": "المنقحات",
 
   // "search.filters.reset": "Reset filters",
-  // TODO New key - Add a translation
-  "search.filters.reset": "Reset filters",
-
+  "search.filters.reset": "إعادة تعيين المنقحات",
 
+  // "search.filters.search.submit": "Submit",
+  "search.filters.search.submit": "تقديم",
 
   // "search.form.search": "Search",
-  // TODO New key - Add a translation
-  "search.form.search": "Search",
-
-  // "search.form.search_dspace": "Search DSpace",
-  // TODO New key - Add a translation
-  "search.form.search_dspace": "Search DSpace",
-
-  // "search.form.search_mydspace": "Search MyDSpace",
-  // TODO New key - Add a translation
-  "search.form.search_mydspace": "Search MyDSpace",
+  "search.form.search": "بحث",
 
+  // "search.form.search_dspace": "All repository",
+  "search.form.search_dspace": "كل المستودع",
 
+  // "search.form.scope.all": "All of DSpace",
+  "search.form.scope.all": "كل دي سبيس",
 
   // "search.results.head": "Search Results",
-  // TODO New key - Add a translation
-  "search.results.head": "Search Results",
+  "search.results.head": "نتائج البحث",
 
   // "search.results.no-results": "Your search returned no results. Having trouble finding what you're looking for? Try putting",
-  // TODO New key - Add a translation
-  "search.results.no-results": "Your search returned no results. Having trouble finding what you're looking for? Try putting",
+  "search.results.no-results": "لم يسفر بحثك عن أي نتائج. هل تجد صعوبة في العثور على ما تبحث عنه؟ جرب وضع",
 
   // "search.results.no-results-link": "quotes around it",
-  // TODO New key - Add a translation
-  "search.results.no-results-link": "quotes around it",
+  "search.results.no-results-link": "قوسي نص حوله",
 
   // "search.results.empty": "Your search returned no results.",
+  "search.results.empty": "لم يسفر بحثك عن أي نتائج.",
+
+  // "search.results.view-result": "View",
+  "search.results.view-result": "عرض",
+
+  // "search.results.response.500": "An error occurred during query execution, please try again later",
+  "search.results.response.500": "حدث خطأ أثناء تنفيذ الاستعلام، يرجى إعادة المحاولة مرة أخرى لاحقاً",
+
+  // "default.search.results.head": "Search Results",
+  "default.search.results.head": "نتائج البحث",
+
+  // "default-relationships.search.results.head": "Search Results",
   // TODO New key - Add a translation
-  "search.results.empty": "Your search returned no results.",
-
-
+  "default-relationships.search.results.head": "Search Results",
 
   // "search.sidebar.close": "Back to results",
-  // TODO New key - Add a translation
-  "search.sidebar.close": "Back to results",
+  "search.sidebar.close": "العودة إلى النتائج",
 
   // "search.sidebar.filters.title": "Filters",
-  // TODO New key - Add a translation
-  "search.sidebar.filters.title": "Filters",
+  "search.sidebar.filters.title": "المنقحات",
 
   // "search.sidebar.open": "Search Tools",
-  // TODO New key - Add a translation
-  "search.sidebar.open": "Search Tools",
+  "search.sidebar.open": "أدوات البحث",
 
   // "search.sidebar.results": "results",
-  // TODO New key - Add a translation
-  "search.sidebar.results": "results",
+  "search.sidebar.results": "النتائج",
 
   // "search.sidebar.settings.rpp": "Results per page",
-  // TODO New key - Add a translation
-  "search.sidebar.settings.rpp": "Results per page",
+  "search.sidebar.settings.rpp": "النتائج لكل صفحة",
 
   // "search.sidebar.settings.sort-by": "Sort By",
-  // TODO New key - Add a translation
-  "search.sidebar.settings.sort-by": "Sort By",
+  "search.sidebar.settings.sort-by": "فرز حسب",
 
   // "search.sidebar.settings.title": "Settings",
-  // TODO New key - Add a translation
-  "search.sidebar.settings.title": "Settings",
-
-
+  "search.sidebar.settings.title": "الإعدادات",
 
   // "search.view-switch.show-detail": "Show detail",
-  // TODO New key - Add a translation
-  "search.view-switch.show-detail": "Show detail",
+  "search.view-switch.show-detail": "عرض التفاصل",
 
   // "search.view-switch.show-grid": "Show as grid",
-  // TODO New key - Add a translation
-  "search.view-switch.show-grid": "Show as grid",
+  "search.view-switch.show-grid": "عرض كشبكة",
 
   // "search.view-switch.show-list": "Show as list",
-  // TODO New key - Add a translation
-  "search.view-switch.show-list": "Show as list",
+  "search.view-switch.show-list": "عرض كقائمة",
 
+  // "selectable-list-item-control.deselect": "Deselect item",
+  "selectable-list-item-control.deselect": "إلغاء تحديد المادة",
 
+  // "selectable-list-item-control.select": "Select item",
+  "selectable-list-item-control.select": "تحديد المادة",
 
   // "sorting.ASC": "Ascending",
-  // TODO New key - Add a translation
-  "sorting.ASC": "Ascending",
+  "sorting.ASC": "تصاعدياً",
 
   // "sorting.DESC": "Descending",
-  // TODO New key - Add a translation
-  "sorting.DESC": "Descending",
+  "sorting.DESC": "تنازلياً",
 
   // "sorting.dc.title.ASC": "Title Ascending",
-  // TODO New key - Add a translation
-  "sorting.dc.title.ASC": "Title Ascending",
+  "sorting.dc.title.ASC": "العنوان تصاعدياً",
 
   // "sorting.dc.title.DESC": "Title Descending",
+  "sorting.dc.title.DESC": "العنوان تنازلياً",
+
+  // "sorting.score.ASC": "Least Relevant",
+  "sorting.score.ASC": "الأقل صلة",
+
+  // "sorting.score.DESC": "Most Relevant",
+  "sorting.score.DESC": "الأكثر صلة",
+
+  // "sorting.dc.date.issued.ASC": "Date Issued Ascending",
+  "sorting.dc.date.issued.ASC": "تاريخ الإصدار تصاعدياً",
+
+  // "sorting.dc.date.issued.DESC": "Date Issued Descending",
+  "sorting.dc.date.issued.DESC": "تاريخ الإصدار تنازلياً",
+
+  // "sorting.dc.date.accessioned.ASC": "Accessioned Date Ascending",
+  "sorting.dc.date.accessioned.ASC": "تاريخ الإيداع تصاعدياً",
+
+  // "sorting.dc.date.accessioned.DESC": "Accessioned Date Descending",
+  "sorting.dc.date.accessioned.DESC": "تاريخ الإيداع تنازلياً",
+
+  // "sorting.lastModified.ASC": "Last modified Ascending",
+  "sorting.lastModified.ASC": "آخر تعديل تصاعدياً",
+
+  // "sorting.lastModified.DESC": "Last modified Descending",
+  "sorting.lastModified.DESC": "آخر تعديل تنازلياً",
+
+  // "sorting.person.familyName.ASC": "Surname Ascending",
   // TODO New key - Add a translation
-  "sorting.dc.title.DESC": "Title Descending",
+  "sorting.person.familyName.ASC": "Surname Ascending",
 
-  // "sorting.score.DESC": "Relevance",
+  // "sorting.person.familyName.DESC": "Surname Descending",
   // TODO New key - Add a translation
-  "sorting.score.DESC": "Relevance",
+  "sorting.person.familyName.DESC": "Surname Descending",
 
+  // "sorting.person.givenName.ASC": "Name Ascending",
+  // TODO New key - Add a translation
+  "sorting.person.givenName.ASC": "Name Ascending",
 
+  // "sorting.person.givenName.DESC": "Name Descending",
+  // TODO New key - Add a translation
+  "sorting.person.givenName.DESC": "Name Descending",
+
+  // "sorting.person.birthDate.ASC": "Birth Date Ascending",
+  // TODO New key - Add a translation
+  "sorting.person.birthDate.ASC": "Birth Date Ascending",
+
+  // "sorting.person.birthDate.DESC": "Birth Date Descending",
+  // TODO New key - Add a translation
+  "sorting.person.birthDate.DESC": "Birth Date Descending",
 
   // "statistics.title": "Statistics",
-  // TODO New key - Add a translation
-  "statistics.title": "Statistics",
+  "statistics.title": "الاحصائيات",
 
   // "statistics.header": "Statistics for {{ scope }}",
-  // TODO New key - Add a translation
-  "statistics.header": "Statistics for {{ scope }}",
+  "statistics.header": "احصائيات لـ {{ scope }}",
 
   // "statistics.breadcrumbs": "Statistics",
-  // TODO New key - Add a translation
-  "statistics.breadcrumbs": "Statistics",
+  "statistics.breadcrumbs": "الاحصائيات",
 
   // "statistics.page.no-data": "No data available",
-  // TODO New key - Add a translation
-  "statistics.page.no-data": "No data available",
+  "statistics.page.no-data": "لا تتوافر أي بيانات",
 
   // "statistics.table.no-data": "No data available",
-  // TODO New key - Add a translation
-  "statistics.table.no-data": "No data available",
+  "statistics.table.no-data": "لا تتوافر أي بيانات",
 
   // "statistics.table.title.TotalVisits": "Total visits",
-  // TODO New key - Add a translation
-  "statistics.table.title.TotalVisits": "Total visits",
+  "statistics.table.title.TotalVisits": "إجمالي الزيارات",
 
   // "statistics.table.title.TotalVisitsPerMonth": "Total visits per month",
-  // TODO New key - Add a translation
-  "statistics.table.title.TotalVisitsPerMonth": "Total visits per month",
+  "statistics.table.title.TotalVisitsPerMonth": "إجمالي الزيارات لكل شهر",
 
   // "statistics.table.title.TotalDownloads": "File Visits",
-  // TODO New key - Add a translation
-  "statistics.table.title.TotalDownloads": "File Visits",
+  "statistics.table.title.TotalDownloads": "زيارات الملف",
 
   // "statistics.table.title.TopCountries": "Top country views",
-  // TODO New key - Add a translation
-  "statistics.table.title.TopCountries": "Top country views",
+  "statistics.table.title.TopCountries": "أعلى مشاهدات على مستوى البلد",
 
   // "statistics.table.title.TopCities": "Top city views",
-  // TODO New key - Add a translation
-  "statistics.table.title.TopCities": "Top city views",
+  "statistics.table.title.TopCities": "أعلى مشاهدات على مستوى المدينة",
 
   // "statistics.table.header.views": "Views",
-  // TODO New key - Add a translation
-  "statistics.table.header.views": "Views",
+  "statistics.table.header.views": "المشاهدات",
 
+  // "statistics.table.no-name": "(object name could not be loaded)",
+  "statistics.table.no-name": "(تعذر تحميل اسم الكائن)",
 
+  // "submission.edit.breadcrumbs": "Edit Submission",
+  "submission.edit.breadcrumbs": "تحرير التقديم",
 
   // "submission.edit.title": "Edit Submission",
-  // TODO New key - Add a translation
-  "submission.edit.title": "Edit Submission",
+  "submission.edit.title": "تحرير التقديم",
 
-  // "submission.general.cannot_submit": "You have not the privilege to make a new submission.",
-  // TODO New key - Add a translation
-  "submission.general.cannot_submit": "You have not the privilege to make a new submission.",
+  // "submission.general.cancel": "Cancel",
+  "submission.general.cancel": "إلغاء",
+
+  // "submission.general.cannot_submit": "You don't have permission to make a new submission.",
+  "submission.general.cannot_submit": "ليس لديك صلاحية القيام بتقديم جديد.",
 
   // "submission.general.deposit": "Deposit",
-  // TODO New key - Add a translation
-  "submission.general.deposit": "Deposit",
+  "submission.general.deposit": "إيداع",
 
   // "submission.general.discard.confirm.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "submission.general.discard.confirm.cancel": "Cancel",
+  "submission.general.discard.confirm.cancel": "إلغاء",
 
   // "submission.general.discard.confirm.info": "This operation can't be undone. Are you sure?",
-  // TODO New key - Add a translation
-  "submission.general.discard.confirm.info": "This operation can't be undone. Are you sure?",
+  "submission.general.discard.confirm.info": "لا يمكن التراجع عن هذه العملية. هل أنت متأكد؟",
 
   // "submission.general.discard.confirm.submit": "Yes, I'm sure",
-  // TODO New key - Add a translation
-  "submission.general.discard.confirm.submit": "Yes, I'm sure",
+  "submission.general.discard.confirm.submit": "نعم، متأكد",
 
   // "submission.general.discard.confirm.title": "Discard submission",
-  // TODO New key - Add a translation
-  "submission.general.discard.confirm.title": "Discard submission",
+  "submission.general.discard.confirm.title": "تجاهل التقديم",
 
   // "submission.general.discard.submit": "Discard",
+  "submission.general.discard.submit": "تجاهل",
+
+  // "submission.general.back.submit": "Back",
   // TODO New key - Add a translation
-  "submission.general.discard.submit": "Discard",
+  "submission.general.back.submit": "Back",
+
+  // "submission.general.info.saved": "Saved",
+  "submission.general.info.saved": "محفوظ",
+
+  // "submission.general.info.pending-changes": "Unsaved changes",
+  "submission.general.info.pending-changes": "تغييرات غير محفوظة",
 
   // "submission.general.save": "Save",
-  // TODO New key - Add a translation
-  "submission.general.save": "Save",
+  "submission.general.save": "حفظ",
 
   // "submission.general.save-later": "Save for later",
-  // TODO New key - Add a translation
-  "submission.general.save-later": "Save for later",
-
+  "submission.general.save-later": "حفظ لوقت لاحق",
 
   // "submission.import-external.page.title": "Import metadata from an external source",
-  // TODO New key - Add a translation
-  "submission.import-external.page.title": "Import metadata from an external source",
+  "submission.import-external.page.title": "استيراد ميتاداتا من مصدر خارجي",
 
   // "submission.import-external.title": "Import metadata from an external source",
-  // TODO New key - Add a translation
-  "submission.import-external.title": "Import metadata from an external source",
+  "submission.import-external.title": "استيراد ميتاداتا من مصدر خارجي",
+
+  // "submission.import-external.title.Journal": "Import a journal from an external source",
+  "submission.import-external.title.Journal": "استيراد دورية من مصدر خارجي",
+
+  // "submission.import-external.title.JournalIssue": "Import a journal issue from an external source",
+  "submission.import-external.title.JournalIssue": "استيراد عدد دورية من مصدر خارجيe",
+
+  // "submission.import-external.title.JournalVolume": "Import a journal volume from an external source",
+  "submission.import-external.title.JournalVolume": "استيراد مجلد دورية من مصدر خارجي",
+
+  // "submission.import-external.title.OrgUnit": "Import a publisher from an external source",
+  "submission.import-external.title.OrgUnit": "استيراد ناشر من مصدر خارجي",
+
+  // "submission.import-external.title.Person": "Import a person from an external source",
+  "submission.import-external.title.Person": "استيراد شخص من مصدر خارجي",
+
+  // "submission.import-external.title.Project": "Import a project from an external source",
+  "submission.import-external.title.Project": "استيراد مشروع من مصدر خارجي",
+
+  // "submission.import-external.title.Publication": "Import a publication from an external source",
+  "submission.import-external.title.Publication": "استيراد منشور من مصدر خارجي",
+
+  // "submission.import-external.title.none": "Import metadata from an external source",
+  "submission.import-external.title.none": "استيراد ميتاداتا من مصدر خارجي",
 
   // "submission.import-external.page.hint": "Enter a query above to find items from the web to import in to DSpace.",
-  // TODO New key - Add a translation
-  "submission.import-external.page.hint": "Enter a query above to find items from the web to import in to DSpace.",
+  "submission.import-external.page.hint": "قم بإدخال استعلام أعلاه للعثور على مواد من الويب لاستيرادها إلى دي سبيس.",
 
   // "submission.import-external.back-to-my-dspace": "Back to MyDSpace",
-  // TODO New key - Add a translation
-  "submission.import-external.back-to-my-dspace": "Back to MyDSpace",
+  "submission.import-external.back-to-my-dspace": "العودة إلى ماي سبيس",
 
   // "submission.import-external.search.placeholder": "Search the external source",
-  // TODO New key - Add a translation
-  "submission.import-external.search.placeholder": "Search the external source",
+  "submission.import-external.search.placeholder": "بحث المصدر الخارجي",
 
   // "submission.import-external.search.button": "Search",
-  // TODO New key - Add a translation
-  "submission.import-external.search.button": "Search",
+  "submission.import-external.search.button": "بحث",
 
   // "submission.import-external.search.button.hint": "Write some words to search",
-  // TODO New key - Add a translation
-  "submission.import-external.search.button.hint": "Write some words to search",
+  "submission.import-external.search.button.hint": "اكتب بعض الكلمات للبحث",
 
   // "submission.import-external.search.source.hint": "Pick an external source",
-  // TODO New key - Add a translation
-  "submission.import-external.search.source.hint": "Pick an external source",
+  "submission.import-external.search.source.hint": "اختر مصدراً خارجياً",
 
   // "submission.import-external.source.arxiv": "arXiv",
-  // TODO New key - Add a translation
   "submission.import-external.source.arxiv": "arXiv",
 
-  // "submission.import-external.source.loading": "Loading ...",
+  // "submission.import-external.source.ads": "NASA/ADS",
+  "submission.import-external.source.ads": "ناسا/ADS",
+
+  // "submission.import-external.source.cinii": "CiNii",
+  "submission.import-external.source.cinii": "CiNii",
+
+  // "submission.import-external.source.crossref": "CrossRef",
+  "submission.import-external.source.crossref": "كروس ريف",
+
+  // "submission.import-external.source.datacite": "DataCite",
+  "submission.import-external.source.datacite": "داتاسايت",
+
+  // "submission.import-external.source.doi": "DOI",
   // TODO New key - Add a translation
-  "submission.import-external.source.loading": "Loading ...",
+  "submission.import-external.source.doi": "DOI",
+
+  // "submission.import-external.source.scielo": "SciELO",
+  "submission.import-external.source.scielo": "SciELO",
+
+  // "submission.import-external.source.scopus": "Scopus",
+  "submission.import-external.source.scopus": "سكوبس",
+
+  // "submission.import-external.source.vufind": "VuFind",
+  "submission.import-external.source.vufind": "فيوفايند",
+
+  // "submission.import-external.source.wos": "Web Of Science",
+  "submission.import-external.source.wos": "شبكة العلوم",
+
+  // "submission.import-external.source.orcidWorks": "ORCID",
+  "submission.import-external.source.orcidWorks": "أوركيد",
+
+  // "submission.import-external.source.epo": "European Patent Office (EPO)",
+  "submission.import-external.source.epo": "مكتب براءات الاختراع الأوروبي (EPO)",
+
+  // "submission.import-external.source.loading": "Loading ...",
+  "submission.import-external.source.loading": "جاري التحميل ...",
 
   // "submission.import-external.source.sherpaJournal": "SHERPA Journals",
-  // TODO New key - Add a translation
-  "submission.import-external.source.sherpaJournal": "SHERPA Journals",
+  "submission.import-external.source.sherpaJournal": "دوريات شيربا",
+
+  // "submission.import-external.source.sherpaJournalIssn": "SHERPA Journals by ISSN",
+  "submission.import-external.source.sherpaJournalIssn": "دوريات شيربا بواسطة الردمد",
 
   // "submission.import-external.source.sherpaPublisher": "SHERPA Publishers",
-  // TODO New key - Add a translation
-  "submission.import-external.source.sherpaPublisher": "SHERPA Publishers",
+  "submission.import-external.source.sherpaPublisher": "ناشري شيربا",
+
+  // "submission.import-external.source.openAIREFunding": "Funding OpenAIRE API",
+  "submission.import-external.source.openAIREFunding": "تمويل واجهة برمجة تطبيقات OpenAIRE",
 
   // "submission.import-external.source.orcid": "ORCID",
-  // TODO New key - Add a translation
-  "submission.import-external.source.orcid": "ORCID",
+  "submission.import-external.source.orcid": "أوركيد",
 
   // "submission.import-external.source.pubmed": "Pubmed",
-  // TODO New key - Add a translation
   "submission.import-external.source.pubmed": "Pubmed",
 
+  // "submission.import-external.source.pubmedeu": "Pubmed Europe",
+  "submission.import-external.source.pubmedeu": "Pubmed Europe",
+
   // "submission.import-external.source.lcname": "Library of Congress Names",
-  // TODO New key - Add a translation
-  "submission.import-external.source.lcname": "Library of Congress Names",
+  "submission.import-external.source.lcname": "أسماء مكتبة الكونجرس",
+
+  // "submission.import-external.source.ror": "Research Organization Registry (ROR)",
+  "submission.import-external.source.ror": "سجل المؤسسات البحثية (ROR)",
 
   // "submission.import-external.preview.title": "Item Preview",
-  // TODO New key - Add a translation
-  "submission.import-external.preview.title": "Item Preview",
+  "submission.import-external.preview.title": "معاينة المادة",
+
+  // "submission.import-external.preview.title.Publication": "Publication Preview",
+  "submission.import-external.preview.title.Publication": "معاينة المنشور",
+
+  // "submission.import-external.preview.title.none": "Item Preview",
+  "submission.import-external.preview.title.none": "معاينة المادة",
+
+  // "submission.import-external.preview.title.Journal": "Journal Preview",
+  "submission.import-external.preview.title.Journal": "معاينة الدورية",
+
+  // "submission.import-external.preview.title.OrgUnit": "Organizational Unit Preview",
+  "submission.import-external.preview.title.OrgUnit": "معاينة الوحدة المؤسسية",
+
+  // "submission.import-external.preview.title.Person": "Person Preview",
+  "submission.import-external.preview.title.Person": "معاينة الشخص",
+
+  // "submission.import-external.preview.title.Project": "Project Preview",
+  "submission.import-external.preview.title.Project": "معاينة المشروع",
 
   // "submission.import-external.preview.subtitle": "The metadata below was imported from an external source. It will be pre-filled when you start the submission.",
-  // TODO New key - Add a translation
-  "submission.import-external.preview.subtitle": "The metadata below was imported from an external source. It will be pre-filled when you start the submission.",
+  "submission.import-external.preview.subtitle": "تم استيراد الميتاداتا أدناه من مصدر خارجي. ستتم تعبئتها بشكل مسبق عند بدء التقديم.",
 
   // "submission.import-external.preview.button.import": "Start submission",
-  // TODO New key - Add a translation
-  "submission.import-external.preview.button.import": "Start submission",
+  "submission.import-external.preview.button.import": "بدء التقديم",
 
   // "submission.import-external.preview.error.import.title": "Submission error",
-  // TODO New key - Add a translation
-  "submission.import-external.preview.error.import.title": "Submission error",
+  "submission.import-external.preview.error.import.title": "خطأ في التقديم",
 
   // "submission.import-external.preview.error.import.body": "An error occurs during the external source entry import process.",
-  // TODO New key - Add a translation
-  "submission.import-external.preview.error.import.body": "An error occurs during the external source entry import process.",
+  "submission.import-external.preview.error.import.body": "حدث خطأ أثناء عملية استيراد مدخل المصدر الخارجي.",
 
   // "submission.sections.describe.relationship-lookup.close": "Close",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.close": "Close",
+  "submission.sections.describe.relationship-lookup.close": "إغلاق",
 
   // "submission.sections.describe.relationship-lookup.external-source.added": "Successfully added local entry to the selection",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.external-source.added": "Successfully added local entry to the selection",
+  "submission.sections.describe.relationship-lookup.external-source.added": "تمت إضافة المدخل المحلي بنجاح إلى التحديد",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-button-title.isAuthorOfPublication": "Import remote author",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.external-source.import-button-title.isAuthorOfPublication": "Import remote author",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.isAuthorOfPublication": "استيراد مؤلف بعيد",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-button-title.Journal": "Import remote journal",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Journal": "Import remote journal",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Journal": "استيراد دورية بعيدة",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-button-title.Journal Issue": "Import remote journal issue",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Journal Issue": "Import remote journal issue",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Journal Issue": "استيراد عدد دورية بعيد",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-button-title.Journal Volume": "Import remote journal volume",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Journal Volume": "Import remote journal volume",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Journal Volume": "استيراد مجلد دورية بعيد",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-button-title.isProjectOfPublication": "Project",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.isProjectOfPublication": "المشروع",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-button-title.none": "Import remote item",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.none": "استيراد مادة بعيدة",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-button-title.Event": "Import remote event",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Event": "استيراد فعالية بعيدة",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-button-title.Product": "Import remote product",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Product": "استيراد منتج بعيد",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-button-title.Equipment": "Import remote equipment",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Equipment": "استيراد معدات بعيدة",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-button-title.OrgUnit": "Import remote organizational unit",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.OrgUnit": "استيراد وحدة مؤسسية بعيدة",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-button-title.Funding": "Import remote fund",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Funding": "استيراد تمويل بعيد",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-button-title.Person": "Import remote person",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Person": "استيراد شخص بعيد",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-button-title.Patent": "Import remote patent",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Patent": "استيراد براءة اختراع بعيدة",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-button-title.Project": "Import remote project",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Project": "استيراد مشروع بعيد",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-button-title.Publication": "Import remote publication",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Publication": "استيراد منشور بعيد",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.isProjectOfPublication.added.new-entity": "New Entity Added!",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.isProjectOfPublication.added.new-entity": "تمت إضافة كينونة جديدة!",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.isProjectOfPublication.title": "Project",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.isProjectOfPublication.title": "مشروع",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.openAIREFunding": "Funding OpenAIRE API",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.openAIREFunding": "تمويل واجهة برمجة تطبيقات OpenAIRE",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.isAuthorOfPublication.title": "Import Remote Author",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.isAuthorOfPublication.title": "Import Remote Author",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.isAuthorOfPublication.title": "استيراد مؤلف بعيد",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.isAuthorOfPublication.added.local-entity": "Successfully added local author to the selection",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.isAuthorOfPublication.added.local-entity": "Successfully added local author to the selection",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.isAuthorOfPublication.added.local-entity": "تمت إضافة المؤلف المحلي بنجاح إلى التحديد",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.isAuthorOfPublication.added.new-entity": "Successfully imported and added external author to the selection",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.isAuthorOfPublication.added.new-entity": "Successfully imported and added external author to the selection",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.isAuthorOfPublication.added.new-entity": "تم استيراد وإضافة المؤلف الخارجي بنجاح إلى التحديد",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.authority": "Authority",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.authority": "Authority",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.authority": "الاستناد",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.authority.new": "Import as a new local authority entry",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.authority.new": "Import as a new local authority entry",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.authority.new": "استيراد كإدخال استناد محلي جديد",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.cancel": "Cancel",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.cancel": "إلغاء",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.collection": "Select a collection to import new entries to",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.collection": "Select a collection to import new entries to",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.collection": "حدد حاوية لاستيراد الإدخالات الجديدة إليها",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.entities": "Entities",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.entities": "Entities",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.entities": "الكينونات",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.entities.new": "Import as a new local entity",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.entities.new": "Import as a new local entity",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.entities.new": "استيراد ككينونة محلية جديدة",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.lcname": "Importing from LC Name",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.lcname": "Importing from LC Name",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.lcname": "استيراد من اسم مكتبة الكونجرس",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.orcid": "Importing from ORCID",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.orcid": "Importing from ORCID",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.orcid": "استيراد من أوركيد",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.sherpaJournal": "Importing from Sherpa Journal",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.sherpaJournal": "Importing from Sherpa Journal",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.sherpaJournal": "استيراد من دورية شيربا",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.sherpaPublisher": "Importing from Sherpa Publisher",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.sherpaPublisher": "Importing from Sherpa Publisher",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.sherpaPublisher": "استيراد من ناشر شيربا",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.pubmed": "Importing from PubMed",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.pubmed": "Importing from PubMed",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.pubmed": "استيراد من PubMed",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.arxiv": "Importing from arXiv",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.arxiv": "Importing from arXiv",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.arxiv": "استيراد من arXiv",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.ror": "Import from ROR",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.ror": "استيراد من ROR",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.import": "Import",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.import": "Import",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.import": "استيراد",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal.title": "Import Remote Journal",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal.title": "Import Remote Journal",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal.title": "استيراد دورية بعيدة",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal.added.local-entity": "Successfully added local journal to the selection",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal.added.local-entity": "Successfully added local journal to the selection",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal.added.local-entity": "تمت إضافة الدورية المحلية بنجاح إلى التحديد",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal.added.new-entity": "Successfully imported and added external journal to the selection",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal.added.new-entity": "Successfully imported and added external journal to the selection",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal.added.new-entity": "تم بنجاح استيراد وإضافة دورية خارجية إلى التحديد",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Issue.title": "Import Remote Journal Issue",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Issue.title": "Import Remote Journal Issue",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Issue.title": "استيراد عدد دورية بعيدة",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Issue.added.local-entity": "Successfully added local journal issue to the selection",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Issue.added.local-entity": "Successfully added local journal issue to the selection",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Issue.added.local-entity": "تمت إضافة عدد الدورية المحلية بنجاح إلى التحديد",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Issue.added.new-entity": "Successfully imported and added external journal issue to the selection",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Issue.added.new-entity": "Successfully imported and added external journal issue to the selection",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Issue.added.new-entity": "تم استيراد عدد الدورية الخارجية وإضافته بنجاح إلى التحديد",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Volume.title": "Import Remote Journal Volume",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Volume.title": "Import Remote Journal Volume",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Volume.title": "استيراد مجلد دورية بعيدة",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Volume.added.local-entity": "Successfully added local journal volume to the selection",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Volume.added.local-entity": "Successfully added local journal volume to the selection",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Volume.added.local-entity": "تمت إضافة مجلد الدورية المحلية بنجاح إلى التحديد",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Volume.added.new-entity": "Successfully imported and added external journal volume to the selection",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Volume.added.new-entity": "Successfully imported and added external journal volume to the selection",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Volume.added.new-entity": "تم استيراد مجلد الدورية الخارجية وإضافته بنجاح إلى التحديد",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.select": "Select a local match:",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.select": "Select a local match:",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.select": "تحديد تطابق محلي:",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.isOrgUnitOfProject.title": "Import Remote Organization",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.isOrgUnitOfProject.title": "استيراد مؤسسة بعيدة",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.isOrgUnitOfProject.added.local-entity": "Successfully added local organization to the selection",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.isOrgUnitOfProject.added.local-entity": "تمت إضافة المؤسسة المحلية إلى التحديد بنجاح",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.isOrgUnitOfProject.added.new-entity": "Successfully imported and added external organization to the selection",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.isOrgUnitOfProject.added.new-entity": "تم بنجاح استيراد وإضافة مؤسسة خارجية إلى التحديد",
 
   // "submission.sections.describe.relationship-lookup.search-tab.deselect-all": "Deselect all",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.deselect-all": "Deselect all",
+  "submission.sections.describe.relationship-lookup.search-tab.deselect-all": "إلغاء تحديد الكل",
 
   // "submission.sections.describe.relationship-lookup.search-tab.deselect-page": "Deselect page",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.deselect-page": "Deselect page",
+  "submission.sections.describe.relationship-lookup.search-tab.deselect-page": "إلغاء تحديد الصفحة",
 
   // "submission.sections.describe.relationship-lookup.search-tab.loading": "Loading...",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.loading": "Loading...",
+  "submission.sections.describe.relationship-lookup.search-tab.loading": "جاري التحميل...",
 
   // "submission.sections.describe.relationship-lookup.search-tab.placeholder": "Search query",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.placeholder": "Search query",
+  "submission.sections.describe.relationship-lookup.search-tab.placeholder": "استعلام البحث",
 
   // "submission.sections.describe.relationship-lookup.search-tab.search": "Go",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.search": "Go",
+  "submission.sections.describe.relationship-lookup.search-tab.search": "اذهب",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.search-form.placeholder": "Search...",
+  "submission.sections.describe.relationship-lookup.search-tab.search-form.placeholder": "بحث...",
 
   // "submission.sections.describe.relationship-lookup.search-tab.select-all": "Select all",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.select-all": "Select all",
+  "submission.sections.describe.relationship-lookup.search-tab.select-all": "تحديد الكل",
 
   // "submission.sections.describe.relationship-lookup.search-tab.select-page": "Select page",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.select-page": "Select page",
+  "submission.sections.describe.relationship-lookup.search-tab.select-page": "تحديد الصفحة",
 
   // "submission.sections.describe.relationship-lookup.selected": "Selected {{ size }} items",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selected": "Selected {{ size }} items",
+  "submission.sections.describe.relationship-lookup.selected": "{{ size }} مادة محددة",
 
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isAuthorOfPublication": "Local Authors ({{ count }})",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isAuthorOfPublication": "Local Authors ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isAuthorOfPublication": "المؤلفين المحليين ({{ count }})",
 
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalOfPublication": "Local Journals ({{ count }})",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalOfPublication": "Local Journals ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalOfPublication": "الدوريات المحلية ({{ count }})",
+
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.Project": "Local Projects ({{ count }})",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.Project": "Local Projects ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.Project": "المشاريع المحلية ({{ count }})",
 
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.Publication": "Local Publications ({{ count }})",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.Publication": "Local Publications ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.Publication": "المنشورات المحلية ({{ count }})",
 
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.Person": "Local Authors ({{ count }})",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.Person": "Local Authors ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.Person": "المؤلفين المحليين ({{ count }})",
 
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.OrgUnit": "Local Organizational Units ({{ count }})",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.OrgUnit": "Local Organizational Units ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.OrgUnit": "الوحدات المؤسسية المحلية ({{ count }})",
 
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.DataPackage": "Local Data Packages ({{ count }})",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.DataPackage": "Local Data Packages ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.DataPackage": "حزم البيانات المحلية ({{ count }})",
 
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.DataFile": "Local Data Files ({{ count }})",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.DataFile": "Local Data Files ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.DataFile": "ملفات البيانات المحلية ({{ count }})",
 
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.Journal": "Local Journals ({{ count }})",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.Journal": "Local Journals ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.Journal": "الدوريات المحلية ({{ count }})",
 
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalIssueOfPublication": "Local Journal Issues ({{ count }})",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalIssueOfPublication": "Local Journal Issues ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalIssueOfPublication": "أعداد الدوريات المحلية ({{ count }})",
+
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.JournalIssue": "Local Journal Issues ({{ count }})",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.JournalIssue": "Local Journal Issues ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.JournalIssue": "أعداد الدوريات المحلية ({{ count }})",
 
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalVolumeOfPublication": "Local Journal Volumes ({{ count }})",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalVolumeOfPublication": "Local Journal Volumes ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalVolumeOfPublication": "مجلدات الدوريات المحلية ({{ count }})",
+
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.JournalVolume": "Local Journal Volumes ({{ count }})",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.JournalVolume": "Local Journal Volumes ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.JournalVolume": "مجلدات الدوريات المحلية ({{ count }})",
 
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaJournal": "Sherpa Journals ({{ count }})",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaJournal": "Sherpa Journals ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaJournal": "دوريات شيربا ({{ count }})",
 
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaPublisher": "Sherpa Publishers ({{ count }})",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaPublisher": "Sherpa Publishers ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaPublisher": "ناشري شيربا ({{ count }})",
 
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.orcid": "ORCID ({{ count }})",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.orcid": "ORCID ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.orcid": "أوركيد ({{ count }})",
 
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.lcname": "LC Names ({{ count }})",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.lcname": "LC Names ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.lcname": "أسماء مكتبة الكونجرس ({{ count }})",
 
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.pubmed": "PubMed ({{ count }})",
-  // TODO New key - Add a translation
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.pubmed": "PubMed ({{ count }})",
 
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.arxiv": "arXiv ({{ count }})",
-  // TODO New key - Add a translation
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.arxiv": "arXiv ({{ count }})",
 
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.ror": "ROR ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.ror": "ROR ({{ count }})",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.orcidWorks": "ORCID ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.orcidWorks": "أوركيد ({{ count }})",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.crossref": "CrossRef ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.crossref": "CrossRef ({{ count }})",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.scopus": "Scopus ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.scopus": "Scopus ({{ count }})",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.openaireFunding": "Funding OpenAIRE ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.openaireFunding": "تمويل OpenAIRE ({{ count }})",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaJournalIssn": "Sherpa Journals by ISSN ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaJournalIssn": "دوريات شيربا حسب ISSN ({{ count }})",
+
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingAgencyOfPublication": "Search for Funding Agencies",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingAgencyOfPublication": "Search for Funding Agencies",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingAgencyOfPublication": "البحث عن وكالات ممولة",
 
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingOfPublication": "Search for Funding",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingOfPublication": "Search for Funding",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingOfPublication": "البحث عن تمويل",
 
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isChildOrgUnitOf": "Search for Organizational Units",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isChildOrgUnitOf": "Search for Organizational Units",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isChildOrgUnitOf": "البحث عن الوحدات المؤسسية",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.openAIREFunding": "Funding OpenAIRE API",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.openAIREFunding": "تمويل واجهة برمجة تطبيقات OpenAIRE",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isProjectOfPublication": "Projects",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isProjectOfPublication": "المشاريع",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingAgencyOfProject": "Funder of the Project",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingAgencyOfProject": "ممول المشروع",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isPublicationOfAuthor": "Publication of the Author",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isPublicationOfAuthor": "منشورات المؤلف",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isOrgUnitOfProject": "OrgUnit of the Project",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isOrgUnitOfProject": "الوحدة المؤسسية للمشروع",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.openAIREFunding": "Funding OpenAIRE API",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.openAIREFunding": "تمويل واجهة برمجة تطبيقات OpenAIRE",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.isProjectOfPublication": "Project",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isProjectOfPublication": "المشروع",
+
+  // "submission.sections.describe.relationship-lookup.title.isProjectOfPublication": "Projects",
+  "submission.sections.describe.relationship-lookup.title.isProjectOfPublication": "المشاريع",
+
+  // "submission.sections.describe.relationship-lookup.title.isFundingAgencyOfProject": "Funder of the Project",
+  "submission.sections.describe.relationship-lookup.title.isFundingAgencyOfProject": "ممول المشروع",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.search-form.placeholder": "Search...",
+  "submission.sections.describe.relationship-lookup.selection-tab.search-form.placeholder": "بحث...",
 
   // "submission.sections.describe.relationship-lookup.selection-tab.tab-title": "Current Selection ({{ count }})",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.tab-title": "Current Selection ({{ count }})",
+  "submission.sections.describe.relationship-lookup.selection-tab.tab-title": "التحديد الحالي ({{ count }})",
+
+  // "submission.sections.describe.relationship-lookup.title.Journal": "Journal",
+  "submission.sections.describe.relationship-lookup.title.Journal": "الدورية",
 
   // "submission.sections.describe.relationship-lookup.title.isJournalIssueOfPublication": "Journal Issues",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.title.isJournalIssueOfPublication": "Journal Issues",
+  "submission.sections.describe.relationship-lookup.title.isJournalIssueOfPublication": "أعداد الدورية",
+
   // "submission.sections.describe.relationship-lookup.title.JournalIssue": "Journal Issues",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.title.JournalIssue": "Journal Issues",
+  "submission.sections.describe.relationship-lookup.title.JournalIssue": "أعداد الدورية",
 
   // "submission.sections.describe.relationship-lookup.title.isJournalVolumeOfPublication": "Journal Volumes",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.title.isJournalVolumeOfPublication": "Journal Volumes",
+  "submission.sections.describe.relationship-lookup.title.isJournalVolumeOfPublication": "مجلدات الدورية",
+
   // "submission.sections.describe.relationship-lookup.title.JournalVolume": "Journal Volumes",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.title.JournalVolume": "Journal Volumes",
+  "submission.sections.describe.relationship-lookup.title.JournalVolume": "مجلدات الدورية",
 
   // "submission.sections.describe.relationship-lookup.title.isJournalOfPublication": "Journals",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.title.isJournalOfPublication": "Journals",
+  "submission.sections.describe.relationship-lookup.title.isJournalOfPublication": "الدوريات",
 
   // "submission.sections.describe.relationship-lookup.title.isAuthorOfPublication": "Authors",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.title.isAuthorOfPublication": "Authors",
+  "submission.sections.describe.relationship-lookup.title.isAuthorOfPublication": "المؤلفين",
 
   // "submission.sections.describe.relationship-lookup.title.isFundingAgencyOfPublication": "Funding Agency",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.title.isFundingAgencyOfPublication": "Funding Agency",
+  "submission.sections.describe.relationship-lookup.title.isFundingAgencyOfPublication": "الوكالة الممولة",
+
   // "submission.sections.describe.relationship-lookup.title.Project": "Projects",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.title.Project": "Projects",
+  "submission.sections.describe.relationship-lookup.title.Project": "المشروعات",
 
   // "submission.sections.describe.relationship-lookup.title.Publication": "Publications",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.title.Publication": "Publications",
+  "submission.sections.describe.relationship-lookup.title.Publication": "المنشورات",
 
   // "submission.sections.describe.relationship-lookup.title.Person": "Authors",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.title.Person": "Authors",
+  "submission.sections.describe.relationship-lookup.title.Person": "المؤلفين",
 
   // "submission.sections.describe.relationship-lookup.title.OrgUnit": "Organizational Units",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.title.OrgUnit": "Organizational Units",
+  "submission.sections.describe.relationship-lookup.title.OrgUnit": "الوحدات المؤسسية",
 
   // "submission.sections.describe.relationship-lookup.title.DataPackage": "Data Packages",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.title.DataPackage": "Data Packages",
+  "submission.sections.describe.relationship-lookup.title.DataPackage": "حزم البيانات",
 
   // "submission.sections.describe.relationship-lookup.title.DataFile": "Data Files",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.title.DataFile": "Data Files",
+  "submission.sections.describe.relationship-lookup.title.DataFile": "ملفات البيانات",
 
   // "submission.sections.describe.relationship-lookup.title.Funding Agency": "Funding Agency",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.title.Funding Agency": "Funding Agency",
+  "submission.sections.describe.relationship-lookup.title.Funding Agency": "الوكالة الممولة",
 
   // "submission.sections.describe.relationship-lookup.title.isFundingOfPublication": "Funding",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.title.isFundingOfPublication": "Funding",
+  "submission.sections.describe.relationship-lookup.title.isFundingOfPublication": "تمويل",
 
   // "submission.sections.describe.relationship-lookup.title.isChildOrgUnitOf": "Parent Organizational Unit",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.title.isChildOrgUnitOf": "Parent Organizational Unit",
+  "submission.sections.describe.relationship-lookup.title.isChildOrgUnitOf": "الوحدة المؤسسية الأصلية",
+
+  // "submission.sections.describe.relationship-lookup.title.isPublicationOfAuthor": "Publication",
+  "submission.sections.describe.relationship-lookup.title.isPublicationOfAuthor": "النشر",
+
+  // "submission.sections.describe.relationship-lookup.title.isOrgUnitOfProject": "OrgUnit",
+  "submission.sections.describe.relationship-lookup.title.isOrgUnitOfProject": "وحدة مؤسسية",
 
   // "submission.sections.describe.relationship-lookup.search-tab.toggle-dropdown": "Toggle dropdown",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.toggle-dropdown": "Toggle dropdown",
+  "submission.sections.describe.relationship-lookup.search-tab.toggle-dropdown": "قائمة التبديل المنسدلة",
 
   // "submission.sections.describe.relationship-lookup.selection-tab.settings": "Settings",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.settings": "Settings",
+  "submission.sections.describe.relationship-lookup.selection-tab.settings": "الإعدادات",
 
   // "submission.sections.describe.relationship-lookup.selection-tab.no-selection": "Your selection is currently empty.",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.no-selection": "Your selection is currently empty.",
+  "submission.sections.describe.relationship-lookup.selection-tab.no-selection": "تحديدك فارغ حالياً.",
 
   // "submission.sections.describe.relationship-lookup.selection-tab.title.isAuthorOfPublication": "Selected Authors",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.title.isAuthorOfPublication": "Selected Authors",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isAuthorOfPublication": "المؤلفين المحددين",
 
   // "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalOfPublication": "Selected Journals",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalOfPublication": "Selected Journals",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalOfPublication": "الدوريات المحددة",
 
   // "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalVolumeOfPublication": "Selected Journal Volume",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalVolumeOfPublication": "Selected Journal Volume",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalVolumeOfPublication": "مجلد الدورية المحدد",
+
   // "submission.sections.describe.relationship-lookup.selection-tab.title.Project": "Selected Projects",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.title.Project": "Selected Projects",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.Project": "المشاريع المحددة",
 
   // "submission.sections.describe.relationship-lookup.selection-tab.title.Publication": "Selected Publications",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.title.Publication": "Selected Publications",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.Publication": "المنشورات المحددة",
 
   // "submission.sections.describe.relationship-lookup.selection-tab.title.Person": "Selected Authors",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.title.Person": "Selected Authors",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.Person": "المؤلفين المحددين",
 
   // "submission.sections.describe.relationship-lookup.selection-tab.title.OrgUnit": "Selected Organizational Units",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.title.OrgUnit": "Selected Organizational Units",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.OrgUnit": "الوحدات المؤسسية المحددة",
 
   // "submission.sections.describe.relationship-lookup.selection-tab.title.DataPackage": "Selected Data Packages",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.title.DataPackage": "Selected Data Packages",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.DataPackage": "حزم البيانات المحددة",
 
   // "submission.sections.describe.relationship-lookup.selection-tab.title.DataFile": "Selected Data Files",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.title.DataFile": "Selected Data Files",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.DataFile": "ملفات البيانات المحددة",
 
   // "submission.sections.describe.relationship-lookup.selection-tab.title.Journal": "Selected Journals",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.title.Journal": "Selected Journals",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.Journal": "الدوريات المحددة",
 
   // "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalIssueOfPublication": "Selected Issue",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalIssueOfPublication": "Selected Issue",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalIssueOfPublication": "العدد المحدد",
+
   // "submission.sections.describe.relationship-lookup.selection-tab.title.JournalVolume": "Selected Journal Volume",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.title.JournalVolume": "Selected Journal Volume",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.JournalVolume": "مجلد الدورية المحدد",
 
   // "submission.sections.describe.relationship-lookup.selection-tab.title.isFundingAgencyOfPublication": "Selected Funding Agency",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.title.isFundingAgencyOfPublication": "Selected Funding Agency",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isFundingAgencyOfPublication": "الوكالة الممولة المحددة",
 
   // "submission.sections.describe.relationship-lookup.selection-tab.title.isFundingOfPublication": "Selected Funding",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.title.isFundingOfPublication": "Selected Funding",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isFundingOfPublication": "التمويل المحدد",
+
   // "submission.sections.describe.relationship-lookup.selection-tab.title.JournalIssue": "Selected Issue",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.title.JournalIssue": "Selected Issue",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.JournalIssue": "العدد المحدد",
 
   // "submission.sections.describe.relationship-lookup.selection-tab.title.isChildOrgUnitOf": "Selected Organizational Unit",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.title.isChildOrgUnitOf": "Selected Organizational Unit",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isChildOrgUnitOf": "الوحدة المؤسسية المحددة",
 
   // "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaJournal": "Search Results",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaJournal": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaJournal": "نتائج البحث",
 
   // "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaPublisher": "Search Results",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaPublisher": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaPublisher": "نتائج البحث",
 
   // "submission.sections.describe.relationship-lookup.selection-tab.title.orcid": "Search Results",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.title.orcid": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.orcid": "نتائج البحث",
 
   // "submission.sections.describe.relationship-lookup.selection-tab.title.orcidv2": "Search Results",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.title.orcidv2": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.orcidv2": "نتائج البحث",
 
   // "submission.sections.describe.relationship-lookup.selection-tab.title.lcname": "Search Results",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.title.lcname": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.lcname": "نتائج البحث",
 
   // "submission.sections.describe.relationship-lookup.selection-tab.title.pubmed": "Search Results",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.title.pubmed": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.pubmed": "نتائج البحث",
 
   // "submission.sections.describe.relationship-lookup.selection-tab.title.arxiv": "Search Results",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.title.arxiv": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.arxiv": "نتائج البحث",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.crossref": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.crossref": "نتائج البحث",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.epo": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.epo": "نتائج البحث",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.scopus": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.scopus": "نتائج البحث",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.scielo": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.scielo": "نتائج البحث",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.wos": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.wos": "نتائج البحث",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.ror": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.ror": "نتائج البحث",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title": "نتائج البحث",
 
   // "submission.sections.describe.relationship-lookup.name-variant.notification.content": "Would you like to save \"{{ value }}\" as a name variant for this person so you and others can reuse it for future submissions? If you don't you can still use it for this submission.",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.name-variant.notification.content": "Would you like to save \"{{ value }}\" as a name variant for this person so you and others can reuse it for future submissions? If you don't you can still use it for this submission.",
+  "submission.sections.describe.relationship-lookup.name-variant.notification.content": "هل ترغب في حفظe \"{{ value }}\" كمتغير اسم لهذا الشخص حتى تتمكن أنت والآخرون من إعادة استخدامه لعمليات التقديم المستقبلية؟ إذا لم تقم بذلك، فلا يزال بإمكانك استخدامه لهذا التقديم.",
 
   // "submission.sections.describe.relationship-lookup.name-variant.notification.confirm": "Save a new name variant",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.name-variant.notification.confirm": "Save a new name variant",
+  "submission.sections.describe.relationship-lookup.name-variant.notification.confirm": "حفظ متغير اسم جديد",
 
   // "submission.sections.describe.relationship-lookup.name-variant.notification.decline": "Use only for this submission",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.name-variant.notification.decline": "Use only for this submission",
+  "submission.sections.describe.relationship-lookup.name-variant.notification.decline": "استخدم فقط لهذا التقديم",
 
   // "submission.sections.ccLicense.type": "License Type",
-  // TODO New key - Add a translation
-  "submission.sections.ccLicense.type": "License Type",
+  "submission.sections.ccLicense.type": "نوع الترخيص",
 
   // "submission.sections.ccLicense.select": "Select a license type…",
-  // TODO New key - Add a translation
-  "submission.sections.ccLicense.select": "Select a license type…",
+  "submission.sections.ccLicense.select": "قم بتحديد نوع الترخيص…",
 
   // "submission.sections.ccLicense.change": "Change your license type…",
-  // TODO New key - Add a translation
-  "submission.sections.ccLicense.change": "Change your license type…",
+  "submission.sections.ccLicense.change": "قم بتغيير نوع الترخيص…",
 
   // "submission.sections.ccLicense.none": "No licenses available",
-  // TODO New key - Add a translation
-  "submission.sections.ccLicense.none": "No licenses available",
+  "submission.sections.ccLicense.none": "لا تتوافر أي تراخيص",
 
   // "submission.sections.ccLicense.option.select": "Select an option…",
-  // TODO New key - Add a translation
-  "submission.sections.ccLicense.option.select": "Select an option…",
+  "submission.sections.ccLicense.option.select": "قم بتحديد خيار…",
 
   // "submission.sections.ccLicense.link": "You’ve selected the following license:",
-  // TODO New key - Add a translation
-  "submission.sections.ccLicense.link": "You’ve selected the following license:",
+  "submission.sections.ccLicense.link": "لقد قمت بتحديد الترخيص التالي:",
 
   // "submission.sections.ccLicense.confirmation": "I grant the license above",
-  // TODO New key - Add a translation
-  "submission.sections.ccLicense.confirmation": "I grant the license above",
+  "submission.sections.ccLicense.confirmation": "أمنحك الترخيص أعلاه",
 
   // "submission.sections.general.add-more": "Add more",
-  // TODO New key - Add a translation
-  "submission.sections.general.add-more": "Add more",
+  "submission.sections.general.add-more": "إضافة المزيد",
+
+  // "submission.sections.general.cannot_deposit": "Deposit cannot be completed due to errors in the form.<br>Please fill out all required fields to complete the deposit.",
+  "submission.sections.general.cannot_deposit": "لا يمكن إتمام الإيداع بسبب وجود أخطاء في النموذج.<br>يرجى ملء جميع الحقول المطلوبة لإتمام الإيداع.",
 
   // "submission.sections.general.collection": "Collection",
-  // TODO New key - Add a translation
-  "submission.sections.general.collection": "Collection",
+  "submission.sections.general.collection": "حاوية",
 
   // "submission.sections.general.deposit_error_notice": "There was an issue when submitting the item, please try again later.",
-  // TODO New key - Add a translation
-  "submission.sections.general.deposit_error_notice": "There was an issue when submitting the item, please try again later.",
+  "submission.sections.general.deposit_error_notice": "حدثت مشكلة أثناء تقديم المادة، يرجى إعادة المحاولة مرة أخرى لاحقاً.",
 
   // "submission.sections.general.deposit_success_notice": "Submission deposited successfully.",
-  // TODO New key - Add a translation
-  "submission.sections.general.deposit_success_notice": "Submission deposited successfully.",
+  "submission.sections.general.deposit_success_notice": "تم إيداع التقديم بنجاح.",
 
   // "submission.sections.general.discard_error_notice": "There was an issue when discarding the item, please try again later.",
-  // TODO New key - Add a translation
-  "submission.sections.general.discard_error_notice": "There was an issue when discarding the item, please try again later.",
+  "submission.sections.general.discard_error_notice": "حدثت مشكلة أثناء تجاهل المادة، يرجى إعادة المحاولة مرة أخرى لاحقاً.",
 
   // "submission.sections.general.discard_success_notice": "Submission discarded successfully.",
-  // TODO New key - Add a translation
-  "submission.sections.general.discard_success_notice": "Submission discarded successfully.",
+  "submission.sections.general.discard_success_notice": "تم تجاهل التقديم بنجاح.",
 
   // "submission.sections.general.metadata-extracted": "New metadata have been extracted and added to the <strong>{{sectionId}}</strong> section.",
-  // TODO New key - Add a translation
-  "submission.sections.general.metadata-extracted": "New metadata have been extracted and added to the <strong>{{sectionId}}</strong> section.",
+  "submission.sections.general.metadata-extracted": "تم استخلاص ميتاداتا جديدة وإضافتها إلى قسم <strong>{{sectionId}}</strong>.",
 
   // "submission.sections.general.metadata-extracted-new-section": "New <strong>{{sectionId}}</strong> section has been added to submission.",
-  // TODO New key - Add a translation
-  "submission.sections.general.metadata-extracted-new-section": "New <strong>{{sectionId}}</strong> section has been added to submission.",
+  "submission.sections.general.metadata-extracted-new-section": "تمت إضافة قسم <strong>{{sectionId}}</strong> جديد إلى التقديم.",
 
   // "submission.sections.general.no-collection": "No collection found",
-  // TODO New key - Add a translation
-  "submission.sections.general.no-collection": "No collection found",
+  "submission.sections.general.no-collection": "لم يتم العثور على حاويات",
+
+  // "submission.sections.general.no-entity": "No entity types found",
+  "submission.sections.general.no-entity": "لم يتم العثور على أنواع كينونات",
 
   // "submission.sections.general.no-sections": "No options available",
-  // TODO New key - Add a translation
-  "submission.sections.general.no-sections": "No options available",
+  "submission.sections.general.no-sections": "لا تتوافر أي خيارات",
 
   // "submission.sections.general.save_error_notice": "There was an issue when saving the item, please try again later.",
-  // TODO New key - Add a translation
-  "submission.sections.general.save_error_notice": "There was an issue when saving the item, please try again later.",
+  "submission.sections.general.save_error_notice": "حدثت مشكلة أثناء حفظ المادة، يرجى إعادة المحاولة مرة أخرى لاحقاً.",
 
   // "submission.sections.general.save_success_notice": "Submission saved successfully.",
-  // TODO New key - Add a translation
-  "submission.sections.general.save_success_notice": "Submission saved successfully.",
+  "submission.sections.general.save_success_notice": "تم حفظ التقديم بنجاح.",
 
   // "submission.sections.general.search-collection": "Search for a collection",
-  // TODO New key - Add a translation
-  "submission.sections.general.search-collection": "Search for a collection",
+  "submission.sections.general.search-collection": "البحث عن حاوية",
 
   // "submission.sections.general.sections_not_valid": "There are incomplete sections.",
-  // TODO New key - Add a translation
-  "submission.sections.general.sections_not_valid": "There are incomplete sections.",
+  "submission.sections.general.sections_not_valid": "هناك أقسام غير مكتملة.",
 
+  // "submission.sections.identifiers.info": "The following identifiers will be created for your item:",
+  "submission.sections.identifiers.info": "سيتم إنشاء المعرفات التالية للمادة الخاصة بك:",
 
+  // "submission.sections.identifiers.no_handle": "No handles have been minted for this item.",
+  "submission.sections.identifiers.no_handle": "لم يتم سك أي هاندل لهذه المادة.",
+
+  // "submission.sections.identifiers.no_doi": "No DOIs have been minted for this item.",
+  "submission.sections.identifiers.no_doi": "لم يتم سك أي معرفات كائنات رقمية لهذه المادة.",
+
+  // "submission.sections.identifiers.handle_label": "Handle: ",
+  "submission.sections.identifiers.handle_label": "هاندل: ",
+
+  // "submission.sections.identifiers.doi_label": "DOI: ",
+  "submission.sections.identifiers.doi_label": "معرف الكائن الرقمي: ",
+
+  // "submission.sections.identifiers.otherIdentifiers_label": "Other identifiers: ",
+  "submission.sections.identifiers.otherIdentifiers_label": "معرفات أخرى: ",
+
+  // "submission.sections.submit.progressbar.accessCondition": "Item access conditions",
+  "submission.sections.submit.progressbar.accessCondition": "شروط الوصول للمادة",
 
   // "submission.sections.submit.progressbar.CClicense": "Creative commons license",
-  // TODO New key - Add a translation
-  "submission.sections.submit.progressbar.CClicense": "Creative commons license",
+  "submission.sections.submit.progressbar.CClicense": "الإبداعية العامة",
 
   // "submission.sections.submit.progressbar.describe.recycle": "Recycle",
-  // TODO New key - Add a translation
-  "submission.sections.submit.progressbar.describe.recycle": "Recycle",
+  "submission.sections.submit.progressbar.describe.recycle": "إعادة تدوير",
 
   // "submission.sections.submit.progressbar.describe.stepcustom": "Describe",
-  // TODO New key - Add a translation
-  "submission.sections.submit.progressbar.describe.stepcustom": "Describe",
+  "submission.sections.submit.progressbar.describe.stepcustom": "وصف",
 
   // "submission.sections.submit.progressbar.describe.stepone": "Describe",
-  // TODO New key - Add a translation
-  "submission.sections.submit.progressbar.describe.stepone": "Describe",
+  "submission.sections.submit.progressbar.describe.stepone": "وصف",
 
   // "submission.sections.submit.progressbar.describe.steptwo": "Describe",
-  // TODO New key - Add a translation
-  "submission.sections.submit.progressbar.describe.steptwo": "Describe",
+  "submission.sections.submit.progressbar.describe.steptwo": "وصف",
 
-  // "submission.sections.submit.progressbar.detect-duplicate": "Potential duplicates",
+  // "submission.sections.submit.progressbar.duplicates": "Potential duplicates",
   // TODO New key - Add a translation
-  "submission.sections.submit.progressbar.detect-duplicate": "Potential duplicates",
+  "submission.sections.submit.progressbar.duplicates": "Potential duplicates",
+
+  // "submission.sections.submit.progressbar.identifiers": "Identifiers",
+  "submission.sections.submit.progressbar.identifiers": "المعرفات",
 
   // "submission.sections.submit.progressbar.license": "Deposit license",
-  // TODO New key - Add a translation
-  "submission.sections.submit.progressbar.license": "Deposit license",
+  "submission.sections.submit.progressbar.license": "رخصة الإيداع",
+
+  // "submission.sections.submit.progressbar.sherpapolicy": "Sherpa policies",
+  "submission.sections.submit.progressbar.sherpapolicy": "سياسات شيربا",
 
   // "submission.sections.submit.progressbar.upload": "Upload files",
+  "submission.sections.submit.progressbar.upload": "تحميل الملفات",
+
+  // "submission.sections.submit.progressbar.sherpaPolicies": "Publisher open access policy information",
+  "submission.sections.submit.progressbar.sherpaPolicies": "معلومات سياسة الوصول الحر للناشر",
+
+  // "submission.sections.sherpa-policy.title-empty": "No publisher policy information available. If your work has an associated ISSN, please enter it above to see any related publisher open access policies.",
+  "submission.sections.sherpa-policy.title-empty": "لا تتوفر معلومات حول سياسة الناشر. إذا كان لعملك رقم ISSN مرتبط، يرجى إدخاله أعلاه للاطلاع على أي سياسة وصول حر للناشرين ذوي الصلة.",
+
+  // "submission.sections.status.errors.title": "Errors",
+  "submission.sections.status.errors.title": "أخطاء",
+
+  // "submission.sections.status.valid.title": "Valid",
+  "submission.sections.status.valid.title": "صالح",
+
+  // "submission.sections.status.warnings.title": "Warnings",
+  "submission.sections.status.warnings.title": "تحذيرات",
+
+  // "submission.sections.status.errors.aria": "has errors",
+  "submission.sections.status.errors.aria": "به أخطاء",
+
+  // "submission.sections.status.valid.aria": "is valid",
+  "submission.sections.status.valid.aria": "صالح",
+
+  // "submission.sections.status.warnings.aria": "has warnings",
+  "submission.sections.status.warnings.aria": "ذو تحذيرات",
+
+  // "submission.sections.status.info.title": "Additional Information",
+  "submission.sections.status.info.title": "معلومات إضافية",
+
+  // "submission.sections.status.info.aria": "Additional Information",
+  "submission.sections.status.info.aria": "معلومات إضافية",
+
+  // "submission.sections.toggle.open": "Open section",
+  "submission.sections.toggle.open": "فتح القسم",
+
+  // "submission.sections.toggle.close": "Close section",
+  "submission.sections.toggle.close": "إغلاق القسم",
+
+  // "submission.sections.toggle.aria.open": "Expand {{sectionHeader}} section",
+  "submission.sections.toggle.aria.open": "توسيع قسم {{sectionHeader}}",
+
+  // "submission.sections.toggle.aria.close": "Collapse {{sectionHeader}} section",
+  "submission.sections.toggle.aria.close": "طي قسم {{sectionHeader}}",
+
+  // "submission.sections.upload.primary.make": "Make {{fileName}} the primary bitstream",
   // TODO New key - Add a translation
-  "submission.sections.submit.progressbar.upload": "Upload files",
-
+  "submission.sections.upload.primary.make": "Make {{fileName}} the primary bitstream",
 
+  // "submission.sections.upload.primary.remove": "Remove {{fileName}} as the primary bitstream",
+  // TODO New key - Add a translation
+  "submission.sections.upload.primary.remove": "Remove {{fileName}} as the primary bitstream",
 
   // "submission.sections.upload.delete.confirm.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "submission.sections.upload.delete.confirm.cancel": "Cancel",
+  "submission.sections.upload.delete.confirm.cancel": "إلغاء",
 
   // "submission.sections.upload.delete.confirm.info": "This operation can't be undone. Are you sure?",
-  // TODO New key - Add a translation
-  "submission.sections.upload.delete.confirm.info": "This operation can't be undone. Are you sure?",
+  "submission.sections.upload.delete.confirm.info": "لا يمكن التراجع عن هذه العملية. هل أنت متأكد؟",
 
   // "submission.sections.upload.delete.confirm.submit": "Yes, I'm sure",
-  // TODO New key - Add a translation
-  "submission.sections.upload.delete.confirm.submit": "Yes, I'm sure",
+  "submission.sections.upload.delete.confirm.submit": "نعم، متأكد",
 
   // "submission.sections.upload.delete.confirm.title": "Delete bitstream",
-  // TODO New key - Add a translation
-  "submission.sections.upload.delete.confirm.title": "Delete bitstream",
+  "submission.sections.upload.delete.confirm.title": "حذف تدفق البت",
 
   // "submission.sections.upload.delete.submit": "Delete",
-  // TODO New key - Add a translation
-  "submission.sections.upload.delete.submit": "Delete",
+  "submission.sections.upload.delete.submit": "حذف",
+
+  // "submission.sections.upload.download.title": "Download bitstream",
+  "submission.sections.upload.download.title": "تحميل تدفق البت",
 
   // "submission.sections.upload.drop-message": "Drop files to attach them to the item",
-  // TODO New key - Add a translation
-  "submission.sections.upload.drop-message": "Drop files to attach them to the item",
+  "submission.sections.upload.drop-message": "قم بإسقاط الملفات لإرفاقها بالمادة",
+
+  // "submission.sections.upload.edit.title": "Edit bitstream",
+  "submission.sections.upload.edit.title": "تحرير دفق البت",
 
   // "submission.sections.upload.form.access-condition-label": "Access condition type",
-  // TODO New key - Add a translation
-  "submission.sections.upload.form.access-condition-label": "Access condition type",
+  "submission.sections.upload.form.access-condition-label": "نوع شرط الوصول",
+
+  // "submission.sections.upload.form.access-condition-hint": "Select an access condition to apply on the bitstream once the item is deposited",
+  "submission.sections.upload.form.access-condition-hint": "حدد شرط الوصول لتطبيقه على تدفقات البت بمجرد إيداع المادة",
 
   // "submission.sections.upload.form.date-required": "Date is required.",
-  // TODO New key - Add a translation
-  "submission.sections.upload.form.date-required": "Date is required.",
+  "submission.sections.upload.form.date-required": "التاريخ مطلوب.",
+
+  // "submission.sections.upload.form.date-required-from": "Grant access from date is required.",
+  "submission.sections.upload.form.date-required-from": "تاريخ منح الوصول منذ مطلوب.",
+
+  // "submission.sections.upload.form.date-required-until": "Grant access until date is required.",
+  "submission.sections.upload.form.date-required-until": "تاريخ منح الوصول حتى مطلوب.",
 
   // "submission.sections.upload.form.from-label": "Grant access from",
-  // TODO New key - Add a translation
-  "submission.sections.upload.form.from-label": "Grant access from",
+  "submission.sections.upload.form.from-label": "منح الوصول من",
+
+  // "submission.sections.upload.form.from-hint": "Select the date from which the related access condition is applied",
+  "submission.sections.upload.form.from-hint": "حدد التاريخ الذي يتم تطبيق شرط الوصول ذي الصلة منذ بلوغه",
 
   // "submission.sections.upload.form.from-placeholder": "From",
-  // TODO New key - Add a translation
-  "submission.sections.upload.form.from-placeholder": "From",
+  "submission.sections.upload.form.from-placeholder": "من",
 
   // "submission.sections.upload.form.group-label": "Group",
-  // TODO New key - Add a translation
-  "submission.sections.upload.form.group-label": "Group",
+  "submission.sections.upload.form.group-label": "المجموعة",
 
   // "submission.sections.upload.form.group-required": "Group is required.",
-  // TODO New key - Add a translation
-  "submission.sections.upload.form.group-required": "Group is required.",
+  "submission.sections.upload.form.group-required": "المجموعة مطلوبة.",
 
   // "submission.sections.upload.form.until-label": "Grant access until",
-  // TODO New key - Add a translation
-  "submission.sections.upload.form.until-label": "Grant access until",
+  "submission.sections.upload.form.until-label": "منح الوصول حتى",
+
+  // "submission.sections.upload.form.until-hint": "Select the date until which the related access condition is applied",
+  "submission.sections.upload.form.until-hint": "حدد التاريخ الذي يتم تطبيق شرط الوصول ذي الصلة حتى بلوغه",
 
   // "submission.sections.upload.form.until-placeholder": "Until",
-  // TODO New key - Add a translation
-  "submission.sections.upload.form.until-placeholder": "Until",
+  "submission.sections.upload.form.until-placeholder": "حتى",
 
   // "submission.sections.upload.header.policy.default.nolist": "Uploaded files in the {{collectionName}} collection will be accessible according to the following group(s):",
-  // TODO New key - Add a translation
-  "submission.sections.upload.header.policy.default.nolist": "Uploaded files in the {{collectionName}} collection will be accessible according to the following group(s):",
+  "submission.sections.upload.header.policy.default.nolist": "ستكون الملفات المرفوعة في الحاوية {{collectionName}} قابلة للوصول وفقًا للمجموعات التالية:",
 
   // "submission.sections.upload.header.policy.default.withlist": "Please note that uploaded files in the {{collectionName}} collection will be accessible, in addition to what is explicitly decided for the single file, with the following group(s):",
-  // TODO New key - Add a translation
-  "submission.sections.upload.header.policy.default.withlist": "Please note that uploaded files in the {{collectionName}} collection will be accessible, in addition to what is explicitly decided for the single file, with the following group(s):",
+  "submission.sections.upload.header.policy.default.withlist": "يرجى ملاحظة أن الملفات المرفوعة في حاوية {{collectionName}} ستكون قابلة للوصول، بالإضافة إلى ما تقرر بوضوح للملف المفرد، مع المجموعات التالية:",
 
   // "submission.sections.upload.info": "Here you will find all the files currently in the item. You can update the file metadata and access conditions or <strong>upload additional files by dragging & dropping them anywhere on the page.</strong>",
-  // TODO New key - Add a translation
-  "submission.sections.upload.info": "Here you will find all the files currently in the item. You can update the file metadata and access conditions or <strong>upload additional files by dragging & dropping them anywhere on the page.</strong>",
+  "submission.sections.upload.info": "ستجد هنا كل الملفات الموجودة في المادة حاليًا. يمكنك تحديث ميتاداتا الملف وشروط الوصول أو <strong> تحميل ملفات إضافية عن طريق سحبها وإسقاطها في أي مكان في الصفحة</strong>",
 
   // "submission.sections.upload.no-entry": "No",
-  // TODO New key - Add a translation
-  "submission.sections.upload.no-entry": "No",
+  "submission.sections.upload.no-entry": "لا",
 
   // "submission.sections.upload.no-file-uploaded": "No file uploaded yet.",
-  // TODO New key - Add a translation
-  "submission.sections.upload.no-file-uploaded": "No file uploaded yet.",
+  "submission.sections.upload.no-file-uploaded": "لم يتم تحميل أي ملف حتى الآن.",
 
   // "submission.sections.upload.save-metadata": "Save metadata",
-  // TODO New key - Add a translation
-  "submission.sections.upload.save-metadata": "Save metadata",
+  "submission.sections.upload.save-metadata": "حفظ الميتاداتا",
 
   // "submission.sections.upload.undo": "Cancel",
-  // TODO New key - Add a translation
-  "submission.sections.upload.undo": "Cancel",
+  "submission.sections.upload.undo": "إلغاء",
 
   // "submission.sections.upload.upload-failed": "Upload failed",
-  // TODO New key - Add a translation
-  "submission.sections.upload.upload-failed": "Upload failed",
+  "submission.sections.upload.upload-failed": "فشل التحميل",
 
   // "submission.sections.upload.upload-successful": "Upload successful",
+  "submission.sections.upload.upload-successful": "نجح التحميل",
+
+  // "submission.sections.accesses.form.discoverable-description": "When checked, this item will be discoverable in search/browse. When unchecked, the item will only be available via a direct link and will never appear in search/browse.",
+  "submission.sections.accesses.form.discoverable-description": "عند التحديد، ستكون هذه المادة قابلة للاكتشاف في البحث/الاستعراض. عند إلغاء التحديد، ستكون المادة متاحة فقط عبر رابط مباشر ولن تظهر أبدًا في البحث/الاستعراض.",
+
+  // "submission.sections.accesses.form.discoverable-label": "Discoverable",
+  "submission.sections.accesses.form.discoverable-label": "قابل للاكتشاف",
+
+  // "submission.sections.accesses.form.access-condition-label": "Access condition type",
+  "submission.sections.accesses.form.access-condition-label": "نوع شرط الوصول",
+
+  // "submission.sections.accesses.form.access-condition-hint": "Select an access condition to apply on the item once it is deposited",
+  "submission.sections.accesses.form.access-condition-hint": "حدد شرط الوصول لتطبيقه على المادة بمجرد إيداعها",
+
+  // "submission.sections.accesses.form.date-required": "Date is required.",
+  "submission.sections.accesses.form.date-required": "التاريخ مطلوب.",
+
+  // "submission.sections.accesses.form.date-required-from": "Grant access from date is required.",
+  "submission.sections.accesses.form.date-required-from": "تاريخ منح الوصول منذ مطلوب.",
+
+  // "submission.sections.accesses.form.date-required-until": "Grant access until date is required.",
+  "submission.sections.accesses.form.date-required-until": "تاريخ منح الوصول حتى مطلوب.",
+
+  // "submission.sections.accesses.form.from-label": "Grant access from",
+  "submission.sections.accesses.form.from-label": "منح الوصول منذ",
+
+  // "submission.sections.accesses.form.from-hint": "Select the date from which the related access condition is applied",
+  "submission.sections.accesses.form.from-hint": "حدد التاريخ الذي يتم فيه تطبيق شرط الوصول ذي الصلة",
+
+  // "submission.sections.accesses.form.from-placeholder": "From",
+  "submission.sections.accesses.form.from-placeholder": "من",
+
+  // "submission.sections.accesses.form.group-label": "Group",
+  "submission.sections.accesses.form.group-label": "المجموعة",
+
+  // "submission.sections.accesses.form.group-required": "Group is required.",
+  "submission.sections.accesses.form.group-required": "المجموعة مطلوبة.",
+
+  // "submission.sections.accesses.form.until-label": "Grant access until",
+  "submission.sections.accesses.form.until-label": "منح الوصول حتى",
+
+  // "submission.sections.accesses.form.until-hint": "Select the date until which the related access condition is applied",
+  "submission.sections.accesses.form.until-hint": "حدد التاريخ الذي يتم تطبيق شرط الوصول ذي الصلة حتى بلوغه",
+
+  // "submission.sections.accesses.form.until-placeholder": "Until",
+  "submission.sections.accesses.form.until-placeholder": "حتى",
+
+  // "submission.sections.duplicates.none": "No duplicates were detected.",
   // TODO New key - Add a translation
-  "submission.sections.upload.upload-successful": "Upload successful",
+  "submission.sections.duplicates.none": "No duplicates were detected.",
 
-
-
-  // "submission.submit.title": "Submission",
+  // "submission.sections.duplicates.detected": "Potential duplicates were detected. Please review the list below.",
   // TODO New key - Add a translation
-  "submission.submit.title": "Submission",
+  "submission.sections.duplicates.detected": "Potential duplicates were detected. Please review the list below.",
 
+  // "submission.sections.duplicates.in-workspace": "This item is in workspace",
+  // TODO New key - Add a translation
+  "submission.sections.duplicates.in-workspace": "This item is in workspace",
 
+  // "submission.sections.duplicates.in-workflow": "This item is in workflow",
+  // TODO New key - Add a translation
+  "submission.sections.duplicates.in-workflow": "This item is in workflow",
+
+  // "submission.sections.license.granted-label": "I confirm the license above",
+  "submission.sections.license.granted-label": "أؤكد الترخيص أعلاه",
+
+  // "submission.sections.license.required": "You must accept the license",
+  "submission.sections.license.required": "يجب عليك قبول الترخيص",
+
+  // "submission.sections.license.notgranted": "You must accept the license",
+  "submission.sections.license.notgranted": "يجب عليك قبول الترخيص",
+
+  // "submission.sections.sherpa.publication.information": "Publication information",
+  "submission.sections.sherpa.publication.information": "معلومات الناشر",
+
+  // "submission.sections.sherpa.publication.information.title": "Title",
+  "submission.sections.sherpa.publication.information.title": "العنوان",
+
+  // "submission.sections.sherpa.publication.information.issns": "ISSNs",
+  "submission.sections.sherpa.publication.information.issns": "أرقام ردمد",
+
+  // "submission.sections.sherpa.publication.information.url": "URL",
+  "submission.sections.sherpa.publication.information.url": "عنوان URL",
+
+  // "submission.sections.sherpa.publication.information.publishers": "Publisher",
+  "submission.sections.sherpa.publication.information.publishers": "الناشر",
+
+  // "submission.sections.sherpa.publication.information.romeoPub": "Romeo Pub",
+  "submission.sections.sherpa.publication.information.romeoPub": "Romeo Pub",
+
+  // "submission.sections.sherpa.publication.information.zetoPub": "Zeto Pub",
+  "submission.sections.sherpa.publication.information.zetoPub": "Zeto Pub",
+
+  // "submission.sections.sherpa.publisher.policy": "Publisher Policy",
+  "submission.sections.sherpa.publisher.policy": "سياسة الناشر",
+
+  // "submission.sections.sherpa.publisher.policy.description": "The below information was found via Sherpa Romeo. Based on the policies of your publisher, it provides advice regarding whether an embargo may be necessary and/or which files you are allowed to upload. If you have questions, please contact your site administrator via the feedback form in the footer.",
+  "submission.sections.sherpa.publisher.policy.description": "تم العثور على المعلومات أدناه عبر شيربا روميو. وبناءً على سياسات الناشر الخاص بك، فإنه يقدم النصائح بشأن ما إذا كان الحظر ضروريًا أو الملفات المسموح لك بتحميلها. إذا كانت لديك أسئلة، يرجى الاتصال بمسؤول موقعك عبر نموذج التعليقات الموجود في التذييل.",
+
+  // "submission.sections.sherpa.publisher.policy.openaccess": "Open Access pathways permitted by this journal's policy are listed below by article version. Click on a pathway for a more detailed view",
+  "submission.sections.sherpa.publisher.policy.openaccess": "مسارات الوصول الحر التي تسمح بها سياسة هذه الدورية مدرجة أدناه حسب إصدار المقال. انقر على المسار للحصول على عرض أكثر تفصيلاً",
+
+  // "submission.sections.sherpa.publisher.policy.more.information": "For more information, please see the following links:",
+  "submission.sections.sherpa.publisher.policy.more.information": "للمزيد من المعلومات، يرجى الاطلاع على الروابط التالية:",
+
+  // "submission.sections.sherpa.publisher.policy.version": "Version",
+  "submission.sections.sherpa.publisher.policy.version": "الإصدارة",
+
+  // "submission.sections.sherpa.publisher.policy.embargo": "Embargo",
+  "submission.sections.sherpa.publisher.policy.embargo": "حظر",
+
+  // "submission.sections.sherpa.publisher.policy.noembargo": "No Embargo",
+  "submission.sections.sherpa.publisher.policy.noembargo": "بلا حظر",
+
+  // "submission.sections.sherpa.publisher.policy.nolocation": "None",
+  "submission.sections.sherpa.publisher.policy.nolocation": "لا شيء",
+
+  // "submission.sections.sherpa.publisher.policy.license": "License",
+  "submission.sections.sherpa.publisher.policy.license": "الترخيص",
+
+  // "submission.sections.sherpa.publisher.policy.prerequisites": "Prerequisites",
+  "submission.sections.sherpa.publisher.policy.prerequisites": "المتطلبات الأساسية",
+
+  // "submission.sections.sherpa.publisher.policy.location": "Location",
+  "submission.sections.sherpa.publisher.policy.location": "الموقع",
+
+  // "submission.sections.sherpa.publisher.policy.conditions": "Conditions",
+  "submission.sections.sherpa.publisher.policy.conditions": "الشروط",
+
+  // "submission.sections.sherpa.publisher.policy.refresh": "Refresh",
+  "submission.sections.sherpa.publisher.policy.refresh": "تحديث",
+
+  // "submission.sections.sherpa.record.information": "Record Information",
+  "submission.sections.sherpa.record.information": "معلومات التسجيلة",
+
+  // "submission.sections.sherpa.record.information.id": "ID",
+  "submission.sections.sherpa.record.information.id": "المعرّف",
+
+  // "submission.sections.sherpa.record.information.date.created": "Date Created",
+  "submission.sections.sherpa.record.information.date.created": "تاريخ الإنشاء",
+
+  // "submission.sections.sherpa.record.information.date.modified": "Last Modified",
+  "submission.sections.sherpa.record.information.date.modified": "آخر تعديل",
+
+  // "submission.sections.sherpa.record.information.uri": "URI",
+  "submission.sections.sherpa.record.information.uri": "URI",
+
+  // "submission.sections.sherpa.error.message": "There was an error retrieving sherpa informations",
+  "submission.sections.sherpa.error.message": "حدث خطأ أثناء استرداد معلومات شيربا",
+
+  // "submission.submit.breadcrumbs": "New submission",
+  "submission.submit.breadcrumbs": "تقديم جديد",
+
+  // "submission.submit.title": "New submission",
+  "submission.submit.title": "تقديم جديد",
 
   // "submission.workflow.generic.delete": "Delete",
-  // TODO New key - Add a translation
-  "submission.workflow.generic.delete": "Delete",
+  "submission.workflow.generic.delete": "حذف",
 
-  // "submission.workflow.generic.delete-help": "If you would to discard this item, select \"Delete\".  You will then be asked to confirm it.",
-  // TODO New key - Add a translation
-  "submission.workflow.generic.delete-help": "If you would to discard this item, select \"Delete\".  You will then be asked to confirm it.",
+  // "submission.workflow.generic.delete-help": "Select this option to discard this item. You will then be asked to confirm it.",
+  "submission.workflow.generic.delete-help": "حدد هذا الخيار لتجاهل هذه المادة. سيُطلب منك بعد ذلك تأكيد ذلك.",
 
   // "submission.workflow.generic.edit": "Edit",
-  // TODO New key - Add a translation
-  "submission.workflow.generic.edit": "Edit",
+  "submission.workflow.generic.edit": "تحرير",
 
   // "submission.workflow.generic.edit-help": "Select this option to change the item's metadata.",
-  // TODO New key - Add a translation
-  "submission.workflow.generic.edit-help": "Select this option to change the item's metadata.",
+  "submission.workflow.generic.edit-help": "حدد هذا الخيار لتغيير ميتاداتا المادة.",
 
   // "submission.workflow.generic.view": "View",
-  // TODO New key - Add a translation
-  "submission.workflow.generic.view": "View",
+  "submission.workflow.generic.view": "عرض",
 
   // "submission.workflow.generic.view-help": "Select this option to view the item's metadata.",
-  // TODO New key - Add a translation
-  "submission.workflow.generic.view-help": "Select this option to view the item's metadata.",
+  "submission.workflow.generic.view-help": "حدد هذا الخيار لعرض ميتاداتا المادة.",
 
+  // "submission.workflow.generic.submit_select_reviewer": "Select Reviewer",
+  "submission.workflow.generic.submit_select_reviewer": "حدد المراجع",
 
+  // "submission.workflow.generic.submit_select_reviewer-help": "",
+  "submission.workflow.generic.submit_select_reviewer-help": "",
+
+  // "submission.workflow.generic.submit_score": "Rate",
+  "submission.workflow.generic.submit_score": "تقييم",
+
+  // "submission.workflow.generic.submit_score-help": "",
+  "submission.workflow.generic.submit_score-help": "",
 
   // "submission.workflow.tasks.claimed.approve": "Approve",
-  // TODO New key - Add a translation
-  "submission.workflow.tasks.claimed.approve": "Approve",
+  "submission.workflow.tasks.claimed.approve": "قبول",
 
   // "submission.workflow.tasks.claimed.approve_help": "If you have reviewed the item and it is suitable for inclusion in the collection, select \"Approve\".",
-  // TODO New key - Add a translation
-  "submission.workflow.tasks.claimed.approve_help": "If you have reviewed the item and it is suitable for inclusion in the collection, select \"Approve\".",
+  "submission.workflow.tasks.claimed.approve_help": "إذا قمت بمراجعة المادة وكانت ملائمة للإدراج في الحاوية، اختر  \"قبول\".",
 
   // "submission.workflow.tasks.claimed.edit": "Edit",
-  // TODO New key - Add a translation
-  "submission.workflow.tasks.claimed.edit": "Edit",
+  "submission.workflow.tasks.claimed.edit": "تحرير",
 
   // "submission.workflow.tasks.claimed.edit_help": "Select this option to change the item's metadata.",
-  // TODO New key - Add a translation
-  "submission.workflow.tasks.claimed.edit_help": "Select this option to change the item's metadata.",
+  "submission.workflow.tasks.claimed.edit_help": "قم بتحديد هذا الخيار لتغيير ميتاداتا المادة.",
+
+  // "submission.workflow.tasks.claimed.decline": "Decline",
+  "submission.workflow.tasks.claimed.decline": "رفض",
+
+  // "submission.workflow.tasks.claimed.decline_help": "",
+  "submission.workflow.tasks.claimed.decline_help": "",
 
   // "submission.workflow.tasks.claimed.reject.reason.info": "Please enter your reason for rejecting the submission into the box below, indicating whether the submitter may fix a problem and resubmit.",
-  // TODO New key - Add a translation
-  "submission.workflow.tasks.claimed.reject.reason.info": "Please enter your reason for rejecting the submission into the box below, indicating whether the submitter may fix a problem and resubmit.",
+  "submission.workflow.tasks.claimed.reject.reason.info": "يرجي إدخال سبب رفض التقديم في المربع أدناه، وقم بتوضيح ما إذا كان بإمكان المقدم تصحيح المشكلة وإعادة التقديم.",
 
   // "submission.workflow.tasks.claimed.reject.reason.placeholder": "Describe the reason of reject",
-  // TODO New key - Add a translation
-  "submission.workflow.tasks.claimed.reject.reason.placeholder": "Describe the reason of reject",
+  "submission.workflow.tasks.claimed.reject.reason.placeholder": "قم بوصف سبب الرفض",
 
   // "submission.workflow.tasks.claimed.reject.reason.submit": "Reject item",
-  // TODO New key - Add a translation
-  "submission.workflow.tasks.claimed.reject.reason.submit": "Reject item",
+  "submission.workflow.tasks.claimed.reject.reason.submit": "رفض المادة",
 
   // "submission.workflow.tasks.claimed.reject.reason.title": "Reason",
-  // TODO New key - Add a translation
-  "submission.workflow.tasks.claimed.reject.reason.title": "Reason",
+  "submission.workflow.tasks.claimed.reject.reason.title": "السبب",
 
   // "submission.workflow.tasks.claimed.reject.submit": "Reject",
-  // TODO New key - Add a translation
-  "submission.workflow.tasks.claimed.reject.submit": "Reject",
+  "submission.workflow.tasks.claimed.reject.submit": "رفض",
 
   // "submission.workflow.tasks.claimed.reject_help": "If you have reviewed the item and found it is <strong>not</strong> suitable for inclusion in the collection, select \"Reject\".  You will then be asked to enter a message indicating why the item is unsuitable, and whether the submitter should change something and resubmit.",
-  // TODO New key - Add a translation
-  "submission.workflow.tasks.claimed.reject_help": "If you have reviewed the item and found it is <strong>not</strong> suitable for inclusion in the collection, select \"Reject\".  You will then be asked to enter a message indicating why the item is unsuitable, and whether the submitter should change something and resubmit.",
+  "submission.workflow.tasks.claimed.reject_help": "إذا قمت بمراجعة المادة ووجدتها <strong>غير</strong> ملائمة للإدراج في الحاوية، اختر \"رفض\". سيُطلب منك إدخال رسالة لتوضيح سبب عدم ملاءمة المادة، وما إذا كان يجب على المقدم إجراء بعض التغييرات وإعادة التقديم.",
 
   // "submission.workflow.tasks.claimed.return": "Return to pool",
-  // TODO New key - Add a translation
-  "submission.workflow.tasks.claimed.return": "Return to pool",
+  "submission.workflow.tasks.claimed.return": "إعادة إلى الصحن",
 
   // "submission.workflow.tasks.claimed.return_help": "Return the task to the pool so that another user may perform the task.",
-  // TODO New key - Add a translation
-  "submission.workflow.tasks.claimed.return_help": "Return the task to the pool so that another user may perform the task.",
-
-
+  "submission.workflow.tasks.claimed.return_help": "إعادة المهمة إلى الصحن لكي يقوم مستخدم آخر بأداء المهمة.",
 
   // "submission.workflow.tasks.generic.error": "Error occurred during operation...",
-  // TODO New key - Add a translation
-  "submission.workflow.tasks.generic.error": "Error occurred during operation...",
+  "submission.workflow.tasks.generic.error": "حدث خطأ أثناء العملية...",
 
   // "submission.workflow.tasks.generic.processing": "Processing...",
-  // TODO New key - Add a translation
-  "submission.workflow.tasks.generic.processing": "Processing...",
+  "submission.workflow.tasks.generic.processing": "جاري المعالجة...",
 
   // "submission.workflow.tasks.generic.submitter": "Submitter",
-  // TODO New key - Add a translation
-  "submission.workflow.tasks.generic.submitter": "Submitter",
+  "submission.workflow.tasks.generic.submitter": "المقدم",
 
   // "submission.workflow.tasks.generic.success": "Operation successful",
-  // TODO New key - Add a translation
-  "submission.workflow.tasks.generic.success": "Operation successful",
-
-
+  "submission.workflow.tasks.generic.success": "تمت العملية بنجاح",
 
   // "submission.workflow.tasks.pool.claim": "Claim",
-  // TODO New key - Add a translation
-  "submission.workflow.tasks.pool.claim": "Claim",
+  "submission.workflow.tasks.pool.claim": "مطالبة",
 
   // "submission.workflow.tasks.pool.claim_help": "Assign this task to yourself.",
-  // TODO New key - Add a translation
-  "submission.workflow.tasks.pool.claim_help": "Assign this task to yourself.",
+  "submission.workflow.tasks.pool.claim_help": "قم بتعيين هذه المهمة لنفسك.",
 
   // "submission.workflow.tasks.pool.hide-detail": "Hide detail",
-  // TODO New key - Add a translation
-  "submission.workflow.tasks.pool.hide-detail": "Hide detail",
+  "submission.workflow.tasks.pool.hide-detail": "إخفاء التفاصيل",
 
   // "submission.workflow.tasks.pool.show-detail": "Show detail",
+  "submission.workflow.tasks.pool.show-detail": "عرض التفاصيل",
+
+  // "submission.workflow.tasks.duplicates": "potential duplicates were detected for this item. Claim and edit this item to see details.",
   // TODO New key - Add a translation
-  "submission.workflow.tasks.pool.show-detail": "Show detail",
+  "submission.workflow.tasks.duplicates": "potential duplicates were detected for this item. Claim and edit this item to see details.",
 
+  // "submission.workspace.generic.view": "View",
+  "submission.workspace.generic.view": "عرض",
 
+  // "submission.workspace.generic.view-help": "Select this option to view the item's metadata.",
+  "submission.workspace.generic.view-help": "حدد هذا الخيار لعرض ميتاداتا المادة.",
+
+  // "submitter.empty": "N/A",
+  "submitter.empty": "غير قابل للتطبيق",
+
+  // "subscriptions.title": "Subscriptions",
+  "subscriptions.title": "الاشتراكات",
+
+  // "subscriptions.item": "Subscriptions for items",
+  "subscriptions.item": "اشتراكات للمواد",
+
+  // "subscriptions.collection": "Subscriptions for collections",
+  "subscriptions.collection": "اشتراكات للحاويات",
+
+  // "subscriptions.community": "Subscriptions for communities",
+  "subscriptions.community": "اشتراكات للمجتمعات",
+
+  // "subscriptions.subscription_type": "Subscription type",
+  "subscriptions.subscription_type": "نوع الاشتراك",
+
+  // "subscriptions.frequency": "Subscription frequency",
+  "subscriptions.frequency": "تواتر الاشتراك",
+
+  // "subscriptions.frequency.D": "Daily",
+  "subscriptions.frequency.D": "يومي",
+
+  // "subscriptions.frequency.M": "Monthly",
+  "subscriptions.frequency.M": "شهري",
+
+  // "subscriptions.frequency.W": "Weekly",
+  "subscriptions.frequency.W": "أسبوعي",
+
+  // "subscriptions.tooltip": "Subscribe",
+  "subscriptions.tooltip": "اشتراك",
+
+  // "subscriptions.modal.title": "Subscriptions",
+  "subscriptions.modal.title": "الاشتراكات",
+
+  // "subscriptions.modal.type-frequency": "Type and frequency",
+  "subscriptions.modal.type-frequency": "النوع والتواتر",
+
+  // "subscriptions.modal.close": "Close",
+  "subscriptions.modal.close": "إغلاق",
+
+  // "subscriptions.modal.delete-info": "To remove this subscription, please visit the \"Subscriptions\" page under your user profile",
+  "subscriptions.modal.delete-info": "لإزالة هذا الاشتراك، يرجى زيارة صفحة \"الاشتراكات\" أدنى ملف تعريف المستخدم الخاص بك",
+
+  // "subscriptions.modal.new-subscription-form.type.content": "Content",
+  "subscriptions.modal.new-subscription-form.type.content": "المحتوى",
+
+  // "subscriptions.modal.new-subscription-form.frequency.D": "Daily",
+  "subscriptions.modal.new-subscription-form.frequency.D": "يومي",
+
+  // "subscriptions.modal.new-subscription-form.frequency.W": "Weekly",
+  "subscriptions.modal.new-subscription-form.frequency.W": "أسبوعي",
+
+  // "subscriptions.modal.new-subscription-form.frequency.M": "Monthly",
+  "subscriptions.modal.new-subscription-form.frequency.M": "شهري",
+
+  // "subscriptions.modal.new-subscription-form.submit": "Submit",
+  "subscriptions.modal.new-subscription-form.submit": "تقديم",
+
+  // "subscriptions.modal.new-subscription-form.processing": "Processing...",
+  "subscriptions.modal.new-subscription-form.processing": "جاري المعالجة...",
+
+  // "subscriptions.modal.create.success": "Subscribed to {{ type }} successfully.",
+  "subscriptions.modal.create.success": "تم الاشتراك في {{type}} بنجاح.",
+
+  // "subscriptions.modal.delete.success": "Subscription deleted successfully",
+  "subscriptions.modal.delete.success": "تم حذف الاشتراك بنجاح",
+
+  // "subscriptions.modal.update.success": "Subscription to {{ type }} updated successfully",
+  "subscriptions.modal.update.success": "تم تحديث الاشتراك في {{type}} بنجاح",
+
+  // "subscriptions.modal.create.error": "An error occurs during the subscription creation",
+  "subscriptions.modal.create.error": "حدث خطأ أثناء إنشاء الاشتراك",
+
+  // "subscriptions.modal.delete.error": "An error occurs during the subscription delete",
+  "subscriptions.modal.delete.error": "حدث خطأ أثناء حذف الاشتراك",
+
+  // "subscriptions.modal.update.error": "An error occurs during the subscription update",
+  "subscriptions.modal.update.error": "حدث خطأ أثناء تحديث الاشتراك",
+
+  // "subscriptions.table.dso": "Subject",
+  "subscriptions.table.dso": "الموضوع",
+
+  // "subscriptions.table.subscription_type": "Subscription Type",
+  "subscriptions.table.subscription_type": "نوع الاشتراك",
+
+  // "subscriptions.table.subscription_frequency": "Subscription Frequency",
+  "subscriptions.table.subscription_frequency": "تواتر الاشتراك",
+
+  // "subscriptions.table.action": "Action",
+  "subscriptions.table.action": "إجراء",
+
+  // "subscriptions.table.edit": "Edit",
+  "subscriptions.table.edit": "تحرير",
+
+  // "subscriptions.table.delete": "Delete",
+  "subscriptions.table.delete": "حذف",
+
+  // "subscriptions.table.not-available": "Not available",
+  "subscriptions.table.not-available": "غير متاح",
+
+  // "subscriptions.table.not-available-message": "The subscribed item has been deleted, or you don't currently have the permission to view it",
+  "subscriptions.table.not-available-message": "تم حذف مادة الاشتراك، أو ليس لديك صلاحية حالياً لمشاهدتها",
+
+  // "subscriptions.table.empty.message": "You do not have any subscriptions at this time. To subscribe to email updates for a Community or Collection, use the subscription button on the object's page.",
+  "subscriptions.table.empty.message": "ليس لديك أي اشتراكات في هذا الوقت. للاشتراك في تحديثات البريد الإلكتروني لمجتمع أو حاوية، استخدم زر الاشتراك الموجود في صفحة الكائن.",
+
+  // "thumbnail.default.alt": "Thumbnail Image",
+  "thumbnail.default.alt": "صورة مصغرة",
+
+  // "thumbnail.default.placeholder": "No Thumbnail Available",
+  "thumbnail.default.placeholder": "لا تتوفر صورة مصغرة",
+
+  // "thumbnail.project.alt": "Project Logo",
+  "thumbnail.project.alt": "شعار المشروع",
+
+  // "thumbnail.project.placeholder": "Project Placeholder Image",
+  "thumbnail.project.placeholder": "صورة العنصر النائب للمشروع",
+
+  // "thumbnail.orgunit.alt": "OrgUnit Logo",
+  "thumbnail.orgunit.alt": "شعار الوحدة المؤسسية",
+
+  // "thumbnail.orgunit.placeholder": "OrgUnit Placeholder Image",
+  "thumbnail.orgunit.placeholder": "صورة العنصر النائي للوحدة المؤسسية",
+
+  // "thumbnail.person.alt": "Profile Picture",
+  "thumbnail.person.alt": "صورة الملف الشخصي",
+
+  // "thumbnail.person.placeholder": "No Profile Picture Available",
+  "thumbnail.person.placeholder": "لا تتوافر صورة للملف الشخصي",
 
   // "title": "DSpace",
-  // TODO New key - Add a translation
-  "title": "DSpace",
-
-
+  "title": "دي سبيس",
 
   // "vocabulary-treeview.header": "Hierarchical tree view",
-  // TODO New key - Add a translation
-  "vocabulary-treeview.header": "Hierarchical tree view",
+  "vocabulary-treeview.header": "عرض الشجرة الهرمية",
 
   // "vocabulary-treeview.load-more": "Load more",
-  // TODO New key - Add a translation
-  "vocabulary-treeview.load-more": "Load more",
+  "vocabulary-treeview.load-more": "تحميل المزيد",
 
   // "vocabulary-treeview.search.form.reset": "Reset",
-  // TODO New key - Add a translation
-  "vocabulary-treeview.search.form.reset": "Reset",
+  "vocabulary-treeview.search.form.reset": "إعادة تعيين",
 
   // "vocabulary-treeview.search.form.search": "Search",
-  // TODO New key - Add a translation
-  "vocabulary-treeview.search.form.search": "Search",
+  "vocabulary-treeview.search.form.search": "بحث",
+
+  // "vocabulary-treeview.search.form.search-placeholder": "Filter results by typing the first few letters",
+  "vocabulary-treeview.search.form.search-placeholder": "تنقيح النتائج عن طريق كتابة الأحرف الأولى",
 
   // "vocabulary-treeview.search.no-result": "There were no items to show",
-  // TODO New key - Add a translation
-  "vocabulary-treeview.search.no-result": "There were no items to show",
+  "vocabulary-treeview.search.no-result": "لم تكن هناك مواد للعرض",
 
   // "vocabulary-treeview.tree.description.nsi": "The Norwegian Science Index",
-  // TODO New key - Add a translation
-  "vocabulary-treeview.tree.description.nsi": "The Norwegian Science Index",
+  "vocabulary-treeview.tree.description.nsi": "فهرس العلوم النرويجي",
 
   // "vocabulary-treeview.tree.description.srsc": "Research Subject Categories",
-  // TODO New key - Add a translation
-  "vocabulary-treeview.tree.description.srsc": "Research Subject Categories",
-
+  "vocabulary-treeview.tree.description.srsc": "فئات موضوع البحث",
 
+  // "vocabulary-treeview.info": "Select a subject to add as search filter",
+  "vocabulary-treeview.info": "قم بتحديد موضوع لإضافته كمنقح بحث",
 
   // "uploader.browse": "browse",
-  // TODO New key - Add a translation
-  "uploader.browse": "browse",
+  "uploader.browse": "استعراض",
 
   // "uploader.drag-message": "Drag & Drop your files here",
-  // TODO New key - Add a translation
-  "uploader.drag-message": "Drag & Drop your files here",
+  "uploader.drag-message": "قم بسحب وإسقاط ملفاتك هنا",
+
+  // "uploader.delete.btn-title": "Delete",
+  "uploader.delete.btn-title": "حذف",
 
   // "uploader.or": ", or ",
-  // TODO New key - Add a translation
-  "uploader.or": ", or ",
+  "uploader.or": ", أو ",
 
   // "uploader.processing": "Processing uploaded file(s)... (it's now safe to close this page)",
-  // TODO New key - Add a translation
-  "uploader.processing": "Processing uploaded file(s)... (it's now safe to close this page)",
+  "uploader.processing": "جاري معالجة الملفات التي تم تحميلها... (أصبح من الآمن الآن إغلاق هذه الصفحة)",
 
   // "uploader.queue-length": "Queue length",
-  // TODO New key - Add a translation
-  "uploader.queue-length": "Queue length",
+  "uploader.queue-length": "طول الصف",
 
   // "virtual-metadata.delete-item.info": "Select the types for which you want to save the virtual metadata as real metadata",
-  // TODO New key - Add a translation
-  "virtual-metadata.delete-item.info": "Select the types for which you want to save the virtual metadata as real metadata",
+  "virtual-metadata.delete-item.info": "قم بتحديد الأنواع التي تريد حفظ الميتاداتا الافتراضية لها كميتاداتا فعلية",
 
   // "virtual-metadata.delete-item.modal-head": "The virtual metadata of this relation",
-  // TODO New key - Add a translation
-  "virtual-metadata.delete-item.modal-head": "The virtual metadata of this relation",
+  "virtual-metadata.delete-item.modal-head": "الميتاداتا الافتراضية لهذه العلاقة",
 
   // "virtual-metadata.delete-relationship.modal-head": "Select the items for which you want to save the virtual metadata as real metadata",
-  // TODO New key - Add a translation
-  "virtual-metadata.delete-relationship.modal-head": "Select the items for which you want to save the virtual metadata as real metadata",
+  "virtual-metadata.delete-relationship.modal-head": "قم بتحديد المواد التي تريد حفظ الميتاداتا الافتراضية لها كميتاداتا فعلية",
 
+  // "supervisedWorkspace.search.results.head": "Supervised Items",
+  "supervisedWorkspace.search.results.head": "مواد خاضعة للإشراف",
 
+  // "workspace.search.results.head": "Your submissions",
+  "workspace.search.results.head": "تقديمات",
 
   // "workflowAdmin.search.results.head": "Administer Workflow",
-  // TODO New key - Add a translation
-  "workflowAdmin.search.results.head": "Administer Workflow",
+  "workflowAdmin.search.results.head": "أدر سير العمل",
 
+  // "workflow.search.results.head": "Workflow tasks",
+  "workflow.search.results.head": "مهام سير العمل",
 
+  // "supervision.search.results.head": "Workflow and Workspace tasks",
+  "supervision.search.results.head": "مهام سير العمل ومساحة العمل",
+
+  // "orgunit.search.results.head": "Organizational Unit Search Results",
+  "orgunit.search.results.head": "نتائج بحث الوحدات المؤسسية",
+
+  // "workflow-item.edit.breadcrumbs": "Edit workflowitem",
+  "workflow-item.edit.breadcrumbs": "تحرير مادة سير العمل",
+
+  // "workflow-item.edit.title": "Edit workflowitem",
+  "workflow-item.edit.title": "تحرير مادة سير العمل",
 
   // "workflow-item.delete.notification.success.title": "Deleted",
-  // TODO New key - Add a translation
-  "workflow-item.delete.notification.success.title": "Deleted",
+  "workflow-item.delete.notification.success.title": "تم الحذف",
 
   // "workflow-item.delete.notification.success.content": "This workflow item was successfully deleted",
-  // TODO New key - Add a translation
-  "workflow-item.delete.notification.success.content": "This workflow item was successfully deleted",
+  "workflow-item.delete.notification.success.content": "تم حذف مادة سير العمل هذه بنجاح",
 
   // "workflow-item.delete.notification.error.title": "Something went wrong",
-  // TODO New key - Add a translation
-  "workflow-item.delete.notification.error.title": "Something went wrong",
+  "workflow-item.delete.notification.error.title": "لقد حدث خطأ ما",
 
   // "workflow-item.delete.notification.error.content": "The workflow item could not be deleted",
-  // TODO New key - Add a translation
-  "workflow-item.delete.notification.error.content": "The workflow item could not be deleted",
+  "workflow-item.delete.notification.error.content": "تعذر حذف مادة سير العمل",
 
   // "workflow-item.delete.title": "Delete workflow item",
-  // TODO New key - Add a translation
-  "workflow-item.delete.title": "Delete workflow item",
+  "workflow-item.delete.title": "حذف مادة سير العمل",
 
   // "workflow-item.delete.header": "Delete workflow item",
-  // TODO New key - Add a translation
-  "workflow-item.delete.header": "Delete workflow item",
+  "workflow-item.delete.header": "حذف مادة سير العمل",
 
   // "workflow-item.delete.button.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "workflow-item.delete.button.cancel": "Cancel",
+  "workflow-item.delete.button.cancel": "إلغاء",
 
   // "workflow-item.delete.button.confirm": "Delete",
-  // TODO New key - Add a translation
-  "workflow-item.delete.button.confirm": "Delete",
-
+  "workflow-item.delete.button.confirm": "حذف",
 
   // "workflow-item.send-back.notification.success.title": "Sent back to submitter",
-  // TODO New key - Add a translation
-  "workflow-item.send-back.notification.success.title": "Sent back to submitter",
+  "workflow-item.send-back.notification.success.title": "إعادة إرسال إلى المقدم",
 
   // "workflow-item.send-back.notification.success.content": "This workflow item was successfully sent back to the submitter",
-  // TODO New key - Add a translation
-  "workflow-item.send-back.notification.success.content": "This workflow item was successfully sent back to the submitter",
+  "workflow-item.send-back.notification.success.content": "تمت إعادة إرسال مادة سير العمل هذه إلى المقدم بنجاح",
 
   // "workflow-item.send-back.notification.error.title": "Something went wrong",
-  // TODO New key - Add a translation
-  "workflow-item.send-back.notification.error.title": "Something went wrong",
+  "workflow-item.send-back.notification.error.title": "لقد حدث خطأ ما",
 
   // "workflow-item.send-back.notification.error.content": "The workflow item could not be sent back to the submitter",
-  // TODO New key - Add a translation
-  "workflow-item.send-back.notification.error.content": "The workflow item could not be sent back to the submitter",
+  "workflow-item.send-back.notification.error.content": "تعذر إعادة إرسال مادة سير العمل إلى المقدم",
 
   // "workflow-item.send-back.title": "Send workflow item back to submitter",
-  // TODO New key - Add a translation
-  "workflow-item.send-back.title": "Send workflow item back to submitter",
+  "workflow-item.send-back.title": "إعادة إرسال مادة سير العمل إلى المقدم",
 
   // "workflow-item.send-back.header": "Send workflow item back to submitter",
-  // TODO New key - Add a translation
-  "workflow-item.send-back.header": "Send workflow item back to submitter",
+  "workflow-item.send-back.header": "إعادة إرسال مادة سير العمل إلى المقدم",
 
   // "workflow-item.send-back.button.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "workflow-item.send-back.button.cancel": "Cancel",
+  "workflow-item.send-back.button.cancel": "إلغاء",
 
-  // "workflow-item.send-back.button.confirm": "Send back"
-  // TODO New key - Add a translation
-  "workflow-item.send-back.button.confirm": "Send back",
+  // "workflow-item.send-back.button.confirm": "Send back",
+  "workflow-item.send-back.button.confirm": "إعادة إرسال",
 
+  // "workflow-item.view.breadcrumbs": "Workflow View",
+  "workflow-item.view.breadcrumbs": "عرض سير العمل",
+
+  // "workspace-item.view.breadcrumbs": "Workspace View",
+  "workspace-item.view.breadcrumbs": "عرض مساحة العمل",
+
+  // "workspace-item.view.title": "Workspace View",
+  "workspace-item.view.title": "عرض مساحة العمل",
+
+  // "workspace-item.delete.breadcrumbs": "Workspace Delete",
+  "workspace-item.delete.breadcrumbs": "حذف مساحة العمل",
+
+  // "workspace-item.delete.header": "Delete workspace item",
+  "workspace-item.delete.header": "حذف مادة مساحة العمل",
+
+  // "workspace-item.delete.button.confirm": "Delete",
+  "workspace-item.delete.button.confirm": "حذف",
+
+  // "workspace-item.delete.button.cancel": "Cancel",
+  "workspace-item.delete.button.cancel": "إلغاء",
+
+  // "workspace-item.delete.notification.success.title": "Deleted",
+  "workspace-item.delete.notification.success.title": "تم الحذف",
+
+  // "workspace-item.delete.title": "This workspace item was successfully deleted",
+  "workspace-item.delete.title": "تم حذف مادة مساحة العمل بنجاح",
+
+  // "workspace-item.delete.notification.error.title": "Something went wrong",
+  "workspace-item.delete.notification.error.title": "هناك خطأ ما",
+
+  // "workspace-item.delete.notification.error.content": "The workspace item could not be deleted",
+  "workspace-item.delete.notification.error.content": "تعذر حذف مادة مساحة العمل",
+
+  // "workflow-item.advanced.title": "Advanced workflow",
+  "workflow-item.advanced.title": "سير العمل المتقدم",
+
+  // "workflow-item.selectrevieweraction.notification.success.title": "Selected reviewer",
+  "workflow-item.selectrevieweraction.notification.success.title": "المراجع المحدد",
+
+  // "workflow-item.selectrevieweraction.notification.success.content": "The reviewer for this workflow item has been successfully selected",
+  "workflow-item.selectrevieweraction.notification.success.content": "تم اختيار المراجع الخاص بمادة سير العمل هذه بنجاح",
+
+  // "workflow-item.selectrevieweraction.notification.error.title": "Something went wrong",
+  "workflow-item.selectrevieweraction.notification.error.title": "هناك خطأ ما",
+
+  // "workflow-item.selectrevieweraction.notification.error.content": "Couldn't select the reviewer for this workflow item",
+  "workflow-item.selectrevieweraction.notification.error.content": "تعذر تحديد المراجع لعنصر سير العمل هذا",
+
+  // "workflow-item.selectrevieweraction.title": "Select Reviewer",
+  "workflow-item.selectrevieweraction.title": "تحديد مراجع",
+
+  // "workflow-item.selectrevieweraction.header": "Select Reviewer",
+  "workflow-item.selectrevieweraction.header": "تحديد مراجع",
+
+  // "workflow-item.selectrevieweraction.button.cancel": "Cancel",
+  "workflow-item.selectrevieweraction.button.cancel": "إلغاء",
+
+  // "workflow-item.selectrevieweraction.button.confirm": "Confirm",
+  "workflow-item.selectrevieweraction.button.confirm": "تأكيد",
+
+  // "workflow-item.scorereviewaction.notification.success.title": "Rating review",
+  "workflow-item.scorereviewaction.notification.success.title": "مراجعة التقييم",
+
+  // "workflow-item.scorereviewaction.notification.success.content": "The rating for this item workflow item has been successfully submitted",
+  "workflow-item.scorereviewaction.notification.success.content": "تم إرسال التقييم الخاص بعنصر سير عمل هذه المادة بنجاح",
+
+  // "workflow-item.scorereviewaction.notification.error.title": "Something went wrong",
+  "workflow-item.scorereviewaction.notification.error.title": "هناك خطأ ما",
+
+  // "workflow-item.scorereviewaction.notification.error.content": "Couldn't rate this item",
+  "workflow-item.scorereviewaction.notification.error.content": "تعذر تقييم هذه المادة",
+
+  // "workflow-item.scorereviewaction.title": "Rate this item",
+  "workflow-item.scorereviewaction.title": "قم بتقيم هذه المادة",
+
+  // "workflow-item.scorereviewaction.header": "Rate this item",
+  "workflow-item.scorereviewaction.header": "قم بتقييم هذه المادة",
+
+  // "workflow-item.scorereviewaction.button.cancel": "Cancel",
+  "workflow-item.scorereviewaction.button.cancel": "إلغاء",
+
+  // "workflow-item.scorereviewaction.button.confirm": "Confirm",
+  "workflow-item.scorereviewaction.button.confirm": "تأكيد",
+
+  // "idle-modal.header": "Session will expire soon",
+  "idle-modal.header": "ستنتهي الجلسة بعد قليل",
+
+  // "idle-modal.info": "For security reasons, user sessions expire after {{ timeToExpire }} minutes of inactivity. Your session will expire soon. Would you like to extend it or log out?",
+  "idle-modal.info": "لأسباب أمنية، تنتهي جلسات المستخدم بعد {{ timeToExpire }} دقيقة من عدم النشاط. ستنتهي جلستك بعد قليل. هل ترغب في تمديدها أم تسجيل الخروج؟",
+
+  // "idle-modal.log-out": "Log out",
+  "idle-modal.log-out": "خروج",
+
+  // "idle-modal.extend-session": "Extend session",
+  "idle-modal.extend-session": "تمديد الجلسة",
+
+  // "researcher.profile.action.processing": "Processing...",
+  "researcher.profile.action.processing": "جاري المعالجة...",
+
+  // "researcher.profile.associated": "Researcher profile associated",
+  "researcher.profile.associated": "الملف الشخصي للباحث المرتبط",
+
+  // "researcher.profile.change-visibility.fail": "An unexpected error occurs while changing the profile visibility",
+  "researcher.profile.change-visibility.fail": "حدث خطأ غير متوقع أثناء تغيير رؤية الملف الشخصي",
+
+  // "researcher.profile.create.new": "Create new",
+  "researcher.profile.create.new": "إنشاء جديد",
+
+  // "researcher.profile.create.success": "Researcher profile created successfully",
+  "researcher.profile.create.success": "تم إنشاء الملف الشخصي للباحث بنجاح",
+
+  // "researcher.profile.create.fail": "An error occurs during the researcher profile creation",
+  "researcher.profile.create.fail": "حدث خطأ أثناء إنشاء الملف الشخصي للباحث",
+
+  // "researcher.profile.delete": "Delete",
+  "researcher.profile.delete": "حذف",
+
+  // "researcher.profile.expose": "Expose",
+  "researcher.profile.expose": "عرض",
+
+  // "researcher.profile.hide": "Hide",
+  "researcher.profile.hide": "إخفاء",
+
+  // "researcher.profile.not.associated": "Researcher profile not yet associated",
+  "researcher.profile.not.associated": "الملف الشخصي للباحث غير مرتبط بعد",
+
+  // "researcher.profile.view": "View",
+  "researcher.profile.view": "عرض",
+
+  // "researcher.profile.private.visibility": "PRIVATE",
+  "researcher.profile.private.visibility": "خاص",
+
+  // "researcher.profile.public.visibility": "PUBLIC",
+  "researcher.profile.public.visibility": "عام",
+
+  // "researcher.profile.status": "Status:",
+  "researcher.profile.status": "الحالة:",
+
+  // "researcherprofile.claim.not-authorized": "You are not authorized to claim this item. For more details contact the administrator(s).",
+  "researcherprofile.claim.not-authorized": "لا يحق لك المطالبة بهذه المادة. لمزيد من التفاصيل يرجى الاتصال بالمسؤول.",
+
+  // "researcherprofile.error.claim.body": "An error occurred while claiming the profile, please try again later",
+  "researcherprofile.error.claim.body": "حدث خطأ أثناء المطالبة بالملف الشخصي، يرجى المحاولة مرة أخرى لاحقاً",
+
+  // "researcherprofile.error.claim.title": "Error",
+  "researcherprofile.error.claim.title": "خطأ",
+
+  // "researcherprofile.success.claim.body": "Profile claimed with success",
+  "researcherprofile.success.claim.body": "تمت المطالبة بالملف الشخصي بنجاح",
+
+  // "researcherprofile.success.claim.title": "Success",
+  "researcherprofile.success.claim.title": "نجاح",
+
+  // "person.page.orcid.create": "Create an ORCID ID",
+  "person.page.orcid.create": "إنشاء معرف أوركيد",
+
+  // "person.page.orcid.granted-authorizations": "Granted authorizations",
+  "person.page.orcid.granted-authorizations": "التصاريح الممنوحة",
+
+  // "person.page.orcid.grant-authorizations": "Grant authorizations",
+  "person.page.orcid.grant-authorizations": "منح التصاريح",
+
+  // "person.page.orcid.link": "Connect to ORCID ID",
+  "person.page.orcid.link": "الاتصال بمعرف أوركيد",
+
+  // "person.page.orcid.link.processing": "Linking profile to ORCID...",
+  "person.page.orcid.link.processing": "جاري ربط الملف الشخصي بأوركيد...",
+
+  // "person.page.orcid.link.error.message": "Something went wrong while connecting the profile with ORCID. If the problem persists, contact the administrator.",
+  "person.page.orcid.link.error.message": "حدث خطأ ما أثناء ربط الملف الشخصي بأوركيد. إذا استمرت المشكلة، يرجى الاتصال بالمسؤول.",
+
+  // "person.page.orcid.orcid-not-linked-message": "The ORCID iD of this profile ({{ orcid }}) has not yet been connected to an account on the ORCID registry or the connection is expired.",
+  "person.page.orcid.orcid-not-linked-message": "معرف أوركيد لهذا الملف الشخصي ({{ orcid }}) لم يتم ربطه بعد بحساب في سجل أوركيد أو انتهت صلاحية الاتصال.",
+
+  // "person.page.orcid.unlink": "Disconnect from ORCID",
+  "person.page.orcid.unlink": "قطع الاتصال بأوركيد",
+
+  // "person.page.orcid.unlink.processing": "Processing...",
+  "person.page.orcid.unlink.processing": "جاري المعالجة...",
+
+  // "person.page.orcid.missing-authorizations": "Missing authorizations",
+  "person.page.orcid.missing-authorizations": "تصاريح مفقودة",
+
+  // "person.page.orcid.missing-authorizations-message": "The following authorizations are missing:",
+  "person.page.orcid.missing-authorizations-message": "التصاريح التالية مفقودة:",
+
+  // "person.page.orcid.no-missing-authorizations-message": "Great! This box is empty, so you have granted all access rights to use all functions offers by your institution.",
+  "person.page.orcid.no-missing-authorizations-message": "عظيم! هذا المربع فارغ، لذا فقد قمت بمنح جميع حقوق الوصول لاستخدام جميع الوظائف التي تقدمها مؤسستك.",
+
+  // "person.page.orcid.no-orcid-message": "No ORCID iD associated yet. By clicking on the button below it is possible to link this profile with an ORCID account.",
+  "person.page.orcid.no-orcid-message": "لا يوجد معرف أوركيد مرتبط حتى الآن. بالنقر على الزر أدناه من الممكن ربط هذا الملف الشخصي بحساب أوركيد.",
+
+  // "person.page.orcid.profile-preferences": "Profile preferences",
+  "person.page.orcid.profile-preferences": "تفضيلات الملف الشخصي",
+
+  // "person.page.orcid.funding-preferences": "Funding preferences",
+  "person.page.orcid.funding-preferences": "تفضيلات التمويل",
+
+  // "person.page.orcid.publications-preferences": "Publication preferences",
+  "person.page.orcid.publications-preferences": "تفضيلات النشر",
+
+  // "person.page.orcid.remove-orcid-message": "If you need to remove your ORCID, please contact the repository administrator",
+  "person.page.orcid.remove-orcid-message": "إذا كنت بحاجة إلى إزالة أوركيد الخاص بك، يرجى الاتصال بمسؤول المستودع",
+
+  // "person.page.orcid.save.preference.changes": "Update settings",
+  "person.page.orcid.save.preference.changes": "تحديث الإعدادات",
+
+  // "person.page.orcid.sync-profile.affiliation": "Affiliation",
+  "person.page.orcid.sync-profile.affiliation": "الانتسابات",
+
+  // "person.page.orcid.sync-profile.biographical": "Biographical data",
+  "person.page.orcid.sync-profile.biographical": "البيانات الشخصية",
+
+  // "person.page.orcid.sync-profile.education": "Education",
+  "person.page.orcid.sync-profile.education": "التعليم",
+
+  // "person.page.orcid.sync-profile.identifiers": "Identifiers",
+  "person.page.orcid.sync-profile.identifiers": "المعرفات",
+
+  // "person.page.orcid.sync-fundings.all": "All fundings",
+  "person.page.orcid.sync-fundings.all": "كل التمويلات",
+
+  // "person.page.orcid.sync-fundings.mine": "My fundings",
+  "person.page.orcid.sync-fundings.mine": "تمويلاتي",
+
+  // "person.page.orcid.sync-fundings.my_selected": "Selected fundings",
+  "person.page.orcid.sync-fundings.my_selected": "التمويلات المحددة",
+
+  // "person.page.orcid.sync-fundings.disabled": "Disabled",
+  "person.page.orcid.sync-fundings.disabled": "معطلة",
+
+  // "person.page.orcid.sync-publications.all": "All publications",
+  "person.page.orcid.sync-publications.all": "كل المنشورات",
+
+  // "person.page.orcid.sync-publications.mine": "My publications",
+  "person.page.orcid.sync-publications.mine": "منشوراتي",
+
+  // "person.page.orcid.sync-publications.my_selected": "Selected publications",
+  "person.page.orcid.sync-publications.my_selected": "المنشورات المحددة",
+
+  // "person.page.orcid.sync-publications.disabled": "Disabled",
+  "person.page.orcid.sync-publications.disabled": "معطلة",
+
+  // "person.page.orcid.sync-queue.discard": "Discard the change and do not synchronize with the ORCID registry",
+  "person.page.orcid.sync-queue.discard": "تجاهل التغيير ولا تقم بالمزامنة مع سجل أوركيد",
+
+  // "person.page.orcid.sync-queue.discard.error": "The discarding of the ORCID queue record failed",
+  "person.page.orcid.sync-queue.discard.error": "فشل تجاهل تسجيلة قائمة انتظار أوركيد",
+
+  // "person.page.orcid.sync-queue.discard.success": "The ORCID queue record have been discarded successfully",
+  "person.page.orcid.sync-queue.discard.success": "تم تجاهل تسجيلة قائمة انتظار أوركيد بنجاح",
+
+  // "person.page.orcid.sync-queue.empty-message": "The ORCID queue registry is empty",
+  "person.page.orcid.sync-queue.empty-message": "سجل قائمة انتظار أوركيد فارغ",
+
+  // "person.page.orcid.sync-queue.table.header.type": "Type",
+  "person.page.orcid.sync-queue.table.header.type": "النوع",
+
+  // "person.page.orcid.sync-queue.table.header.description": "Description",
+  "person.page.orcid.sync-queue.table.header.description": "الوصف",
+
+  // "person.page.orcid.sync-queue.table.header.action": "Action",
+  "person.page.orcid.sync-queue.table.header.action": "إجراء",
+
+  // "person.page.orcid.sync-queue.description.affiliation": "Affiliations",
+  "person.page.orcid.sync-queue.description.affiliation": "الانتسابات",
+
+  // "person.page.orcid.sync-queue.description.country": "Country",
+  "person.page.orcid.sync-queue.description.country": "البلد",
+
+  // "person.page.orcid.sync-queue.description.education": "Educations",
+  "person.page.orcid.sync-queue.description.education": "التعليم",
+
+  // "person.page.orcid.sync-queue.description.external_ids": "External ids",
+  "person.page.orcid.sync-queue.description.external_ids": "معرفات خارجية",
+
+  // "person.page.orcid.sync-queue.description.other_names": "Other names",
+  "person.page.orcid.sync-queue.description.other_names": "أسماء أخرى",
+
+  // "person.page.orcid.sync-queue.description.qualification": "Qualifications",
+  "person.page.orcid.sync-queue.description.qualification": "المؤهلات",
+
+  // "person.page.orcid.sync-queue.description.researcher_urls": "Researcher urls",
+  "person.page.orcid.sync-queue.description.researcher_urls": "عناوين URL للباحث",
+
+  // "person.page.orcid.sync-queue.description.keywords": "Keywords",
+  "person.page.orcid.sync-queue.description.keywords": "كلمات رئيسية",
+
+  // "person.page.orcid.sync-queue.tooltip.insert": "Add a new entry in the ORCID registry",
+  "person.page.orcid.sync-queue.tooltip.insert": "إضافة إدخال جديد في سجل أوركيد",
+
+  // "person.page.orcid.sync-queue.tooltip.update": "Update this entry on the ORCID registry",
+  "person.page.orcid.sync-queue.tooltip.update": "تحديث هذا الإدخال في سجل أوركيد",
+
+  // "person.page.orcid.sync-queue.tooltip.delete": "Remove this entry from the ORCID registry",
+  "person.page.orcid.sync-queue.tooltip.delete": "إزالة هذا الإدخال من سجل أوركيد",
+
+  // "person.page.orcid.sync-queue.tooltip.publication": "Publication",
+  "person.page.orcid.sync-queue.tooltip.publication": "النشر",
+
+  // "person.page.orcid.sync-queue.tooltip.project": "Project",
+  "person.page.orcid.sync-queue.tooltip.project": "المشروع",
+
+  // "person.page.orcid.sync-queue.tooltip.affiliation": "Affiliation",
+  "person.page.orcid.sync-queue.tooltip.affiliation": "الانتسابات",
+
+  // "person.page.orcid.sync-queue.tooltip.education": "Education",
+  "person.page.orcid.sync-queue.tooltip.education": "التعليم",
+
+  // "person.page.orcid.sync-queue.tooltip.qualification": "Qualification",
+  "person.page.orcid.sync-queue.tooltip.qualification": "المؤهل",
+
+  // "person.page.orcid.sync-queue.tooltip.other_names": "Other name",
+  "person.page.orcid.sync-queue.tooltip.other_names": "اسم آخر",
+
+  // "person.page.orcid.sync-queue.tooltip.country": "Country",
+  "person.page.orcid.sync-queue.tooltip.country": "البلد",
+
+  // "person.page.orcid.sync-queue.tooltip.keywords": "Keyword",
+  "person.page.orcid.sync-queue.tooltip.keywords": "كلمة رئيسية",
+
+  // "person.page.orcid.sync-queue.tooltip.external_ids": "External identifier",
+  "person.page.orcid.sync-queue.tooltip.external_ids": "معرف خارجي",
+
+  // "person.page.orcid.sync-queue.tooltip.researcher_urls": "Researcher url",
+  "person.page.orcid.sync-queue.tooltip.researcher_urls": "عنوان URL للباحث",
+
+  // "person.page.orcid.sync-queue.send": "Synchronize with ORCID registry",
+  "person.page.orcid.sync-queue.send": "المزامنة مع سجل أوركيد",
+
+  // "person.page.orcid.sync-queue.send.unauthorized-error.title": "The submission to ORCID failed for missing authorizations.",
+  "person.page.orcid.sync-queue.send.unauthorized-error.title": "فشل التقديم إلى أوركيد بسبب نقص تصاريح.",
+
+  // "person.page.orcid.sync-queue.send.unauthorized-error.content": "Click <a href='{{orcid}}'>here</a> to grant again the required permissions. If the problem persists, contact the administrator",
+  "person.page.orcid.sync-queue.send.unauthorized-error.content": "انقر <a href='{{orcid}}'>هنا</a> لمنح الصلاحيات المطلوبة مرة أخرى. إذا استمرت المشكلة، يرجى الاتصال بالمسؤول",
+
+  // "person.page.orcid.sync-queue.send.bad-request-error": "The submission to ORCID failed because the resource sent to ORCID registry is not valid",
+  "person.page.orcid.sync-queue.send.bad-request-error": "فشل التقديم إلى أوركيد لأن المورد الذي تم إرساله إلى سجل أوركيد غير صالح",
+
+  // "person.page.orcid.sync-queue.send.error": "The submission to ORCID failed",
+  "person.page.orcid.sync-queue.send.error": "فشل التقديم إلى أوركيد",
+
+  // "person.page.orcid.sync-queue.send.conflict-error": "The submission to ORCID failed because the resource is already present on the ORCID registry",
+  "person.page.orcid.sync-queue.send.conflict-error": "فشل التقديم إلى أوركيد لأن المورد موجود بالفعل في سجل أوركيد",
+
+  // "person.page.orcid.sync-queue.send.not-found-warning": "The resource does not exists anymore on the ORCID registry.",
+  "person.page.orcid.sync-queue.send.not-found-warning": "لم يعد المورد موجودًا في سجل أوركيد.",
+
+  // "person.page.orcid.sync-queue.send.success": "The submission to ORCID was completed successfully",
+  "person.page.orcid.sync-queue.send.success": "تم اكتمال التقديم إلى أوركيد بنجاح",
+
+  // "person.page.orcid.sync-queue.send.validation-error": "The data that you want to synchronize with ORCID is not valid",
+  "person.page.orcid.sync-queue.send.validation-error": "البيانات التي تريد مزامنتها مع أوركيد غير صالحة",
+
+  // "person.page.orcid.sync-queue.send.validation-error.amount-currency.required": "The amount's currency is required",
+  "person.page.orcid.sync-queue.send.validation-error.amount-currency.required": "عملة المبلغ مطلوبة",
+
+  // "person.page.orcid.sync-queue.send.validation-error.external-id.required": "The resource to be sent requires at least one identifier",
+  "person.page.orcid.sync-queue.send.validation-error.external-id.required": "يتطلب المورد المراد إرساله معرفًا واحدًا على الأقل",
+
+  // "person.page.orcid.sync-queue.send.validation-error.title.required": "The title is required",
+  "person.page.orcid.sync-queue.send.validation-error.title.required": "العنوان مطلوب",
+
+  // "person.page.orcid.sync-queue.send.validation-error.type.required": "The dc.type is required",
+  "person.page.orcid.sync-queue.send.validation-error.type.required": "dc.type مطلوب",
+
+  // "person.page.orcid.sync-queue.send.validation-error.start-date.required": "The start date is required",
+  "person.page.orcid.sync-queue.send.validation-error.start-date.required": "تاريخ البد مطلوب",
+
+  // "person.page.orcid.sync-queue.send.validation-error.funder.required": "The funder is required",
+  "person.page.orcid.sync-queue.send.validation-error.funder.required": "الممول مطلوب",
+
+  // "person.page.orcid.sync-queue.send.validation-error.country.invalid": "Invalid 2 digits ISO 3166 country",
+  "person.page.orcid.sync-queue.send.validation-error.country.invalid": "كود البلد المكون من رقمين ISO 3166 غير صالح",
+
+  // "person.page.orcid.sync-queue.send.validation-error.organization.required": "The organization is required",
+  "person.page.orcid.sync-queue.send.validation-error.organization.required": "المؤسسة مطلوبة",
+
+  // "person.page.orcid.sync-queue.send.validation-error.organization.name-required": "The organization's name is required",
+  "person.page.orcid.sync-queue.send.validation-error.organization.name-required": "اسم المؤسسة مطلوب",
+
+  // "person.page.orcid.sync-queue.send.validation-error.publication.date-invalid": "The publication date must be one year after 1900",
+  "person.page.orcid.sync-queue.send.validation-error.publication.date-invalid": "يجب أن يكون تاريخ النشر بعد سنة واحدة من عام 1900",
+
+  // "person.page.orcid.sync-queue.send.validation-error.organization.address-required": "The organization to be sent requires an address",
+  "person.page.orcid.sync-queue.send.validation-error.organization.address-required": "تتطلب المؤسسة التي سيتم إرسالها عنواناً",
+
+  // "person.page.orcid.sync-queue.send.validation-error.organization.city-required": "The address of the organization to be sent requires a city",
+  "person.page.orcid.sync-queue.send.validation-error.organization.city-required": "يتطلب عنوان المؤسسة المراد إرسالها مدينة",
+
+  // "person.page.orcid.sync-queue.send.validation-error.organization.country-required": "The address of the organization to be sent requires a valid 2 digits ISO 3166 country",
+  "person.page.orcid.sync-queue.send.validation-error.organization.country-required": "يتطلب عنوان المؤسسة المراد إرسالها رقمين صالحين وفقًا لمعايير ISO 3166",
+
+  // "person.page.orcid.sync-queue.send.validation-error.disambiguated-organization.required": "An identifier to disambiguate organizations is required. Supported ids are GRID, Ringgold, Legal Entity identifiers (LEIs) and Crossref Funder Registry identifiers",
+  "person.page.orcid.sync-queue.send.validation-error.disambiguated-organization.required": "مطلوب معرف لتوضيح المؤسسات. المعرفات المدعومة هي GRID وRinggold ومعرفات الكينونات القانونية (LEIs) ومعرفات سجل Crossref Funder",
+
+  // "person.page.orcid.sync-queue.send.validation-error.disambiguated-organization.value-required": "The organization's identifiers requires a value",
+  "person.page.orcid.sync-queue.send.validation-error.disambiguated-organization.value-required": "تتطلب معرفات المؤسسة قيمة",
+
+  // "person.page.orcid.sync-queue.send.validation-error.disambiguation-source.required": "The organization's identifiers requires a source",
+  "person.page.orcid.sync-queue.send.validation-error.disambiguation-source.required": "تتطلب معرفات المؤسسة مصدراً",
+
+  // "person.page.orcid.sync-queue.send.validation-error.disambiguation-source.invalid": "The source of one of the organization identifiers is invalid. Supported sources are RINGGOLD, GRID, LEI and FUNDREF",
+  "person.page.orcid.sync-queue.send.validation-error.disambiguation-source.invalid": "مصدر أحد معرفات المؤسسة غير صالح. المصادر المدعومة هي RINGGOLD وGRID وLEI وFUNDREF",
+
+  // "person.page.orcid.synchronization-mode": "Synchronization mode",
+  "person.page.orcid.synchronization-mode": "وضع المزامنة",
+
+  // "person.page.orcid.synchronization-mode.batch": "Batch",
+  "person.page.orcid.synchronization-mode.batch": "دفعة",
+
+  // "person.page.orcid.synchronization-mode.label": "Synchronization mode",
+  "person.page.orcid.synchronization-mode.label": "وضع المزامنة",
+
+  // "person.page.orcid.synchronization-mode-message": "Please select how you would like synchronization to ORCID to occur. The options include \"Manual\" (you must send your data to ORCID manually), or \"Batch\" (the system will send your data to ORCID via a scheduled script).",
+  "person.page.orcid.synchronization-mode-message": "يرجى تحديد الطريقة التي تريد أن تتم بها المزامنة مع أوركيد. تتضمن الخيارات \"يدوي\" (يجب عليك إرسال بياناتك إلى أوركيد يدوياً)، أو \"بالدفعة\" (سيقوم النظام بإرسال بياناتك إلى أوركيد عبر برنامج نصي مجدول).",
+
+  // "person.page.orcid.synchronization-mode-funding-message": "Select whether to send your linked Project entities to your ORCID record's list of funding information.",
+  "person.page.orcid.synchronization-mode-funding-message": "حدد ما إذا كنت تريد إرسال كينونات المشروع المرتبطة إلى قائمة معلومات التمويل الخاصة بتسجيلة أوركيد الخاصة بك.",
+
+  // "person.page.orcid.synchronization-mode-publication-message": "Select whether to send your linked Publication entities to your ORCID record's list of works.",
+  "person.page.orcid.synchronization-mode-publication-message": "حدد ما إذا كنت تريد إرسال كينونات النشر المرتبطة إلى قائمة أعمال تسجيلة أوركيد الخاصة بك.",
+
+  // "person.page.orcid.synchronization-mode-profile-message": "Select whether to send your biographical data or personal identifiers to your ORCID record.",
+  "person.page.orcid.synchronization-mode-profile-message": "حدد ما إذا كنت تريد إرسال بياناتات الشخصية أو معرفاتك الشخصية إلى تسجيلة أوركيد الخاصة بك.",
+
+  // "person.page.orcid.synchronization-settings-update.success": "The synchronization settings have been updated successfully",
+  "person.page.orcid.synchronization-settings-update.success": "تم تحديث إعدادات المزامنة بنجاح",
+
+  // "person.page.orcid.synchronization-settings-update.error": "The update of the synchronization settings failed",
+  "person.page.orcid.synchronization-settings-update.error": "فشل تحديث إعدادات المزامنة",
+
+  // "person.page.orcid.synchronization-mode.manual": "Manual",
+  "person.page.orcid.synchronization-mode.manual": "يدوي",
+
+  // "person.page.orcid.scope.authenticate": "Get your ORCID iD",
+  "person.page.orcid.scope.authenticate": "احصل على معرف أوركيد الخاص بك",
+
+  // "person.page.orcid.scope.read-limited": "Read your information with visibility set to Trusted Parties",
+  "person.page.orcid.scope.read-limited": "اقرأ معلوماتك مع ضبط مستوى الرؤية للأطراف الموثوقة",
+
+  // "person.page.orcid.scope.activities-update": "Add/update your research activities",
+  "person.page.orcid.scope.activities-update": "إضافة/تحديث الأنشطة البحثية الخاصة بك",
+
+  // "person.page.orcid.scope.person-update": "Add/update other information about you",
+  "person.page.orcid.scope.person-update": "إضافة/تحديث معلومات أخرى عنك",
+
+  // "person.page.orcid.unlink.success": "The disconnection between the profile and the ORCID registry was successful",
+  "person.page.orcid.unlink.success": "تم قطع الاتصال بين الملف الشخصي وسجل أوركيد بنجاح",
+
+  // "person.page.orcid.unlink.error": "An error occurred while disconnecting between the profile and the ORCID registry. Try again",
+  "person.page.orcid.unlink.error": "حدث خطأ أثناء قطع الاتصال بين الملف الشخصي وسجل أوركيد. يرجى إعادة المحاولة",
+
+  // "person.orcid.sync.setting": "ORCID Synchronization settings",
+  "person.orcid.sync.setting": "إعدادات مزامنة أوركيد",
+
+  // "person.orcid.registry.queue": "ORCID Registry Queue",
+  "person.orcid.registry.queue": "قائمة انتظار سجل أوركيد",
+
+  // "person.orcid.registry.auth": "ORCID Authorizations",
+  "person.orcid.registry.auth": "تصاريح أوركيد",
+
+  // "home.recent-submissions.head": "Recent Submissions",
+  "home.recent-submissions.head": "أحدث التقديمات",
+
+  // "listable-notification-object.default-message": "This object couldn't be retrieved",
+  "listable-notification-object.default-message": "تعذر استرداد هذا الكائن",
+
+  // "system-wide-alert-banner.retrieval.error": "Something went wrong retrieving the system-wide alert banner",
+  "system-wide-alert-banner.retrieval.error": "حدث خطأ أثناء استرداد شعار التنبيه على مستوى النظام",
+
+  // "system-wide-alert-banner.countdown.prefix": "In",
+  "system-wide-alert-banner.countdown.prefix": "خلال",
+
+  // "system-wide-alert-banner.countdown.days": "{{days}} day(s),",
+  "system-wide-alert-banner.countdown.days": "{{days}} يوماً,",
+
+  // "system-wide-alert-banner.countdown.hours": "{{hours}} hour(s) and",
+  "system-wide-alert-banner.countdown.hours": "{{hours}} ساعة و",
+
+  // "system-wide-alert-banner.countdown.minutes": "{{minutes}} minute(s):",
+  "system-wide-alert-banner.countdown.minutes": "{{minutes}} دقيقة:",
+
+  // "menu.section.system-wide-alert": "System-wide Alert",
+  "menu.section.system-wide-alert": "تنبيه على مستوى النظام",
+
+  // "system-wide-alert.form.header": "System-wide Alert",
+  "system-wide-alert.form.header": "تنبيه على مستوى النظام",
+
+  // "system-wide-alert-form.retrieval.error": "Something went wrong retrieving the system-wide alert",
+  "system-wide-alert-form.retrieval.error": "حدث خطأ ما أثناء استرداد التنبيه على مستوى النظام",
+
+  // "system-wide-alert.form.cancel": "Cancel",
+  "system-wide-alert.form.cancel": "إلغاء",
+
+  // "system-wide-alert.form.save": "Save",
+  "system-wide-alert.form.save": "حفظ",
+
+  // "system-wide-alert.form.label.active": "ACTIVE",
+  "system-wide-alert.form.label.active": "نشط",
+
+  // "system-wide-alert.form.label.inactive": "INACTIVE",
+  "system-wide-alert.form.label.inactive": "غير نشط",
+
+  // "system-wide-alert.form.error.message": "The system wide alert must have a message",
+  "system-wide-alert.form.error.message": "يجب أن يحتوي التنبيه على مستوى النظام على رسالة",
+
+  // "system-wide-alert.form.label.message": "Alert message",
+  "system-wide-alert.form.label.message": "رسالة تنبيه",
+
+  // "system-wide-alert.form.label.countdownTo.enable": "Enable a countdown timer",
+  "system-wide-alert.form.label.countdownTo.enable": "تفعيل مؤقت العد التنازلي",
+
+  // "system-wide-alert.form.label.countdownTo.hint": "Hint: Set a countdown timer. When enabled, a date can be set in the future and the system-wide alert banner will perform a countdown to the set date. When this timer ends, it will disappear from the alert. The server will NOT be automatically stopped.",
+  "system-wide-alert.form.label.countdownTo.hint": "تلميح: قم بضبط مؤقت العد التنازلي. عند التفعيل، يمكن تعيين تاريخ في المستقبل وسيقوم شعار التنبيه على مستوى النظام بإجراء العد التنازلي للتاريخ المحدد. عندما ينتهي هذا المؤقت، سوف يختفي من التنبيه. لن يتم إيقاف الخادم تلقائياً.",
+
+  // "system-wide-alert-form.select-date-by-calendar": "Select date using calendar",
+  "system-wide-alert-form.select-date-by-calendar": "حدد التاريخ باستخدام التقويم",
+
+  // "system-wide-alert.form.label.preview": "System-wide alert preview",
+  "system-wide-alert.form.label.preview": "معاينة التنبيه على مستوى النظام",
+
+  // "system-wide-alert.form.update.success": "The system-wide alert was successfully updated",
+  "system-wide-alert.form.update.success": "تم تحديث التنبيه على مستوى النظام بنجاح",
+
+  // "system-wide-alert.form.update.error": "Something went wrong when updating the system-wide alert",
+  "system-wide-alert.form.update.error": "حدث خطأ ما أثناء تحديث التنبيه على مستوى النظام",
+
+  // "system-wide-alert.form.create.success": "The system-wide alert was successfully created",
+  "system-wide-alert.form.create.success": "تم إنشاء التنبيه على مستوى النظام بنجاح",
+
+  // "system-wide-alert.form.create.error": "Something went wrong when creating the system-wide alert",
+  "system-wide-alert.form.create.error": "حدث خطأ ما أثناء إنشاء التنبيه على مستوى النظام",
+
+  // "admin.system-wide-alert.breadcrumbs": "System-wide Alerts",
+  "admin.system-wide-alert.breadcrumbs": "تنبيهات على مستوى النظام",
+
+  // "admin.system-wide-alert.title": "System-wide Alerts",
+  "admin.system-wide-alert.title": "تنبيهات على مستوى النظام",
+
+  // "discover.filters.head": "Discover",
+  // TODO New key - Add a translation
+  "discover.filters.head": "Discover",
+
+  // "item-access-control-title": "This form allows you to perform changes to the access conditions of the item's metadata or its bitstreams.",
+  "item-access-control-title": "يتيح لك هذا النموذج إجراء تغييرات على شروط الوصول إلى ميتاداتا المادة أو تدفقات البت الخاصة بها.",
+
+  // "collection-access-control-title": "This form allows you to perform changes to the access conditions of all the items owned by this collection. Changes may be performed to either all Item metadata or all content (bitstreams).",
+  "collection-access-control-title": "يتيح لك هذا النموذج إجراء تغييرات على شروط الوصول لكل المواد المملوكة لهذه المجموعة. قد يتم إجراء التغييرات إما على كل ميتاداتا المادة أو على المحتوى بأكمله (تدفقات البت).",
+
+  // "community-access-control-title": "This form allows you to perform changes to the access conditions of all the items owned by any collection under this community. Changes may be performed to either all Item metadata or all content (bitstreams).",
+  "community-access-control-title": "يتيح لك هذا النموذج إجراء تغييرات على شروط الوصول لكل المواد المملوكة لأي مجموعة ضمن هذا المجتمع. قد يتم إجراء التغييرات إما على كل ميتاداتا المادة أو على المحتوى بأكمله (تدفقات البت).",
+
+  // "access-control-item-header-toggle": "Item's Metadata",
+  "access-control-item-header-toggle": "ميتاداتا المادة",
+
+  // "access-control-item-toggle.enable": "Enable option to perform changes on the item's metadata",
+  "access-control-item-toggle.enable": "تفعيل خيار إجراء تغييرات على ميتاداتا المادة",
+
+  // "access-control-item-toggle.disable": "Disable option to perform changes on the item's metadata",
+  "access-control-item-toggle.disable": "تعطيل خيار إجراء تغييرات على ميتاداتا المادة",
+
+  // "access-control-bitstream-header-toggle": "Bitstreams",
+  "access-control-bitstream-header-toggle": "تدفقات البت",
+
+  // "access-control-bitstream-toggle.enable": "Enable option to perform changes on the bitstreams",
+  "access-control-bitstream-toggle.enable": "تفعيل خيار إجراء تغييرات على تدفقات البت",
+
+  // "access-control-bitstream-toggle.disable": "Disable option to perform changes on the bitstreams",
+  "access-control-bitstream-toggle.disable": "تعطيل خيار إجراء تغييرات على تدفقات البت",
+
+  // "access-control-mode": "Mode",
+  "access-control-mode": "Mode",
+
+  // "access-control-access-conditions": "Access conditions",
+  "access-control-access-conditions": "شروط الوصول",
+
+  // "access-control-no-access-conditions-warning-message": "Currently, no access conditions are specified below. If executed, this will replace the current access conditions with the default access conditions inherited from the owning collection.",
+  "access-control-no-access-conditions-warning-message": "في الوقت الراهن، لم يتم تحديد أي شروط وصول أدناه. عند التنفيذ، سيتم استبدال شروط الوصول الحالية بشروط الوصول الافتراضية الموروثة من المجموعة المالكة.",
+
+  // "access-control-replace-all": "Replace access conditions",
+  "access-control-replace-all": "استبدل شروط الوصول",
+
+  // "access-control-add-to-existing": "Add to existing ones",
+  "access-control-add-to-existing": "إضافة إلى الموجود",
+
+  // "access-control-limit-to-specific": "Limit the changes to specific bitstreams",
+  "access-control-limit-to-specific": "قصر التغييرات على تدفقات بت معينة",
+
+  // "access-control-process-all-bitstreams": "Update all the bitstreams in the item",
+  "access-control-process-all-bitstreams": "تحديد كل تدفقات البت في المادة",
+
+  // "access-control-bitstreams-selected": "bitstreams selected",
+  "access-control-bitstreams-selected": "تم تحديد تدفقات البت",
+
+  // "access-control-bitstreams-select": "Select bitstreams",
+  "access-control-bitstreams-select": "حدد تدفقات البت",
+
+  // "access-control-cancel": "Cancel",
+  "access-control-cancel": "إلغاء",
+
+  // "access-control-execute": "Execute",
+  "access-control-execute": "تنفيذ",
+
+  // "access-control-add-more": "Add more",
+  "access-control-add-more": "إضافة المزيد",
+
+  // "access-control-remove": "Remove access condition",
+  "access-control-remove": "إزالة شرط الوصول",
+
+  // "access-control-select-bitstreams-modal.title": "Select bitstreams",
+  "access-control-select-bitstreams-modal.title": "حدد تدفقات البت",
+
+  // "access-control-select-bitstreams-modal.no-items": "No items to show.",
+  "access-control-select-bitstreams-modal.no-items": "لا توجد مواد.",
+
+  // "access-control-select-bitstreams-modal.close": "Close",
+  "access-control-select-bitstreams-modal.close": "إلغاء",
+
+  // "access-control-option-label": "Access condition type",
+  "access-control-option-label": "نوع شرط الوصول",
+
+  // "access-control-option-note": "Choose an access condition to apply to selected objects.",
+  "access-control-option-note": "اختر شرط وصول لتطبيقه على الكائنات المحددة.",
+
+  // "access-control-option-start-date": "Grant access from",
+  "access-control-option-start-date": "منح الوصول من",
+
+  // "access-control-option-start-date-note": "Select the date from which the related access condition is applied",
+  "access-control-option-start-date-note": "قم بتحديد التاريخ الذي يبدأ منه تطبيق شرط الوصول ذي الصلة",
+
+  // "access-control-option-end-date": "Grant access until",
+  "access-control-option-end-date": "منح الوصول حتى",
+
+  // "access-control-option-end-date-note": "Select the date until which the related access condition is applied",
+  "access-control-option-end-date-note": "قم بتحديد التاريخ الذي سيتم تطبيق شرط الوصول ذي الصلة حتى بلوغه",
+
+  // "vocabulary-treeview.search.form.add": "Add",
+  "vocabulary-treeview.search.form.add": "إضافة",
+
+  // "admin.notifications.publicationclaim.breadcrumbs": "Publication Claim",
+  // TODO New key - Add a translation
+  "admin.notifications.publicationclaim.breadcrumbs": "Publication Claim",
+
+  // "admin.notifications.publicationclaim.page.title": "Publication Claim",
+  // TODO New key - Add a translation
+  "admin.notifications.publicationclaim.page.title": "Publication Claim",
+
+  // "filter.search.operator.placeholder": "Operator",
+  // TODO New key - Add a translation
+  "filter.search.operator.placeholder": "Operator",
+
+  // "search.filters.filter.entityType.text": "Item Type",
+  // TODO New key - Add a translation
+  "search.filters.filter.entityType.text": "Item Type",
+
+  // "search.filters.operator.equals.text": "Equals",
+  // TODO New key - Add a translation
+  "search.filters.operator.equals.text": "Equals",
+
+  // "search.filters.operator.notequals.text": "Not Equals",
+  // TODO New key - Add a translation
+  "search.filters.operator.notequals.text": "Not Equals",
+
+  // "search.filters.operator.notcontains.text": "Not Contains",
+  // TODO New key - Add a translation
+  "search.filters.operator.notcontains.text": "Not Contains",
+
+  // "search.filters.operator.contains.text": "Contains",
+  // TODO New key - Add a translation
+  "search.filters.operator.contains.text": "Contains",
+
+  // "search.filters.filter.title.text": "Title",
+  // TODO New key - Add a translation
+  "search.filters.filter.title.text": "Title",
+
+  // "search.filters.applied.f.title": "Title",
+  // TODO New key - Add a translation
+  "search.filters.applied.f.title": "Title",
+
+  // "search.filters.filter.author.text": "Author",
+  // TODO New key - Add a translation
+  "search.filters.filter.author.text": "Author",
+
+  // "coar-notify-support.title": "COAR Notify Protocol",
+  // TODO New key - Add a translation
+  "coar-notify-support.title": "COAR Notify Protocol",
+
+  // "coar-notify-support-title.content": "Here, we fully support the COAR Notify protocol, which is designed to enhance the communication between repositories. To learn more about the COAR Notify protocol, visit the <a href=\\\"https://notify.coar-repositories.org/\\\">COAR Notify website</a>.",
+  // TODO New key - Add a translation
+  "coar-notify-support-title.content": "Here, we fully support the COAR Notify protocol, which is designed to enhance the communication between repositories. To learn more about the COAR Notify protocol, visit the <a href=\\\"https://notify.coar-repositories.org/\\\">COAR Notify website</a>.",
+
+  // "coar-notify-support.ldn-inbox.title": "LDN InBox",
+  // TODO New key - Add a translation
+  "coar-notify-support.ldn-inbox.title": "LDN InBox",
+
+  // "coar-notify-support.ldn-inbox.content": "For your convenience, our LDN (Linked Data Notifications) InBox is easily accessible at {ldnInboxUrl}. The LDN InBox enables seamless communication and data exchange, ensuring efficient and effective collaboration.",
+  // TODO New key - Add a translation
+  "coar-notify-support.ldn-inbox.content": "For your convenience, our LDN (Linked Data Notifications) InBox is easily accessible at {ldnInboxUrl}. The LDN InBox enables seamless communication and data exchange, ensuring efficient and effective collaboration.",
+
+  // "coar-notify-support.message-moderation.title": "Message Moderation",
+  // TODO New key - Add a translation
+  "coar-notify-support.message-moderation.title": "Message Moderation",
+
+  // "coar-notify-support.message-moderation.content": "To ensure a secure and productive environment, all incoming LDN messages are moderated. If you are planning to exchange information with us, kindly reach out via our dedicated",
+  // TODO New key - Add a translation
+  "coar-notify-support.message-moderation.content": "To ensure a secure and productive environment, all incoming LDN messages are moderated. If you are planning to exchange information with us, kindly reach out via our dedicated",
+
+  // "coar-notify-support.message-moderation.feedback-form": " Feedback form.",
+  // TODO New key - Add a translation
+  "coar-notify-support.message-moderation.feedback-form": " Feedback form.",
+
+  // "service.overview.delete.header": "Delete Service",
+  // TODO New key - Add a translation
+  "service.overview.delete.header": "Delete Service",
+
+  // "ldn-registered-services.title": "Registered Services",
+  // TODO New key - Add a translation
+  "ldn-registered-services.title": "Registered Services",
+  // "ldn-registered-services.table.name": "Name",
+  // TODO New key - Add a translation
+  "ldn-registered-services.table.name": "Name",
+  // "ldn-registered-services.table.description": "Description",
+  // TODO New key - Add a translation
+  "ldn-registered-services.table.description": "Description",
+  // "ldn-registered-services.table.status": "Status",
+  // TODO New key - Add a translation
+  "ldn-registered-services.table.status": "Status",
+  // "ldn-registered-services.table.action": "Action",
+  // TODO New key - Add a translation
+  "ldn-registered-services.table.action": "Action",
+  // "ldn-registered-services.new": "NEW",
+  // TODO New key - Add a translation
+  "ldn-registered-services.new": "NEW",
+  // "ldn-registered-services.new.breadcrumbs": "Registered Services",
+  // TODO New key - Add a translation
+  "ldn-registered-services.new.breadcrumbs": "Registered Services",
+
+  // "ldn-service.overview.table.enabled": "Enabled",
+  // TODO New key - Add a translation
+  "ldn-service.overview.table.enabled": "Enabled",
+  // "ldn-service.overview.table.disabled": "Disabled",
+  // TODO New key - Add a translation
+  "ldn-service.overview.table.disabled": "Disabled",
+  // "ldn-service.overview.table.clickToEnable": "Click to enable",
+  // TODO New key - Add a translation
+  "ldn-service.overview.table.clickToEnable": "Click to enable",
+  // "ldn-service.overview.table.clickToDisable": "Click to disable",
+  // TODO New key - Add a translation
+  "ldn-service.overview.table.clickToDisable": "Click to disable",
+
+  // "ldn-edit-registered-service.title": "Edit Service",
+  // TODO New key - Add a translation
+  "ldn-edit-registered-service.title": "Edit Service",
+  // "ldn-create-service.title": "Create service",
+  // TODO New key - Add a translation
+  "ldn-create-service.title": "Create service",
+  // "service.overview.create.modal": "Create Service",
+  // TODO New key - Add a translation
+  "service.overview.create.modal": "Create Service",
+  // "service.overview.create.body": "Please confirm the creation of this service.",
+  // TODO New key - Add a translation
+  "service.overview.create.body": "Please confirm the creation of this service.",
+  // "ldn-service-status": "Status",
+  // TODO New key - Add a translation
+  "ldn-service-status": "Status",
+  // "service.confirm.create": "Create",
+  // TODO New key - Add a translation
+  "service.confirm.create": "Create",
+  // "service.refuse.create": "Cancel",
+  // TODO New key - Add a translation
+  "service.refuse.create": "Cancel",
+  // "ldn-register-new-service.title": "Register a new service",
+  // TODO New key - Add a translation
+  "ldn-register-new-service.title": "Register a new service",
+  // "ldn-new-service.form.label.submit": "Save",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.label.submit": "Save",
+  // "ldn-new-service.form.label.name": "Name",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.label.name": "Name",
+  // "ldn-new-service.form.label.description": "Description",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.label.description": "Description",
+  // "ldn-new-service.form.label.url": "Service URL",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.label.url": "Service URL",
+  // "ldn-new-service.form.label.ip-range": "Service IP range",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.label.ip-range": "Service IP range",
+  // "ldn-new-service.form.label.score": "Level of trust",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.label.score": "Level of trust",
+  // "ldn-new-service.form.label.ldnUrl": "LDN Inbox URL",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.label.ldnUrl": "LDN Inbox URL",
+  // "ldn-new-service.form.placeholder.name": "Please provide service name",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.placeholder.name": "Please provide service name",
+  // "ldn-new-service.form.placeholder.description": "Please provide a description regarding your service",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.placeholder.description": "Please provide a description regarding your service",
+  // "ldn-new-service.form.placeholder.url": "Please input the URL for users to check out more information about the service",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.placeholder.url": "Please input the URL for users to check out more information about the service",
+  // "ldn-new-service.form.placeholder.lowerIp": "IPv4 range lower bound",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.placeholder.lowerIp": "IPv4 range lower bound",
+  // "ldn-new-service.form.placeholder.upperIp": "IPv4 range upper bound",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.placeholder.upperIp": "IPv4 range upper bound",
+  // "ldn-new-service.form.placeholder.ldnUrl": "Please specify the URL of the LDN Inbox",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.placeholder.ldnUrl": "Please specify the URL of the LDN Inbox",
+  // "ldn-new-service.form.placeholder.score": "Please enter a value between 0 and 1. Use the “.” as decimal separator",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.placeholder.score": "Please enter a value between 0 and 1. Use the “.” as decimal separator",
+  // "ldn-service.form.label.placeholder.default-select": "Select a pattern",
+  // TODO New key - Add a translation
+  "ldn-service.form.label.placeholder.default-select": "Select a pattern",
+
+  // "ldn-service.form.pattern.ack-accept.label": "Acknowledge and Accept",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.ack-accept.label": "Acknowledge and Accept",
+  // "ldn-service.form.pattern.ack-accept.description": "This pattern is used to acknowledge and accept a request (offer). It implies an intention to act on the request.",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.ack-accept.description": "This pattern is used to acknowledge and accept a request (offer). It implies an intention to act on the request.",
+  // "ldn-service.form.pattern.ack-accept.category": "Acknowledgements",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.ack-accept.category": "Acknowledgements",
+
+  // "ldn-service.form.pattern.ack-reject.label": "Acknowledge and Reject",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.ack-reject.label": "Acknowledge and Reject",
+  // "ldn-service.form.pattern.ack-reject.description": "This pattern is used to acknowledge and reject a request (offer). It signifies no further action regarding the request.",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.ack-reject.description": "This pattern is used to acknowledge and reject a request (offer). It signifies no further action regarding the request.",
+  // "ldn-service.form.pattern.ack-reject.category": "Acknowledgements",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.ack-reject.category": "Acknowledgements",
+
+  // "ldn-service.form.pattern.ack-tentative-accept.label": "Acknowledge and Tentatively Accept",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.ack-tentative-accept.label": "Acknowledge and Tentatively Accept",
+  // "ldn-service.form.pattern.ack-tentative-accept.description": "This pattern is used to acknowledge and tentatively accept a request (offer). It implies an intention to act, which may change.",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.ack-tentative-accept.description": "This pattern is used to acknowledge and tentatively accept a request (offer). It implies an intention to act, which may change.",
+  // "ldn-service.form.pattern.ack-tentative-accept.category": "Acknowledgements",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.ack-tentative-accept.category": "Acknowledgements",
+
+  // "ldn-service.form.pattern.ack-tentative-reject.label": "Acknowledge and Tentatively Reject",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.ack-tentative-reject.label": "Acknowledge and Tentatively Reject",
+  // "ldn-service.form.pattern.ack-tentative-reject.description": "This pattern is used to acknowledge and tentatively reject a request (offer). It signifies no further action, subject to change.",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.ack-tentative-reject.description": "This pattern is used to acknowledge and tentatively reject a request (offer). It signifies no further action, subject to change.",
+  // "ldn-service.form.pattern.ack-tentative-reject.category": "Acknowledgements",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.ack-tentative-reject.category": "Acknowledgements",
+
+  // "ldn-service.form.pattern.announce-endorsement.label": "Announce Endorsement",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.announce-endorsement.label": "Announce Endorsement",
+  // "ldn-service.form.pattern.announce-endorsement.description": "This pattern is used to announce the existence of an endorsement, referencing the endorsed resource.",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.announce-endorsement.description": "This pattern is used to announce the existence of an endorsement, referencing the endorsed resource.",
+  // "ldn-service.form.pattern.announce-endorsement.category": "Announcements",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.announce-endorsement.category": "Announcements",
+
+  // "ldn-service.form.pattern.announce-ingest.label": "Announce Ingest",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.announce-ingest.label": "Announce Ingest",
+  // "ldn-service.form.pattern.announce-ingest.description": "This pattern is used to announce that a resource has been ingested.",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.announce-ingest.description": "This pattern is used to announce that a resource has been ingested.",
+  // "ldn-service.form.pattern.announce-ingest.category": "Announcements",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.announce-ingest.category": "Announcements",
+
+  // "ldn-service.form.pattern.announce-relationship.label": "Announce Relationship",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.announce-relationship.label": "Announce Relationship",
+  // "ldn-service.form.pattern.announce-relationship.description": "This pattern is used to announce a relationship between two resources.",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.announce-relationship.description": "This pattern is used to announce a relationship between two resources.",
+  // "ldn-service.form.pattern.announce-relationship.category": "Announcements",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.announce-relationship.category": "Announcements",
+
+  // "ldn-service.form.pattern.announce-review.label": "Announce Review",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.announce-review.label": "Announce Review",
+  // "ldn-service.form.pattern.announce-review.description": "This pattern is used to announce the existence of a review, referencing the reviewed resource.",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.announce-review.description": "This pattern is used to announce the existence of a review, referencing the reviewed resource.",
+  // "ldn-service.form.pattern.announce-review.category": "Announcements",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.announce-review.category": "Announcements",
+
+  // "ldn-service.form.pattern.announce-service-result.label": "Announce Service Result",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.announce-service-result.label": "Announce Service Result",
+  // "ldn-service.form.pattern.announce-service-result.description": "This pattern is used to announce the existence of a 'service result', referencing the relevant resource.",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.announce-service-result.description": "This pattern is used to announce the existence of a 'service result', referencing the relevant resource.",
+  // "ldn-service.form.pattern.announce-service-result.category": "Announcements",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.announce-service-result.category": "Announcements",
+
+  // "ldn-service.form.pattern.request-endorsement.label": "Request Endorsement",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.request-endorsement.label": "Request Endorsement",
+  // "ldn-service.form.pattern.request-endorsement.description": "This pattern is used to request endorsement of a resource owned by the origin system.",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.request-endorsement.description": "This pattern is used to request endorsement of a resource owned by the origin system.",
+  // "ldn-service.form.pattern.request-endorsement.category": "Requests",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.request-endorsement.category": "Requests",
+
+  // "ldn-service.form.pattern.request-ingest.label": "Request Ingest",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.request-ingest.label": "Request Ingest",
+  // "ldn-service.form.pattern.request-ingest.description": "This pattern is used to request that the target system ingest a resource.",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.request-ingest.description": "This pattern is used to request that the target system ingest a resource.",
+  // "ldn-service.form.pattern.request-ingest.category": "Requests",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.request-ingest.category": "Requests",
+
+  // "ldn-service.form.pattern.request-review.label": "Request Review",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.request-review.label": "Request Review",
+  // "ldn-service.form.pattern.request-review.description": "This pattern is used to request a review of a resource owned by the origin system.",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.request-review.description": "This pattern is used to request a review of a resource owned by the origin system.",
+  // "ldn-service.form.pattern.request-review.category": "Requests",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.request-review.category": "Requests",
+
+  // "ldn-service.form.pattern.undo-offer.label": "Undo Offer",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.undo-offer.label": "Undo Offer",
+  // "ldn-service.form.pattern.undo-offer.description": "This pattern is used to undo (retract) an offer previously made.",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.undo-offer.description": "This pattern is used to undo (retract) an offer previously made.",
+  // "ldn-service.form.pattern.undo-offer.category": "Undo",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.undo-offer.category": "Undo",
+
+  // "ldn-new-service.form.label.placeholder.selectedItemFilter": "No Item Filter Selected",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.label.placeholder.selectedItemFilter": "No Item Filter Selected",
+  // "ldn-new-service.form.label.ItemFilter": "Item Filter",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.label.ItemFilter": "Item Filter",
+  // "ldn-new-service.form.label.automatic": "Automatic",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.label.automatic": "Automatic",
+  // "ldn-new-service.form.error.name": "Name is required",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.error.name": "Name is required",
+  // "ldn-new-service.form.error.url": "URL is required",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.error.url": "URL is required",
+  // "ldn-new-service.form.error.ipRange": "Please enter a valid IP range",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.error.ipRange": "Please enter a valid IP range",
+  // "ldn-new-service.form.hint.ipRange": "Please enter a valid IpV4 in both range bounds (note: for single IP, please enter the same value in both fields)",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.hint.ipRange": "Please enter a valid IpV4 in both range bounds (note: for single IP, please enter the same value in both fields)",
+  // "ldn-new-service.form.error.ldnurl": "LDN URL is required",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.error.ldnurl": "LDN URL is required",
+  // "ldn-new-service.form.error.patterns": "At least a pattern is required",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.error.patterns": "At least a pattern is required",
+  // "ldn-new-service.form.error.score": "Please enter a valid score (between 0 and 1). Use the “.” as decimal separator",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.error.score": "Please enter a valid score (between 0 and 1). Use the “.” as decimal separator",
+
+  // "ldn-new-service.form.label.inboundPattern": "Inbound Pattern",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.label.inboundPattern": "Inbound Pattern",
+  // "ldn-new-service.form.label.addPattern": "+ Add more",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.label.addPattern": "+ Add more",
+  // "ldn-new-service.form.label.removeItemFilter": "Remove",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.label.removeItemFilter": "Remove",
+  // "ldn-register-new-service.breadcrumbs": "New Service",
+  // TODO New key - Add a translation
+  "ldn-register-new-service.breadcrumbs": "New Service",
+  // "service.overview.delete.body": "Are you sure you want to delete this service?",
+  // TODO New key - Add a translation
+  "service.overview.delete.body": "Are you sure you want to delete this service?",
+  // "service.overview.edit.body": "Do you confirm the changes?",
+  // TODO New key - Add a translation
+  "service.overview.edit.body": "Do you confirm the changes?",
+  // "service.overview.edit.modal": "Edit Service",
+  // TODO New key - Add a translation
+  "service.overview.edit.modal": "Edit Service",
+  // "service.detail.update": "Confirm",
+  // TODO New key - Add a translation
+  "service.detail.update": "Confirm",
+  // "service.detail.return": "Cancel",
+  // TODO New key - Add a translation
+  "service.detail.return": "Cancel",
+  // "service.overview.reset-form.body": "Are you sure you want to discard the changes and leave?",
+  // TODO New key - Add a translation
+  "service.overview.reset-form.body": "Are you sure you want to discard the changes and leave?",
+  // "service.overview.reset-form.modal": "Discard Changes",
+  // TODO New key - Add a translation
+  "service.overview.reset-form.modal": "Discard Changes",
+  // "service.overview.reset-form.reset-confirm": "Discard",
+  // TODO New key - Add a translation
+  "service.overview.reset-form.reset-confirm": "Discard",
+  // "admin.registries.services-formats.modify.success.head": "Successful Edit",
+  // TODO New key - Add a translation
+  "admin.registries.services-formats.modify.success.head": "Successful Edit",
+  // "admin.registries.services-formats.modify.success.content": "The service has been edited",
+  // TODO New key - Add a translation
+  "admin.registries.services-formats.modify.success.content": "The service has been edited",
+  // "admin.registries.services-formats.modify.failure.head": "Failed Edit",
+  // TODO New key - Add a translation
+  "admin.registries.services-formats.modify.failure.head": "Failed Edit",
+  // "admin.registries.services-formats.modify.failure.content": "The service has not been edited",
+  // TODO New key - Add a translation
+  "admin.registries.services-formats.modify.failure.content": "The service has not been edited",
+  // "ldn-service-notification.created.success.title": "Successful Create",
+  // TODO New key - Add a translation
+  "ldn-service-notification.created.success.title": "Successful Create",
+  // "ldn-service-notification.created.success.body": "The service has been created",
+  // TODO New key - Add a translation
+  "ldn-service-notification.created.success.body": "The service has been created",
+  // "ldn-service-notification.created.failure.title": "Failed Create",
+  // TODO New key - Add a translation
+  "ldn-service-notification.created.failure.title": "Failed Create",
+  // "ldn-service-notification.created.failure.body": "The service has not been created",
+  // TODO New key - Add a translation
+  "ldn-service-notification.created.failure.body": "The service has not been created",
+  // "ldn-service-notification.created.warning.title": "Please select at least one Inbound Pattern",
+  // TODO New key - Add a translation
+  "ldn-service-notification.created.warning.title": "Please select at least one Inbound Pattern",
+  // "ldn-enable-service.notification.success.title": "Successful status updated",
+  // TODO New key - Add a translation
+  "ldn-enable-service.notification.success.title": "Successful status updated",
+  // "ldn-enable-service.notification.success.content": "The service status has been updated",
+  // TODO New key - Add a translation
+  "ldn-enable-service.notification.success.content": "The service status has been updated",
+  // "ldn-service-delete.notification.success.title": "Successful Deletion",
+  // TODO New key - Add a translation
+  "ldn-service-delete.notification.success.title": "Successful Deletion",
+  // "ldn-service-delete.notification.success.content": "The service has been deleted",
+  // TODO New key - Add a translation
+  "ldn-service-delete.notification.success.content": "The service has been deleted",
+  // "ldn-service-delete.notification.error.title": "Failed Deletion",
+  // TODO New key - Add a translation
+  "ldn-service-delete.notification.error.title": "Failed Deletion",
+  // "ldn-service-delete.notification.error.content": "The service has not been deleted",
+  // TODO New key - Add a translation
+  "ldn-service-delete.notification.error.content": "The service has not been deleted",
+  // "service.overview.reset-form.reset-return": "Cancel",
+  // TODO New key - Add a translation
+  "service.overview.reset-form.reset-return": "Cancel",
+  // "service.overview.delete": "Delete service",
+  // TODO New key - Add a translation
+  "service.overview.delete": "Delete service",
+  // "ldn-edit-service.title": "Edit service",
+  // TODO New key - Add a translation
+  "ldn-edit-service.title": "Edit service",
+  // "ldn-edit-service.form.label.name": "Name",
+  // TODO New key - Add a translation
+  "ldn-edit-service.form.label.name": "Name",
+  // "ldn-edit-service.form.label.description": "Description",
+  // TODO New key - Add a translation
+  "ldn-edit-service.form.label.description": "Description",
+  // "ldn-edit-service.form.label.url": "Service URL",
+  // TODO New key - Add a translation
+  "ldn-edit-service.form.label.url": "Service URL",
+  // "ldn-edit-service.form.label.ldnUrl": "LDN Inbox URL",
+  // TODO New key - Add a translation
+  "ldn-edit-service.form.label.ldnUrl": "LDN Inbox URL",
+  // "ldn-edit-service.form.label.inboundPattern": "Inbound Pattern",
+  // TODO New key - Add a translation
+  "ldn-edit-service.form.label.inboundPattern": "Inbound Pattern",
+  // "ldn-edit-service.form.label.noInboundPatternSelected": "No Inbound Pattern",
+  // TODO New key - Add a translation
+  "ldn-edit-service.form.label.noInboundPatternSelected": "No Inbound Pattern",
+  // "ldn-edit-service.form.label.selectedItemFilter": "Selected Item Filter",
+  // TODO New key - Add a translation
+  "ldn-edit-service.form.label.selectedItemFilter": "Selected Item Filter",
+  // "ldn-edit-service.form.label.selectItemFilter": "No Item Filter",
+  // TODO New key - Add a translation
+  "ldn-edit-service.form.label.selectItemFilter": "No Item Filter",
+  // "ldn-edit-service.form.label.automatic": "Automatic",
+  // TODO New key - Add a translation
+  "ldn-edit-service.form.label.automatic": "Automatic",
+  // "ldn-edit-service.form.label.addInboundPattern": "+ Add more",
+  // TODO New key - Add a translation
+  "ldn-edit-service.form.label.addInboundPattern": "+ Add more",
+  // "ldn-edit-service.form.label.submit": "Save",
+  // TODO New key - Add a translation
+  "ldn-edit-service.form.label.submit": "Save",
+  // "ldn-edit-service.breadcrumbs": "Edit Service",
+  // TODO New key - Add a translation
+  "ldn-edit-service.breadcrumbs": "Edit Service",
+  // "ldn-service.control-constaint-select-none": "Select none",
+  // TODO New key - Add a translation
+  "ldn-service.control-constaint-select-none": "Select none",
+
+  // "ldn-register-new-service.notification.error.title": "Error",
+  // TODO New key - Add a translation
+  "ldn-register-new-service.notification.error.title": "Error",
+  // "ldn-register-new-service.notification.error.content": "An error occurred while creating this process",
+  // TODO New key - Add a translation
+  "ldn-register-new-service.notification.error.content": "An error occurred while creating this process",
+  // "ldn-register-new-service.notification.success.title": "Success",
+  // TODO New key - Add a translation
+  "ldn-register-new-service.notification.success.title": "Success",
+  // "ldn-register-new-service.notification.success.content": "The process was successfully created",
+  // TODO New key - Add a translation
+  "ldn-register-new-service.notification.success.content": "The process was successfully created",
+
+  // "submission.sections.notify.info": "The selected service is compatible with the item according to its current status. {{ service.name }}: {{ service.description }}",
+  // TODO New key - Add a translation
+  "submission.sections.notify.info": "The selected service is compatible with the item according to its current status. {{ service.name }}: {{ service.description }}",
+
+  // "item.page.endorsement": "Endorsement",
+  // TODO New key - Add a translation
+  "item.page.endorsement": "Endorsement",
+
+  // "item.page.review": "Review",
+  // TODO New key - Add a translation
+  "item.page.review": "Review",
+
+  // "item.page.dataset": "Dataset",
+  // TODO New key - Add a translation
+  "item.page.dataset": "Dataset",
+  // "menu.section.icon.ldn_services": "LDN Services overview",
+  // TODO New key - Add a translation
+  "menu.section.icon.ldn_services": "LDN Services overview",
+  // "menu.section.services": "LDN Services",
+  // TODO New key - Add a translation
+  "menu.section.services": "LDN Services",
+
+  // "menu.section.services_new": "LDN Service",
+  // TODO New key - Add a translation
+  "menu.section.services_new": "LDN Service",
+
+  // "quality-assurance.topics.description-with-target": "Below you can see all the topics received from the subscriptions to {{source}} in regards to the",
+  // TODO New key - Add a translation
+  "quality-assurance.topics.description-with-target": "Below you can see all the topics received from the subscriptions to {{source}} in regards to the",
+  // "quality-assurance.events.description": "Below the list of all the suggestions for the selected topic <b>{{topic}}</b>, related to <b>{{source}}</b>.",
+  "quality-assurance.events.description": "توجد أدناه القائمة التي تحتوي على كافة الاقتراحات للموضوع المحدد.",
+
+  // "quality-assurance.events.description-with-topic-and-target": "Below the list of all the suggestions for the selected topic <b>{{topic}}</b>, related to <b>{{source}}</b> and ",
+  // TODO New key - Add a translation
+  "quality-assurance.events.description-with-topic-and-target": "Below the list of all the suggestions for the selected topic <b>{{topic}}</b>, related to <b>{{source}}</b> and ",
+
+  // "quality-assurance.event.table.event.message.serviceUrl": "Service URL:",
+  // TODO New key - Add a translation
+  "quality-assurance.event.table.event.message.serviceUrl": "Service URL:",
+
+  // "quality-assurance.event.table.event.message.link": "Link:",
+  // TODO New key - Add a translation
+  "quality-assurance.event.table.event.message.link": "Link:",
+
+  // "service.detail.delete.cancel": "Cancel",
+  // TODO New key - Add a translation
+  "service.detail.delete.cancel": "Cancel",
+
+  // "service.detail.delete.button": "Delete service",
+  // TODO New key - Add a translation
+  "service.detail.delete.button": "Delete service",
+
+  // "service.detail.delete.header": "Delete service",
+  // TODO New key - Add a translation
+  "service.detail.delete.header": "Delete service",
+
+  // "service.detail.delete.body": "Are you sure you want to delete the current service?",
+  // TODO New key - Add a translation
+  "service.detail.delete.body": "Are you sure you want to delete the current service?",
+
+  // "service.detail.delete.confirm": "Delete service",
+  // TODO New key - Add a translation
+  "service.detail.delete.confirm": "Delete service",
+
+  // "service.detail.delete.success": "The service was successfully deleted.",
+  // TODO New key - Add a translation
+  "service.detail.delete.success": "The service was successfully deleted.",
+
+  // "service.detail.delete.error": "Something went wrong when deleting the service",
+  // TODO New key - Add a translation
+  "service.detail.delete.error": "Something went wrong when deleting the service",
+
+  // "service.overview.table.id": "Services ID",
+  // TODO New key - Add a translation
+  "service.overview.table.id": "Services ID",
+
+  // "service.overview.table.name": "Name",
+  // TODO New key - Add a translation
+  "service.overview.table.name": "Name",
+
+  // "service.overview.table.start": "Start time (UTC)",
+  // TODO New key - Add a translation
+  "service.overview.table.start": "Start time (UTC)",
+
+  // "service.overview.table.status": "Status",
+  // TODO New key - Add a translation
+  "service.overview.table.status": "Status",
+
+  // "service.overview.table.user": "User",
+  // TODO New key - Add a translation
+  "service.overview.table.user": "User",
+
+  // "service.overview.title": "Services Overview",
+  // TODO New key - Add a translation
+  "service.overview.title": "Services Overview",
+
+  // "service.overview.breadcrumbs": "Services Overview",
+  // TODO New key - Add a translation
+  "service.overview.breadcrumbs": "Services Overview",
+
+  // "service.overview.table.actions": "Actions",
+  // TODO New key - Add a translation
+  "service.overview.table.actions": "Actions",
+
+  // "service.overview.table.description": "Description",
+  // TODO New key - Add a translation
+  "service.overview.table.description": "Description",
+
+  // "submission.sections.submit.progressbar.coarnotify": "COAR Notify",
+  // TODO New key - Add a translation
+  "submission.sections.submit.progressbar.coarnotify": "COAR Notify",
+
+  // "submission.section.section-coar-notify.control.request-review.label": "You can request a review to one of the following services",
+  // TODO New key - Add a translation
+  "submission.section.section-coar-notify.control.request-review.label": "You can request a review to one of the following services",
+
+  // "submission.section.section-coar-notify.control.request-endorsement.label": "You can request an Endorsement to one of the following overlay journals",
+  // TODO New key - Add a translation
+  "submission.section.section-coar-notify.control.request-endorsement.label": "You can request an Endorsement to one of the following overlay journals",
+
+  // "submission.section.section-coar-notify.control.request-ingest.label": "You can request to ingest a copy of your submission to one of the following services",
+  // TODO New key - Add a translation
+  "submission.section.section-coar-notify.control.request-ingest.label": "You can request to ingest a copy of your submission to one of the following services",
+
+  // "submission.section.section-coar-notify.dropdown.no-data": "No data available",
+  // TODO New key - Add a translation
+  "submission.section.section-coar-notify.dropdown.no-data": "No data available",
+
+  // "submission.section.section-coar-notify.dropdown.select-none": "Select none",
+  // TODO New key - Add a translation
+  "submission.section.section-coar-notify.dropdown.select-none": "Select none",
+
+  // "submission.section.section-coar-notify.small.notification": "Select a service for {{ pattern }} of this item",
+  // TODO New key - Add a translation
+  "submission.section.section-coar-notify.small.notification": "Select a service for {{ pattern }} of this item",
+
+  // "submission.section.section-coar-notify.selection.description": "Selected service's description:",
+  // TODO New key - Add a translation
+  "submission.section.section-coar-notify.selection.description": "Selected service's description:",
+
+  // "submission.section.section-coar-notify.selection.no-description": "No further information is available",
+  // TODO New key - Add a translation
+  "submission.section.section-coar-notify.selection.no-description": "No further information is available",
+
+  // "submission.section.section-coar-notify.notification.error": "The selected service is not suitable for the current item. Please check the description for details about which record can be managed by this service.",
+  // TODO New key - Add a translation
+  "submission.section.section-coar-notify.notification.error": "The selected service is not suitable for the current item. Please check the description for details about which record can be managed by this service.",
+
+  // "submission.section.section-coar-notify.info.no-pattern": "No configurable patterns found.",
+  // TODO New key - Add a translation
+  "submission.section.section-coar-notify.info.no-pattern": "No configurable patterns found.",
+
+  // "error.validation.coarnotify.invalidfilter": "Invalid filter, try to select another service or none.",
+  // TODO New key - Add a translation
+  "error.validation.coarnotify.invalidfilter": "Invalid filter, try to select another service or none.",
+
+  // "request-status-alert-box.accepted": "The requested {{ offerType }} for <a href='{{serviceUrl}}' target='_blank'> {{ serviceName }}  </a> has been taken in charge.",
+  // TODO New key - Add a translation
+  "request-status-alert-box.accepted": "The requested {{ offerType }} for <a href='{{serviceUrl}}' target='_blank'> {{ serviceName }}  </a> has been taken in charge.",
+
+  // "request-status-alert-box.rejected": "The requested {{ offerType }} for <a href='{{serviceUrl}}' target='_blank'> {{ serviceName }}  </a> has been rejected.",
+  // TODO New key - Add a translation
+  "request-status-alert-box.rejected": "The requested {{ offerType }} for <a href='{{serviceUrl}}' target='_blank'> {{ serviceName }}  </a> has been rejected.",
+
+  // "request-status-alert-box.requested": "The requested {{ offerType }} for <a href='{{serviceUrl}}' target='_blank'> {{ serviceName }}  </a> is pending.",
+  // TODO New key - Add a translation
+  "request-status-alert-box.requested": "The requested {{ offerType }} for <a href='{{serviceUrl}}' target='_blank'> {{ serviceName }}  </a> is pending.",
+
+  // "ldn-service-button-mark-inbound-deletion": "Mark inbound pattern for deletion",
+  // TODO New key - Add a translation
+  "ldn-service-button-mark-inbound-deletion": "Mark inbound pattern for deletion",
+
+  // "ldn-service-button-unmark-inbound-deletion": "Unmark inbound pattern for deletion",
+  // TODO New key - Add a translation
+  "ldn-service-button-unmark-inbound-deletion": "Unmark inbound pattern for deletion",
+
+  // "ldn-service-input-inbound-item-filter-dropdown": "Select Item filter for inbound pattern",
+  // TODO New key - Add a translation
+  "ldn-service-input-inbound-item-filter-dropdown": "Select Item filter for inbound pattern",
+
+  // "ldn-service-input-inbound-pattern-dropdown": "Select inbound pattern for service",
+  // TODO New key - Add a translation
+  "ldn-service-input-inbound-pattern-dropdown": "Select inbound pattern for service",
+
+  // "ldn-service-overview-select-delete": "Select service for deletion",
+  // TODO New key - Add a translation
+  "ldn-service-overview-select-delete": "Select service for deletion",
+
+  // "ldn-service-overview-select-edit": "Edit LDN service",
+  // TODO New key - Add a translation
+  "ldn-service-overview-select-edit": "Edit LDN service",
+
+  // "ldn-service-overview-close-modal": "Close modal",
+  // TODO New key - Add a translation
+  "ldn-service-overview-close-modal": "Close modal",
+
+  // "a-common-or_statement.label": "Item type is Journal Article or Dataset",
+  // TODO New key - Add a translation
+  "a-common-or_statement.label": "Item type is Journal Article or Dataset",
+
+  // "always_true_filter.label": "Always true",
+  // TODO New key - Add a translation
+  "always_true_filter.label": "Always true",
+
+  // "automatic_processing_collection_filter_16.label": "Automatic processing",
+  // TODO New key - Add a translation
+  "automatic_processing_collection_filter_16.label": "Automatic processing",
+
+  // "dc-identifier-uri-contains-doi_condition.label": "URI contains DOI",
+  // TODO New key - Add a translation
+  "dc-identifier-uri-contains-doi_condition.label": "URI contains DOI",
+
+  // "doi-filter.label": "DOI filter",
+  // TODO New key - Add a translation
+  "doi-filter.label": "DOI filter",
+
+  // "driver-document-type_condition.label": "Document type equals driver",
+  // TODO New key - Add a translation
+  "driver-document-type_condition.label": "Document type equals driver",
+
+  // "has-at-least-one-bitstream_condition.label": "Has at least one Bitstream",
+  // TODO New key - Add a translation
+  "has-at-least-one-bitstream_condition.label": "Has at least one Bitstream",
+
+  // "has-bitstream_filter.label": "Has Bitstream",
+  // TODO New key - Add a translation
+  "has-bitstream_filter.label": "Has Bitstream",
+
+  // "has-one-bitstream_condition.label": "Has one Bitstream",
+  // TODO New key - Add a translation
+  "has-one-bitstream_condition.label": "Has one Bitstream",
+
+  // "is-archived_condition.label": "Is archived",
+  // TODO New key - Add a translation
+  "is-archived_condition.label": "Is archived",
+
+  // "is-withdrawn_condition.label": "Is withdrawn",
+  // TODO New key - Add a translation
+  "is-withdrawn_condition.label": "Is withdrawn",
+
+  // "item-is-public_condition.label": "Item is public",
+  // TODO New key - Add a translation
+  "item-is-public_condition.label": "Item is public",
+
+  // "journals_ingest_suggestion_collection_filter_18.label": "Journals ingest",
+  // TODO New key - Add a translation
+  "journals_ingest_suggestion_collection_filter_18.label": "Journals ingest",
+
+  // "title-starts-with-pattern_condition.label": "Title starts with pattern",
+  // TODO New key - Add a translation
+  "title-starts-with-pattern_condition.label": "Title starts with pattern",
+
+  // "type-equals-dataset_condition.label": "Type equals Dataset",
+  // TODO New key - Add a translation
+  "type-equals-dataset_condition.label": "Type equals Dataset",
+
+  // "type-equals-journal-article_condition.label": "Type equals Journal Article",
+  // TODO New key - Add a translation
+  "type-equals-journal-article_condition.label": "Type equals Journal Article",
+
+  // "search.filters.filter.subject.text": "Subject",
+  // TODO New key - Add a translation
+  "search.filters.filter.subject.text": "Subject",
+
+  // "search.advanced.filters.head": "Advanced Search",
+  // TODO New key - Add a translation
+  "search.advanced.filters.head": "Advanced Search",
+
+  // "filter.search.text.placeholder": "Search text",
+  // TODO New key - Add a translation
+  "filter.search.text.placeholder": "Search text",
+
+  // "advancesearch.form.submit": "Add",
+  // TODO New key - Add a translation
+  "advancesearch.form.submit": "Add",
+
+  // "ldn.no-filter.label": "None",
+  // TODO New key - Add a translation
+  "ldn.no-filter.label": "None",
+
+  // "admin.notify.dashboard": "Dashboard",
+  // TODO New key - Add a translation
+  "admin.notify.dashboard": "Dashboard",
+
+  // "menu.section.notify_dashboard": "Dashboard",
+  // TODO New key - Add a translation
+  "menu.section.notify_dashboard": "Dashboard",
+
+  // "menu.section.coar_notify": "COAR Notify",
+  // TODO New key - Add a translation
+  "menu.section.coar_notify": "COAR Notify",
+
+  // "admin-notify-dashboard.title": "Notify Dashboard",
+  // TODO New key - Add a translation
+  "admin-notify-dashboard.title": "Notify Dashboard",
+
+  // "admin-notify-dashboard.description": "The Notify dashboard monitor the general usage of the COAR Notify protocol across the repository. In the “Metrics” tab are statistics about usage of the COAR Notify protocol. In the “Logs/Inbound” and “Logs/Outbound” tabs it’s possible to search and check the individual status of each LDN message, either received or sent.",
+  // TODO New key - Add a translation
+  "admin-notify-dashboard.description": "The Notify dashboard monitor the general usage of the COAR Notify protocol across the repository. In the “Metrics” tab are statistics about usage of the COAR Notify protocol. In the “Logs/Inbound” and “Logs/Outbound” tabs it’s possible to search and check the individual status of each LDN message, either received or sent.",
+
+  // "admin-notify-dashboard.metrics": "Metrics",
+  // TODO New key - Add a translation
+  "admin-notify-dashboard.metrics": "Metrics",
+
+  // "admin-notify-dashboard.received-ldn": "Number of received LDN",
+  // TODO New key - Add a translation
+  "admin-notify-dashboard.received-ldn": "Number of received LDN",
+
+  // "admin-notify-dashboard.generated-ldn": "Number of generated LDN",
+  // TODO New key - Add a translation
+  "admin-notify-dashboard.generated-ldn": "Number of generated LDN",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.accepted": "Accepted",
+  // TODO New key - Add a translation
+  "admin-notify-dashboard.NOTIFY.incoming.accepted": "Accepted",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.accepted.description": "Accepted inbound notifications",
+  // TODO New key - Add a translation
+  "admin-notify-dashboard.NOTIFY.incoming.accepted.description": "Accepted inbound notifications",
+
+  // "admin-notify-logs.NOTIFY.incoming.accepted": "Currently displaying: Accepted notifications",
+  // TODO New key - Add a translation
+  "admin-notify-logs.NOTIFY.incoming.accepted": "Currently displaying: Accepted notifications",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.processed": "Processed LDN",
+  // TODO New key - Add a translation
+  "admin-notify-dashboard.NOTIFY.incoming.processed": "Processed LDN",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.processed.description": "Processed inbound notifications",
+  // TODO New key - Add a translation
+  "admin-notify-dashboard.NOTIFY.incoming.processed.description": "Processed inbound notifications",
+
+  // "admin-notify-logs.NOTIFY.incoming.processed": "Currently displaying: Processed LDN",
+  // TODO New key - Add a translation
+  "admin-notify-logs.NOTIFY.incoming.processed": "Currently displaying: Processed LDN",
+
+  // "admin-notify-logs.NOTIFY.incoming.failure": "Currently displaying: Failed notifications",
+  // TODO New key - Add a translation
+  "admin-notify-logs.NOTIFY.incoming.failure": "Currently displaying: Failed notifications",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.failure": "Failure",
+  // TODO New key - Add a translation
+  "admin-notify-dashboard.NOTIFY.incoming.failure": "Failure",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.failure.description": "Failed inbound notifications",
+  // TODO New key - Add a translation
+  "admin-notify-dashboard.NOTIFY.incoming.failure.description": "Failed inbound notifications",
+
+  // "admin-notify-logs.NOTIFY.outgoing.failure": "Currently displaying: Failed notifications",
+  // TODO New key - Add a translation
+  "admin-notify-logs.NOTIFY.outgoing.failure": "Currently displaying: Failed notifications",
+
+  // "admin-notify-dashboard.NOTIFY.outgoing.failure": "Failure",
+  // TODO New key - Add a translation
+  "admin-notify-dashboard.NOTIFY.outgoing.failure": "Failure",
+
+  // "admin-notify-dashboard.NOTIFY.outgoing.failure.description": "Failed outbound notifications",
+  // TODO New key - Add a translation
+  "admin-notify-dashboard.NOTIFY.outgoing.failure.description": "Failed outbound notifications",
+
+  // "admin-notify-logs.NOTIFY.incoming.untrusted": "Currently displaying: Untrusted notifications",
+  // TODO New key - Add a translation
+  "admin-notify-logs.NOTIFY.incoming.untrusted": "Currently displaying: Untrusted notifications",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.untrusted": "Untrusted",
+  // TODO New key - Add a translation
+  "admin-notify-dashboard.NOTIFY.incoming.untrusted": "Untrusted",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.untrusted.description": "Inbound notifications not trusted",
+  // TODO New key - Add a translation
+  "admin-notify-dashboard.NOTIFY.incoming.untrusted.description": "Inbound notifications not trusted",
+
+  // "admin-notify-logs.NOTIFY.incoming.delivered": "Currently displaying: Delivered notifications",
+  // TODO New key - Add a translation
+  "admin-notify-logs.NOTIFY.incoming.delivered": "Currently displaying: Delivered notifications",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.delivered.description": "Inbound notifications successfully delivered",
+  // TODO New key - Add a translation
+  "admin-notify-dashboard.NOTIFY.incoming.delivered.description": "Inbound notifications successfully delivered",
+
+  // "admin-notify-dashboard.NOTIFY.outgoing.delivered": "Delivered",
+  // TODO New key - Add a translation
+  "admin-notify-dashboard.NOTIFY.outgoing.delivered": "Delivered",
+
+  // "admin-notify-logs.NOTIFY.outgoing.delivered": "Currently displaying: Delivered notifications",
+  // TODO New key - Add a translation
+  "admin-notify-logs.NOTIFY.outgoing.delivered": "Currently displaying: Delivered notifications",
+
+  // "admin-notify-dashboard.NOTIFY.outgoing.delivered.description": "Outbound notifications successfully delivered",
+  // TODO New key - Add a translation
+  "admin-notify-dashboard.NOTIFY.outgoing.delivered.description": "Outbound notifications successfully delivered",
+
+  // "admin-notify-logs.NOTIFY.outgoing.queued": "Currently displaying: Queued notifications",
+  // TODO New key - Add a translation
+  "admin-notify-logs.NOTIFY.outgoing.queued": "Currently displaying: Queued notifications",
+
+  // "admin-notify-dashboard.NOTIFY.outgoing.queued.description": "Notifications currently queued",
+  // TODO New key - Add a translation
+  "admin-notify-dashboard.NOTIFY.outgoing.queued.description": "Notifications currently queued",
+
+  // "admin-notify-dashboard.NOTIFY.outgoing.queued": "Queued",
+  // TODO New key - Add a translation
+  "admin-notify-dashboard.NOTIFY.outgoing.queued": "Queued",
+
+  // "admin-notify-logs.NOTIFY.outgoing.queued_for_retry": "Currently displaying: Queued for retry notifications",
+  // TODO New key - Add a translation
+  "admin-notify-logs.NOTIFY.outgoing.queued_for_retry": "Currently displaying: Queued for retry notifications",
+
+  // "admin-notify-dashboard.NOTIFY.outgoing.queued_for_retry": "Queued for retry",
+  // TODO New key - Add a translation
+  "admin-notify-dashboard.NOTIFY.outgoing.queued_for_retry": "Queued for retry",
+
+  // "admin-notify-dashboard.NOTIFY.outgoing.queued_for_retry.description": "Notifications currently queued for retry",
+  // TODO New key - Add a translation
+  "admin-notify-dashboard.NOTIFY.outgoing.queued_for_retry.description": "Notifications currently queued for retry",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.involvedItems": "Items involved",
+  // TODO New key - Add a translation
+  "admin-notify-dashboard.NOTIFY.incoming.involvedItems": "Items involved",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.involvedItems.description": "Items related to inbound notifications",
+  // TODO New key - Add a translation
+  "admin-notify-dashboard.NOTIFY.incoming.involvedItems.description": "Items related to inbound notifications",
+
+  // "admin-notify-dashboard.NOTIFY.outgoing.involvedItems": "Items involved",
+  // TODO New key - Add a translation
+  "admin-notify-dashboard.NOTIFY.outgoing.involvedItems": "Items involved",
+
+  // "admin-notify-dashboard.NOTIFY.outgoing.involvedItems.description": "Items related to outbound notifications",
+  // TODO New key - Add a translation
+  "admin-notify-dashboard.NOTIFY.outgoing.involvedItems.description": "Items related to outbound notifications",
+
+  // "admin.notify.dashboard.breadcrumbs": "Dashboard",
+  // TODO New key - Add a translation
+  "admin.notify.dashboard.breadcrumbs": "Dashboard",
+
+  // "admin.notify.dashboard.inbound": "Inbound messages",
+  // TODO New key - Add a translation
+  "admin.notify.dashboard.inbound": "Inbound messages",
+
+  // "admin.notify.dashboard.inbound-logs": "Logs/Inbound",
+  // TODO New key - Add a translation
+  "admin.notify.dashboard.inbound-logs": "Logs/Inbound",
+
+  // "admin.notify.dashboard.filter": "Filter: ",
+  // TODO New key - Add a translation
+  "admin.notify.dashboard.filter": "Filter: ",
+
+  // "search.filters.applied.f.relateditem": "Related items",
+  // TODO New key - Add a translation
+  "search.filters.applied.f.relateditem": "Related items",
+
+  // "search.filters.applied.f.ldn_service": "LDN Service",
+  // TODO New key - Add a translation
+  "search.filters.applied.f.ldn_service": "LDN Service",
+
+  // "search.filters.applied.f.notifyReview": "Notify Review",
+  // TODO New key - Add a translation
+  "search.filters.applied.f.notifyReview": "Notify Review",
+
+  // "search.filters.applied.f.notifyEndorsement": "Notify Endorsement",
+  // TODO New key - Add a translation
+  "search.filters.applied.f.notifyEndorsement": "Notify Endorsement",
+
+  // "search.filters.applied.f.notifyRelation": "Notify Relation",
+  // TODO New key - Add a translation
+  "search.filters.applied.f.notifyRelation": "Notify Relation",
+
+  // "search.filters.filter.queue_last_start_time.head": "Last processing time ",
+  // TODO New key - Add a translation
+  "search.filters.filter.queue_last_start_time.head": "Last processing time ",
+
+  // "search.filters.filter.queue_last_start_time.min.label": "Min range",
+  // TODO New key - Add a translation
+  "search.filters.filter.queue_last_start_time.min.label": "Min range",
+
+  // "search.filters.filter.queue_last_start_time.max.label": "Max range",
+  // TODO New key - Add a translation
+  "search.filters.filter.queue_last_start_time.max.label": "Max range",
+
+  // "search.filters.applied.f.queue_last_start_time.min": "Min range",
+  // TODO New key - Add a translation
+  "search.filters.applied.f.queue_last_start_time.min": "Min range",
+
+  // "search.filters.applied.f.queue_last_start_time.max": "Max range",
+  // TODO New key - Add a translation
+  "search.filters.applied.f.queue_last_start_time.max": "Max range",
+
+  // "admin.notify.dashboard.outbound": "Outbound messages",
+  // TODO New key - Add a translation
+  "admin.notify.dashboard.outbound": "Outbound messages",
+
+  // "admin.notify.dashboard.outbound-logs": "Logs/Outbound",
+  // TODO New key - Add a translation
+  "admin.notify.dashboard.outbound-logs": "Logs/Outbound",
+
+  // "NOTIFY.incoming.search.results.head": "Incoming",
+  // TODO New key - Add a translation
+  "NOTIFY.incoming.search.results.head": "Incoming",
+
+  // "search.filters.filter.relateditem.head": "Related item",
+  // TODO New key - Add a translation
+  "search.filters.filter.relateditem.head": "Related item",
+
+  // "search.filters.filter.origin.head": "Origin",
+  // TODO New key - Add a translation
+  "search.filters.filter.origin.head": "Origin",
+
+  // "search.filters.filter.ldn_service.head": "LDN Service",
+  // TODO New key - Add a translation
+  "search.filters.filter.ldn_service.head": "LDN Service",
+
+  // "search.filters.filter.target.head": "Target",
+  // TODO New key - Add a translation
+  "search.filters.filter.target.head": "Target",
+
+  // "search.filters.filter.queue_status.head": "Queue status",
+  // TODO New key - Add a translation
+  "search.filters.filter.queue_status.head": "Queue status",
+
+  // "search.filters.filter.activity_stream_type.head": "Activity stream type",
+  // TODO New key - Add a translation
+  "search.filters.filter.activity_stream_type.head": "Activity stream type",
+
+  // "search.filters.filter.coar_notify_type.head": "COAR Notify type",
+  // TODO New key - Add a translation
+  "search.filters.filter.coar_notify_type.head": "COAR Notify type",
+
+  // "search.filters.filter.notification_type.head": "Notification type",
+  // TODO New key - Add a translation
+  "search.filters.filter.notification_type.head": "Notification type",
+
+  // "search.filters.filter.relateditem.label": "Search related items",
+  // TODO New key - Add a translation
+  "search.filters.filter.relateditem.label": "Search related items",
+
+  // "search.filters.filter.queue_status.label": "Search queue status",
+  // TODO New key - Add a translation
+  "search.filters.filter.queue_status.label": "Search queue status",
+
+  // "search.filters.filter.target.label": "Search target",
+  // TODO New key - Add a translation
+  "search.filters.filter.target.label": "Search target",
+
+  // "search.filters.filter.activity_stream_type.label": "Search activity stream type",
+  // TODO New key - Add a translation
+  "search.filters.filter.activity_stream_type.label": "Search activity stream type",
+
+  // "search.filters.applied.f.queue_status": "Queue Status",
+  // TODO New key - Add a translation
+  "search.filters.applied.f.queue_status": "Queue Status",
+
+  // "search.filters.queue_status.0,authority": "Untrusted Ip",
+  // TODO New key - Add a translation
+  "search.filters.queue_status.0,authority": "Untrusted Ip",
+
+  // "search.filters.queue_status.1,authority": "Queued",
+  // TODO New key - Add a translation
+  "search.filters.queue_status.1,authority": "Queued",
+
+  // "search.filters.queue_status.2,authority": "Processing",
+  // TODO New key - Add a translation
+  "search.filters.queue_status.2,authority": "Processing",
+
+  // "search.filters.queue_status.3,authority": "Processed",
+  // TODO New key - Add a translation
+  "search.filters.queue_status.3,authority": "Processed",
+
+  // "search.filters.queue_status.4,authority": "Failed",
+  // TODO New key - Add a translation
+  "search.filters.queue_status.4,authority": "Failed",
+
+  // "search.filters.queue_status.5,authority": "Untrusted",
+  // TODO New key - Add a translation
+  "search.filters.queue_status.5,authority": "Untrusted",
+
+  // "search.filters.queue_status.6,authority": "Unmapped Action",
+  // TODO New key - Add a translation
+  "search.filters.queue_status.6,authority": "Unmapped Action",
+
+  // "search.filters.queue_status.7,authority": "Queued for retry",
+  // TODO New key - Add a translation
+  "search.filters.queue_status.7,authority": "Queued for retry",
+
+  // "search.filters.applied.f.activity_stream_type": "Activity stream type",
+  // TODO New key - Add a translation
+  "search.filters.applied.f.activity_stream_type": "Activity stream type",
+
+  // "search.filters.applied.f.coar_notify_type": "COAR Notify type",
+  // TODO New key - Add a translation
+  "search.filters.applied.f.coar_notify_type": "COAR Notify type",
+
+  // "search.filters.applied.f.notification_type": "Notification type",
+  // TODO New key - Add a translation
+  "search.filters.applied.f.notification_type": "Notification type",
+
+  // "search.filters.filter.coar_notify_type.label": "Search COAR Notify type",
+  // TODO New key - Add a translation
+  "search.filters.filter.coar_notify_type.label": "Search COAR Notify type",
+
+  // "search.filters.filter.notification_type.label": "Search notification type",
+  // TODO New key - Add a translation
+  "search.filters.filter.notification_type.label": "Search notification type",
+
+  // "search.filters.filter.relateditem.placeholder": "Related items",
+  // TODO New key - Add a translation
+  "search.filters.filter.relateditem.placeholder": "Related items",
+
+  // "search.filters.filter.target.placeholder": "Target",
+  // TODO New key - Add a translation
+  "search.filters.filter.target.placeholder": "Target",
+
+  // "search.filters.filter.origin.label": "Search source",
+  // TODO New key - Add a translation
+  "search.filters.filter.origin.label": "Search source",
+
+  // "search.filters.filter.origin.placeholder": "Source",
+  // TODO New key - Add a translation
+  "search.filters.filter.origin.placeholder": "Source",
+
+  // "search.filters.filter.ldn_service.label": "Search LDN Service",
+  // TODO New key - Add a translation
+  "search.filters.filter.ldn_service.label": "Search LDN Service",
+
+  // "search.filters.filter.ldn_service.placeholder": "LDN Service",
+  // TODO New key - Add a translation
+  "search.filters.filter.ldn_service.placeholder": "LDN Service",
+
+  // "search.filters.filter.queue_status.placeholder": "Queue status",
+  // TODO New key - Add a translation
+  "search.filters.filter.queue_status.placeholder": "Queue status",
+
+  // "search.filters.filter.activity_stream_type.placeholder": "Activity stream type",
+  // TODO New key - Add a translation
+  "search.filters.filter.activity_stream_type.placeholder": "Activity stream type",
+
+  // "search.filters.filter.coar_notify_type.placeholder": "COAR Notify type",
+  // TODO New key - Add a translation
+  "search.filters.filter.coar_notify_type.placeholder": "COAR Notify type",
+
+  // "search.filters.filter.notification_type.placeholder": "Notification",
+  // TODO New key - Add a translation
+  "search.filters.filter.notification_type.placeholder": "Notification",
+
+  // "search.filters.filter.notifyRelation.head": "Notify Relation",
+  // TODO New key - Add a translation
+  "search.filters.filter.notifyRelation.head": "Notify Relation",
+
+  // "search.filters.filter.notifyRelation.label": "Search Notify Relation",
+  // TODO New key - Add a translation
+  "search.filters.filter.notifyRelation.label": "Search Notify Relation",
+
+  // "search.filters.filter.notifyRelation.placeholder": "Notify Relation",
+  // TODO New key - Add a translation
+  "search.filters.filter.notifyRelation.placeholder": "Notify Relation",
+
+  // "search.filters.filter.notifyReview.head": "Notify Review",
+  // TODO New key - Add a translation
+  "search.filters.filter.notifyReview.head": "Notify Review",
+
+  // "search.filters.filter.notifyReview.label": "Search Notify Review",
+  // TODO New key - Add a translation
+  "search.filters.filter.notifyReview.label": "Search Notify Review",
+
+  // "search.filters.filter.notifyReview.placeholder": "Notify Review",
+  // TODO New key - Add a translation
+  "search.filters.filter.notifyReview.placeholder": "Notify Review",
+
+  // "search.filters.coar_notify_type.coar-notify:ReviewAction": "Review action",
+  // TODO New key - Add a translation
+  "search.filters.coar_notify_type.coar-notify:ReviewAction": "Review action",
+
+  // "search.filters.coar_notify_type.coar-notify:ReviewAction,authority": "Review action",
+  // TODO New key - Add a translation
+  "search.filters.coar_notify_type.coar-notify:ReviewAction,authority": "Review action",
+
+  // "notify-detail-modal.coar-notify:ReviewAction": "Review action",
+  // TODO New key - Add a translation
+  "notify-detail-modal.coar-notify:ReviewAction": "Review action",
+
+  // "search.filters.coar_notify_type.coar-notify:EndorsementAction": "Endorsement action",
+  // TODO New key - Add a translation
+  "search.filters.coar_notify_type.coar-notify:EndorsementAction": "Endorsement action",
+
+  // "search.filters.coar_notify_type.coar-notify:EndorsementAction,authority": "Endorsement action",
+  // TODO New key - Add a translation
+  "search.filters.coar_notify_type.coar-notify:EndorsementAction,authority": "Endorsement action",
+
+  // "notify-detail-modal.coar-notify:EndorsementAction": "Endorsement action",
+  // TODO New key - Add a translation
+  "notify-detail-modal.coar-notify:EndorsementAction": "Endorsement action",
+
+  // "search.filters.coar_notify_type.coar-notify:IngestAction": "Ingest action",
+  // TODO New key - Add a translation
+  "search.filters.coar_notify_type.coar-notify:IngestAction": "Ingest action",
+
+  // "search.filters.coar_notify_type.coar-notify:IngestAction,authority": "Ingest action",
+  // TODO New key - Add a translation
+  "search.filters.coar_notify_type.coar-notify:IngestAction,authority": "Ingest action",
+
+  // "notify-detail-modal.coar-notify:IngestAction": "Ingest action",
+  // TODO New key - Add a translation
+  "notify-detail-modal.coar-notify:IngestAction": "Ingest action",
+
+  // "search.filters.coar_notify_type.coar-notify:RelationshipAction": "Relationship action",
+  // TODO New key - Add a translation
+  "search.filters.coar_notify_type.coar-notify:RelationshipAction": "Relationship action",
+
+  // "search.filters.coar_notify_type.coar-notify:RelationshipAction,authority": "Relationship action",
+  // TODO New key - Add a translation
+  "search.filters.coar_notify_type.coar-notify:RelationshipAction,authority": "Relationship action",
+
+  // "notify-detail-modal.coar-notify:RelationshipAction": "Relationship action",
+  // TODO New key - Add a translation
+  "notify-detail-modal.coar-notify:RelationshipAction": "Relationship action",
+
+  // "search.filters.queue_status.QUEUE_STATUS_QUEUED": "Queued",
+  // TODO New key - Add a translation
+  "search.filters.queue_status.QUEUE_STATUS_QUEUED": "Queued",
+
+  // "notify-detail-modal.QUEUE_STATUS_QUEUED": "Queued",
+  // TODO New key - Add a translation
+  "notify-detail-modal.QUEUE_STATUS_QUEUED": "Queued",
+
+  // "search.filters.queue_status.QUEUE_STATUS_QUEUED_FOR_RETRY": "Queued for retry",
+  // TODO New key - Add a translation
+  "search.filters.queue_status.QUEUE_STATUS_QUEUED_FOR_RETRY": "Queued for retry",
+
+  // "notify-detail-modal.QUEUE_STATUS_QUEUED_FOR_RETRY": "Queued for retry",
+  // TODO New key - Add a translation
+  "notify-detail-modal.QUEUE_STATUS_QUEUED_FOR_RETRY": "Queued for retry",
+
+  // "search.filters.queue_status.QUEUE_STATUS_PROCESSING": "Processing",
+  // TODO New key - Add a translation
+  "search.filters.queue_status.QUEUE_STATUS_PROCESSING": "Processing",
+
+  // "notify-detail-modal.QUEUE_STATUS_PROCESSING": "Processing",
+  // TODO New key - Add a translation
+  "notify-detail-modal.QUEUE_STATUS_PROCESSING": "Processing",
+
+  // "search.filters.queue_status.QUEUE_STATUS_PROCESSED": "Processed",
+  // TODO New key - Add a translation
+  "search.filters.queue_status.QUEUE_STATUS_PROCESSED": "Processed",
+
+  // "notify-detail-modal.QUEUE_STATUS_PROCESSED": "Processed",
+  // TODO New key - Add a translation
+  "notify-detail-modal.QUEUE_STATUS_PROCESSED": "Processed",
+
+  // "search.filters.queue_status.QUEUE_STATUS_FAILED": "Failed",
+  // TODO New key - Add a translation
+  "search.filters.queue_status.QUEUE_STATUS_FAILED": "Failed",
+
+  // "notify-detail-modal.QUEUE_STATUS_FAILED": "Failed",
+  // TODO New key - Add a translation
+  "notify-detail-modal.QUEUE_STATUS_FAILED": "Failed",
+
+  // "search.filters.queue_status.QUEUE_STATUS_UNTRUSTED": "Untrusted",
+  // TODO New key - Add a translation
+  "search.filters.queue_status.QUEUE_STATUS_UNTRUSTED": "Untrusted",
+
+  // "search.filters.queue_status.QUEUE_STATUS_UNTRUSTED_IP": "Untrusted Ip",
+  // TODO New key - Add a translation
+  "search.filters.queue_status.QUEUE_STATUS_UNTRUSTED_IP": "Untrusted Ip",
+
+  // "notify-detail-modal.QUEUE_STATUS_UNTRUSTED": "Untrusted",
+  // TODO New key - Add a translation
+  "notify-detail-modal.QUEUE_STATUS_UNTRUSTED": "Untrusted",
+
+  // "notify-detail-modal.QUEUE_STATUS_UNTRUSTED_IP": "Untrusted Ip",
+  // TODO New key - Add a translation
+  "notify-detail-modal.QUEUE_STATUS_UNTRUSTED_IP": "Untrusted Ip",
+
+  // "search.filters.queue_status.QUEUE_STATUS_UNMAPPED_ACTION": "Unmapped Action",
+  // TODO New key - Add a translation
+  "search.filters.queue_status.QUEUE_STATUS_UNMAPPED_ACTION": "Unmapped Action",
+
+  // "notify-detail-modal.QUEUE_STATUS_UNMAPPED_ACTION": "Unmapped Action",
+  // TODO New key - Add a translation
+  "notify-detail-modal.QUEUE_STATUS_UNMAPPED_ACTION": "Unmapped Action",
+
+  // "sorting.queue_last_start_time.DESC": "Last started queue Descending",
+  // TODO New key - Add a translation
+  "sorting.queue_last_start_time.DESC": "Last started queue Descending",
+
+  // "sorting.queue_last_start_time.ASC": "Last started queue Ascending",
+  // TODO New key - Add a translation
+  "sorting.queue_last_start_time.ASC": "Last started queue Ascending",
+
+  // "sorting.queue_attempts.DESC": "Queue attempted Descending",
+  // TODO New key - Add a translation
+  "sorting.queue_attempts.DESC": "Queue attempted Descending",
+
+  // "sorting.queue_attempts.ASC": "Queue attempted Ascending",
+  // TODO New key - Add a translation
+  "sorting.queue_attempts.ASC": "Queue attempted Ascending",
+
+  // "NOTIFY.incoming.involvedItems.search.results.head": "Items involved in incoming LDN",
+  // TODO New key - Add a translation
+  "NOTIFY.incoming.involvedItems.search.results.head": "Items involved in incoming LDN",
+
+  // "NOTIFY.outgoing.involvedItems.search.results.head": "Items involved in outgoing LDN",
+  // TODO New key - Add a translation
+  "NOTIFY.outgoing.involvedItems.search.results.head": "Items involved in outgoing LDN",
+
+  // "type.notify-detail-modal": "Type",
+  // TODO New key - Add a translation
+  "type.notify-detail-modal": "Type",
+
+  // "id.notify-detail-modal": "Id",
+  // TODO New key - Add a translation
+  "id.notify-detail-modal": "Id",
+
+  // "coarNotifyType.notify-detail-modal": "COAR Notify type",
+  // TODO New key - Add a translation
+  "coarNotifyType.notify-detail-modal": "COAR Notify type",
+
+  // "activityStreamType.notify-detail-modal": "Activity stream type",
+  // TODO New key - Add a translation
+  "activityStreamType.notify-detail-modal": "Activity stream type",
+
+  // "inReplyTo.notify-detail-modal": "In reply to",
+  // TODO New key - Add a translation
+  "inReplyTo.notify-detail-modal": "In reply to",
+
+  // "object.notify-detail-modal": "Repository Item",
+  // TODO New key - Add a translation
+  "object.notify-detail-modal": "Repository Item",
+
+  // "context.notify-detail-modal": "Repository Item",
+  // TODO New key - Add a translation
+  "context.notify-detail-modal": "Repository Item",
+
+  // "queueAttempts.notify-detail-modal": "Queue attempts",
+  // TODO New key - Add a translation
+  "queueAttempts.notify-detail-modal": "Queue attempts",
+
+  // "queueLastStartTime.notify-detail-modal": "Queue last started",
+  // TODO New key - Add a translation
+  "queueLastStartTime.notify-detail-modal": "Queue last started",
+
+  // "origin.notify-detail-modal": "LDN Service",
+  // TODO New key - Add a translation
+  "origin.notify-detail-modal": "LDN Service",
+
+  // "target.notify-detail-modal": "LDN Service",
+  // TODO New key - Add a translation
+  "target.notify-detail-modal": "LDN Service",
+
+  // "queueStatusLabel.notify-detail-modal": "Queue status",
+  // TODO New key - Add a translation
+  "queueStatusLabel.notify-detail-modal": "Queue status",
+
+  // "queueTimeout.notify-detail-modal": "Queue timeout",
+  // TODO New key - Add a translation
+  "queueTimeout.notify-detail-modal": "Queue timeout",
+
+  // "notify-message-modal.title": "Message Detail",
+  // TODO New key - Add a translation
+  "notify-message-modal.title": "Message Detail",
+
+  // "notify-message-modal.show-message": "Show message",
+  // TODO New key - Add a translation
+  "notify-message-modal.show-message": "Show message",
+
+  // "notify-message-result.timestamp": "Timestamp",
+  // TODO New key - Add a translation
+  "notify-message-result.timestamp": "Timestamp",
+
+  // "notify-message-result.repositoryItem": "Repository Item",
+  // TODO New key - Add a translation
+  "notify-message-result.repositoryItem": "Repository Item",
+
+  // "notify-message-result.ldnService": "LDN Service",
+  // TODO New key - Add a translation
+  "notify-message-result.ldnService": "LDN Service",
+
+  // "notify-message-result.type": "Type",
+  // TODO New key - Add a translation
+  "notify-message-result.type": "Type",
+
+  // "notify-message-result.status": "Status",
+  // TODO New key - Add a translation
+  "notify-message-result.status": "Status",
+
+  // "notify-message-result.action": "Action",
+  // TODO New key - Add a translation
+  "notify-message-result.action": "Action",
+
+  // "notify-message-result.detail": "Detail",
+  // TODO New key - Add a translation
+  "notify-message-result.detail": "Detail",
+
+  // "notify-message-result.reprocess": "Reprocess",
+  // TODO New key - Add a translation
+  "notify-message-result.reprocess": "Reprocess",
+
+  // "notify-queue-status.processed": "Processed",
+  // TODO New key - Add a translation
+  "notify-queue-status.processed": "Processed",
+
+  // "notify-queue-status.failed": "Failed",
+  // TODO New key - Add a translation
+  "notify-queue-status.failed": "Failed",
+
+  // "notify-queue-status.queue_retry": "Queued for retry",
+  // TODO New key - Add a translation
+  "notify-queue-status.queue_retry": "Queued for retry",
+
+  // "notify-queue-status.unmapped_action": "Unmapped action",
+  // TODO New key - Add a translation
+  "notify-queue-status.unmapped_action": "Unmapped action",
+
+  // "notify-queue-status.processing": "Processing",
+  // TODO New key - Add a translation
+  "notify-queue-status.processing": "Processing",
+
+  // "notify-queue-status.queued": "Queued",
+  // TODO New key - Add a translation
+  "notify-queue-status.queued": "Queued",
+
+  // "notify-queue-status.untrusted": "Untrusted",
+  // TODO New key - Add a translation
+  "notify-queue-status.untrusted": "Untrusted",
+
+  // "ldnService.notify-detail-modal": "LDN Service",
+  // TODO New key - Add a translation
+  "ldnService.notify-detail-modal": "LDN Service",
+
+  // "relatedItem.notify-detail-modal": "Related Item",
+  // TODO New key - Add a translation
+  "relatedItem.notify-detail-modal": "Related Item",
+
+  // "search.filters.filter.notifyEndorsement.head": "Notify Endorsement",
+  // TODO New key - Add a translation
+  "search.filters.filter.notifyEndorsement.head": "Notify Endorsement",
+
+  // "search.filters.filter.notifyEndorsement.placeholder": "Notify Endorsement",
+  // TODO New key - Add a translation
+  "search.filters.filter.notifyEndorsement.placeholder": "Notify Endorsement",
+
+  // "search.filters.filter.notifyEndorsement.label": "Search Notify Endorsement",
+  // TODO New key - Add a translation
+  "search.filters.filter.notifyEndorsement.label": "Search Notify Endorsement",
 
 }
diff --git a/src/assets/i18n/bn.json5 b/src/assets/i18n/bn.json5
index cc05d12828..66a5d5d52f 100644
--- a/src/assets/i18n/bn.json5
+++ b/src/assets/i18n/bn.json5
@@ -3121,7 +3121,7 @@
   // "item.page.version.create": "Create new version",
   "item.page.version.create": "নতুন সংস্করণ তৈরি করুন",
 
-  // "item.page.version.hasDraft": "A new version cannot be created because there is an inprogress submission in the version history",
+  // "item.page.version.hasDraft": "A new version cannot be created because there is an in-progress submission in the version history",
   "item.page.version.hasDraft": "একটি নতুন সংস্করণ তৈরি করা যাচ্ছে না কারণ ভার্সন হিস্ট্রিতে একটি জমা ইনপ্রগ্রেসস অবস্থাই রয়েছে",
 
   // "item.preview.dc.identifier.uri": "Identifier:",
@@ -3250,7 +3250,7 @@
   // "item.version.history.table.action.deleteVersion": "Delete version",
   "item.version.history.table.action.deleteVersion": "মুছে ফেলুন সংস্করণ",
 
-  // "item.version.history.table.action.hasDraft": "A new version cannot be created because there is an inprogress submission in the version history",
+  // "item.version.history.table.action.hasDraft": "A new version cannot be created because there is an in-progress submission in the version history",
   "item.version.history.table.action.hasDraft": "একটি নতুন সংস্করণ তৈরি করা যাচ্ছে না কারণ ভার্সন হিস্ট্রিতে একটি জমা ইনপ্রগ্রেসস অবস্থাই রয়েছে",
 
 
@@ -3291,7 +3291,7 @@
   // "item.version.create.notification.failure" : "New version has not been created",
   "item.version.create.notification.failure": "নতুন সংস্করণ তৈরি করা হয়নি",
 
-  // "item.version.create.notification.inProgress" : "A new version cannot be created because there is an inprogress submission in the version history",
+  // "item.version.create.notification.inProgress" : "A new version cannot be created because there is an in-progress submission in the version history",
   "item.version.create.notification.inProgress": "একটি নতুন সংস্করণ তৈরি করা যাবে না কারণ ভার্সন হিস্ট্রিতে একটি জমা ইনপ্রগ্রেসস অবস্থাই রয়েছে",
 
 
@@ -3880,20 +3880,20 @@
   // "mydspace.show.workspace": "Your Submissions",
   "mydspace.show.workspace": "আপনার জমাগুলো",
 
-  // "mydspace.status.archived": "Archived",
-  "mydspace.status.archived": "সংরক্ষণাগারভুক্ত",
+  // "mydspace.status.mydspaceArchived": "Archived",
+  "mydspace.status.mydspaceArchived": "সংরক্ষণাগারভুক্ত",
 
-  // "mydspace.status.validation": "Validation",
-  "mydspace.status.validation": "বৈধতা",
+  // "mydspace.status.mydspaceValidation": "Validation",
+  "mydspace.status.mydspaceValidation": "বৈধতা",
 
-  // "mydspace.status.waiting-for-controller": "Waiting for controller",
-  "mydspace.status.waiting-for-controller": "নিয়ামক জন্য অপেক্ষা করছে",
+  // "mydspace.status.mydspaceWaitingController": "Waiting for reviewer",
+  "mydspace.status.mydspaceWaitingController": "নিয়ামক জন্য অপেক্ষা করছে",
 
-  // "mydspace.status.workflow": "Workflow",
-  "mydspace.status.workflow": "ওয়ার্কফ্লো",
+  // "mydspace.status.mydspaceWorkflow": "Workflow",
+  "mydspace.status.mydspaceWorkflow": "ওয়ার্কফ্লো",
 
-  // "mydspace.status.workspace": "Workspace",
-  "mydspace.status.workspace": "কর্মক্ষেত্র",
+  // "mydspace.status.mydspaceWorkspace": "Workspace",
+  "mydspace.status.mydspaceWorkspace": "কর্মক্ষেত্র",
 
   // "mydspace.title": "MyDSpace",
   "mydspace.title": "আমার ডিস্পেস",
@@ -4616,6 +4616,10 @@
   // "resource-policies.form.name.label": "Name",
   "resource-policies.form.name.label": "নাম",
 
+  //"resource-policies.form.name.hint": "Max 30 characters",
+  // TODO New key - Add a translation
+  "resource-policies.form.name.hint": "Max 30 characters",
+
   // "resource-policies.form.policy-type.label": "Select the policy type",
   "resource-policies.form.policy-type.label": "নীতির টাইপ নির্বাচন করুন",
 
diff --git a/src/assets/i18n/ca.json5 b/src/assets/i18n/ca.json5
index 34279548bb..1e8290c8ae 100644
--- a/src/assets/i18n/ca.json5
+++ b/src/assets/i18n/ca.json5
@@ -3376,7 +3376,7 @@
   // "item.page.version.create": "Create new version",
   "item.page.version.create": "Crear una nova versió",
 
-  // "item.page.version.hasDraft": "A new version cannot be created because there is an inprogress submission in the version history",
+  // "item.page.version.hasDraft": "A new version cannot be created because there is an in-progress submission in the version history",
   "item.page.version.hasDraft": "No es pot crear una nova versió perquè a l'historial de versions hi ha un enviament en curs",
 
   // "item.page.claim.button": "Claim",
@@ -3535,7 +3535,7 @@
   // "item.version.history.table.action.deleteVersion": "Delete version",
   "item.version.history.table.action.deleteVersion": "Esborrar versió",
 
-  // "item.version.history.table.action.hasDraft": "A new version cannot be created because there is an inprogress submission in the version history",
+  // "item.version.history.table.action.hasDraft": "A new version cannot be created because there is an in-progress submission in the version history",
   "item.version.history.table.action.hasDraft": "No és possible crear una nova versió ja que existeix a l'historial de versions un enviament pendent",
 
 
@@ -3582,7 +3582,7 @@
   // "item.version.create.notification.failure" : "New version has not been created",
   "item.version.create.notification.failure": "No s'ha creat una nova versió",
 
-  // "item.version.create.notification.inProgress" : "A new version cannot be created because there is an inprogress submission in the version history",
+  // "item.version.create.notification.inProgress" : "A new version cannot be created because there is an in-progress submission in the version history",
   "item.version.create.notification.inProgress": "No és possible crear una nova versió ja que existeix a l'historial de versions un enviament pendent",
 
 
@@ -4190,20 +4190,20 @@
   // "mydspace.show.workspace": "Your Submissions",
   "mydspace.show.workspace": "Els seus enviaments",
 
-  // "mydspace.status.archived": "Archived",
-  "mydspace.status.archived": "Arxivat",
+  // "mydspace.status.mydspaceArchived": "Archived",
+  "mydspace.status.mydspaceArchived": "Arxivat",
 
-  // "mydspace.status.validation": "Validation",
-  "mydspace.status.validation": "Validació",
+  // "mydspace.status.mydspaceValidation": "Validation",
+  "mydspace.status.mydspaceValidation": "Validació",
 
-  // "mydspace.status.waiting-for-controller": "Waiting for controller",
-  "mydspace.status.waiting-for-controller": "Esperant el controlador",
+  // "mydspace.status.mydspaceWaitingController": "Waiting for reviewer",
+  "mydspace.status.mydspaceWaitingController": "Esperant el controlador",
 
-  // "mydspace.status.workflow": "Workflow",
-  "mydspace.status.workflow": "Flux de treball",
+  // "mydspace.status.mydspaceWorkflow": "Workflow",
+  "mydspace.status.mydspaceWorkflow": "Flux de treball",
 
-  // "mydspace.status.workspace": "Workspace",
-  "mydspace.status.workspace": "Espai de treball",
+  // "mydspace.status.mydspaceWorkspace": "Workspace",
+  "mydspace.status.mydspaceWorkspace": "Espai de treball",
 
   // "mydspace.title": "MyDSpace",
   "mydspace.title": "El meu DSpace",
@@ -5034,6 +5034,9 @@
   // "resource-policies.form.name.label": "Name",
   "resource-policies.form.name.label": "Nom",
 
+  //"resource-policies.form.name.hint": "Max 30 characters",
+  "resource-policies.form.name.hint": "Màxim 30 caràcters",
+
   // "resource-policies.form.policy-type.label": "Select the policy type",
   "resource-policies.form.policy-type.label": "Seleccioneu el tipus de política",
 
@@ -5645,8 +5648,8 @@
   // "submission.import-external.source.cinii": "CiNii",
   "submission.import-external.source.cinii": "CiNii",
 
-  // "submission.import-external.source.crossref": "CrossRef",
-  "submission.import-external.source.crossref": "CrossRef",
+  // "submission.import-external.source.crossref": "Crossref",
+  "submission.import-external.source.crossref": "Crossref",
 
   // "submission.import-external.source.datacite": "DataCite",
   "submission.import-external.source.datacite": "DataCite",
diff --git a/src/assets/i18n/cs.json5 b/src/assets/i18n/cs.json5
index f3155e9f57..866660f513 100644
--- a/src/assets/i18n/cs.json5
+++ b/src/assets/i18n/cs.json5
@@ -1,267 +1,269 @@
 {
 
   // "401.help": "You're not authorized to access this page. You can use the button below to get back to the home page.",
-  // TODO New key - Add a translation
-  "401.help": "You're not authorized to access this page. You can use the button below to get back to the home page.",
+  "401.help": "Nemáte oprávnění k přístupu na tuto stránku. Pro návrat na domovskou stránku můžete použít tlačítko níže.",
 
   // "401.link.home-page": "Take me to the home page",
-  // TODO New key - Add a translation
-  "401.link.home-page": "Take me to the home page",
-
-  // "401.unauthorized": "unauthorized",
-  // TODO New key - Add a translation
-  "401.unauthorized": "unauthorized",
-
+  "401.link.home-page": "Návrat na domovskou stránku",
 
+  // "401.unauthorized": "Unauthorized",
+  "401.unauthorized": "Neautorizovaný přístup",
 
   // "403.help": "You don't have permission to access this page. You can use the button below to get back to the home page.",
-  // TODO New key - Add a translation
-  "403.help": "You don't have permission to access this page. You can use the button below to get back to the home page.",
+  "403.help": "Nemáte povolení k přístupu na tuto stránku. Pro návrat na domovskou stránku můžete použít tlačítko níže.",
 
   // "403.link.home-page": "Take me to the home page",
-  // TODO New key - Add a translation
-  "403.link.home-page": "Take me to the home page",
+  "403.link.home-page": "Návrat na domovskou stránku",
 
-  // "403.forbidden": "forbidden",
-  // TODO New key - Add a translation
-  "403.forbidden": "forbidden",
+  // "403.forbidden": "Forbidden",
+  "403.forbidden": "Přístup zakázán",
 
+  // "500.page-internal-server-error": "Service unavailable",
+  "500.page-internal-server-error": "Služba je nedostupná",
 
+  // "500.help": "The server is temporarily unable to service your request due to maintenance downtime or capacity problems. Please try again later.",
+  "500.help": "Server není dočasně schopen obsloužit váš požadavek z důvodu výpadku údržby nebo kapacitních problémů. Zkuste to prosím později.",
+
+  // "500.link.home-page": "Take me to the home page",
+  "500.link.home-page": "Návrat na domovskou stránku",
 
   // "404.help": "We can't find the page you're looking for. The page may have been moved or deleted. You can use the button below to get back to the home page. ",
-  "404.help": "Nepodařilo se najít stránku, kterou hledáte. Je možné, že stránka byla přesunuta nebo smazána. Pomocí tlačítka níže můžete přejít na domovskou stránku. ",
+  "404.help": "Nemůžeme najít stránku, kterou hledáte. Stránka mohla být přesunuta nebo smazána. Pomocí níže uvedeného tlačítka se můžete vrátit na domovskou stránku. ",
 
   // "404.link.home-page": "Take me to the home page",
-  "404.link.home-page": "Přejít na domovskou stránku",
+  "404.link.home-page": "Návrat na domovskou stránku",
 
-  // "404.page-not-found": "page not found",
-  "404.page-not-found": "stránka nenalezena",
+  // "404.page-not-found": "Page not found",
+  "404.page-not-found": "Stránka nebyla nalezena",
+
+  // "error-page.description.401": "Unauthorized",
+  "error-page.description.401": "Neautorizovaný přístup",
+
+  // "error-page.description.403": "Forbidden",
+  "error-page.description.403": "Přístup zakázán",
+
+  // "error-page.description.500": "Service unavailable",
+  "error-page.description.500": "Služba je nedostupná",
+
+  // "error-page.description.404": "Page not found",
+  "error-page.description.404": "Stránka nebyla nalezena",
+
+  // "error-page.orcid.generic-error": "An error occurred during login via ORCID. Make sure you have shared your ORCID account email address with DSpace. If the error persists, contact the administrator",
+  "error-page.orcid.generic-error": "Při přihlašování přes ORCID došlo k chybě. Ujistěte se, že jste sdíleli e-mailovou adresu připojenou ke svému účtu ORCID s DSpace. Pokud chyba přetrvává, kontaktujte správce",
+
+  // "access-status.embargo.listelement.badge": "Embargo",
+  "access-status.embargo.listelement.badge": "Embargo",
+
+  // "access-status.metadata.only.listelement.badge": "Metadata only",
+  "access-status.metadata.only.listelement.badge": "Pouze metadata",
+
+  // "access-status.open.access.listelement.badge": "Open Access",
+  "access-status.open.access.listelement.badge": "Otevřený přístup",
+
+  // "access-status.restricted.listelement.badge": "Restricted",
+  "access-status.restricted.listelement.badge": "Omezený přístup",
+
+  // "access-status.unknown.listelement.badge": "Unknown",
+  "access-status.unknown.listelement.badge": "Status neznámý",
 
   // "admin.curation-tasks.breadcrumbs": "System curation tasks",
-  // TODO New key - Add a translation
-  "admin.curation-tasks.breadcrumbs": "System curation tasks",
+  "admin.curation-tasks.breadcrumbs": "Systémové úlohy správy",
 
   // "admin.curation-tasks.title": "System curation tasks",
-  // TODO New key - Add a translation
-  "admin.curation-tasks.title": "System curation tasks",
+  "admin.curation-tasks.title": "Systémové úlohy správy",
 
   // "admin.curation-tasks.header": "System curation tasks",
-  // TODO New key - Add a translation
-  "admin.curation-tasks.header": "System curation tasks",
+  "admin.curation-tasks.header": "Systémové úlohy správy",
 
   // "admin.registries.bitstream-formats.breadcrumbs": "Format registry",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.breadcrumbs": "Format registry",
+  "admin.registries.bitstream-formats.breadcrumbs": "Registr formátů",
 
   // "admin.registries.bitstream-formats.create.breadcrumbs": "Bitstream format",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.create.breadcrumbs": "Bitstream format",
+  "admin.registries.bitstream-formats.create.breadcrumbs": "Formát souboru",
 
   // "admin.registries.bitstream-formats.create.failure.content": "An error occurred while creating the new bitstream format.",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.create.failure.content": "An error occurred while creating the new bitstream format.",
+  "admin.registries.bitstream-formats.create.failure.content": "Při vytváření nového formátu souboru došlo k chybě.",
 
   // "admin.registries.bitstream-formats.create.failure.head": "Failure",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.create.failure.head": "Failure",
+  "admin.registries.bitstream-formats.create.failure.head": "Vytváření nového formátu souboru selhalo",
 
-  // "admin.registries.bitstream-formats.create.head": "Create Bitstream format",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.create.head": "Create Bitstream format",
+  // "admin.registries.bitstream-formats.create.head": "Create bitstream format",
+  "admin.registries.bitstream-formats.create.head": "Vytvořit formát souboru",
 
   // "admin.registries.bitstream-formats.create.new": "Add a new bitstream format",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.create.new": "Add a new bitstream format",
+  "admin.registries.bitstream-formats.create.new": "Přidat nový formát souboru",
 
   // "admin.registries.bitstream-formats.create.success.content": "The new bitstream format was successfully created.",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.create.success.content": "The new bitstream format was successfully created.",
+  "admin.registries.bitstream-formats.create.success.content": "Nový formát souboru byl úspěšně vytvořen.",
 
   // "admin.registries.bitstream-formats.create.success.head": "Success",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.create.success.head": "Success",
+  "admin.registries.bitstream-formats.create.success.head": "Úspěšně vytvořeno",
 
   // "admin.registries.bitstream-formats.delete.failure.amount": "Failed to remove {{ amount }} format(s)",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.delete.failure.amount": "Failed to remove {{ amount }} format(s)",
+  "admin.registries.bitstream-formats.delete.failure.amount": "Nepodařilo se odstranit formát(y) {{ amount }}",
 
   // "admin.registries.bitstream-formats.delete.failure.head": "Failure",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.delete.failure.head": "Failure",
+  "admin.registries.bitstream-formats.delete.failure.head": "Odstranění formátu souboru selhalo",
 
   // "admin.registries.bitstream-formats.delete.success.amount": "Successfully removed {{ amount }} format(s)",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.delete.success.amount": "Successfully removed {{ amount }} format(s)",
+  "admin.registries.bitstream-formats.delete.success.amount": "Úspěšně odstraněno {{ amount }} formatů",
 
   // "admin.registries.bitstream-formats.delete.success.head": "Success",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.delete.success.head": "Success",
+  "admin.registries.bitstream-formats.delete.success.head": "Úspěšně odstraněno",
 
   // "admin.registries.bitstream-formats.description": "This list of bitstream formats provides information about known formats and their support level.",
-  "admin.registries.bitstream-formats.description": "Tento seznam formátů souborů poskytuje informace o známých formátech a o úrovni jejich podpory.",
+  "admin.registries.bitstream-formats.description": "Tento seznam formátů souboru poskytuje informace o známých formátech a úrovni jejich podpory.",
 
   // "admin.registries.bitstream-formats.edit.breadcrumbs": "Bitstream format",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.edit.breadcrumbs": "Bitstream format",
+  "admin.registries.bitstream-formats.edit.breadcrumbs": "Formát souboru",
 
   // "admin.registries.bitstream-formats.edit.description.hint": "",
-  // TODO New key - Add a translation
   "admin.registries.bitstream-formats.edit.description.hint": "",
 
   // "admin.registries.bitstream-formats.edit.description.label": "Description",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.edit.description.label": "Description",
+  "admin.registries.bitstream-formats.edit.description.label": "Popis",
 
   // "admin.registries.bitstream-formats.edit.extensions.hint": "Extensions are file extensions that are used to automatically identify the format of uploaded files. You can enter several extensions for each format.",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.edit.extensions.hint": "Extensions are file extensions that are used to automatically identify the format of uploaded files. You can enter several extensions for each format.",
+  "admin.registries.bitstream-formats.edit.extensions.hint": "Přípony jsou přípony souborů, které se používají k automatické identifikaci formátu nahraných souborů. Pro každý formát můžete zadat několik přípon.",
 
   // "admin.registries.bitstream-formats.edit.extensions.label": "File extensions",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.edit.extensions.label": "File extensions",
+  "admin.registries.bitstream-formats.edit.extensions.label": "Přípony souborů",
 
   // "admin.registries.bitstream-formats.edit.extensions.placeholder": "Enter a file extension without the dot",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.edit.extensions.placeholder": "Enter a file extension without the dot",
+  "admin.registries.bitstream-formats.edit.extensions.placeholder": "Zadejte příponu souboru bez tečky",
 
   // "admin.registries.bitstream-formats.edit.failure.content": "An error occurred while editing the bitstream format.",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.edit.failure.content": "An error occurred while editing the bitstream format.",
+  "admin.registries.bitstream-formats.edit.failure.content": "Při úpravě formátu souboru došlo k chybě.",
 
   // "admin.registries.bitstream-formats.edit.failure.head": "Failure",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.edit.failure.head": "Failure",
+  "admin.registries.bitstream-formats.edit.failure.head": "Úprava formátu souboru selhala",
 
   // "admin.registries.bitstream-formats.edit.head": "Bitstream format: {{ format }}",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.edit.head": "Bitstream format: {{ format }}",
+  "admin.registries.bitstream-formats.edit.head": "Formát souboru: {{ format }}",
 
   // "admin.registries.bitstream-formats.edit.internal.hint": "Formats marked as internal are hidden from the user, and used for administrative purposes.",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.edit.internal.hint": "Formats marked as internal are hidden from the user, and used for administrative purposes.",
+  "admin.registries.bitstream-formats.edit.internal.hint": "Formáty označené jako interní jsou uživateli skryté a používají se pro účely správy.",
 
   // "admin.registries.bitstream-formats.edit.internal.label": "Internal",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.edit.internal.label": "Internal",
+  "admin.registries.bitstream-formats.edit.internal.label": "Interní",
 
   // "admin.registries.bitstream-formats.edit.mimetype.hint": "The MIME type associated with this format, does not have to be unique.",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.edit.mimetype.hint": "The MIME type associated with this format, does not have to be unique.",
+  "admin.registries.bitstream-formats.edit.mimetype.hint": "Typ MIME spojený s tímto formátem, nemusí být jedinečný.",
 
   // "admin.registries.bitstream-formats.edit.mimetype.label": "MIME Type",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.edit.mimetype.label": "MIME Type",
+  "admin.registries.bitstream-formats.edit.mimetype.label": "Typ MIME",
 
   // "admin.registries.bitstream-formats.edit.shortDescription.hint": "A unique name for this format, (e.g. Microsoft Word XP or Microsoft Word 2000)",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.edit.shortDescription.hint": "A unique name for this format, (e.g. Microsoft Word XP or Microsoft Word 2000)",
+  "admin.registries.bitstream-formats.edit.shortDescription.hint": "Jedinečný název pro tento formát (např. Microsoft Word XP nebo Microsoft Word 2000)",
 
   // "admin.registries.bitstream-formats.edit.shortDescription.label": "Name",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.edit.shortDescription.label": "Name",
+  "admin.registries.bitstream-formats.edit.shortDescription.label": "Název",
 
   // "admin.registries.bitstream-formats.edit.success.content": "The bitstream format was successfully edited.",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.edit.success.content": "The bitstream format was successfully edited.",
+  "admin.registries.bitstream-formats.edit.success.content": "Formát souboru byl úspěšně upraven.",
 
   // "admin.registries.bitstream-formats.edit.success.head": "Success",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.edit.success.head": "Success",
+  "admin.registries.bitstream-formats.edit.success.head": "Úspěšně upraveno",
 
   // "admin.registries.bitstream-formats.edit.supportLevel.hint": "The level of support your institution pledges for this format.",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.edit.supportLevel.hint": "The level of support your institution pledges for this format.",
+  "admin.registries.bitstream-formats.edit.supportLevel.hint": "Úroveň podpory, kterou vaše instituce slibuje pro tento formát.",
 
   // "admin.registries.bitstream-formats.edit.supportLevel.label": "Support level",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.edit.supportLevel.label": "Support level",
+  "admin.registries.bitstream-formats.edit.supportLevel.label": "Úroveň podpory",
 
   // "admin.registries.bitstream-formats.head": "Bitstream Format Registry",
-  "admin.registries.bitstream-formats.head": "Registr formátů souborů",
+  "admin.registries.bitstream-formats.head": "Registr formátů souboru",
 
   // "admin.registries.bitstream-formats.no-items": "No bitstream formats to show.",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.no-items": "No bitstream formats to show.",
+  "admin.registries.bitstream-formats.no-items": "Žádné formáty souboru k zobrazení.",
 
   // "admin.registries.bitstream-formats.table.delete": "Delete selected",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.table.delete": "Delete selected",
+  "admin.registries.bitstream-formats.table.delete": "Smazat vybrané",
 
   // "admin.registries.bitstream-formats.table.deselect-all": "Deselect all",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.table.deselect-all": "Deselect all",
+  "admin.registries.bitstream-formats.table.deselect-all": "Zrušit výběr všech",
 
   // "admin.registries.bitstream-formats.table.internal": "internal",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.table.internal": "internal",
+  "admin.registries.bitstream-formats.table.internal": "Interní",
 
   // "admin.registries.bitstream-formats.table.mimetype": "MIME Type",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.table.mimetype": "MIME Type",
+  "admin.registries.bitstream-formats.table.mimetype": "Typ MIME",
 
   // "admin.registries.bitstream-formats.table.name": "Name",
+  "admin.registries.bitstream-formats.table.name": "Název",
+
+  // "admin.registries.bitstream-formats.table.selected": "Selected bitstream formats",
   // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.table.name": "Name",
-  // TODO New key - Add a translation
+  "admin.registries.bitstream-formats.table.selected": "Selected bitstream formats",
+
+  // "admin.registries.bitstream-formats.table.id": "ID",
   "admin.registries.bitstream-formats.table.id": "ID",
 
-  // "admin.registries.bitstream-formats.table.return": "Return",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.table.return": "Return",
+  // "admin.registries.bitstream-formats.table.return": "Back",
+  // TODO Source message changed - Revise the translation
+  "admin.registries.bitstream-formats.table.return": "Zpět",
 
   // "admin.registries.bitstream-formats.table.supportLevel.KNOWN": "Known",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.table.supportLevel.KNOWN": "Known",
+  "admin.registries.bitstream-formats.table.supportLevel.KNOWN": "Známé",
 
   // "admin.registries.bitstream-formats.table.supportLevel.SUPPORTED": "Supported",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.table.supportLevel.SUPPORTED": "Supported",
+  "admin.registries.bitstream-formats.table.supportLevel.SUPPORTED": "Podporované",
 
   // "admin.registries.bitstream-formats.table.supportLevel.UNKNOWN": "Unknown",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.table.supportLevel.UNKNOWN": "Unknown",
+  "admin.registries.bitstream-formats.table.supportLevel.UNKNOWN": "Neznámé",
 
   // "admin.registries.bitstream-formats.table.supportLevel.head": "Support Level",
+  "admin.registries.bitstream-formats.table.supportLevel.head": "Úroveň podpory",
+
+  // "admin.registries.bitstream-formats.title": "Bitstream Format Registry",
+  "admin.registries.bitstream-formats.title": "Registr formátů souboru",
+
+  // "admin.registries.bitstream-formats.select": "Select",
   // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.table.supportLevel.head": "Support Level",
-
-  // "admin.registries.bitstream-formats.title": "DSpace Angular :: Bitstream Format Registry",
-  "admin.registries.bitstream-formats.title": "DSpace Angular :: Registr formátů souborů",
-
+  "admin.registries.bitstream-formats.select": "Select",
 
+  // "admin.registries.bitstream-formats.deselect": "Deselect",
+  // TODO New key - Add a translation
+  "admin.registries.bitstream-formats.deselect": "Deselect",
 
   // "admin.registries.metadata.breadcrumbs": "Metadata registry",
-  // TODO New key - Add a translation
-  "admin.registries.metadata.breadcrumbs": "Metadata registry",
+  "admin.registries.metadata.breadcrumbs": "Registr metadat",
 
   // "admin.registries.metadata.description": "The metadata registry maintains a list of all metadata fields available in the repository. These fields may be divided amongst multiple schemas. However, DSpace requires the qualified Dublin Core schema.",
-  "admin.registries.metadata.description": "Registr metadat je seznam všech metadatových polí dostupných v repozitáři. Tyto pole mohou být rozdělena do více schémat. DSpace však vyžaduje použití schématu Kvalifikovaný Dublin Core.",
+  "admin.registries.metadata.description": "Registr metadat udržuje seznam všech polí metadat dostupných v úložišti. Tato pole mohou být rozdělena mezi více schémat. DSpace však vyžaduje kvalifikované schéma Dublin Core.",
 
   // "admin.registries.metadata.form.create": "Create metadata schema",
-  // TODO New key - Add a translation
-  "admin.registries.metadata.form.create": "Create metadata schema",
+  "admin.registries.metadata.form.create": "Vytvořit metadatové schéma",
 
   // "admin.registries.metadata.form.edit": "Edit metadata schema",
-  // TODO New key - Add a translation
-  "admin.registries.metadata.form.edit": "Edit metadata schema",
+  "admin.registries.metadata.form.edit": "Upravit metadatové schéma",
 
   // "admin.registries.metadata.form.name": "Name",
-  // TODO New key - Add a translation
-  "admin.registries.metadata.form.name": "Name",
+  "admin.registries.metadata.form.name": "Název",
 
   // "admin.registries.metadata.form.namespace": "Namespace",
-  // TODO New key - Add a translation
   "admin.registries.metadata.form.namespace": "Namespace",
 
   // "admin.registries.metadata.head": "Metadata Registry",
   "admin.registries.metadata.head": "Registr metadat",
 
   // "admin.registries.metadata.schemas.no-items": "No metadata schemas to show.",
-  "admin.registries.metadata.schemas.no-items": "Žádná schémata metadat.",
+  "admin.registries.metadata.schemas.no-items": "Žádná schémata metadat k zobrazení.",
+
+  // "admin.registries.metadata.schemas.select": "Select",
+  // TODO New key - Add a translation
+  "admin.registries.metadata.schemas.select": "Select",
+
+  // "admin.registries.metadata.schemas.deselect": "Deselect",
+  // TODO New key - Add a translation
+  "admin.registries.metadata.schemas.deselect": "Deselect",
 
   // "admin.registries.metadata.schemas.table.delete": "Delete selected",
+  "admin.registries.metadata.schemas.table.delete": "Smazat vybrané",
+
+  // "admin.registries.metadata.schemas.table.selected": "Selected schemas",
   // TODO New key - Add a translation
-  "admin.registries.metadata.schemas.table.delete": "Delete selected",
+  "admin.registries.metadata.schemas.table.selected": "Selected schemas",
 
   // "admin.registries.metadata.schemas.table.id": "ID",
   "admin.registries.metadata.schemas.table.id": "ID",
@@ -270,1304 +272,1848 @@
   "admin.registries.metadata.schemas.table.name": "Název",
 
   // "admin.registries.metadata.schemas.table.namespace": "Namespace",
-  "admin.registries.metadata.schemas.table.namespace": "Jmenný prostor",
-
-  // "admin.registries.metadata.title": "DSpace Angular :: Metadata Registry",
-  "admin.registries.metadata.title": "DSpace Angular :: Registr metadat",
-
+  "admin.registries.metadata.schemas.table.namespace": "Namespace",
 
+  // "admin.registries.metadata.title": "Metadata Registry",
+  "admin.registries.metadata.title": "Registr metadat",
 
   // "admin.registries.schema.breadcrumbs": "Metadata schema",
-  // TODO New key - Add a translation
-  "admin.registries.schema.breadcrumbs": "Metadata schema",
+  "admin.registries.schema.breadcrumbs": "Metadatové schéma",
 
   // "admin.registries.schema.description": "This is the metadata schema for \"{{namespace}}\".",
-  "admin.registries.schema.description": "Toto je schéma metadat pro „{{namespace}}“.",
+  "admin.registries.schema.description": "Toto je metadatové schéma pro \"{{namespace}}\".",
+
+  // "admin.registries.schema.fields.select": "Select",
+  // TODO New key - Add a translation
+  "admin.registries.schema.fields.select": "Select",
+
+  // "admin.registries.schema.fields.deselect": "Deselect",
+  // TODO New key - Add a translation
+  "admin.registries.schema.fields.deselect": "Deselect",
 
   // "admin.registries.schema.fields.head": "Schema metadata fields",
-  "admin.registries.schema.fields.head": "Pole schématu metadat",
+  "admin.registries.schema.fields.head": "Metadatové pole schématu",
 
   // "admin.registries.schema.fields.no-items": "No metadata fields to show.",
-  "admin.registries.schema.fields.no-items": "Žádná metadatová pole.",
+  "admin.registries.schema.fields.no-items": "Žádná metadatová pole k zobrazení.",
 
   // "admin.registries.schema.fields.table.delete": "Delete selected",
-  // TODO New key - Add a translation
-  "admin.registries.schema.fields.table.delete": "Delete selected",
+  "admin.registries.schema.fields.table.delete": "Smazat vybrané",
 
   // "admin.registries.schema.fields.table.field": "Field",
   "admin.registries.schema.fields.table.field": "Pole",
+
+  // "admin.registries.schema.fields.table.selected": "Selected metadata fields",
   // TODO New key - Add a translation
+  "admin.registries.schema.fields.table.selected": "Selected metadata fields",
+
+  // "admin.registries.schema.fields.table.id": "ID",
+  // TODO Source message changed - Revise the translation
   "admin.registries.schema.fields.table.id": "ID",
 
   // "admin.registries.schema.fields.table.scopenote": "Scope Note",
-  "admin.registries.schema.fields.table.scopenote": "Poznámka o rozsahu",
+  "admin.registries.schema.fields.table.scopenote": "Poznámka k rozsahu",
 
   // "admin.registries.schema.form.create": "Create metadata field",
-  // TODO New key - Add a translation
-  "admin.registries.schema.form.create": "Create metadata field",
+  "admin.registries.schema.form.create": "Vytvořit metadatové pole",
 
   // "admin.registries.schema.form.edit": "Edit metadata field",
-  // TODO New key - Add a translation
-  "admin.registries.schema.form.edit": "Edit metadata field",
+  "admin.registries.schema.form.edit": "Upravit metadatové pole",
 
   // "admin.registries.schema.form.element": "Element",
-  // TODO New key - Add a translation
-  "admin.registries.schema.form.element": "Element",
+  "admin.registries.schema.form.element": "Termín",
 
   // "admin.registries.schema.form.qualifier": "Qualifier",
-  // TODO New key - Add a translation
-  "admin.registries.schema.form.qualifier": "Qualifier",
+  "admin.registries.schema.form.qualifier": "Kvalifikátor",
 
   // "admin.registries.schema.form.scopenote": "Scope Note",
-  // TODO New key - Add a translation
-  "admin.registries.schema.form.scopenote": "Scope Note",
+  "admin.registries.schema.form.scopenote": "Poznámka k rozsahu",
 
   // "admin.registries.schema.head": "Metadata Schema",
-  "admin.registries.schema.head": "Schéma metadat",
+  "admin.registries.schema.head": "Metadatové schéma",
 
   // "admin.registries.schema.notification.created": "Successfully created metadata schema \"{{prefix}}\"",
-  // TODO New key - Add a translation
-  "admin.registries.schema.notification.created": "Successfully created metadata schema \"{{prefix}}\"",
+  "admin.registries.schema.notification.created": "Metadatové schéma bylo Úspěšně vytvořeno \"{{prefix}}\"",
 
   // "admin.registries.schema.notification.deleted.failure": "Failed to delete {{amount}} metadata schemas",
-  // TODO New key - Add a translation
-  "admin.registries.schema.notification.deleted.failure": "Failed to delete {{amount}} metadata schemas",
+  "admin.registries.schema.notification.deleted.failure": "Nepodařilo se odstranit metadatové schéma {{amount}}",
 
   // "admin.registries.schema.notification.deleted.success": "Successfully deleted {{amount}} metadata schemas",
-  // TODO New key - Add a translation
-  "admin.registries.schema.notification.deleted.success": "Successfully deleted {{amount}} metadata schemas",
+  "admin.registries.schema.notification.deleted.success": "Úspěšně odstraněno {{amount}} metadatových schémat",
 
   // "admin.registries.schema.notification.edited": "Successfully edited metadata schema \"{{prefix}}\"",
-  // TODO New key - Add a translation
-  "admin.registries.schema.notification.edited": "Successfully edited metadata schema \"{{prefix}}\"",
+  "admin.registries.schema.notification.edited": "Úspěšně upraveno metadatové schéma \"{{prefix}}\"",
 
   // "admin.registries.schema.notification.failure": "Error",
-  // TODO New key - Add a translation
-  "admin.registries.schema.notification.failure": "Error",
+  "admin.registries.schema.notification.failure": "Chyba",
 
   // "admin.registries.schema.notification.field.created": "Successfully created metadata field \"{{field}}\"",
-  // TODO New key - Add a translation
-  "admin.registries.schema.notification.field.created": "Successfully created metadata field \"{{field}}\"",
+  "admin.registries.schema.notification.field.created": "Úspěšně vytvořeno metadatové pole \"{{field}}\"",
 
   // "admin.registries.schema.notification.field.deleted.failure": "Failed to delete {{amount}} metadata fields",
-  // TODO New key - Add a translation
-  "admin.registries.schema.notification.field.deleted.failure": "Failed to delete {{amount}} metadata fields",
+  "admin.registries.schema.notification.field.deleted.failure": "Nepodařilo se smazat metadatové pole {{amount}}",
 
   // "admin.registries.schema.notification.field.deleted.success": "Successfully deleted {{amount}} metadata fields",
-  // TODO New key - Add a translation
-  "admin.registries.schema.notification.field.deleted.success": "Successfully deleted {{amount}} metadata fields",
+  "admin.registries.schema.notification.field.deleted.success": "Úspěšně odstraněno {{amount}} polí metadat",
 
   // "admin.registries.schema.notification.field.edited": "Successfully edited metadata field \"{{field}}\"",
-  // TODO New key - Add a translation
-  "admin.registries.schema.notification.field.edited": "Successfully edited metadata field \"{{field}}\"",
+  "admin.registries.schema.notification.field.edited": "Úspěšně upraveno metadatové pole \"{{field}}\"",
 
   // "admin.registries.schema.notification.success": "Success",
-  // TODO New key - Add a translation
-  "admin.registries.schema.notification.success": "Success",
+  "admin.registries.schema.notification.success": "V pořádku",
 
-  // "admin.registries.schema.return": "Return",
-  // TODO New key - Add a translation
-  "admin.registries.schema.return": "Return",
+  // "admin.registries.schema.return": "Back",
+  // TODO Source message changed - Revise the translation
+  "admin.registries.schema.return": "Zpět",
 
-  // "admin.registries.schema.title": "DSpace Angular :: Metadata Schema Registry",
-  "admin.registries.schema.title": "DSpace Angular :: Registr schémat metadat",
+  // "admin.registries.schema.title": "Metadata Schema Registry",
+  "admin.registries.schema.title": "Registr metadatových schémat",
 
+  // "admin.access-control.bulk-access.breadcrumbs": "Bulk Access Management",
+  "admin.access-control.bulk-access.breadcrumbs": "Hromadná správa přístupu",
 
+  // "administrativeBulkAccess.search.results.head": "Search Results",
+  "administrativeBulkAccess.search.results.head": "Výsledky vyhledávání",
+
+  // "admin.access-control.bulk-access": "Bulk Access Management",
+  "admin.access-control.bulk-access": "Hromadná správa přístupu",
+
+  // "admin.access-control.bulk-access.title": "Bulk Access Management",
+  "admin.access-control.bulk-access.title": "Hromadná správa přístupu",
+
+  // "admin.access-control.bulk-access-browse.header": "Step 1: Select Objects",
+  "admin.access-control.bulk-access-browse.header": "Krok 1: Vybrat záznam",
+
+  // "admin.access-control.bulk-access-browse.search.header": "Search",
+  "admin.access-control.bulk-access-browse.search.header": "Hledat",
+
+  // "admin.access-control.bulk-access-browse.selected.header": "Current selection({{number}})",
+  "admin.access-control.bulk-access-browse.selected.header": "Aktuální výběr({{number}})",
+
+  // "admin.access-control.bulk-access-settings.header": "Step 2: Operation to Perform",
+  "admin.access-control.bulk-access-settings.header": "Krok 2: Provést operaci",
 
   // "admin.access-control.epeople.actions.delete": "Delete EPerson",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.actions.delete": "Delete EPerson",
+  "admin.access-control.epeople.actions.delete": "Smazat uživatele",
 
   // "admin.access-control.epeople.actions.impersonate": "Impersonate EPerson",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.actions.impersonate": "Impersonate EPerson",
+  "admin.access-control.epeople.actions.impersonate": "Simulace jiného uživatele",
 
   // "admin.access-control.epeople.actions.reset": "Reset password",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.actions.reset": "Reset password",
+  "admin.access-control.epeople.actions.reset": "Resetovat heslo",
 
   // "admin.access-control.epeople.actions.stop-impersonating": "Stop impersonating EPerson",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.actions.stop-impersonating": "Stop impersonating EPerson",
+  "admin.access-control.epeople.actions.stop-impersonating": "Přestat vystupovat jako jiný uživatel",
 
-  // "admin.access-control.epeople.title": "DSpace Angular :: EPeople",
+  // "admin.access-control.epeople.breadcrumbs": "EPeople",
+  "admin.access-control.epeople.breadcrumbs": "Uživatelé",
+
+  // "admin.access-control.epeople.title": "EPeople",
+  "admin.access-control.epeople.title": "Uživatelé",
+
+  // "admin.access-control.epeople.edit.breadcrumbs": "New EPerson",
   // TODO New key - Add a translation
-  "admin.access-control.epeople.title": "DSpace Angular :: EPeople",
+  "admin.access-control.epeople.edit.breadcrumbs": "New EPerson",
+
+  // "admin.access-control.epeople.edit.title": "New EPerson",
+  // TODO New key - Add a translation
+  "admin.access-control.epeople.edit.title": "New EPerson",
+
+  // "admin.access-control.epeople.add.breadcrumbs": "Add EPerson",
+  // TODO New key - Add a translation
+  "admin.access-control.epeople.add.breadcrumbs": "Add EPerson",
+
+  // "admin.access-control.epeople.add.title": "Add EPerson",
+  // TODO New key - Add a translation
+  "admin.access-control.epeople.add.title": "Add EPerson",
 
   // "admin.access-control.epeople.head": "EPeople",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.head": "EPeople",
+  "admin.access-control.epeople.head": "Uživatelé",
 
   // "admin.access-control.epeople.search.head": "Search",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.search.head": "Search",
+  "admin.access-control.epeople.search.head": "Hledat",
 
   // "admin.access-control.epeople.button.see-all": "Browse All",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.button.see-all": "Browse All",
+  "admin.access-control.epeople.button.see-all": "Procházet vše",
 
   // "admin.access-control.epeople.search.scope.metadata": "Metadata",
-  // TODO New key - Add a translation
   "admin.access-control.epeople.search.scope.metadata": "Metadata",
 
-  // "admin.access-control.epeople.search.scope.email": "E-mail (exact)",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.search.scope.email": "E-mail (exact)",
+  // "admin.access-control.epeople.search.scope.email": "Email (exact)",
+  // TODO Source message changed - Revise the translation
+  "admin.access-control.epeople.search.scope.email": "E-mail (přesný)",
 
   // "admin.access-control.epeople.search.button": "Search",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.search.button": "Search",
+  "admin.access-control.epeople.search.button": "Hledat",
+
+  // "admin.access-control.epeople.search.placeholder": "Search people...",
+  "admin.access-control.epeople.search.placeholder": "Hledat uživatele...",
 
   // "admin.access-control.epeople.button.add": "Add EPerson",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.button.add": "Add EPerson",
+  "admin.access-control.epeople.button.add": "Přidat uživatele",
 
   // "admin.access-control.epeople.table.id": "ID",
-  // TODO New key - Add a translation
   "admin.access-control.epeople.table.id": "ID",
 
   // "admin.access-control.epeople.table.name": "Name",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.table.name": "Name",
+  "admin.access-control.epeople.table.name": "Jméno",
 
-  // "admin.access-control.epeople.table.email": "E-mail (exact)",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.table.email": "E-mail (exact)",
+  // "admin.access-control.epeople.table.email": "Email (exact)",
+  // TODO Source message changed - Revise the translation
+  "admin.access-control.epeople.table.email": "E-mail (přesný)",
 
   // "admin.access-control.epeople.table.edit": "Edit",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.table.edit": "Edit",
+  "admin.access-control.epeople.table.edit": "Upravit",
 
   // "admin.access-control.epeople.table.edit.buttons.edit": "Edit \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.table.edit.buttons.edit": "Edit \"{{name}}\"",
+  "admin.access-control.epeople.table.edit.buttons.edit": "Upravit \"{{name}}\"",
+
+  // "admin.access-control.epeople.table.edit.buttons.edit-disabled": "You are not authorized to edit this group",
+  "admin.access-control.epeople.table.edit.buttons.edit-disabled": "Nejste oprávněni upravovat tuto skupinu",
 
   // "admin.access-control.epeople.table.edit.buttons.remove": "Delete \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.table.edit.buttons.remove": "Delete \"{{name}}\"",
+  "admin.access-control.epeople.table.edit.buttons.remove": "Odstranit \"{{name}}\"",
 
   // "admin.access-control.epeople.no-items": "No EPeople to show.",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.no-items": "No EPeople to show.",
+  "admin.access-control.epeople.no-items": "Žádní uživatelé k zobrazení.",
 
   // "admin.access-control.epeople.form.create": "Create EPerson",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.form.create": "Create EPerson",
+  "admin.access-control.epeople.form.create": "Vytvořit uživatele",
 
   // "admin.access-control.epeople.form.edit": "Edit EPerson",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.form.edit": "Edit EPerson",
+  "admin.access-control.epeople.form.edit": "Upravit uživatele",
 
   // "admin.access-control.epeople.form.firstName": "First name",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.form.firstName": "First name",
+  "admin.access-control.epeople.form.firstName": "Křestní jméno",
 
   // "admin.access-control.epeople.form.lastName": "Last name",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.form.lastName": "Last name",
+  "admin.access-control.epeople.form.lastName": "Příjmení",
 
-  // "admin.access-control.epeople.form.email": "E-mail",
-  // TODO New key - Add a translation
+  // "admin.access-control.epeople.form.email": "Email",
+  // TODO Source message changed - Revise the translation
   "admin.access-control.epeople.form.email": "E-mail",
 
-  // "admin.access-control.epeople.form.emailHint": "Must be valid e-mail address",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.form.emailHint": "Must be valid e-mail address",
+  // "admin.access-control.epeople.form.emailHint": "Must be a valid email address",
+  // TODO Source message changed - Revise the translation
+  "admin.access-control.epeople.form.emailHint": "Musí to být platná e-mailová adresa",
 
   // "admin.access-control.epeople.form.canLogIn": "Can log in",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.form.canLogIn": "Can log in",
+  "admin.access-control.epeople.form.canLogIn": "Lze se přihlásit",
 
   // "admin.access-control.epeople.form.requireCertificate": "Requires certificate",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.form.requireCertificate": "Requires certificate",
+  "admin.access-control.epeople.form.requireCertificate": "Vyžaduje certifikát",
+
+  // "admin.access-control.epeople.form.return": "Back",
+  "admin.access-control.epeople.form.return": "Zpět",
 
   // "admin.access-control.epeople.form.notification.created.success": "Successfully created EPerson \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.form.notification.created.success": "Successfully created EPerson \"{{name}}\"",
+  "admin.access-control.epeople.form.notification.created.success": "Úspěšně vytvořen uživatel \"{{name}}\"",
 
   // "admin.access-control.epeople.form.notification.created.failure": "Failed to create EPerson \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.form.notification.created.failure": "Failed to create EPerson \"{{name}}\"",
+  "admin.access-control.epeople.form.notification.created.failure": "Nepodařilo se vytvořit uživatele \"{{name}}\"",
 
   // "admin.access-control.epeople.form.notification.created.failure.emailInUse": "Failed to create EPerson \"{{name}}\", email \"{{email}}\" already in use.",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.form.notification.created.failure.emailInUse": "Failed to create EPerson \"{{name}}\", email \"{{email}}\" already in use.",
+  "admin.access-control.epeople.form.notification.created.failure.emailInUse": "Nepodařilo se vytvořit uživatele \"{{name}}\", e-mail \"{{email}}\" je již používán.",
 
   // "admin.access-control.epeople.form.notification.edited.failure.emailInUse": "Failed to edit EPerson \"{{name}}\", email \"{{email}}\" already in use.",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.form.notification.edited.failure.emailInUse": "Failed to edit EPerson \"{{name}}\", email \"{{email}}\" already in use.",
+  "admin.access-control.epeople.form.notification.edited.failure.emailInUse": "Nepodařilo se upravit uživatele \"{{name}}\", e-mail \"{{email}}\" je již používán.",
 
   // "admin.access-control.epeople.form.notification.edited.success": "Successfully edited EPerson \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.form.notification.edited.success": "Successfully edited EPerson \"{{name}}\"",
+  "admin.access-control.epeople.form.notification.edited.success": "Úspěšně upraven uživatel \"{{name}}\"",
 
   // "admin.access-control.epeople.form.notification.edited.failure": "Failed to edit EPerson \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.form.notification.edited.failure": "Failed to edit EPerson \"{{name}}\"",
+  "admin.access-control.epeople.form.notification.edited.failure": "Nepodařilo se upravit uživatele \"{{name}}\"",
 
   // "admin.access-control.epeople.form.notification.deleted.success": "Successfully deleted EPerson \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.form.notification.deleted.success": "Successfully deleted EPerson \"{{name}}\"",
+  "admin.access-control.epeople.form.notification.deleted.success": "Úspěšně smazán uživatel \"{{name}}\"",
 
   // "admin.access-control.epeople.form.notification.deleted.failure": "Failed to delete EPerson \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.form.notification.deleted.failure": "Failed to delete EPerson \"{{name}}\"",
+  "admin.access-control.epeople.form.notification.deleted.failure": "Nepodařilo se smazat uživatele \"{{name}}\"",
 
   // "admin.access-control.epeople.form.groupsEPersonIsMemberOf": "Member of these groups:",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.form.groupsEPersonIsMemberOf": "Member of these groups:",
+  "admin.access-control.epeople.form.groupsEPersonIsMemberOf": "Člen těchto skupin:",
 
   // "admin.access-control.epeople.form.table.id": "ID",
-  // TODO New key - Add a translation
   "admin.access-control.epeople.form.table.id": "ID",
 
   // "admin.access-control.epeople.form.table.name": "Name",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.form.table.name": "Name",
+  "admin.access-control.epeople.form.table.name": "Jméno",
+
+  // "admin.access-control.epeople.form.table.collectionOrCommunity": "Collection/Community",
+  "admin.access-control.epeople.form.table.collectionOrCommunity": "Kolekce/Komunita",
 
   // "admin.access-control.epeople.form.memberOfNoGroups": "This EPerson is not a member of any groups",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.form.memberOfNoGroups": "This EPerson is not a member of any groups",
+  "admin.access-control.epeople.form.memberOfNoGroups": "Tento uživatel není členem žádné skupiny",
 
   // "admin.access-control.epeople.form.goToGroups": "Add to groups",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.form.goToGroups": "Add to groups",
+  "admin.access-control.epeople.form.goToGroups": "Přidat do skupin",
 
-  // "admin.access-control.epeople.notification.deleted.failure": "Failed to delete EPerson: \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.notification.deleted.failure": "Failed to delete EPerson: \"{{name}}\"",
+  // "admin.access-control.epeople.notification.deleted.failure": "Error occurred when trying to delete EPerson with id \"{{id}}\" with code: \"{{statusCode}}\" and message: \"{{restResponse.errorMessage}}\"",
+  "admin.access-control.epeople.notification.deleted.failure": "Nepodařilo se odstranit uživatele: \"{{name}}\"",
 
   // "admin.access-control.epeople.notification.deleted.success": "Successfully deleted EPerson: \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.notification.deleted.success": "Successfully deleted EPerson: \"{{name}}\"",
+  "admin.access-control.epeople.notification.deleted.success": "Úspěšně odstraněn uživatel: \"{{name}}\"",
 
+  // "admin.access-control.groups.title": "Groups",
+  "admin.access-control.groups.title": "Skupiny",
 
+  // "admin.access-control.groups.breadcrumbs": "Groups",
+  "admin.access-control.groups.breadcrumbs": "Skupiny",
 
-  // "admin.access-control.groups.title": "DSpace Angular :: Groups",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.title": "DSpace Angular :: Groups",
+  // "admin.access-control.groups.singleGroup.breadcrumbs": "Edit Group",
+  "admin.access-control.groups.singleGroup.breadcrumbs": "Upravit skupinu",
 
-  // "admin.access-control.groups.title.singleGroup": "DSpace Angular :: Edit Group",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.title.singleGroup": "DSpace Angular :: Edit Group",
+  // "admin.access-control.groups.title.singleGroup": "Edit Group",
+  "admin.access-control.groups.title.singleGroup": "Upravit skupinu",
 
-  // "admin.access-control.groups.title.addGroup": "DSpace Angular :: New Group",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.title.addGroup": "DSpace Angular :: New Group",
+  // "admin.access-control.groups.title.addGroup": "New Group",
+  "admin.access-control.groups.title.addGroup": "Nová skupina",
+
+  // "admin.access-control.groups.addGroup.breadcrumbs": "New Group",
+  "admin.access-control.groups.addGroup.breadcrumbs": "Nová skupina",
 
   // "admin.access-control.groups.head": "Groups",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.head": "Groups",
+  "admin.access-control.groups.head": "Skupiny",
 
   // "admin.access-control.groups.button.add": "Add group",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.button.add": "Add group",
+  "admin.access-control.groups.button.add": "Přidat skupinu",
 
   // "admin.access-control.groups.search.head": "Search groups",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.search.head": "Search groups",
+  "admin.access-control.groups.search.head": "Hledat skupiny",
 
   // "admin.access-control.groups.button.see-all": "Browse all",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.button.see-all": "Browse all",
+  "admin.access-control.groups.button.see-all": "Procházet vše",
 
   // "admin.access-control.groups.search.button": "Search",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.search.button": "Search",
+  "admin.access-control.groups.search.button": "Hledat",
+
+  // "admin.access-control.groups.search.placeholder": "Search groups...",
+  "admin.access-control.groups.search.placeholder": "Hledat skupiny...",
 
   // "admin.access-control.groups.table.id": "ID",
-  // TODO New key - Add a translation
   "admin.access-control.groups.table.id": "ID",
 
   // "admin.access-control.groups.table.name": "Name",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.table.name": "Name",
+  "admin.access-control.groups.table.name": "Název",
+
+  // "admin.access-control.groups.table.collectionOrCommunity": "Collection/Community",
+  "admin.access-control.groups.table.collectionOrCommunity": "Kolekce/Komunita",
 
   // "admin.access-control.groups.table.members": "Members",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.table.members": "Members",
+  "admin.access-control.groups.table.members": "Členové",
 
   // "admin.access-control.groups.table.edit": "Edit",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.table.edit": "Edit",
+  "admin.access-control.groups.table.edit": "Upravit",
 
   // "admin.access-control.groups.table.edit.buttons.edit": "Edit \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.table.edit.buttons.edit": "Edit \"{{name}}\"",
+  "admin.access-control.groups.table.edit.buttons.edit": "Upravit \"{{name}}\"",
 
   // "admin.access-control.groups.table.edit.buttons.remove": "Delete \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.table.edit.buttons.remove": "Delete \"{{name}}\"",
+  "admin.access-control.groups.table.edit.buttons.remove": "Odstranit \"{{name}}\"",
 
   // "admin.access-control.groups.no-items": "No groups found with this in their name or this as UUID",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.no-items": "No groups found with this in their name or this as UUID",
+  "admin.access-control.groups.no-items": "Nebyla nalezena žádná skupina s tímto v návzvu nebo UUID",
 
   // "admin.access-control.groups.notification.deleted.success": "Successfully deleted group \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.notification.deleted.success": "Successfully deleted group \"{{name}}\"",
+  "admin.access-control.groups.notification.deleted.success": "Úspěšně odstraněna skupina \"{{name}}\"",
 
   // "admin.access-control.groups.notification.deleted.failure.title": "Failed to delete group \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.notification.deleted.failure.title": "Failed to delete group \"{{name}}\"",
+  "admin.access-control.groups.notification.deleted.failure.title": "Nepodařilo se odstranit skupinu \"{{name}}\"",
 
   // "admin.access-control.groups.notification.deleted.failure.content": "Cause: \"{{cause}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.notification.deleted.failure.content": "Cause: \"{{cause}}\"",
-
-
+  "admin.access-control.groups.notification.deleted.failure.content": "Důvod: \"{{cause}}\"",
 
   // "admin.access-control.groups.form.alert.permanent": "This group is permanent, so it can't be edited or deleted. You can still add and remove group members using this page.",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.alert.permanent": "This group is permanent, so it can't be edited or deleted. You can still add and remove group members using this page.",
+  "admin.access-control.groups.form.alert.permanent": "Tato skupina je trvalá, takže ji nelze upravit ani odstranit. Přesto můžete členy skupiny přidávat a odebírat pomocí této stránky.",
 
   // "admin.access-control.groups.form.alert.workflowGroup": "This group can’t be modified or deleted because it corresponds to a role in the submission and workflow process in the \"{{name}}\" {{comcol}}. You can delete it from the <a href='{{comcolEditRolesRoute}}'>\"assign roles\"</a> tab on the edit {{comcol}} page. You can still add and remove group members using this page.",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.alert.workflowGroup": "This group can’t be modified or deleted because it corresponds to a role in the submission and workflow process in the \"{{name}}\" {{comcol}}. You can delete it from the <a href='{{comcolEditRolesRoute}}'>\"assign roles\"</a> tab on the edit {{comcol}} page. You can still add and remove group members using this page.",
+  "admin.access-control.groups.form.alert.workflowGroup": "Tuto skupinu nelze změnit či vymazat, protože odpovídá roli v zadávání a workflow v \"{{name}}\" {{comcol}}. Můžete ji vymazat z <a href='{{comcolEditRolesRoute}}'>\"assign roles\"</a> záložce na stránce editace {{comcol}}. Na této stránce můžete přidávat či odebírat členy skupiny.",
 
   // "admin.access-control.groups.form.head.create": "Create group",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.head.create": "Create group",
+  "admin.access-control.groups.form.head.create": "Vytvořit skupinu",
 
   // "admin.access-control.groups.form.head.edit": "Edit group",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.head.edit": "Edit group",
+  "admin.access-control.groups.form.head.edit": "Upravit skupinu",
 
   // "admin.access-control.groups.form.groupName": "Group name",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.groupName": "Group name",
+  "admin.access-control.groups.form.groupName": "Název skupiny",
+
+  // "admin.access-control.groups.form.groupCommunity": "Community or Collection",
+  "admin.access-control.groups.form.groupCommunity": "Komunita nebo kolekce",
 
   // "admin.access-control.groups.form.groupDescription": "Description",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.groupDescription": "Description",
+  "admin.access-control.groups.form.groupDescription": "Popis",
 
   // "admin.access-control.groups.form.notification.created.success": "Successfully created Group \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.notification.created.success": "Successfully created Group \"{{name}}\"",
+  "admin.access-control.groups.form.notification.created.success": "Úspěšně vytvořena skupina \"{{name}}\"",
 
   // "admin.access-control.groups.form.notification.created.failure": "Failed to create Group \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.notification.created.failure": "Failed to create Group \"{{name}}\"",
+  "admin.access-control.groups.form.notification.created.failure": "Nepodařilo se vytvořit skupinu \"{{name}}\"",
 
   // "admin.access-control.groups.form.notification.created.failure.groupNameInUse": "Failed to create Group with name: \"{{name}}\", make sure the name is not already in use.",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.notification.created.failure.groupNameInUse": "Failed to create Group with name: \"{{name}}\", make sure the name is not already in use.",
+  "admin.access-control.groups.form.notification.created.failure.groupNameInUse": "Nepodařilo se vytvořit skupinu s názvem: \"{{name}}\", ujistěte se, že název již není používán.",
 
   // "admin.access-control.groups.form.notification.edited.failure": "Failed to edit Group \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.notification.edited.failure": "Failed to edit Group \"{{name}}\"",
+  "admin.access-control.groups.form.notification.edited.failure": "Nepodařilo se upravit skupinu s názvem \"{{name}}\"",
 
   // "admin.access-control.groups.form.notification.edited.failure.groupNameInUse": "Name \"{{name}}\" already in use!",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.notification.edited.failure.groupNameInUse": "Name \"{{name}}\" already in use!",
+  "admin.access-control.groups.form.notification.edited.failure.groupNameInUse": "Název \"{{name}}\" je již používán!",
 
   // "admin.access-control.groups.form.notification.edited.success": "Successfully edited Group \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.notification.edited.success": "Successfully edited Group \"{{name}}\"",
+  "admin.access-control.groups.form.notification.edited.success": "Úspěšně upravena skupina \"{{name}}\"",
 
   // "admin.access-control.groups.form.actions.delete": "Delete Group",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.actions.delete": "Delete Group",
+  "admin.access-control.groups.form.actions.delete": "Odstranit skupinu",
 
   // "admin.access-control.groups.form.delete-group.modal.header": "Delete Group \"{{ dsoName }}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.delete-group.modal.header": "Delete Group \"{{ dsoName }}\"",
+  "admin.access-control.groups.form.delete-group.modal.header": "Odstranit skupinu \"{{ dsoName }}\"",
 
   // "admin.access-control.groups.form.delete-group.modal.info": "Are you sure you want to delete Group \"{{ dsoName }}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.delete-group.modal.info": "Are you sure you want to delete Group \"{{ dsoName }}\"",
+  "admin.access-control.groups.form.delete-group.modal.info": "Určitě chcete odstranit skupinu \"{{ dsoName }}\"",
 
   // "admin.access-control.groups.form.delete-group.modal.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.delete-group.modal.cancel": "Cancel",
+  "admin.access-control.groups.form.delete-group.modal.cancel": "Zrušit",
 
   // "admin.access-control.groups.form.delete-group.modal.confirm": "Delete",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.delete-group.modal.confirm": "Delete",
+  "admin.access-control.groups.form.delete-group.modal.confirm": "Odstranit",
 
   // "admin.access-control.groups.form.notification.deleted.success": "Successfully deleted group \"{{ name }}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.notification.deleted.success": "Successfully deleted group \"{{ name }}\"",
+  "admin.access-control.groups.form.notification.deleted.success": "Úspěšně odstraněna skupina \"{{ name }}\"",
 
   // "admin.access-control.groups.form.notification.deleted.failure.title": "Failed to delete group \"{{ name }}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.notification.deleted.failure.title": "Failed to delete group \"{{ name }}\"",
+  "admin.access-control.groups.form.notification.deleted.failure.title": "Nepodařilo se odstranit skupinu \"{{ name }}\"",
 
   // "admin.access-control.groups.form.notification.deleted.failure.content": "Cause: \"{{ cause }}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.notification.deleted.failure.content": "Cause: \"{{ cause }}\"",
+  "admin.access-control.groups.form.notification.deleted.failure.content": "Důvod: \"{{ cause }}\"",
 
   // "admin.access-control.groups.form.members-list.head": "EPeople",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.members-list.head": "EPeople",
+  "admin.access-control.groups.form.members-list.head": "Uživatelé",
 
   // "admin.access-control.groups.form.members-list.search.head": "Add EPeople",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.members-list.search.head": "Add EPeople",
+  "admin.access-control.groups.form.members-list.search.head": "Přidat uživatele",
 
   // "admin.access-control.groups.form.members-list.button.see-all": "Browse All",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.members-list.button.see-all": "Browse All",
+  "admin.access-control.groups.form.members-list.button.see-all": "Procházet vše",
 
   // "admin.access-control.groups.form.members-list.headMembers": "Current Members",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.members-list.headMembers": "Current Members",
-
-  // "admin.access-control.groups.form.members-list.search.scope.metadata": "Metadata",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.members-list.search.scope.metadata": "Metadata",
-
-  // "admin.access-control.groups.form.members-list.search.scope.email": "E-mail (exact)",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.members-list.search.scope.email": "E-mail (exact)",
+  "admin.access-control.groups.form.members-list.headMembers": "Současní členové",
 
   // "admin.access-control.groups.form.members-list.search.button": "Search",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.members-list.search.button": "Search",
+  "admin.access-control.groups.form.members-list.search.button": "Hledat",
 
   // "admin.access-control.groups.form.members-list.table.id": "ID",
-  // TODO New key - Add a translation
   "admin.access-control.groups.form.members-list.table.id": "ID",
 
   // "admin.access-control.groups.form.members-list.table.name": "Name",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.members-list.table.name": "Name",
+  "admin.access-control.groups.form.members-list.table.name": "Název",
+
+  // "admin.access-control.groups.form.members-list.table.identity": "Identity",
+  "admin.access-control.groups.form.members-list.table.identity": "Identita",
+
+  // "admin.access-control.groups.form.members-list.table.email": "Email",
+  "admin.access-control.groups.form.members-list.table.email": "E-mail",
+
+  // "admin.access-control.groups.form.members-list.table.netid": "NetID",
+  "admin.access-control.groups.form.members-list.table.netid": "NetID",
 
   // "admin.access-control.groups.form.members-list.table.edit": "Remove / Add",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.members-list.table.edit": "Remove / Add",
+  "admin.access-control.groups.form.members-list.table.edit": "Odstranit / Přidat",
 
   // "admin.access-control.groups.form.members-list.table.edit.buttons.remove": "Remove member with name \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.members-list.table.edit.buttons.remove": "Remove member with name \"{{name}}\"",
+  "admin.access-control.groups.form.members-list.table.edit.buttons.remove": "Odebrat člena jménem \"{{name}}\"",
 
   // "admin.access-control.groups.form.members-list.notification.success.addMember": "Successfully added member: \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.members-list.notification.success.addMember": "Successfully added member: \"{{name}}\"",
+  "admin.access-control.groups.form.members-list.notification.success.addMember": "Úspěšně přidán člen: \"{{name}}\"",
 
   // "admin.access-control.groups.form.members-list.notification.failure.addMember": "Failed to add member: \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.members-list.notification.failure.addMember": "Failed to add member: \"{{name}}\"",
+  "admin.access-control.groups.form.members-list.notification.failure.addMember": "Nepodařilo se přidat člena: \"{{name}}\"",
 
   // "admin.access-control.groups.form.members-list.notification.success.deleteMember": "Successfully deleted member: \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.members-list.notification.success.deleteMember": "Successfully deleted member: \"{{name}}\"",
+  "admin.access-control.groups.form.members-list.notification.success.deleteMember": "Úspěšně odstraněn člen: \"{{name}}\"",
 
   // "admin.access-control.groups.form.members-list.notification.failure.deleteMember": "Failed to delete member: \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.members-list.notification.failure.deleteMember": "Failed to delete member: \"{{name}}\"",
+  "admin.access-control.groups.form.members-list.notification.failure.deleteMember": "Nepodařilo se smazat člena: \"{{name}}\"",
 
   // "admin.access-control.groups.form.members-list.table.edit.buttons.add": "Add member with name \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.members-list.table.edit.buttons.add": "Add member with name \"{{name}}\"",
+  "admin.access-control.groups.form.members-list.table.edit.buttons.add": "Přidat člena jménem \"{{name}}\"",
 
   // "admin.access-control.groups.form.members-list.notification.failure.noActiveGroup": "No current active group, submit a name first.",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.members-list.notification.failure.noActiveGroup": "No current active group, submit a name first.",
+  "admin.access-control.groups.form.members-list.notification.failure.noActiveGroup": "Žádná aktuální aktivní skupina, nejprve zadejte název.",
 
   // "admin.access-control.groups.form.members-list.no-members-yet": "No members in group yet, search and add.",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.members-list.no-members-yet": "No members in group yet, search and add.",
+  "admin.access-control.groups.form.members-list.no-members-yet": "Ve skupině zatím nejsou žádní členové, vyhledejte je a přidejte.",
 
   // "admin.access-control.groups.form.members-list.no-items": "No EPeople found in that search",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.members-list.no-items": "No EPeople found in that search",
+  "admin.access-control.groups.form.members-list.no-items": "V tomto vyhledávání nebyli nalezeni žádní uživatelé",
 
   // "admin.access-control.groups.form.subgroups-list.notification.failure": "Something went wrong: \"{{cause}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.subgroups-list.notification.failure": "Something went wrong: \"{{cause}}\"",
+  "admin.access-control.groups.form.subgroups-list.notification.failure": "Neúspěch: Něco se pokazilo: \"{{cause}}\"",
 
   // "admin.access-control.groups.form.subgroups-list.head": "Groups",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.subgroups-list.head": "Groups",
+  "admin.access-control.groups.form.subgroups-list.head": "Skupiny",
 
   // "admin.access-control.groups.form.subgroups-list.search.head": "Add Subgroup",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.subgroups-list.search.head": "Add Subgroup",
+  "admin.access-control.groups.form.subgroups-list.search.head": "Přidat podskupinu",
 
   // "admin.access-control.groups.form.subgroups-list.button.see-all": "Browse All",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.subgroups-list.button.see-all": "Browse All",
+  "admin.access-control.groups.form.subgroups-list.button.see-all": "Procházet vše",
 
   // "admin.access-control.groups.form.subgroups-list.headSubgroups": "Current Subgroups",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.subgroups-list.headSubgroups": "Current Subgroups",
+  "admin.access-control.groups.form.subgroups-list.headSubgroups": "Aktuální podskupiny",
 
   // "admin.access-control.groups.form.subgroups-list.search.button": "Search",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.subgroups-list.search.button": "Search",
+  "admin.access-control.groups.form.subgroups-list.search.button": "Hledat",
 
   // "admin.access-control.groups.form.subgroups-list.table.id": "ID",
-  // TODO New key - Add a translation
   "admin.access-control.groups.form.subgroups-list.table.id": "ID",
 
   // "admin.access-control.groups.form.subgroups-list.table.name": "Name",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.subgroups-list.table.name": "Name",
+  "admin.access-control.groups.form.subgroups-list.table.name": "Název",
+
+  // "admin.access-control.groups.form.subgroups-list.table.collectionOrCommunity": "Collection/Community",
+  "admin.access-control.groups.form.subgroups-list.table.collectionOrCommunity": "Kolekce/Komunita",
 
   // "admin.access-control.groups.form.subgroups-list.table.edit": "Remove / Add",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.subgroups-list.table.edit": "Remove / Add",
+  "admin.access-control.groups.form.subgroups-list.table.edit": "Odstranit / Přidat",
 
   // "admin.access-control.groups.form.subgroups-list.table.edit.buttons.remove": "Remove subgroup with name \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.subgroups-list.table.edit.buttons.remove": "Remove subgroup with name \"{{name}}\"",
+  "admin.access-control.groups.form.subgroups-list.table.edit.buttons.remove": "Odebrat podskupinu s názvem \"{{name}}\"",
 
   // "admin.access-control.groups.form.subgroups-list.table.edit.buttons.add": "Add subgroup with name \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.subgroups-list.table.edit.buttons.add": "Add subgroup with name \"{{name}}\"",
-
-  // "admin.access-control.groups.form.subgroups-list.table.edit.currentGroup": "Current group",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.subgroups-list.table.edit.currentGroup": "Current group",
+  "admin.access-control.groups.form.subgroups-list.table.edit.buttons.add": "Přidat podskupinu s názvem \"{{name}}\"",
 
   // "admin.access-control.groups.form.subgroups-list.notification.success.addSubgroup": "Successfully added subgroup: \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.subgroups-list.notification.success.addSubgroup": "Successfully added subgroup: \"{{name}}\"",
+  "admin.access-control.groups.form.subgroups-list.notification.success.addSubgroup": "Úspěšně přidána podskupina: \"{{name}}\"",
 
   // "admin.access-control.groups.form.subgroups-list.notification.failure.addSubgroup": "Failed to add subgroup: \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.subgroups-list.notification.failure.addSubgroup": "Failed to add subgroup: \"{{name}}\"",
+  "admin.access-control.groups.form.subgroups-list.notification.failure.addSubgroup": "Nepodařilo se přidat podskupinu: \"{{name}}\"",
 
   // "admin.access-control.groups.form.subgroups-list.notification.success.deleteSubgroup": "Successfully deleted subgroup: \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.subgroups-list.notification.success.deleteSubgroup": "Successfully deleted subgroup: \"{{name}}\"",
+  "admin.access-control.groups.form.subgroups-list.notification.success.deleteSubgroup": "Úspěšně odstraněna podskupina: \"{{name}}\"",
 
   // "admin.access-control.groups.form.subgroups-list.notification.failure.deleteSubgroup": "Failed to delete subgroup: \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.subgroups-list.notification.failure.deleteSubgroup": "Failed to delete subgroup: \"{{name}}\"",
+  "admin.access-control.groups.form.subgroups-list.notification.failure.deleteSubgroup": "Podskupinu se nepodařilo odstranit: \"{{name}}\"",
 
   // "admin.access-control.groups.form.subgroups-list.notification.failure.noActiveGroup": "No current active group, submit a name first.",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.subgroups-list.notification.failure.noActiveGroup": "No current active group, submit a name first.",
+  "admin.access-control.groups.form.subgroups-list.notification.failure.noActiveGroup": "Žádná aktuální aktivní skupina, nejprve zadejte název.",
 
   // "admin.access-control.groups.form.subgroups-list.notification.failure.subgroupToAddIsActiveGroup": "This is the current group, can't be added.",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.subgroups-list.notification.failure.subgroupToAddIsActiveGroup": "This is the current group, can't be added.",
+  "admin.access-control.groups.form.subgroups-list.notification.failure.subgroupToAddIsActiveGroup": "Toto je aktuální skupina, nelze přidat.",
 
   // "admin.access-control.groups.form.subgroups-list.no-items": "No groups found with this in their name or this as UUID",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.subgroups-list.no-items": "No groups found with this in their name or this as UUID",
+  "admin.access-control.groups.form.subgroups-list.no-items": "Nebyla nalezena žádná skupina s tímto v návzvu nebo UUID",
 
   // "admin.access-control.groups.form.subgroups-list.no-subgroups-yet": "No subgroups in group yet.",
+  "admin.access-control.groups.form.subgroups-list.no-subgroups-yet": "Ve skupině zatím nejsou žádné podskupiny.",
+
+  // "admin.access-control.groups.form.return": "Back",
+  // TODO Source message changed - Revise the translation
+  "admin.access-control.groups.form.return": "Zpět",
+
+  // "admin.quality-assurance.breadcrumbs": "Quality Assurance",
   // TODO New key - Add a translation
-  "admin.access-control.groups.form.subgroups-list.no-subgroups-yet": "No subgroups in group yet.",
+  "admin.quality-assurance.breadcrumbs": "Quality Assurance",
 
-  // "admin.access-control.groups.form.return": "Return to groups",
+  // "admin.notifications.event.breadcrumbs": "Quality Assurance Suggestions",
   // TODO New key - Add a translation
-  "admin.access-control.groups.form.return": "Return to groups",
+  "admin.notifications.event.breadcrumbs": "Quality Assurance Suggestions",
+
+  // "admin.notifications.event.page.title": "Quality Assurance Suggestions",
+  // TODO New key - Add a translation
+  "admin.notifications.event.page.title": "Quality Assurance Suggestions",
+
+  // "admin.quality-assurance.page.title": "Quality Assurance",
+  // TODO New key - Add a translation
+  "admin.quality-assurance.page.title": "Quality Assurance",
+
+  // "admin.notifications.source.breadcrumbs": "Quality Assurance",
+  // TODO New key - Add a translation
+  "admin.notifications.source.breadcrumbs": "Quality Assurance",
+
+  // "admin.access-control.groups.form.tooltip.editGroupPage": "On this page, you can modify the properties and members of a group. In the top section, you can edit the group name and description, unless this is an admin group for a collection or community, in which case the group name and description are auto-generated and cannot be edited. In the following sections, you can edit group membership. See [the wiki](https://wiki.lyrasis.org/display/DSDOC7x/Create+or+manage+a+user+group) for more details.",
+  "admin.access-control.groups.form.tooltip.editGroupPage": "Na této stránce můžete upravit vlastnosti a členy skupiny. V horní části můžete upravit název a popis skupiny, pokud se nejedá o skupinu admin pro kolekci nebo komunitu. V takovém případě jsou název a popis skupiny vygenerovány automaticky a nelze je upravovat. V následujících částech můžete upravovat členství ve skupině. Další podrobnosti naleznete v části [wiki](https://wiki.lyrasis.org/display/DSDOC7x/Create+or+manage+a+user+group).",
+
+  // "admin.access-control.groups.form.tooltip.editGroup.addEpeople": "To add or remove an EPerson to/from this group, either click the 'Browse All' button or use the search bar below to search for users (use the dropdown to the left of the search bar to choose whether to search by metadata or by email). Then click the plus icon for each user you wish to add in the list below, or the trash can icon for each user you wish to remove. The list below may have several pages: use the page controls below the list to navigate to the next pages.",
+  "admin.access-control.groups.form.tooltip.editGroup.addEpeople": "Pro přidání nebo odebrání uživatele z této skupiny, buď klikněte na „Prohledávat všechny“ nebo použijte vyhledávací okno pro vyhledání uživatele (použijte roletku na levé straně vyhledávacího okna a vyberte, zda chcete prohledávat pomocí metadat nebo e-mailu). Potom klikněte na tlačítko plus u každého uživatele, kterého chcete přidat, nebo na ikonu odpadkového koše u každého uživatele, kterého chcete odebrat. Seznam níže může obsahovat několik stránek: k přechodu na další stránku použijte ovládací prvky pod seznamem. Až budete hotovi, uložte změny pomocí tlačítka „Uložit“ v horní části.",
+
+  // "admin.access-control.groups.form.tooltip.editGroup.addSubgroups": "To add or remove a Subgroup to/from this group, either click the 'Browse All' button or use the search bar below to search for groups. Then click the plus icon for each group you wish to add in the list below, or the trash can icon for each group you wish to remove. The list below may have several pages: use the page controls below the list to navigate to the next pages.",
+  "admin.access-control.groups.form.tooltip.editGroup.addSubgroups": "Pro přidání nebo odebrání podskupiny z této skupiny, buď klikněte na „Prohledávat všechny“ nebo použijte vyhledávací okno níže pro vyhledání uživatele. Potom klikněte na tlačítko plus u každého uživatele, kterého chcete přidat, nebo na ikonu odpadkového koše u každého uživatele, kterého chcete odebrat. Seznam níže může obsahovat několik stránek: k přechodu na další stránku použijte ovládací prvky pod seznamem. Až budete hotovi, uložte změny pomocí tlačítka „Uložit“ v horní části.",
+
+  // "admin.reports.collections.title": "Collection Filter Report",
+  // TODO New key - Add a translation
+  "admin.reports.collections.title": "Collection Filter Report",
+
+  // "admin.reports.collections.breadcrumbs": "Collection Filter Report",
+  // TODO New key - Add a translation
+  "admin.reports.collections.breadcrumbs": "Collection Filter Report",
+
+  // "admin.reports.collections.head": "Collection Filter Report",
+  // TODO New key - Add a translation
+  "admin.reports.collections.head": "Collection Filter Report",
+
+  // "admin.reports.button.show-collections": "Show Collections",
+  // TODO New key - Add a translation
+  "admin.reports.button.show-collections": "Show Collections",
+
+  // "admin.reports.collections.collections-report": "Collection Report",
+  // TODO New key - Add a translation
+  "admin.reports.collections.collections-report": "Collection Report",
+
+  // "admin.reports.collections.item-results": "Item Results",
+  // TODO New key - Add a translation
+  "admin.reports.collections.item-results": "Item Results",
+
+  // "admin.reports.collections.community": "Community",
+  // TODO New key - Add a translation
+  "admin.reports.collections.community": "Community",
+
+  // "admin.reports.collections.collection": "Collection",
+  // TODO New key - Add a translation
+  "admin.reports.collections.collection": "Collection",
+
+  // "admin.reports.collections.nb_items": "Nb. Items",
+  // TODO New key - Add a translation
+  "admin.reports.collections.nb_items": "Nb. Items",
+
+  // "admin.reports.collections.match_all_selected_filters": "Matching all selected filters",
+  // TODO New key - Add a translation
+  "admin.reports.collections.match_all_selected_filters": "Matching all selected filters",
+
+  // "admin.reports.items.breadcrumbs": "Metadata Query Report",
+  // TODO New key - Add a translation
+  "admin.reports.items.breadcrumbs": "Metadata Query Report",
+
+  // "admin.reports.items.head": "Metadata Query Report",
+  // TODO New key - Add a translation
+  "admin.reports.items.head": "Metadata Query Report",
+
+  // "admin.reports.items.run": "Run Item Query",
+  // TODO New key - Add a translation
+  "admin.reports.items.run": "Run Item Query",
+
+  // "admin.reports.items.section.collectionSelector": "Collection Selector",
+  // TODO New key - Add a translation
+  "admin.reports.items.section.collectionSelector": "Collection Selector",
+
+  // "admin.reports.items.section.metadataFieldQueries": "Metadata Field Queries",
+  // TODO New key - Add a translation
+  "admin.reports.items.section.metadataFieldQueries": "Metadata Field Queries",
+
+  // "admin.reports.items.predefinedQueries": "Predefined Queries",
+  // TODO New key - Add a translation
+  "admin.reports.items.predefinedQueries": "Predefined Queries",
+
+  // "admin.reports.items.section.limitPaginateQueries": "Limit/Paginate Queries",
+  // TODO New key - Add a translation
+  "admin.reports.items.section.limitPaginateQueries": "Limit/Paginate Queries",
+
+  // "admin.reports.items.limit": "Limit/",
+  // TODO New key - Add a translation
+  "admin.reports.items.limit": "Limit/",
+
+  // "admin.reports.items.offset": "Offset",
+  // TODO New key - Add a translation
+  "admin.reports.items.offset": "Offset",
+
+  // "admin.reports.items.wholeRepo": "Whole Repository",
+  // TODO New key - Add a translation
+  "admin.reports.items.wholeRepo": "Whole Repository",
+
+  // "admin.reports.items.anyField": "Any field",
+  // TODO New key - Add a translation
+  "admin.reports.items.anyField": "Any field",
+
+  // "admin.reports.items.predicate.exists": "exists",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.exists": "exists",
+
+  // "admin.reports.items.predicate.doesNotExist": "does not exist",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.doesNotExist": "does not exist",
+
+  // "admin.reports.items.predicate.equals": "equals",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.equals": "equals",
+
+  // "admin.reports.items.predicate.doesNotEqual": "does not equal",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.doesNotEqual": "does not equal",
+
+  // "admin.reports.items.predicate.like": "like",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.like": "like",
+
+  // "admin.reports.items.predicate.notLike": "not like",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.notLike": "not like",
+
+  // "admin.reports.items.predicate.contains": "contains",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.contains": "contains",
+
+  // "admin.reports.items.predicate.doesNotContain": "does not contain",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.doesNotContain": "does not contain",
+
+  // "admin.reports.items.predicate.matches": "matches",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.matches": "matches",
+
+  // "admin.reports.items.predicate.doesNotMatch": "does not match",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.doesNotMatch": "does not match",
+
+  // "admin.reports.items.preset.new": "New Query",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.new": "New Query",
+
+  // "admin.reports.items.preset.hasNoTitle": "Has No Title",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasNoTitle": "Has No Title",
+
+  // "admin.reports.items.preset.hasNoIdentifierUri": "Has No dc.identifier.uri",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasNoIdentifierUri": "Has No dc.identifier.uri",
+
+  // "admin.reports.items.preset.hasCompoundSubject": "Has compound subject",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasCompoundSubject": "Has compound subject",
+
+  // "admin.reports.items.preset.hasCompoundAuthor": "Has compound dc.contributor.author",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasCompoundAuthor": "Has compound dc.contributor.author",
+
+  // "admin.reports.items.preset.hasCompoundCreator": "Has compound dc.creator",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasCompoundCreator": "Has compound dc.creator",
+
+  // "admin.reports.items.preset.hasUrlInDescription": "Has URL in dc.description",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasUrlInDescription": "Has URL in dc.description",
+
+  // "admin.reports.items.preset.hasFullTextInProvenance": "Has full text in dc.description.provenance",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasFullTextInProvenance": "Has full text in dc.description.provenance",
+
+  // "admin.reports.items.preset.hasNonFullTextInProvenance": "Has non-full text in dc.description.provenance",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasNonFullTextInProvenance": "Has non-full text in dc.description.provenance",
+
+  // "admin.reports.items.preset.hasEmptyMetadata": "Has empty metadata",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasEmptyMetadata": "Has empty metadata",
+
+  // "admin.reports.items.preset.hasUnbreakingDataInDescription": "Has unbreaking metadata in description",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasUnbreakingDataInDescription": "Has unbreaking metadata in description",
+
+  // "admin.reports.items.preset.hasXmlEntityInMetadata": "Has XML entity in metadata",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasXmlEntityInMetadata": "Has XML entity in metadata",
+
+  // "admin.reports.items.preset.hasNonAsciiCharInMetadata": "Has non-ascii character in metadata",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasNonAsciiCharInMetadata": "Has non-ascii character in metadata",
+
+  // "admin.reports.items.number": "No.",
+  // TODO New key - Add a translation
+  "admin.reports.items.number": "No.",
+
+  // "admin.reports.items.id": "UUID",
+  // TODO New key - Add a translation
+  "admin.reports.items.id": "UUID",
+
+  // "admin.reports.items.collection": "Collection",
+  // TODO New key - Add a translation
+  "admin.reports.items.collection": "Collection",
+
+  // "admin.reports.items.handle": "URI",
+  // TODO New key - Add a translation
+  "admin.reports.items.handle": "URI",
+
+  // "admin.reports.items.title": "Title",
+  // TODO New key - Add a translation
+  "admin.reports.items.title": "Title",
 
 
+  // "admin.reports.commons.filters": "Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters": "Filters",
+
+  // "admin.reports.commons.additional-data": "Additional data to return",
+  // TODO New key - Add a translation
+  "admin.reports.commons.additional-data": "Additional data to return",
+
+  // "admin.reports.commons.previous-page": "Prev Page",
+  // TODO New key - Add a translation
+  "admin.reports.commons.previous-page": "Prev Page",
+
+  // "admin.reports.commons.next-page": "Next Page",
+  // TODO New key - Add a translation
+  "admin.reports.commons.next-page": "Next Page",
+
+  // "admin.reports.commons.page": "Page",
+  // TODO New key - Add a translation
+  "admin.reports.commons.page": "Page",
+
+  // "admin.reports.commons.of": "of",
+  // TODO New key - Add a translation
+  "admin.reports.commons.of": "of",
+
+  // "admin.reports.commons.export": "Export for Metadata Update",
+  // TODO New key - Add a translation
+  "admin.reports.commons.export": "Export for Metadata Update",
+
+  // "admin.reports.commons.filters.deselect_all": "Deselect all filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.deselect_all": "Deselect all filters",
+
+  // "admin.reports.commons.filters.select_all": "Select all filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.select_all": "Select all filters",
+
+  // "admin.reports.commons.filters.matches_all": "Matches all specified filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.matches_all": "Matches all specified filters",
+
+
+  // "admin.reports.commons.filters.property": "Item Property Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property": "Item Property Filters",
+
+  // "admin.reports.commons.filters.property.is_item": "Is Item - always true",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.is_item": "Is Item - always true",
+
+  // "admin.reports.commons.filters.property.is_withdrawn": "Withdrawn Items",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.is_withdrawn": "Withdrawn Items",
+
+  // "admin.reports.commons.filters.property.is_not_withdrawn": "Available Items - Not Withdrawn",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.is_not_withdrawn": "Available Items - Not Withdrawn",
+
+  // "admin.reports.commons.filters.property.is_discoverable": "Discoverable Items - Not Private",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.is_discoverable": "Discoverable Items - Not Private",
+
+  // "admin.reports.commons.filters.property.is_not_discoverable": "Not Discoverable - Private Item",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.is_not_discoverable": "Not Discoverable - Private Item",
+
+  // "admin.reports.commons.filters.bitstream": "Basic Bitstream Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream": "Basic Bitstream Filters",
+
+  // "admin.reports.commons.filters.bitstream.has_multiple_originals": "Item has Multiple Original Bitstreams",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream.has_multiple_originals": "Item has Multiple Original Bitstreams",
+
+  // "admin.reports.commons.filters.bitstream.has_no_originals": "Item has No Original Bitstreams",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream.has_no_originals": "Item has No Original Bitstreams",
+
+  // "admin.reports.commons.filters.bitstream.has_one_original": "Item has One Original Bitstream",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream.has_one_original": "Item has One Original Bitstream",
+
+  // "admin.reports.commons.filters.bitstream_mime": "Bitstream Filters by MIME Type",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime": "Bitstream Filters by MIME Type",
+
+  // "admin.reports.commons.filters.bitstream_mime.has_doc_original": "Item has a Doc Original Bitstream (PDF, Office, Text, HTML, XML, etc)",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_doc_original": "Item has a Doc Original Bitstream (PDF, Office, Text, HTML, XML, etc)",
+
+  // "admin.reports.commons.filters.bitstream_mime.has_image_original": "Item has an Image Original Bitstream",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_image_original": "Item has an Image Original Bitstream",
+
+  // "admin.reports.commons.filters.bitstream_mime.has_unsupp_type": "Has Other Bitstream Types (not Doc or Image)",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_unsupp_type": "Has Other Bitstream Types (not Doc or Image)",
+
+  // "admin.reports.commons.filters.bitstream_mime.has_mixed_original": "Item has multiple types of Original Bitstreams (Doc, Image, Other)",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_mixed_original": "Item has multiple types of Original Bitstreams (Doc, Image, Other)",
+
+  // "admin.reports.commons.filters.bitstream_mime.has_pdf_original": "Item has a PDF Original Bitstream",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_pdf_original": "Item has a PDF Original Bitstream",
+
+  // "admin.reports.commons.filters.bitstream_mime.has_jpg_original": "Item has JPG Original Bitstream",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_jpg_original": "Item has JPG Original Bitstream",
+
+  // "admin.reports.commons.filters.bitstream_mime.has_small_pdf": "Has unusually small PDF",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_small_pdf": "Has unusually small PDF",
+
+  // "admin.reports.commons.filters.bitstream_mime.has_large_pdf": "Has unusually large PDF",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_large_pdf": "Has unusually large PDF",
+
+  // "admin.reports.commons.filters.bitstream_mime.has_doc_without_text": "Has document bitstream without TEXT item",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_doc_without_text": "Has document bitstream without TEXT item",
+
+  // "admin.reports.commons.filters.mime": "Supported MIME Type Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.mime": "Supported MIME Type Filters",
+
+  // "admin.reports.commons.filters.mime.has_only_supp_image_type": "Item Image Bitstreams are Supported",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.mime.has_only_supp_image_type": "Item Image Bitstreams are Supported",
+
+  // "admin.reports.commons.filters.mime.has_unsupp_image_type": "Item has Image Bitstream that is Unsupported",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.mime.has_unsupp_image_type": "Item has Image Bitstream that is Unsupported",
+
+  // "admin.reports.commons.filters.mime.has_only_supp_doc_type": "Item Document Bitstreams are Supported",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.mime.has_only_supp_doc_type": "Item Document Bitstreams are Supported",
+
+  // "admin.reports.commons.filters.mime.has_unsupp_doc_type": "Item has Document Bitstream that is Unsupported",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.mime.has_unsupp_doc_type": "Item has Document Bitstream that is Unsupported",
+
+  // "admin.reports.commons.filters.bundle": "Bitstream Bundle Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle": "Bitstream Bundle Filters",
+
+  // "admin.reports.commons.filters.bundle.has_unsupported_bundle": "Has bitstream in an unsupported bundle",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_unsupported_bundle": "Has bitstream in an unsupported bundle",
+
+  // "admin.reports.commons.filters.bundle.has_small_thumbnail": "Has unusually small thumbnail",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_small_thumbnail": "Has unusually small thumbnail",
+
+  // "admin.reports.commons.filters.bundle.has_original_without_thumbnail": "Has original bitstream without thumbnail",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_original_without_thumbnail": "Has original bitstream without thumbnail",
+
+  // "admin.reports.commons.filters.bundle.has_invalid_thumbnail_name": "Has invalid thumbnail name (assumes one thumbnail for each original)",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_invalid_thumbnail_name": "Has invalid thumbnail name (assumes one thumbnail for each original)",
+
+  // "admin.reports.commons.filters.bundle.has_non_generated_thumb": "Has non-generated thumbnail",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_non_generated_thumb": "Has non-generated thumbnail",
+
+  // "admin.reports.commons.filters.bundle.no_license": "Doesn't have a license",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.no_license": "Doesn't have a license",
+
+  // "admin.reports.commons.filters.bundle.has_license_documentation": "Has documentation in the license bundle",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_license_documentation": "Has documentation in the license bundle",
+
+  // "admin.reports.commons.filters.permission": "Permission Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission": "Permission Filters",
+
+  // "admin.reports.commons.filters.permission.has_restricted_original": "Item has Restricted Original Bitstream",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_original": "Item has Restricted Original Bitstream",
+
+  // "admin.reports.commons.filters.permission.has_restricted_original.tooltip": "Item has at least one original bitstream that is not accessible to Anonymous user",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_original.tooltip": "Item has at least one original bitstream that is not accessible to Anonymous user",
+
+  // "admin.reports.commons.filters.permission.has_restricted_thumbnail": "Item has Restricted Thumbnail",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_thumbnail": "Item has Restricted Thumbnail",
+
+  // "admin.reports.commons.filters.permission.has_restricted_thumbnail.tooltip": "Item has at least one thumbnail that is not accessible to Anonymous user",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_thumbnail.tooltip": "Item has at least one thumbnail that is not accessible to Anonymous user",
+
+  // "admin.reports.commons.filters.permission.has_restricted_metadata": "Item has Restricted Metadata",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_metadata": "Item has Restricted Metadata",
+
+  // "admin.reports.commons.filters.permission.has_restricted_metadata.tooltip": "Item has metadata that is not accessible to Anonymous user",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_metadata.tooltip": "Item has metadata that is not accessible to Anonymous user",
 
   // "admin.search.breadcrumbs": "Administrative Search",
-  // TODO New key - Add a translation
-  "admin.search.breadcrumbs": "Administrative Search",
+  "admin.search.breadcrumbs": "Administrátorské vyhledávání",
 
   // "admin.search.collection.edit": "Edit",
-  // TODO New key - Add a translation
-  "admin.search.collection.edit": "Edit",
+  "admin.search.collection.edit": "Upravit",
 
   // "admin.search.community.edit": "Edit",
-  // TODO New key - Add a translation
-  "admin.search.community.edit": "Edit",
+  "admin.search.community.edit": "Upravit",
 
   // "admin.search.item.delete": "Delete",
-  // TODO New key - Add a translation
-  "admin.search.item.delete": "Delete",
+  "admin.search.item.delete": "Odstranit",
 
   // "admin.search.item.edit": "Edit",
-  // TODO New key - Add a translation
-  "admin.search.item.edit": "Edit",
+  "admin.search.item.edit": "Upravit",
 
-  // "admin.search.item.make-private": "Make Private",
-  // TODO New key - Add a translation
-  "admin.search.item.make-private": "Make Private",
+  // "admin.search.item.make-private": "Make non-discoverable",
+  // TODO Source message changed - Revise the translation
+  "admin.search.item.make-private": "Učinit nedohledatelným",
 
-  // "admin.search.item.make-public": "Make Public",
-  // TODO New key - Add a translation
-  "admin.search.item.make-public": "Make Public",
+  // "admin.search.item.make-public": "Make discoverable",
+  // TODO Source message changed - Revise the translation
+  "admin.search.item.make-public": "Učinit dohledatelným",
 
   // "admin.search.item.move": "Move",
-  // TODO New key - Add a translation
-  "admin.search.item.move": "Move",
+  "admin.search.item.move": "Přesunout",
 
   // "admin.search.item.reinstate": "Reinstate",
-  // TODO New key - Add a translation
-  "admin.search.item.reinstate": "Reinstate",
+  "admin.search.item.reinstate": "Obnovit",
 
   // "admin.search.item.withdraw": "Withdraw",
-  // TODO New key - Add a translation
-  "admin.search.item.withdraw": "Withdraw",
+  "admin.search.item.withdraw": "Stáhnout",
 
   // "admin.search.title": "Administrative Search",
-  // TODO New key - Add a translation
-  "admin.search.title": "Administrative Search",
+  "admin.search.title": "Administrátorské vyhledávání",
 
   // "administrativeView.search.results.head": "Administrative Search",
-  // TODO New key - Add a translation
-  "administrativeView.search.results.head": "Administrative Search",
-
-
-
+  "administrativeView.search.results.head": "Administrátorské vyhledávání",
 
   // "admin.workflow.breadcrumbs": "Administer Workflow",
-  // TODO New key - Add a translation
-  "admin.workflow.breadcrumbs": "Administer Workflow",
+  "admin.workflow.breadcrumbs": "Spravovat workflow",
 
   // "admin.workflow.title": "Administer Workflow",
-  // TODO New key - Add a translation
-  "admin.workflow.title": "Administer Workflow",
+  "admin.workflow.title": "Spravovat workflow",
 
   // "admin.workflow.item.workflow": "Workflow",
-  // TODO New key - Add a translation
   "admin.workflow.item.workflow": "Workflow",
 
+  // "admin.workflow.item.workspace": "Workspace",
+  "admin.workflow.item.workspace": "Pracovní prostor",
+
   // "admin.workflow.item.delete": "Delete",
-  // TODO New key - Add a translation
-  "admin.workflow.item.delete": "Delete",
+  "admin.workflow.item.delete": "Smazat",
 
   // "admin.workflow.item.send-back": "Send back",
-  // TODO New key - Add a translation
-  "admin.workflow.item.send-back": "Send back",
+  "admin.workflow.item.send-back": "Odeslat zpět",
 
+  // "admin.workflow.item.policies": "Policies",
+  "admin.workflow.item.policies": "Politiky pro záznam",
 
+  // "admin.workflow.item.supervision": "Supervision",
+  "admin.workflow.item.supervision": "Supervize",
 
   // "admin.metadata-import.breadcrumbs": "Import Metadata",
-  // TODO New key - Add a translation
-  "admin.metadata-import.breadcrumbs": "Import Metadata",
+  "admin.metadata-import.breadcrumbs": "Importovat metadata",
+
+  // "admin.batch-import.breadcrumbs": "Import Batch",
+  "admin.batch-import.breadcrumbs": "Importovat dávku",
 
   // "admin.metadata-import.title": "Import Metadata",
-  // TODO New key - Add a translation
-  "admin.metadata-import.title": "Import Metadata",
+  "admin.metadata-import.title": "Importovat metadata",
+
+  // "admin.batch-import.title": "Import Batch",
+  "admin.batch-import.title": "Importovat dávku",
 
   // "admin.metadata-import.page.header": "Import Metadata",
-  // TODO New key - Add a translation
-  "admin.metadata-import.page.header": "Import Metadata",
+  "admin.metadata-import.page.header": "Importovat metadata",
+
+  // "admin.batch-import.page.header": "Import Batch",
+  "admin.batch-import.page.header": "Importovat dávku",
 
   // "admin.metadata-import.page.help": "You can drop or browse CSV files that contain batch metadata operations on files here",
-  // TODO New key - Add a translation
-  "admin.metadata-import.page.help": "You can drop or browse CSV files that contain batch metadata operations on files here",
+  "admin.metadata-import.page.help": "Sem můžete přetáhnout nebo vybrat CSV soubory, které obsahují dávkové operace na metadatech souborů",
+
+  // "admin.batch-import.page.help": "Select the Collection to import into. Then, drop or browse to a Simple Archive Format (SAF) zip file that includes the Items to import",
+  "admin.batch-import.page.help": "Vyberte kolekci, do které budete importovat. Poté přetáhněte nebo vyberte soubor typu Simple Archive Format (SAF), který obsahuje záznamy k importu",
+
+  // "admin.batch-import.page.toggle.help": "It is possible to perform import either with file upload or via URL, use above toggle to set the input source",
+  "admin.batch-import.page.toggle.help": "Import je možné provést buď pomocí nahrání souboru, nebo prostřednictvím URL adresy. Použijte přepínač výše k určení zdroje vstupu",
 
   // "admin.metadata-import.page.dropMsg": "Drop a metadata CSV to import",
-  // TODO New key - Add a translation
-  "admin.metadata-import.page.dropMsg": "Drop a metadata CSV to import",
+  "admin.metadata-import.page.dropMsg": "Přetáhněte CSV soubor s metadaty k importu",
+
+  // "admin.batch-import.page.dropMsg": "Drop a batch ZIP to import",
+  "admin.batch-import.page.dropMsg": "Přetáhněte soubor ZIP k importu",
 
   // "admin.metadata-import.page.dropMsgReplace": "Drop to replace the metadata CSV to import",
-  // TODO New key - Add a translation
-  "admin.metadata-import.page.dropMsgReplace": "Drop to replace the metadata CSV to import",
+  "admin.metadata-import.page.dropMsgReplace": "CSV k importu",
 
-  // "admin.metadata-import.page.button.return": "Return",
-  // TODO New key - Add a translation
-  "admin.metadata-import.page.button.return": "Return",
+  // "admin.batch-import.page.dropMsgReplace": "Drop to replace the batch ZIP to import",
+  "admin.batch-import.page.dropMsgReplace": "Nahraďte přetažením soubor ZIP k importu",
+
+  // "admin.metadata-import.page.button.return": "Back",
+  // TODO Source message changed - Revise the translation
+  "admin.metadata-import.page.button.return": "Zpět",
 
   // "admin.metadata-import.page.button.proceed": "Proceed",
-  // TODO New key - Add a translation
-  "admin.metadata-import.page.button.proceed": "Proceed",
+  "admin.metadata-import.page.button.proceed": "Pokračovat",
+
+  // "admin.metadata-import.page.button.select-collection": "Select Collection",
+  "admin.metadata-import.page.button.select-collection": "Vybrat kolekci",
 
   // "admin.metadata-import.page.error.addFile": "Select file first!",
-  // TODO New key - Add a translation
-  "admin.metadata-import.page.error.addFile": "Select file first!",
+  "admin.metadata-import.page.error.addFile": "Nejprve vyberte soubor!",
 
+  // "admin.metadata-import.page.error.addFileUrl": "Insert file URL first!",
+  "admin.metadata-import.page.error.addFileUrl": "Nejprve vložte URL adresu souboru!",
 
+  // "admin.batch-import.page.error.addFile": "Select ZIP file first!",
+  "admin.batch-import.page.error.addFile": "Nejprve vyberte soubor ZIP!",
 
+  // "admin.metadata-import.page.toggle.upload": "Upload",
+  "admin.metadata-import.page.toggle.upload": "Nahrát",
+
+  // "admin.metadata-import.page.toggle.url": "URL",
+  "admin.metadata-import.page.toggle.url": "URL",
+
+  // "admin.metadata-import.page.urlMsg": "Insert the batch ZIP url to import",
+  "admin.metadata-import.page.urlMsg": "Vložte url ZIP souboru pro import",
+
+  // "admin.metadata-import.page.validateOnly": "Validate Only",
+  "admin.metadata-import.page.validateOnly": "Pouze ověřit",
+
+  // "admin.metadata-import.page.validateOnly.hint": "When selected, the uploaded CSV will be validated. You will receive a report of detected changes, but no changes will be saved.",
+  "admin.metadata-import.page.validateOnly.hint": "Po výběru bude nahraný CSV ověřen. Obdržíte zprávu o zjištěných změnách, ale žádné změny nebudou uloženy.",
+
+  // "advanced-workflow-action.rating.form.rating.label": "Rating",
+  "advanced-workflow-action.rating.form.rating.label": "Hodnocení",
+
+  // "advanced-workflow-action.rating.form.rating.error": "You must rate the item",
+  "advanced-workflow-action.rating.form.rating.error": "Musíte ohodnotit záznam",
+
+  // "advanced-workflow-action.rating.form.review.label": "Review",
+  "advanced-workflow-action.rating.form.review.label": "Recenze",
+
+  // "advanced-workflow-action.rating.form.review.error": "You must enter a review to submit this rating",
+  "advanced-workflow-action.rating.form.review.error": "Pro odeslání tohoto hodnocení musíte zadat recenzi",
+
+  // "advanced-workflow-action.rating.description": "Please select a rating below",
+  "advanced-workflow-action.rating.description": "Níže vyberte hodnocení",
+
+  // "advanced-workflow-action.rating.description-requiredDescription": "Please select a rating below and also add a review",
+  "advanced-workflow-action.rating.description-requiredDescription": "Vyberte prosím hodnocení níže a přidejte recenzi",
+
+  // "advanced-workflow-action.select-reviewer.description-single": "Please select a single reviewer below before submitting",
+  "advanced-workflow-action.select-reviewer.description-single": "Před odesláním si prosím vyberte jednoho recenzenta.",
+
+  // "advanced-workflow-action.select-reviewer.description-multiple": "Please select one or more reviewers below before submitting",
+  "advanced-workflow-action.select-reviewer.description-multiple": "Před odesláním vyberte jednoho nebo více recenzentů.",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.head": "EPeople",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.head": "Uživatelé",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.head": "Add EPeople",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.head": "Přidat uživatele",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.button.see-all": "Browse All",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.button.see-all": "Prohledávat vše",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.headMembers": "Current Members",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.headMembers": "Současní členové",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.button": "Search",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.button": "Hledat",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.id": "ID",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.id": "ID",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.name": "Name",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.name": "Jméno",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.identity": "Identity",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.identity": "Identita",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.email": "Email",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.email": "E-mail",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.netid": "NetID",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.netid": "NetID",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.edit": "Remove / Add",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.edit": "Odstranit / Přidat",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.edit.buttons.remove": "Remove member with name \"{{name}}\"",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.edit.buttons.remove": "Odstranit člena jménem \"{{name}}\"",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.success.addMember": "Successfully added member: \"{{name}}\"",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.success.addMember": "Úspěšně přidaný uživatel: \"{{name}}\"",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.failure.addMember": "Failed to add member: \"{{name}}\"",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.failure.addMember": "Nepodařilo se přidat člena: \"{{name}}\"",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.success.deleteMember": "Successfully deleted member: \"{{name}}\"",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.success.deleteMember": "Úspěšně odstraněný uživatel: \"{{name}}\"",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.failure.deleteMember": "Failed to delete member: \"{{name}}\"",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.failure.deleteMember": "Nepodařilo se odstranit uživatele: \"{{name}}\"",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.edit.buttons.add": "Add member with name \"{{name}}\"",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.edit.buttons.add": "Přidat uživatele jménem \"{{name}}\"",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.failure.noActiveGroup": "No current active group, submit a name first.",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.failure.noActiveGroup": "Žádná aktuální aktivní skupina, nejprve zadejte název.",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.no-members-yet": "No members in group yet, search and add.",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.no-members-yet": "Žádní členové ve skupině, nejdříve vyhledejte a přidejte.",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.no-items": "No EPeople found in that search",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.no-items": "V tomto vyhledávání nebyli nalezeni žádní uživatelé",
+
+  // "advanced-workflow-action.select-reviewer.no-reviewer-selected.error": "No reviewer selected.",
+  "advanced-workflow-action.select-reviewer.no-reviewer-selected.error": "Nebyl vybrán žádný recenzent.",
+
+  // "admin.batch-import.page.validateOnly.hint": "When selected, the uploaded ZIP will be validated. You will receive a report of detected changes, but no changes will be saved.",
+  "admin.batch-import.page.validateOnly.hint": "Po výběru bude nahraný ZIP validován. Obdržíte zprávu o zjištěných změnách, ale žádné změny nebudou uloženy.",
+
+  // "admin.batch-import.page.remove": "remove",
+  "admin.batch-import.page.remove": "Odstranit",
 
   // "auth.errors.invalid-user": "Invalid email address or password.",
   "auth.errors.invalid-user": "Neplatná e-mailová adresa nebo heslo.",
 
   // "auth.messages.expired": "Your session has expired. Please log in again.",
-  "auth.messages.expired": "Vaše relace vypršela. Prosím, znova se přihlaste.",
+  "auth.messages.expired": "Vaše relace vypršela. Přihlaste se prosím znovu.",
 
+  // "auth.messages.token-refresh-failed": "Refreshing your session token failed. Please log in again.",
+  "auth.messages.token-refresh-failed": "Nepodařilo se obnovit váš přístupový token. Prosím přihlašte se znovu.",
 
+  // "bitstream.download.page": "Now downloading {{bitstream}}...",
+  "bitstream.download.page": "Nyní se stahuje {{bitstream}}...",
+
+  // "bitstream.download.page.back": "Back",
+  "bitstream.download.page.back": "Zpět",
+
+  // "bitstream.edit.authorizations.link": "Edit bitstream's Policies",
+  "bitstream.edit.authorizations.link": "Upravit politiky souboru",
+
+  // "bitstream.edit.authorizations.title": "Edit bitstream's Policies",
+  "bitstream.edit.authorizations.title": "Upravit politiky souboru",
+
+  // "bitstream.edit.return": "Back",
+  "bitstream.edit.return": "Zpět",
 
   // "bitstream.edit.bitstream": "Bitstream: ",
-  // TODO New key - Add a translation
-  "bitstream.edit.bitstream": "Bitstream: ",
+  "bitstream.edit.bitstream": "Soubor: ",
 
   // "bitstream.edit.form.description.hint": "Optionally, provide a brief description of the file, for example \"<i>Main article</i>\" or \"<i>Experiment data readings</i>\".",
-  // TODO New key - Add a translation
-  "bitstream.edit.form.description.hint": "Optionally, provide a brief description of the file, for example \"<i>Main article</i>\" or \"<i>Experiment data readings</i>\".",
+  "bitstream.edit.form.description.hint": "Zadejte případně stručný popis souboru, např. \"<i>Hlavní článek</i>\" nebo \"<i>Experimentální data</i>\".",
 
   // "bitstream.edit.form.description.label": "Description",
-  // TODO New key - Add a translation
-  "bitstream.edit.form.description.label": "Description",
+  "bitstream.edit.form.description.label": "Popis",
 
   // "bitstream.edit.form.embargo.hint": "The first day from which access is allowed. <b>This date cannot be modified on this form.</b> To set an embargo date for a bitstream, go to the <i>Item Status</i> tab, click <i>Authorizations...</i>, create or edit the bitstream's <i>READ</i> policy, and set the <i>Start Date</i> as desired.",
-  // TODO New key - Add a translation
-  "bitstream.edit.form.embargo.hint": "The first day from which access is allowed. <b>This date cannot be modified on this form.</b> To set an embargo date for a bitstream, go to the <i>Item Status</i> tab, click <i>Authorizations...</i>, create or edit the bitstream's <i>READ</i> policy, and set the <i>Start Date</i> as desired.",
+  "bitstream.edit.form.embargo.hint": "První den, od něhož je povolen přístup. <b>Toto datum nelze změnit v tomto formuláři.</b> K nastavení embarga pro tento soubor jděte na záložku <i>Stav záznamu</i>, klikněte na <i>Oprávnění...</i>, vytvořte nebo upravte politiku souboru <i>ČÍST</i> a nastavte <i>Datum zahájení</i> podle potřeby.",
 
   // "bitstream.edit.form.embargo.label": "Embargo until specific date",
-  // TODO New key - Add a translation
-  "bitstream.edit.form.embargo.label": "Embargo until specific date",
+  "bitstream.edit.form.embargo.label": "Do určitého data pod embargem",
 
   // "bitstream.edit.form.fileName.hint": "Change the filename for the bitstream. Note that this will change the display bitstream URL, but old links will still resolve as long as the sequence ID does not change.",
-  // TODO New key - Add a translation
-  "bitstream.edit.form.fileName.hint": "Change the filename for the bitstream. Note that this will change the display bitstream URL, but old links will still resolve as long as the sequence ID does not change.",
+  "bitstream.edit.form.fileName.hint": "Změňte jméno souboru. Pozor - změní to zobrazované URL souboru, ale původní odkazy budou i nadále fungovat, pokud se nezmění ID sekvence.",
 
   // "bitstream.edit.form.fileName.label": "Filename",
-  // TODO New key - Add a translation
-  "bitstream.edit.form.fileName.label": "Filename",
+  "bitstream.edit.form.fileName.label": "Název souboru",
 
   // "bitstream.edit.form.newFormat.label": "Describe new format",
-  // TODO New key - Add a translation
-  "bitstream.edit.form.newFormat.label": "Describe new format",
+  "bitstream.edit.form.newFormat.label": "Popište nový formát",
 
   // "bitstream.edit.form.newFormat.hint": "The application you used to create the file, and the version number (for example, \"<i>ACMESoft SuperApp version 1.5</i>\").",
-  // TODO New key - Add a translation
-  "bitstream.edit.form.newFormat.hint": "The application you used to create the file, and the version number (for example, \"<i>ACMESoft SuperApp version 1.5</i>\").",
+  "bitstream.edit.form.newFormat.hint": "Aplikace, kterou jste použili k vytvoření souboru, a číslo verze (například \"<i>ACMESoft SuperApp verze 1.5</i>\").",
 
-  // "bitstream.edit.form.primaryBitstream.label": "Primary bitstream",
-  // TODO New key - Add a translation
-  "bitstream.edit.form.primaryBitstream.label": "Primary bitstream",
+  // "bitstream.edit.form.primaryBitstream.label": "Primary File",
+  "bitstream.edit.form.primaryBitstream.label": "Primární soubor",
 
   // "bitstream.edit.form.selectedFormat.hint": "If the format is not in the above list, <b>select \"format not in list\" above</b> and describe it under \"Describe new format\".",
-  // TODO New key - Add a translation
-  "bitstream.edit.form.selectedFormat.hint": "If the format is not in the above list, <b>select \"format not in list\" above</b> and describe it under \"Describe new format\".",
+  "bitstream.edit.form.selectedFormat.hint": "Pokud formát není ve výše uvedeném seznamu, <b>vyberte \"format not in list\" výše</b> a popište v části \"Describe new format\".",
 
   // "bitstream.edit.form.selectedFormat.label": "Selected Format",
-  // TODO New key - Add a translation
-  "bitstream.edit.form.selectedFormat.label": "Selected Format",
+  "bitstream.edit.form.selectedFormat.label": "Vybraný formát",
 
   // "bitstream.edit.form.selectedFormat.unknown": "Format not in list",
-  // TODO New key - Add a translation
-  "bitstream.edit.form.selectedFormat.unknown": "Format not in list",
+  "bitstream.edit.form.selectedFormat.unknown": "Formát není v seznamu",
 
   // "bitstream.edit.notifications.error.format.title": "An error occurred saving the bitstream's format",
-  // TODO New key - Add a translation
-  "bitstream.edit.notifications.error.format.title": "An error occurred saving the bitstream's format",
+  "bitstream.edit.notifications.error.format.title": "Došlo k chybě při ukládání formátu bitového toku",
+
+  // "bitstream.edit.notifications.error.primaryBitstream.title": "An error occurred saving the primary bitstream",
+  "bitstream.edit.notifications.error.primaryBitstream.title": "Při ukládání primárního datového toku došlo k chybě",
+
+  // "bitstream.edit.form.iiifLabel.label": "IIIF Label",
+  "bitstream.edit.form.iiifLabel.label": "IIIF štítek",
+
+  // "bitstream.edit.form.iiifLabel.hint": "Canvas label for this image. If not provided default label will be used.",
+  "bitstream.edit.form.iiifLabel.hint": "Canvas štítek pro tento obrázek. Pokud nebude zadán, bude využit přednastavený štítek.",
+
+  // "bitstream.edit.form.iiifToc.label": "IIIF Table of Contents",
+  "bitstream.edit.form.iiifToc.label": "IIIF obsah",
+
+  // "bitstream.edit.form.iiifToc.hint": "Adding text here makes this the start of a new table of contents range.",
+  "bitstream.edit.form.iiifToc.hint": "Přidáním textu na toto místo se vytvoří začátek nového rozsahu obsahu.",
+
+  // "bitstream.edit.form.iiifWidth.label": "IIIF Canvas Width",
+  "bitstream.edit.form.iiifWidth.label": "IIIF šířka plátna",
+
+  // "bitstream.edit.form.iiifWidth.hint": "The canvas width should usually match the image width.",
+  "bitstream.edit.form.iiifWidth.hint": "Šířka plátna by obvykle měla odpovídat šířce obrázku.",
+
+  // "bitstream.edit.form.iiifHeight.label": "IIIF Canvas Height",
+  "bitstream.edit.form.iiifHeight.label": "IIIF výška plátna",
+
+  // "bitstream.edit.form.iiifHeight.hint": "The canvas height should usually match the image height.",
+  "bitstream.edit.form.iiifHeight.hint": "Výška plátna by obvykle měla odpovídat výšce obrázku.",
 
   // "bitstream.edit.notifications.saved.content": "Your changes to this bitstream were saved.",
-  // TODO New key - Add a translation
-  "bitstream.edit.notifications.saved.content": "Your changes to this bitstream were saved.",
+  "bitstream.edit.notifications.saved.content": "Vaše změny v tomto souboru byly uloženy.",
 
   // "bitstream.edit.notifications.saved.title": "Bitstream saved",
-  // TODO New key - Add a translation
-  "bitstream.edit.notifications.saved.title": "Bitstream saved",
+  "bitstream.edit.notifications.saved.title": "Soubor uložen",
 
   // "bitstream.edit.title": "Edit bitstream",
-  // TODO New key - Add a translation
-  "bitstream.edit.title": "Edit bitstream",
+  "bitstream.edit.title": "Upravit soubor",
 
+  // "bitstream-request-a-copy.alert.canDownload1": "You already have access to this file. If you want to download the file, click ",
+  "bitstream-request-a-copy.alert.canDownload1": "K tomuto souboru již máte přístup. Pokud chcete soubor stáhnout, klikněte zde",
 
+  // "bitstream-request-a-copy.alert.canDownload2": "here",
+  "bitstream-request-a-copy.alert.canDownload2": "zde",
+
+  // "bitstream-request-a-copy.header": "Request a copy of the file",
+  "bitstream-request-a-copy.header": "Vyžádat si kopii souboru",
+
+  // "bitstream-request-a-copy.intro": "Enter the following information to request a copy for the following item: ",
+  "bitstream-request-a-copy.intro": "Zadejte následující informace, abyste si vyžádali kopii následující záznamy: ",
+
+  // "bitstream-request-a-copy.intro.bitstream.one": "Requesting the following file: ",
+  "bitstream-request-a-copy.intro.bitstream.one": "Žádám o kopii následujícího souboru: ",
+
+  // "bitstream-request-a-copy.intro.bitstream.all": "Requesting all files. ",
+  "bitstream-request-a-copy.intro.bitstream.all": "Žádám o všechny soubory. ",
+
+  // "bitstream-request-a-copy.name.label": "Name *",
+  "bitstream-request-a-copy.name.label": "Název *",
+
+  // "bitstream-request-a-copy.name.error": "The name is required",
+  "bitstream-request-a-copy.name.error": "Název je vyžadován",
+
+  // "bitstream-request-a-copy.email.label": "Your email address *",
+  "bitstream-request-a-copy.email.label": "Vaše e-mailová adresa *",
+
+  // "bitstream-request-a-copy.email.hint": "This email address is used for sending the file.",
+  "bitstream-request-a-copy.email.hint": "Tato e-mailová adresa se používá pro odeslání souboru.",
+
+  // "bitstream-request-a-copy.email.error": "Please enter a valid email address.",
+  "bitstream-request-a-copy.email.error": "Zadejte prosím platnou e-mailovou adresu.",
+
+  // "bitstream-request-a-copy.allfiles.label": "Files",
+  "bitstream-request-a-copy.allfiles.label": "Soubory",
+
+  // "bitstream-request-a-copy.files-all-false.label": "Only the requested file",
+  "bitstream-request-a-copy.files-all-false.label": "Pouze požadovaný soubor",
+
+  // "bitstream-request-a-copy.files-all-true.label": "All files (of this item) in restricted access",
+  "bitstream-request-a-copy.files-all-true.label": "Všechny soubory (tohoto záznamu) v omezeném přístupu",
+
+  // "bitstream-request-a-copy.message.label": "Message",
+  "bitstream-request-a-copy.message.label": "Zpráva",
+
+  // "bitstream-request-a-copy.return": "Back",
+  "bitstream-request-a-copy.return": "Zpět",
+
+  // "bitstream-request-a-copy.submit": "Request copy",
+  "bitstream-request-a-copy.submit": "Žádost o kopii",
+
+  // "bitstream-request-a-copy.submit.success": "The item request was submitted successfully.",
+  "bitstream-request-a-copy.submit.success": "Požadavek na záznam byl úspěšně odeslán.",
+
+  // "bitstream-request-a-copy.submit.error": "Something went wrong with submitting the item request.",
+  "bitstream-request-a-copy.submit.error": "Něco se pokazilo při odesílání požadavku na záznam.",
+
+  // "browse.back.all-results": "All browse results",
+  "browse.back.all-results": "Všechny výsledky procházení",
 
   // "browse.comcol.by.author": "By Author",
-  // TODO New key - Add a translation
-  "browse.comcol.by.author": "By Author",
+  "browse.comcol.by.author": "Podle autora",
 
   // "browse.comcol.by.dateissued": "By Issue Date",
-  // TODO New key - Add a translation
-  "browse.comcol.by.dateissued": "By Issue Date",
+  "browse.comcol.by.dateissued": "Podle data vydání",
 
   // "browse.comcol.by.subject": "By Subject",
+  "browse.comcol.by.subject": "Podle předmětu",
+
+  // "browse.comcol.by.srsc": "By Subject Category",
+  "browse.comcol.by.srsc": "Podle předmětu",
+
+  // "browse.comcol.by.nsi": "By Norwegian Science Index",
   // TODO New key - Add a translation
-  "browse.comcol.by.subject": "By Subject",
+  "browse.comcol.by.nsi": "By Norwegian Science Index",
 
   // "browse.comcol.by.title": "By Title",
-  // TODO New key - Add a translation
-  "browse.comcol.by.title": "By Title",
+  "browse.comcol.by.title": "Podle názvu",
 
   // "browse.comcol.head": "Browse",
-  // TODO New key - Add a translation
-  "browse.comcol.head": "Browse",
+  "browse.comcol.head": "Procházet",
 
   // "browse.empty": "No items to show.",
-  // TODO New key - Add a translation
-  "browse.empty": "No items to show.",
+  "browse.empty": "Žádné záznamy k zobrazení",
 
   // "browse.metadata.author": "Author",
-  // TODO New key - Add a translation
-  "browse.metadata.author": "Author",
+  "browse.metadata.author": "Autor",
 
   // "browse.metadata.dateissued": "Issue Date",
-  // TODO New key - Add a translation
-  "browse.metadata.dateissued": "Issue Date",
+  "browse.metadata.dateissued": "Datum vydání",
 
   // "browse.metadata.subject": "Subject",
-  // TODO New key - Add a translation
-  "browse.metadata.subject": "Subject",
+  "browse.metadata.subject": "Předmět",
 
   // "browse.metadata.title": "Title",
+  "browse.metadata.title": "Název",
+
+  // "browse.metadata.srsc": "Subject Category",
   // TODO New key - Add a translation
-  "browse.metadata.title": "Title",
+  "browse.metadata.srsc": "Subject Category",
 
   // "browse.metadata.author.breadcrumbs": "Browse by Author",
-  // TODO New key - Add a translation
-  "browse.metadata.author.breadcrumbs": "Browse by Author",
+  "browse.metadata.author.breadcrumbs": "Procházet podle autora",
 
   // "browse.metadata.dateissued.breadcrumbs": "Browse by Date",
-  // TODO New key - Add a translation
-  "browse.metadata.dateissued.breadcrumbs": "Browse by Date",
+  "browse.metadata.dateissued.breadcrumbs": "Procházet podle data vydání",
 
   // "browse.metadata.subject.breadcrumbs": "Browse by Subject",
+  "browse.metadata.subject.breadcrumbs": "Procházet podle předmětu",
+
+  // "browse.metadata.srsc.breadcrumbs": "Browse by Subject Category",
+  "browse.metadata.srsc.breadcrumbs": "Procházet podle předmětu",
+
+  // "browse.metadata.nsi.breadcrumbs": "Browse by Norwegian Science Index",
   // TODO New key - Add a translation
-  "browse.metadata.subject.breadcrumbs": "Browse by Subject",
+  "browse.metadata.nsi.breadcrumbs": "Browse by Norwegian Science Index",
 
   // "browse.metadata.title.breadcrumbs": "Browse by Title",
-  // TODO New key - Add a translation
-  "browse.metadata.title.breadcrumbs": "Browse by Title",
+  "browse.metadata.title.breadcrumbs": "Procházet podle názvu",
+
+  // "pagination.next.button": "Next",
+  "pagination.next.button": "Další",
+
+  // "pagination.previous.button": "Previous",
+  "pagination.previous.button": "Předchozí",
+
+  // "pagination.next.button.disabled.tooltip": "No more pages of results",
+  "pagination.next.button.disabled.tooltip": "Žádné další stránky výsledků",
+
+  // "browse.startsWith": ", starting with {{ startsWith }}",
+  "browse.startsWith": ", začíná na {{ startsWith }}",
 
   // "browse.startsWith.choose_start": "(Choose start)",
-  // TODO New key - Add a translation
-  "browse.startsWith.choose_start": "(Choose start)",
+  "browse.startsWith.choose_start": "(Vyberte, na co začíná)",
 
   // "browse.startsWith.choose_year": "(Choose year)",
-  // TODO New key - Add a translation
-  "browse.startsWith.choose_year": "(Choose year)",
+  "browse.startsWith.choose_year": "(Vyberte rok)",
 
-  // "browse.startsWith.jump": "Jump to a point in the index:",
-  // TODO New key - Add a translation
-  "browse.startsWith.jump": "Jump to a point in the index:",
+  // "browse.startsWith.choose_year.label": "Choose the issue year",
+  "browse.startsWith.choose_year.label": "Vyberte rok vydání",
+
+  // "browse.startsWith.jump": "Filter results by year or month",
+  // TODO Source message changed - Revise the translation
+  "browse.startsWith.jump": "Filtrovat výsledky podle roku nebo měsíce",
 
   // "browse.startsWith.months.april": "April",
-  // TODO New key - Add a translation
-  "browse.startsWith.months.april": "April",
+  "browse.startsWith.months.april": "Duben",
 
   // "browse.startsWith.months.august": "August",
-  // TODO New key - Add a translation
-  "browse.startsWith.months.august": "August",
+  "browse.startsWith.months.august": "Srpen",
 
   // "browse.startsWith.months.december": "December",
-  // TODO New key - Add a translation
-  "browse.startsWith.months.december": "December",
+  "browse.startsWith.months.december": "Prosinec",
 
   // "browse.startsWith.months.february": "February",
-  // TODO New key - Add a translation
-  "browse.startsWith.months.february": "February",
+  "browse.startsWith.months.february": "Únor",
 
   // "browse.startsWith.months.january": "January",
-  // TODO New key - Add a translation
-  "browse.startsWith.months.january": "January",
+  "browse.startsWith.months.january": "Leden",
 
   // "browse.startsWith.months.july": "July",
-  // TODO New key - Add a translation
-  "browse.startsWith.months.july": "July",
+  "browse.startsWith.months.july": "Červenec",
 
   // "browse.startsWith.months.june": "June",
-  // TODO New key - Add a translation
-  "browse.startsWith.months.june": "June",
+  "browse.startsWith.months.june": "Červen",
 
   // "browse.startsWith.months.march": "March",
-  // TODO New key - Add a translation
-  "browse.startsWith.months.march": "March",
+  "browse.startsWith.months.march": "Březen",
 
   // "browse.startsWith.months.may": "May",
-  // TODO New key - Add a translation
-  "browse.startsWith.months.may": "May",
+  "browse.startsWith.months.may": "Květen",
 
   // "browse.startsWith.months.none": "(Choose month)",
-  // TODO New key - Add a translation
-  "browse.startsWith.months.none": "(Choose month)",
+  "browse.startsWith.months.none": "(Vyberte měsíc)",
+
+  // "browse.startsWith.months.none.label": "Choose the issue month",
+  "browse.startsWith.months.none.label": "Vyberte měsíc vydání",
 
   // "browse.startsWith.months.november": "November",
-  // TODO New key - Add a translation
-  "browse.startsWith.months.november": "November",
+  "browse.startsWith.months.november": "Listopad",
 
   // "browse.startsWith.months.october": "October",
-  // TODO New key - Add a translation
-  "browse.startsWith.months.october": "October",
+  "browse.startsWith.months.october": "Říjen",
 
   // "browse.startsWith.months.september": "September",
-  // TODO New key - Add a translation
-  "browse.startsWith.months.september": "September",
+  "browse.startsWith.months.september": "Září",
 
-  // "browse.startsWith.submit": "Go",
-  // TODO New key - Add a translation
-  "browse.startsWith.submit": "Go",
+  // "browse.startsWith.submit": "Browse",
+  // TODO Source message changed - Revise the translation
+  "browse.startsWith.submit": "Procházet",
 
-  // "browse.startsWith.type_date": "Or type in a date (year-month):",
-  // TODO New key - Add a translation
-  "browse.startsWith.type_date": "Or type in a date (year-month):",
+  // "browse.startsWith.type_date": "Filter results by date",
+  // TODO Source message changed - Revise the translation
+  "browse.startsWith.type_date": "Filtrovat výsledky podle data",
 
-  // "browse.startsWith.type_text": "Or enter first few letters:",
-  // TODO New key - Add a translation
-  "browse.startsWith.type_text": "Or enter first few letters:",
+  // "browse.startsWith.type_date.label": "Or type in a date (year-month) and click on the Browse button",
+  "browse.startsWith.type_date.label": "Nebo zadejte datum (rok-měsíc) a klikněte na tlačítko Procházet",
 
-  // "browse.title": "Browsing {{ collection }} by {{ field }} {{ value }}",
-  "browse.title": "Prohlížíte {{ collection }} dle {{ field }} {{ value }}",
+  // "browse.startsWith.type_text": "Filter results by typing the first few letters",
+  // TODO Source message changed - Revise the translation
+  "browse.startsWith.type_text": "Filtrovat výsledky zadáním několika prvních písmen",
 
+  // "browse.startsWith.input": "Filter",
+  "browse.startsWith.input": "Filtrovat",
+
+  // "browse.taxonomy.button": "Browse",
+  "browse.taxonomy.button": "Procházet",
+
+  // "browse.title": "Browsing by {{ field }}{{ startsWith }} {{ value }}",
+  // TODO Source message changed - Revise the translation
+  "browse.title": "Procházet {{ collection }} podle {{ field }}{{ startsWith }} {{ value }}",
+
+  // "browse.title.page": "Browsing by {{ field }} {{ value }}",
+  "browse.title.page": "Procházet {{ collection }} podle {{ field }}. {{ value }}",
+
+  // "search.browse.item-back": "Back to Results",
+  "search.browse.item-back": "Zpět na seznam výsledků",
 
   // "chips.remove": "Remove chip",
+  "chips.remove": "Odstranit chip",
+
+  // "claimed-approved-search-result-list-element.title": "Approved",
+  "claimed-approved-search-result-list-element.title": "Schváleno",
+
+  // "claimed-declined-search-result-list-element.title": "Rejected, sent back to submitter",
+  "claimed-declined-search-result-list-element.title": "Zamítnuto, posláno zpět odesílateli",
+
+  // "claimed-declined-task-search-result-list-element.title": "Declined, sent back to Review Manager's workflow",
+  "claimed-declined-task-search-result-list-element.title": "Zamítnuto, posláno zpět správci schvalovacího workflow",
+
+  // "collection.create.breadcrumbs": "Create collection",
   // TODO New key - Add a translation
-  "chips.remove": "Remove chip",
-
+  "collection.create.breadcrumbs": "Create collection",
 
+  // "collection.browse.logo": "Browse for a collection logo",
+  // TODO New key - Add a translation
+  "collection.browse.logo": "Browse for a collection logo",
 
   // "collection.create.head": "Create a Collection",
-  // TODO New key - Add a translation
-  "collection.create.head": "Create a Collection",
+  "collection.create.head": "Vytvořit kolekci",
 
   // "collection.create.notifications.success": "Successfully created the Collection",
-  // TODO New key - Add a translation
-  "collection.create.notifications.success": "Successfully created the Collection",
+  "collection.create.notifications.success": "Úspěšně vytvořena kolekce",
 
   // "collection.create.sub-head": "Create a Collection for Community {{ parent }}",
-  // TODO New key - Add a translation
-  "collection.create.sub-head": "Create a Collection for Community {{ parent }}",
+  "collection.create.sub-head": "Vytvořit kolekci pro komunitu {{ parent }}",
 
   // "collection.curate.header": "Curate Collection: {{collection}}",
-  // TODO New key - Add a translation
-  "collection.curate.header": "Curate Collection: {{collection}}",
+  "collection.curate.header": "Spravovat kolekci: {{collection}}",
 
   // "collection.delete.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "collection.delete.cancel": "Cancel",
+  "collection.delete.cancel": "Zrušit",
 
   // "collection.delete.confirm": "Confirm",
-  // TODO New key - Add a translation
-  "collection.delete.confirm": "Confirm",
+  "collection.delete.confirm": "Potvrdit",
+
+  // "collection.delete.processing": "Deleting",
+  "collection.delete.processing": "Odstranit",
 
   // "collection.delete.head": "Delete Collection",
-  // TODO New key - Add a translation
-  "collection.delete.head": "Delete Collection",
+  "collection.delete.head": "Odstranit kolekci",
 
   // "collection.delete.notification.fail": "Collection could not be deleted",
-  // TODO New key - Add a translation
-  "collection.delete.notification.fail": "Collection could not be deleted",
+  "collection.delete.notification.fail": "Kolekce nemůže být odstraněna",
 
   // "collection.delete.notification.success": "Successfully deleted collection",
-  // TODO New key - Add a translation
-  "collection.delete.notification.success": "Successfully deleted collection",
+  "collection.delete.notification.success": "Kolekce byla úspěšně odstraněna",
 
   // "collection.delete.text": "Are you sure you want to delete collection \"{{ dso }}\"",
-  // TODO New key - Add a translation
-  "collection.delete.text": "Are you sure you want to delete collection \"{{ dso }}\"",
-
-
+  "collection.delete.text": "Určitě chcete odstranit kolekci \"{{ dso }}\"",
 
   // "collection.edit.delete": "Delete this collection",
-  // TODO New key - Add a translation
-  "collection.edit.delete": "Delete this collection",
+  "collection.edit.delete": "Smazat tuto kolekci",
 
   // "collection.edit.head": "Edit Collection",
-  // TODO New key - Add a translation
-  "collection.edit.head": "Edit Collection",
+  "collection.edit.head": "Upravit kolekci",
 
   // "collection.edit.breadcrumbs": "Edit Collection",
-  // TODO New key - Add a translation
-  "collection.edit.breadcrumbs": "Edit Collection",
-
-
+  "collection.edit.breadcrumbs": "Upravit kolekci",
 
   // "collection.edit.tabs.mapper.head": "Item Mapper",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.mapper.head": "Item Mapper",
+  "collection.edit.tabs.mapper.head": "Mapování do kolekce",
 
   // "collection.edit.tabs.item-mapper.title": "Collection Edit - Item Mapper",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.item-mapper.title": "Collection Edit - Item Mapper",
+  "collection.edit.tabs.item-mapper.title": "Upravit kolekci - Mapování do kolekce",
 
   // "collection.edit.item-mapper.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "collection.edit.item-mapper.cancel": "Cancel",
+  "collection.edit.item-mapper.cancel": "Zrušit",
 
   // "collection.edit.item-mapper.collection": "Collection: \"<b>{{name}}</b>\"",
-  // TODO New key - Add a translation
-  "collection.edit.item-mapper.collection": "Collection: \"<b>{{name}}</b>\"",
+  "collection.edit.item-mapper.collection": "Kolekce: \"<b>{{name}}</b>\"",
 
   // "collection.edit.item-mapper.confirm": "Map selected items",
-  // TODO New key - Add a translation
-  "collection.edit.item-mapper.confirm": "Map selected items",
+  "collection.edit.item-mapper.confirm": "Mapovat vybrané záznamy",
 
   // "collection.edit.item-mapper.description": "This is the item mapper tool that allows collection administrators to map items from other collections into this collection. You can search for items from other collections and map them, or browse the list of currently mapped items.",
-  // TODO New key - Add a translation
-  "collection.edit.item-mapper.description": "This is the item mapper tool that allows collection administrators to map items from other collections into this collection. You can search for items from other collections and map them, or browse the list of currently mapped items.",
+  "collection.edit.item-mapper.description": "Toto je nástroj mapování záznamů, který umožňuje správcům kolekcí mapovat záznamy z jiných kolekcí do této kolekce. Můžete vyhledávat záznamy z jiných kolekcí a mapovat je nebo procházet seznam aktuálně mapovaných záznamů.",
 
   // "collection.edit.item-mapper.head": "Item Mapper - Map Items from Other Collections",
-  // TODO New key - Add a translation
-  "collection.edit.item-mapper.head": "Item Mapper - Map Items from Other Collections",
+  "collection.edit.item-mapper.head": "Mapování do kolekce - Mapování záznamů z jiných kolekcí",
 
   // "collection.edit.item-mapper.no-search": "Please enter a query to search",
-  // TODO New key - Add a translation
-  "collection.edit.item-mapper.no-search": "Please enter a query to search",
+  "collection.edit.item-mapper.no-search": "Zadejte prosím dotaz pro vyhledávání",
 
   // "collection.edit.item-mapper.notifications.map.error.content": "Errors occurred for mapping of {{amount}} items.",
-  // TODO New key - Add a translation
-  "collection.edit.item-mapper.notifications.map.error.content": "Errors occurred for mapping of {{amount}} items.",
+  "collection.edit.item-mapper.notifications.map.error.content": "Při mapování {{amount}} záznamů došlo k chybám.",
 
   // "collection.edit.item-mapper.notifications.map.error.head": "Mapping errors",
-  // TODO New key - Add a translation
-  "collection.edit.item-mapper.notifications.map.error.head": "Mapping errors",
+  "collection.edit.item-mapper.notifications.map.error.head": "Chyba při mapování",
 
   // "collection.edit.item-mapper.notifications.map.success.content": "Successfully mapped {{amount}} items.",
-  // TODO New key - Add a translation
-  "collection.edit.item-mapper.notifications.map.success.content": "Successfully mapped {{amount}} items.",
+  "collection.edit.item-mapper.notifications.map.success.content": "Úspěšně namapováno {{amount}} záznamů.",
 
   // "collection.edit.item-mapper.notifications.map.success.head": "Mapping completed",
-  // TODO New key - Add a translation
-  "collection.edit.item-mapper.notifications.map.success.head": "Mapping completed",
+  "collection.edit.item-mapper.notifications.map.success.head": "Mapování dokončeno",
 
   // "collection.edit.item-mapper.notifications.unmap.error.content": "Errors occurred for removing the mappings of {{amount}} items.",
-  // TODO New key - Add a translation
-  "collection.edit.item-mapper.notifications.unmap.error.content": "Errors occurred for removing the mappings of {{amount}} items.",
+  "collection.edit.item-mapper.notifications.unmap.error.content": "Při odstraňování mapování {{amount}} záznamů došlo k chybám.",
 
   // "collection.edit.item-mapper.notifications.unmap.error.head": "Remove mapping errors",
-  // TODO New key - Add a translation
-  "collection.edit.item-mapper.notifications.unmap.error.head": "Remove mapping errors",
+  "collection.edit.item-mapper.notifications.unmap.error.head": "Chyba při odstraňování mapování",
 
   // "collection.edit.item-mapper.notifications.unmap.success.content": "Successfully removed the mappings of {{amount}} items.",
-  // TODO New key - Add a translation
-  "collection.edit.item-mapper.notifications.unmap.success.content": "Successfully removed the mappings of {{amount}} items.",
+  "collection.edit.item-mapper.notifications.unmap.success.content": "Úspěšně odstraněno mapování {{amount}} záznamů.",
 
   // "collection.edit.item-mapper.notifications.unmap.success.head": "Remove mapping completed",
-  // TODO New key - Add a translation
-  "collection.edit.item-mapper.notifications.unmap.success.head": "Remove mapping completed",
+  "collection.edit.item-mapper.notifications.unmap.success.head": "Odstranění mapování dokončeno",
 
   // "collection.edit.item-mapper.remove": "Remove selected item mappings",
-  // TODO New key - Add a translation
-  "collection.edit.item-mapper.remove": "Remove selected item mappings",
+  "collection.edit.item-mapper.remove": "Odstranit vybrané mapování záznamů",
+
+  // "collection.edit.item-mapper.search-form.placeholder": "Search items...",
+  "collection.edit.item-mapper.search-form.placeholder": "Hledat záznamy...",
 
   // "collection.edit.item-mapper.tabs.browse": "Browse mapped items",
-  // TODO New key - Add a translation
-  "collection.edit.item-mapper.tabs.browse": "Browse mapped items",
+  "collection.edit.item-mapper.tabs.browse": "Procházet mapované záznamy",
 
   // "collection.edit.item-mapper.tabs.map": "Map new items",
-  // TODO New key - Add a translation
-  "collection.edit.item-mapper.tabs.map": "Map new items",
+  "collection.edit.item-mapper.tabs.map": "Mapovat nové záznamy",
 
+  // "collection.edit.logo.delete.title": "Delete logo",
+  "collection.edit.logo.delete.title": "Smazat logo",
 
+  // "collection.edit.logo.delete-undo.title": "Undo delete",
+  "collection.edit.logo.delete-undo.title": "Zrušit odstranění",
 
   // "collection.edit.logo.label": "Collection logo",
-  // TODO New key - Add a translation
-  "collection.edit.logo.label": "Collection logo",
+  "collection.edit.logo.label": "Logo kolekce",
 
   // "collection.edit.logo.notifications.add.error": "Uploading Collection logo failed. Please verify the content before retrying.",
-  // TODO New key - Add a translation
-  "collection.edit.logo.notifications.add.error": "Uploading Collection logo failed. Please verify the content before retrying.",
+  "collection.edit.logo.notifications.add.error": "Nahrání loga kolekce se nezdařilo. Před dalším pokusem ověřte obsah.",
 
   // "collection.edit.logo.notifications.add.success": "Upload Collection logo successful.",
-  // TODO New key - Add a translation
-  "collection.edit.logo.notifications.add.success": "Upload Collection logo successful.",
+  "collection.edit.logo.notifications.add.success": "Nahrání loga kolekce proběhlo úspěšně.",
 
   // "collection.edit.logo.notifications.delete.success.title": "Logo deleted",
-  // TODO New key - Add a translation
-  "collection.edit.logo.notifications.delete.success.title": "Logo deleted",
+  "collection.edit.logo.notifications.delete.success.title": "Logo smazáno",
 
   // "collection.edit.logo.notifications.delete.success.content": "Successfully deleted the collection's logo",
-  // TODO New key - Add a translation
-  "collection.edit.logo.notifications.delete.success.content": "Successfully deleted the collection's logo",
+  "collection.edit.logo.notifications.delete.success.content": "Úspěšně odstraněno logo kolekce",
 
   // "collection.edit.logo.notifications.delete.error.title": "Error deleting logo",
-  // TODO New key - Add a translation
-  "collection.edit.logo.notifications.delete.error.title": "Error deleting logo",
+  "collection.edit.logo.notifications.delete.error.title": "Chyba při mazání loga",
 
   // "collection.edit.logo.upload": "Drop a Collection Logo to upload",
-  // TODO New key - Add a translation
-  "collection.edit.logo.upload": "Drop a Collection Logo to upload",
-
-
+  "collection.edit.logo.upload": "Odstranit logo kolekce k nahrání",
 
   // "collection.edit.notifications.success": "Successfully edited the Collection",
-  // TODO New key - Add a translation
-  "collection.edit.notifications.success": "Successfully edited the Collection",
+  "collection.edit.notifications.success": "Úspěšně upravena kolekce",
 
-  // "collection.edit.return": "Return",
-  // TODO New key - Add a translation
-  "collection.edit.return": "Return",
+  // "collection.edit.return": "Back",
+  // TODO Source message changed - Revise the translation
+  "collection.edit.return": "Zpět",
 
+  // "collection.edit.tabs.access-control.head": "Access Control",
+  "collection.edit.tabs.access-control.head": "Řízení přístupu",
 
+  // "collection.edit.tabs.access-control.title": "Collection Edit - Access Control",
+  "collection.edit.tabs.access-control.title": "Úprava kolekce - Řízení přístupu",
 
   // "collection.edit.tabs.curate.head": "Curate",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.curate.head": "Curate",
+  "collection.edit.tabs.curate.head": "Spravovat",
 
   // "collection.edit.tabs.curate.title": "Collection Edit - Curate",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.curate.title": "Collection Edit - Curate",
+  "collection.edit.tabs.curate.title": "Upravit kolekci - správa",
 
   // "collection.edit.tabs.authorizations.head": "Authorizations",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.authorizations.head": "Authorizations",
+  "collection.edit.tabs.authorizations.head": "Oprávnění",
 
   // "collection.edit.tabs.authorizations.title": "Collection Edit - Authorizations",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.authorizations.title": "Collection Edit - Authorizations",
+  "collection.edit.tabs.authorizations.title": "Upravit kolekci - Oprávnění",
+
+  // "collection.edit.item.authorizations.load-bundle-button": "Load more bundles",
+  "collection.edit.item.authorizations.load-bundle-button": "Načíst další svazky",
+
+  // "collection.edit.item.authorizations.load-more-button": "Load more",
+  "collection.edit.item.authorizations.load-more-button": "Načíst další",
+
+  // "collection.edit.item.authorizations.show-bitstreams-button": "Show bitstream policies for bundle",
+  "collection.edit.item.authorizations.show-bitstreams-button": "Zobrazit politiky souboru pro svazek",
 
   // "collection.edit.tabs.metadata.head": "Edit Metadata",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.metadata.head": "Edit Metadata",
+  "collection.edit.tabs.metadata.head": "Upravit metadata",
 
   // "collection.edit.tabs.metadata.title": "Collection Edit - Metadata",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.metadata.title": "Collection Edit - Metadata",
+  "collection.edit.tabs.metadata.title": "Upravit kolekci - Metadata",
 
   // "collection.edit.tabs.roles.head": "Assign Roles",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.roles.head": "Assign Roles",
+  "collection.edit.tabs.roles.head": "Přidělit role",
 
   // "collection.edit.tabs.roles.title": "Collection Edit - Roles",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.roles.title": "Collection Edit - Roles",
+  "collection.edit.tabs.roles.title": "Upravit kolekci - Role",
 
   // "collection.edit.tabs.source.external": "This collection harvests its content from an external source",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.source.external": "This collection harvests its content from an external source",
+  "collection.edit.tabs.source.external": "Tato kolekce získává svůj obsah z externího zdroje",
 
   // "collection.edit.tabs.source.form.errors.oaiSource.required": "You must provide a set id of the target collection.",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.source.form.errors.oaiSource.required": "You must provide a set id of the target collection.",
+  "collection.edit.tabs.source.form.errors.oaiSource.required": "Musíte zadat id cílové kolekce.",
 
   // "collection.edit.tabs.source.form.harvestType": "Content being harvested",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.source.form.harvestType": "Content being harvested",
+  "collection.edit.tabs.source.form.harvestType": "Harvestování obsahu",
 
   // "collection.edit.tabs.source.form.head": "Configure an external source",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.source.form.head": "Configure an external source",
+  "collection.edit.tabs.source.form.head": "Konfigurace externího zdroje",
 
   // "collection.edit.tabs.source.form.metadataConfigId": "Metadata Format",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.source.form.metadataConfigId": "Metadata Format",
+  "collection.edit.tabs.source.form.metadataConfigId": "Formát metadat",
 
   // "collection.edit.tabs.source.form.oaiSetId": "OAI specific set id",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.source.form.oaiSetId": "OAI specific set id",
+  "collection.edit.tabs.source.form.oaiSetId": "OAI ID konkrétní sady",
 
   // "collection.edit.tabs.source.form.oaiSource": "OAI Provider",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.source.form.oaiSource": "OAI Provider",
+  "collection.edit.tabs.source.form.oaiSource": "Poskytovatel OAI",
 
   // "collection.edit.tabs.source.form.options.harvestType.METADATA_AND_BITSTREAMS": "Harvest metadata and bitstreams (requires ORE support)",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.source.form.options.harvestType.METADATA_AND_BITSTREAMS": "Harvest metadata and bitstreams (requires ORE support)",
+  "collection.edit.tabs.source.form.options.harvestType.METADATA_AND_BITSTREAMS": "Sklízet metadata a soubory (vyžaduje podporu ORE)",
 
   // "collection.edit.tabs.source.form.options.harvestType.METADATA_AND_REF": "Harvest metadata and references to bitstreams (requires ORE support)",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.source.form.options.harvestType.METADATA_AND_REF": "Harvest metadata and references to bitstreams (requires ORE support)",
+  "collection.edit.tabs.source.form.options.harvestType.METADATA_AND_REF": "Sklízet metadata a odkazy na soubory (vyžaduje podporu ORE)",
 
   // "collection.edit.tabs.source.form.options.harvestType.METADATA_ONLY": "Harvest metadata only",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.source.form.options.harvestType.METADATA_ONLY": "Harvest metadata only",
+  "collection.edit.tabs.source.form.options.harvestType.METADATA_ONLY": "Sklízet pouze metadata",
 
   // "collection.edit.tabs.source.head": "Content Source",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.source.head": "Content Source",
+  "collection.edit.tabs.source.head": "Zdroj obsahu",
 
   // "collection.edit.tabs.source.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.source.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button",
+  "collection.edit.tabs.source.notifications.discarded.content": "Vaše změny byly zahozeny. Pro obnovení změn klikněte na tlačítko 'Vrátit změny'",
 
-  // "collection.edit.tabs.source.notifications.discarded.title": "Changed discarded",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.source.notifications.discarded.title": "Changed discarded",
+  // "collection.edit.tabs.source.notifications.discarded.title": "Changes discarded",
+  // TODO Source message changed - Revise the translation
+  "collection.edit.tabs.source.notifications.discarded.title": "Změny vyřazeny",
 
   // "collection.edit.tabs.source.notifications.invalid.content": "Your changes were not saved. Please make sure all fields are valid before you save.",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.source.notifications.invalid.content": "Your changes were not saved. Please make sure all fields are valid before you save.",
+  "collection.edit.tabs.source.notifications.invalid.content": "Vaše změny nebyly uloženy. Před uložením se prosím ujistěte, že jsou všechna pole platná.",
 
   // "collection.edit.tabs.source.notifications.invalid.title": "Metadata invalid",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.source.notifications.invalid.title": "Metadata invalid",
+  "collection.edit.tabs.source.notifications.invalid.title": "Neplatná metadata",
 
   // "collection.edit.tabs.source.notifications.saved.content": "Your changes to this collection's content source were saved.",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.source.notifications.saved.content": "Your changes to this collection's content source were saved.",
+  "collection.edit.tabs.source.notifications.saved.content": "Vaše změny ve zdroji obsahu této kolekce byly uloženy.",
 
   // "collection.edit.tabs.source.notifications.saved.title": "Content Source saved",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.source.notifications.saved.title": "Content Source saved",
+  "collection.edit.tabs.source.notifications.saved.title": "Zdroj obsahu uložen",
 
   // "collection.edit.tabs.source.title": "Collection Edit - Content Source",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.source.title": "Collection Edit - Content Source",
-
-
+  "collection.edit.tabs.source.title": "Úprava kolekce - zdroj obsahu",
 
   // "collection.edit.template.add-button": "Add",
-  // TODO New key - Add a translation
-  "collection.edit.template.add-button": "Add",
+  "collection.edit.template.add-button": "Přidat",
 
   // "collection.edit.template.breadcrumbs": "Item template",
-  // TODO New key - Add a translation
-  "collection.edit.template.breadcrumbs": "Item template",
+  "collection.edit.template.breadcrumbs": "Šablona záznamu",
 
   // "collection.edit.template.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "collection.edit.template.cancel": "Cancel",
+  "collection.edit.template.cancel": "Zrušit",
 
   // "collection.edit.template.delete-button": "Delete",
-  // TODO New key - Add a translation
-  "collection.edit.template.delete-button": "Delete",
+  "collection.edit.template.delete-button": "Odstranit",
 
   // "collection.edit.template.edit-button": "Edit",
-  // TODO New key - Add a translation
-  "collection.edit.template.edit-button": "Edit",
+  "collection.edit.template.edit-button": "Upravit",
+
+  // "collection.edit.template.error": "An error occurred retrieving the template item",
+  "collection.edit.template.error": "Při načítání šablony pro záznam došlo k chybě",
 
   // "collection.edit.template.head": "Edit Template Item for Collection \"{{ collection }}\"",
-  // TODO New key - Add a translation
-  "collection.edit.template.head": "Edit Template Item for Collection \"{{ collection }}\"",
+  "collection.edit.template.head": "Upravit šablonu pro kolekci \"{{ collection }}\"",
 
   // "collection.edit.template.label": "Template item",
-  // TODO New key - Add a translation
-  "collection.edit.template.label": "Template item",
+  "collection.edit.template.label": "Šablona pro záznam",
+
+  // "collection.edit.template.loading": "Loading template item...",
+  "collection.edit.template.loading": "Načítání šablony pro záznam...",
 
   // "collection.edit.template.notifications.delete.error": "Failed to delete the item template",
-  // TODO New key - Add a translation
-  "collection.edit.template.notifications.delete.error": "Failed to delete the item template",
+  "collection.edit.template.notifications.delete.error": "Nepodařilo se odstranit šablonu pro záznam",
 
   // "collection.edit.template.notifications.delete.success": "Successfully deleted the item template",
-  // TODO New key - Add a translation
-  "collection.edit.template.notifications.delete.success": "Successfully deleted the item template",
+  "collection.edit.template.notifications.delete.success": "Úspěšně odstraněna šablona pro záznam",
 
   // "collection.edit.template.title": "Edit Template Item",
-  // TODO New key - Add a translation
-  "collection.edit.template.title": "Edit Template Item",
-
-
+  "collection.edit.template.title": "Upravit šablonu",
 
   // "collection.form.abstract": "Short Description",
-  // TODO New key - Add a translation
-  "collection.form.abstract": "Short Description",
+  "collection.form.abstract": "Krátký popis",
 
   // "collection.form.description": "Introductory text (HTML)",
-  // TODO New key - Add a translation
-  "collection.form.description": "Introductory text (HTML)",
+  "collection.form.description": "Úvodní text (HTML)",
 
   // "collection.form.errors.title.required": "Please enter a collection name",
-  // TODO New key - Add a translation
-  "collection.form.errors.title.required": "Please enter a collection name",
+  "collection.form.errors.title.required": "Zadejte prosím název kolekce",
 
   // "collection.form.license": "License",
-  // TODO New key - Add a translation
-  "collection.form.license": "License",
+  "collection.form.license": "Licence",
 
   // "collection.form.provenance": "Provenance",
-  // TODO New key - Add a translation
-  "collection.form.provenance": "Provenance",
+  "collection.form.provenance": "Původ",
 
   // "collection.form.rights": "Copyright text (HTML)",
-  // TODO New key - Add a translation
-  "collection.form.rights": "Copyright text (HTML)",
+  "collection.form.rights": "Copyright (HTML)",
 
   // "collection.form.tableofcontents": "News (HTML)",
-  // TODO New key - Add a translation
-  "collection.form.tableofcontents": "News (HTML)",
+  "collection.form.tableofcontents": "Novinky (HTML)",
 
   // "collection.form.title": "Name",
-  // TODO New key - Add a translation
-  "collection.form.title": "Name",
-
+  "collection.form.title": "Název",
 
+  // "collection.form.entityType": "Entity Type",
+  "collection.form.entityType": "Typ subjektu",
 
   // "collection.listelement.badge": "Collection",
+  "collection.listelement.badge": "Kolekce",
+
+  // "collection.logo": "Collection logo",
   // TODO New key - Add a translation
-  "collection.listelement.badge": "Collection",
+  "collection.logo": "Collection logo",
 
-
-
-  // "collection.page.browse.recent.head": "Recent Submissions",
-  "collection.page.browse.recent.head": "Poslední příspěvky",
-
-  // "collection.page.browse.recent.empty": "No items to show",
+  // "collection.page.browse.search.head": "Search",
   // TODO New key - Add a translation
-  "collection.page.browse.recent.empty": "No items to show",
+  "collection.page.browse.search.head": "Search",
 
   // "collection.page.edit": "Edit this collection",
-  // TODO New key - Add a translation
-  "collection.page.edit": "Edit this collection",
+  "collection.page.edit": "Upravit tuto kolekci",
 
   // "collection.page.handle": "Permanent URI for this collection",
-  // TODO New key - Add a translation
-  "collection.page.handle": "Permanent URI for this collection",
+  "collection.page.handle": "Permanentní URI k tomuto záznamu",
 
   // "collection.page.license": "License",
   "collection.page.license": "Licence",
@@ -1575,316 +2121,358 @@
   // "collection.page.news": "News",
   "collection.page.news": "Novinky",
 
-
+  // "collection.search.results.head": "Search Results",
+  // TODO New key - Add a translation
+  "collection.search.results.head": "Search Results",
 
   // "collection.select.confirm": "Confirm selected",
-  // TODO New key - Add a translation
-  "collection.select.confirm": "Confirm selected",
+  "collection.select.confirm": "Potvrdit vybrané",
 
   // "collection.select.empty": "No collections to show",
+  "collection.select.empty": "Žádná kolekce k zobrazení",
+
+  // "collection.select.table.selected": "Selected collections",
   // TODO New key - Add a translation
-  "collection.select.empty": "No collections to show",
+  "collection.select.table.selected": "Selected collections",
+
+  // "collection.select.table.select": "Select collection",
+  // TODO New key - Add a translation
+  "collection.select.table.select": "Select collection",
+
+  // "collection.select.table.deselect": "Deselect collection",
+  // TODO New key - Add a translation
+  "collection.select.table.deselect": "Deselect collection",
 
   // "collection.select.table.title": "Title",
-  // TODO New key - Add a translation
-  "collection.select.table.title": "Title",
+  "collection.select.table.title": "Název",
 
+  // "collection.source.controls.head": "Harvest Controls",
+  "collection.source.controls.head": "Kontroly harvestu",
 
+  // "collection.source.controls.test.submit.error": "Something went wrong with initiating the testing of the settings",
+  "collection.source.controls.test.submit.error": "Něco se pokazilo při zahájení testování nastavení",
+
+  // "collection.source.controls.test.failed": "The script to test the settings has failed",
+  "collection.source.controls.test.failed": "Skript pro testování nastavení selhal",
+
+  // "collection.source.controls.test.completed": "The script to test the settings has successfully finished",
+  "collection.source.controls.test.completed": "Skript pro testování nastavení byl úspěšně dokončen",
+
+  // "collection.source.controls.test.submit": "Test configuration",
+  "collection.source.controls.test.submit": "Test konfigurace",
+
+  // "collection.source.controls.test.running": "Testing configuration...",
+  "collection.source.controls.test.running": "Testování konfigurace...",
+
+  // "collection.source.controls.import.submit.success": "The import has been successfully initiated",
+  "collection.source.controls.import.submit.success": "Import byl úspěšně zahájen",
+
+  // "collection.source.controls.import.submit.error": "Something went wrong with initiating the import",
+  "collection.source.controls.import.submit.error": "Něco se pokazilo při zahájení importu",
+
+  // "collection.source.controls.import.submit": "Import now",
+  "collection.source.controls.import.submit": "Importovat nyní",
+
+  // "collection.source.controls.import.running": "Importing...",
+  "collection.source.controls.import.running": "Importováno...",
+
+  // "collection.source.controls.import.failed": "An error occurred during the import",
+  "collection.source.controls.import.failed": "Během importu došlo k chybě",
+
+  // "collection.source.controls.import.completed": "The import completed",
+  "collection.source.controls.import.completed": "Import byl dokončen",
+
+  // "collection.source.controls.reset.submit.success": "The reset and reimport has been successfully initiated",
+  "collection.source.controls.reset.submit.success": "Reset a opětovný import byl úspěšně zahájen",
+
+  // "collection.source.controls.reset.submit.error": "Something went wrong with initiating the reset and reimport",
+  "collection.source.controls.reset.submit.error": "Něco se pokazilo při zahájení resetu a opětovného importu",
+
+  // "collection.source.controls.reset.failed": "An error occurred during the reset and reimport",
+  "collection.source.controls.reset.failed": "Během resetování a opětovnému importu došlo k chybě",
+
+  // "collection.source.controls.reset.completed": "The reset and reimport completed",
+  "collection.source.controls.reset.completed": "Reset a opětovný import byl dokončen",
+
+  // "collection.source.controls.reset.submit": "Reset and reimport",
+  "collection.source.controls.reset.submit": "Reset a opětovný import",
+
+  // "collection.source.controls.reset.running": "Resetting and reimporting...",
+  "collection.source.controls.reset.running": "Probíhá resetování a opětovný import...",
+
+  // "collection.source.controls.harvest.status": "Harvest status:",
+  "collection.source.controls.harvest.status": "Stav harvestu:",
+
+  // "collection.source.controls.harvest.start": "Harvest start time:",
+  "collection.source.controls.harvest.start": "Čas zahájení harvestu:",
+
+  // "collection.source.controls.harvest.last": "Last time harvested:",
+  "collection.source.controls.harvest.last": "Naposledy harvestováno:",
+
+  // "collection.source.controls.harvest.message": "Harvest info:",
+  "collection.source.controls.harvest.message": "Informace o harvestu:",
+  // "collection.source.controls.harvest.no-information": "N/A",
+  "collection.source.controls.harvest.no-information": "Není k dispozi",
 
   // "collection.source.update.notifications.error.content": "The provided settings have been tested and didn't work.",
-  // TODO New key - Add a translation
-  "collection.source.update.notifications.error.content": "The provided settings have been tested and didn't work.",
+  "collection.source.update.notifications.error.content": "Zadané nastavení bylo otestováno a nefungovalo.",
 
   // "collection.source.update.notifications.error.title": "Server Error",
-  // TODO New key - Add a translation
-  "collection.source.update.notifications.error.title": "Server Error",
+  "collection.source.update.notifications.error.title": "Chyba serveru",
 
+  // "communityList.breadcrumbs": "Community List",
+  "communityList.breadcrumbs": "Seznam komunit",
 
-
-  // "communityList.tabTitle": "DSpace - Community List",
-  // TODO New key - Add a translation
-  "communityList.tabTitle": "DSpace - Community List",
+  // "communityList.tabTitle": "Community List",
+  "communityList.tabTitle": "Seznam komunit",
 
   // "communityList.title": "List of Communities",
-  // TODO New key - Add a translation
-  "communityList.title": "List of Communities",
+  "communityList.title": "Seznam komunit",
 
   // "communityList.showMore": "Show More",
+  "communityList.showMore": "Zobrazit více",
+
+  // "communityList.expand": "Expand {{ name }}",
   // TODO New key - Add a translation
-  "communityList.showMore": "Show More",
+  "communityList.expand": "Expand {{ name }}",
 
+  // "communityList.collapse": "Collapse {{ name }}",
+  // TODO New key - Add a translation
+  "communityList.collapse": "Collapse {{ name }}",
 
+  // "community.browse.logo": "Browse for a community logo",
+  // TODO New key - Add a translation
+  "community.browse.logo": "Browse for a community logo",
+
+  // "community.subcoms-cols.breadcrumbs": "Subcommunities and Collections",
+  // TODO New key - Add a translation
+  "community.subcoms-cols.breadcrumbs": "Subcommunities and Collections",
+
+  // "community.create.breadcrumbs": "Create Community",
+  // TODO New key - Add a translation
+  "community.create.breadcrumbs": "Create Community",
 
   // "community.create.head": "Create a Community",
-  // TODO New key - Add a translation
-  "community.create.head": "Create a Community",
+  "community.create.head": "Vytvořit komunitu",
 
   // "community.create.notifications.success": "Successfully created the Community",
-  // TODO New key - Add a translation
-  "community.create.notifications.success": "Successfully created the Community",
+  "community.create.notifications.success": "Úspěšně vytvořena komunita",
 
   // "community.create.sub-head": "Create a Sub-Community for Community {{ parent }}",
-  // TODO New key - Add a translation
-  "community.create.sub-head": "Create a Sub-Community for Community {{ parent }}",
+  "community.create.sub-head": "Vytvořit podkomunitu v komunitě {{ parent }}",
 
   // "community.curate.header": "Curate Community: {{community}}",
-  // TODO New key - Add a translation
-  "community.curate.header": "Curate Community: {{community}}",
+  "community.curate.header": "Spravovat komunitu: {{ community }}",
 
   // "community.delete.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "community.delete.cancel": "Cancel",
+  "community.delete.cancel": "Zrušit",
 
   // "community.delete.confirm": "Confirm",
-  // TODO New key - Add a translation
-  "community.delete.confirm": "Confirm",
+  "community.delete.confirm": "Potvrdit",
+
+  // "community.delete.processing": "Deleting...",
+  "community.delete.processing": "Probíhá odstraňování...",
 
   // "community.delete.head": "Delete Community",
-  // TODO New key - Add a translation
-  "community.delete.head": "Delete Community",
+  "community.delete.head": "Odstranit komunitu",
 
   // "community.delete.notification.fail": "Community could not be deleted",
-  // TODO New key - Add a translation
-  "community.delete.notification.fail": "Community could not be deleted",
+  "community.delete.notification.fail": "Komunita nemůže být odstraněna",
 
   // "community.delete.notification.success": "Successfully deleted community",
-  // TODO New key - Add a translation
-  "community.delete.notification.success": "Successfully deleted community",
+  "community.delete.notification.success": "Úspěšně odstraněna komunita",
 
   // "community.delete.text": "Are you sure you want to delete community \"{{ dso }}\"",
-  // TODO New key - Add a translation
-  "community.delete.text": "Are you sure you want to delete community \"{{ dso }}\"",
+  "community.delete.text": "Určitě chcete odstranit komunitu \"{{ dso }}\"",
 
   // "community.edit.delete": "Delete this community",
-  // TODO New key - Add a translation
-  "community.edit.delete": "Delete this community",
+  "community.edit.delete": "Odstranit tuto komunitu",
 
   // "community.edit.head": "Edit Community",
-  // TODO New key - Add a translation
-  "community.edit.head": "Edit Community",
+  "community.edit.head": "Upravit komunitu",
 
   // "community.edit.breadcrumbs": "Edit Community",
-  // TODO New key - Add a translation
-  "community.edit.breadcrumbs": "Edit Community",
+  "community.edit.breadcrumbs": "Upravit komunitu",
 
+  // "community.edit.logo.delete.title": "Delete logo",
+  "community.edit.logo.delete.title": "Smazat logo",
+
+  // "community.edit.logo.delete-undo.title": "Undo delete",
+  "community.edit.logo.delete-undo.title": "Zrušit odstranění",
 
   // "community.edit.logo.label": "Community logo",
-  // TODO New key - Add a translation
-  "community.edit.logo.label": "Community logo",
+  "community.edit.logo.label": "Logo komunity",
 
-  // "community.edit.logo.notifications.add.error": "Uploading Community logo failed. Please verify the content before retrying.",
-  // TODO New key - Add a translation
-  "community.edit.logo.notifications.add.error": "Uploading Community logo failed. Please verify the content before retrying.",
+  // "community.edit.logo.notifications.add.error": "Uploading community logo failed. Please verify the content before retrying.",
+  "community.edit.logo.notifications.add.error": "Nahrání loga komunity se nezdařilo. Před dalším pokusem ověřte obsah.",
 
-  // "community.edit.logo.notifications.add.success": "Upload Community logo successful.",
-  // TODO New key - Add a translation
-  "community.edit.logo.notifications.add.success": "Upload Community logo successful.",
+  // "community.edit.logo.notifications.add.success": "Upload community logo successful.",
+  "community.edit.logo.notifications.add.success": "Nahrání loga komunity proběhlo úspěšně.",
 
   // "community.edit.logo.notifications.delete.success.title": "Logo deleted",
-  // TODO New key - Add a translation
-  "community.edit.logo.notifications.delete.success.title": "Logo deleted",
+  "community.edit.logo.notifications.delete.success.title": "Logo smazáno",
 
   // "community.edit.logo.notifications.delete.success.content": "Successfully deleted the community's logo",
-  // TODO New key - Add a translation
-  "community.edit.logo.notifications.delete.success.content": "Successfully deleted the community's logo",
+  "community.edit.logo.notifications.delete.success.content": "Úspěšně odstraněno logo komunity",
 
   // "community.edit.logo.notifications.delete.error.title": "Error deleting logo",
-  // TODO New key - Add a translation
-  "community.edit.logo.notifications.delete.error.title": "Error deleting logo",
-
-  // "community.edit.logo.upload": "Drop a Community Logo to upload",
-  // TODO New key - Add a translation
-  "community.edit.logo.upload": "Drop a Community Logo to upload",
-
+  "community.edit.logo.notifications.delete.error.title": "Chyba při odstraňování loga",
 
+  // "community.edit.logo.upload": "Drop a community logo to upload",
+  "community.edit.logo.upload": "Nahrát logo komunity",
 
   // "community.edit.notifications.success": "Successfully edited the Community",
-  // TODO New key - Add a translation
-  "community.edit.notifications.success": "Successfully edited the Community",
+  "community.edit.notifications.success": "Komunita byla úspěšně upravena",
 
   // "community.edit.notifications.unauthorized": "You do not have privileges to make this change",
-  // TODO New key - Add a translation
-  "community.edit.notifications.unauthorized": "You do not have privileges to make this change",
-
-  // "community.edit.notifications.error": "An error occured while editing the Community",
-  // TODO New key - Add a translation
-  "community.edit.notifications.error": "An error occured while editing the Community",
-
-  // "community.edit.return": "Return",
-  // TODO New key - Add a translation
-  "community.edit.return": "Return",
+  "community.edit.notifications.unauthorized": "K provedení této změny nemáte oprávnění",
 
+  // "community.edit.notifications.error": "An error occured while editing the community",
+  "community.edit.notifications.error": "Při úpravě komunity došlo k chybě",
 
+  // "community.edit.return": "Back",
+  // TODO Source message changed - Revise the translation
+  "community.edit.return": "Zpět",
 
   // "community.edit.tabs.curate.head": "Curate",
-  // TODO New key - Add a translation
-  "community.edit.tabs.curate.head": "Curate",
+  "community.edit.tabs.curate.head": "Spravovat",
 
   // "community.edit.tabs.curate.title": "Community Edit - Curate",
-  // TODO New key - Add a translation
-  "community.edit.tabs.curate.title": "Community Edit - Curate",
+  "community.edit.tabs.curate.title": "Upravit komunitu - správa",
+
+  // "community.edit.tabs.access-control.head": "Access Control",
+  "community.edit.tabs.access-control.head": "Řízení přístupu",
+
+  // "community.edit.tabs.access-control.title": "Community Edit - Access Control",
+  "community.edit.tabs.access-control.title": "Upravit komunitu - Řízení přístupu",
 
   // "community.edit.tabs.metadata.head": "Edit Metadata",
-  // TODO New key - Add a translation
-  "community.edit.tabs.metadata.head": "Edit Metadata",
+  "community.edit.tabs.metadata.head": "Upravit metadata",
 
   // "community.edit.tabs.metadata.title": "Community Edit - Metadata",
-  // TODO New key - Add a translation
-  "community.edit.tabs.metadata.title": "Community Edit - Metadata",
+  "community.edit.tabs.metadata.title": "Upravit komunitu - Metadata",
 
   // "community.edit.tabs.roles.head": "Assign Roles",
-  // TODO New key - Add a translation
-  "community.edit.tabs.roles.head": "Assign Roles",
+  "community.edit.tabs.roles.head": "Přiřadit role",
 
   // "community.edit.tabs.roles.title": "Community Edit - Roles",
-  // TODO New key - Add a translation
-  "community.edit.tabs.roles.title": "Community Edit - Roles",
+  "community.edit.tabs.roles.title": "Upravit komunitu - role",
 
   // "community.edit.tabs.authorizations.head": "Authorizations",
-  // TODO New key - Add a translation
-  "community.edit.tabs.authorizations.head": "Authorizations",
+  "community.edit.tabs.authorizations.head": "Oprávnění",
 
   // "community.edit.tabs.authorizations.title": "Community Edit - Authorizations",
-  // TODO New key - Add a translation
-  "community.edit.tabs.authorizations.title": "Community Edit - Authorizations",
-
-
+  "community.edit.tabs.authorizations.title": "Upravit komunitu - Oprávnění",
 
   // "community.listelement.badge": "Community",
+  "community.listelement.badge": "Komunita",
+
+  // "community.logo": "Community logo",
   // TODO New key - Add a translation
-  "community.listelement.badge": "Community",
-
-
+  "community.logo": "Community logo",
 
   // "comcol-role.edit.no-group": "None",
-  // TODO New key - Add a translation
-  "comcol-role.edit.no-group": "None",
+  "comcol-role.edit.no-group": "Žádná skupina",
 
   // "comcol-role.edit.create": "Create",
-  // TODO New key - Add a translation
-  "comcol-role.edit.create": "Create",
+  "comcol-role.edit.create": "Vytvořit",
+
+  // "comcol-role.edit.create.error.title": "Failed to create a group for the '{{ role }}' role",
+  "comcol-role.edit.create.error.title": "Nepodařilo se vytvořit skupinu pro roli '{{ role }}'",
 
   // "comcol-role.edit.restrict": "Restrict",
-  // TODO New key - Add a translation
-  "comcol-role.edit.restrict": "Restrict",
+  "comcol-role.edit.restrict": "Omezit",
 
   // "comcol-role.edit.delete": "Delete",
-  // TODO New key - Add a translation
-  "comcol-role.edit.delete": "Delete",
+  "comcol-role.edit.delete": "Smazat",
 
+  // "comcol-role.edit.delete.error.title": "Failed to delete the '{{ role }}' role's group",
+  "comcol-role.edit.delete.error.title": "Nepodařilo se smazat skupinu pro roli '{{ role }}'",
 
   // "comcol-role.edit.community-admin.name": "Administrators",
-  // TODO New key - Add a translation
-  "comcol-role.edit.community-admin.name": "Administrators",
+  "comcol-role.edit.community-admin.name": "Správci",
 
   // "comcol-role.edit.collection-admin.name": "Administrators",
-  // TODO New key - Add a translation
-  "comcol-role.edit.collection-admin.name": "Administrators",
-
+  "comcol-role.edit.collection-admin.name": "Správci",
 
   // "comcol-role.edit.community-admin.description": "Community administrators can create sub-communities or collections, and manage or assign management for those sub-communities or collections. In addition, they decide who can submit items to any sub-collections, edit item metadata (after submission), and add (map) existing items from other collections (subject to authorization).",
-  // TODO New key - Add a translation
-  "comcol-role.edit.community-admin.description": "Community administrators can create sub-communities or collections, and manage or assign management for those sub-communities or collections. In addition, they decide who can submit items to any sub-collections, edit item metadata (after submission), and add (map) existing items from other collections (subject to authorization).",
+  "comcol-role.edit.community-admin.description": "Administrátoři komunit mohou vytvářet podkomunity nebo kolekce a spravovat nebo přidělovat správu těmto podkomunitám nebo kolekcím. Kromě toho rozhodují o tom, kdo může odesílat záznamy do všech podkolekcí, upravovat metadata záznamů (po odeslání) a přidávat (mapovat) existující záznamy z jiných kolekcí (na základě oprávnění).",
 
   // "comcol-role.edit.collection-admin.description": "Collection administrators decide who can submit items to the collection, edit item metadata (after submission), and add (map) existing items from other collections to this collection (subject to authorization for that collection).",
-  // TODO New key - Add a translation
-  "comcol-role.edit.collection-admin.description": "Collection administrators decide who can submit items to the collection, edit item metadata (after submission), and add (map) existing items from other collections to this collection (subject to authorization for that collection).",
-
+  "comcol-role.edit.collection-admin.description": "Správci kolekcí rozhodují o tom, kdo může do kolekce vkládat záznamy, upravovat metadata záznamů (po vložení) a přidávat (mapovat) existující záznamy z jiných kolekcí do této kolekce (podléhá autorizaci pro danou kolekci).",
 
   // "comcol-role.edit.submitters.name": "Submitters",
-  // TODO New key - Add a translation
-  "comcol-role.edit.submitters.name": "Submitters",
+  "comcol-role.edit.submitters.name": "Odesílatelé",
 
   // "comcol-role.edit.submitters.description": "The E-People and Groups that have permission to submit new items to this collection.",
-  // TODO New key - Add a translation
-  "comcol-role.edit.submitters.description": "The E-People and Groups that have permission to submit new items to this collection.",
-
+  "comcol-role.edit.submitters.description": "Uživatelé a skupiny, které mají oprávnění ke vkládání nových záznamů do této kolekce.",
 
   // "comcol-role.edit.item_read.name": "Default item read access",
-  // TODO New key - Add a translation
-  "comcol-role.edit.item_read.name": "Default item read access",
+  "comcol-role.edit.item_read.name": "Výchozí přístup ke čtení záznamů",
 
   // "comcol-role.edit.item_read.description": "E-People and Groups that can read new items submitted to this collection. Changes to this role are not retroactive. Existing items in the system will still be viewable by those who had read access at the time of their addition.",
-  // TODO New key - Add a translation
-  "comcol-role.edit.item_read.description": "E-People and Groups that can read new items submitted to this collection. Changes to this role are not retroactive. Existing items in the system will still be viewable by those who had read access at the time of their addition.",
+  "comcol-role.edit.item_read.description": "Uživatelé a skupiny, které mohou číst nové záznamy odeslané do této kolekce. Změny této role nejsou retroaktivní. Stávající záznamy v systému budou stále zobrazitelné pro ty, kteří měli přístup ke čtení v době jejich přidání.",
 
   // "comcol-role.edit.item_read.anonymous-group": "Default read for incoming items is currently set to Anonymous.",
-  // TODO New key - Add a translation
-  "comcol-role.edit.item_read.anonymous-group": "Default read for incoming items is currently set to Anonymous.",
-
+  "comcol-role.edit.item_read.anonymous-group": "Výchozí čtení pro příchozí záznamy je v současné době nastaveno na hodnotu Anonymní.",
 
   // "comcol-role.edit.bitstream_read.name": "Default bitstream read access",
-  // TODO New key - Add a translation
-  "comcol-role.edit.bitstream_read.name": "Default bitstream read access",
+  "comcol-role.edit.bitstream_read.name": "Výchozí přístup ke čtení souboru",
 
-  // "comcol-role.edit.bitstream_read.description": "Community administrators can create sub-communities or collections, and manage or assign management for those sub-communities or collections. In addition, they decide who can submit items to any sub-collections, edit item metadata (after submission), and add (map) existing items from other collections (subject to authorization).",
-  // TODO New key - Add a translation
-  "comcol-role.edit.bitstream_read.description": "Community administrators can create sub-communities or collections, and manage or assign management for those sub-communities or collections. In addition, they decide who can submit items to any sub-collections, edit item metadata (after submission), and add (map) existing items from other collections (subject to authorization).",
+  // "comcol-role.edit.bitstream_read.description": "E-People and Groups that can read new bitstreams submitted to this collection. Changes to this role are not retroactive. Existing bitstreams in the system will still be viewable by those who had read access at the time of their addition.",
+  // TODO Source message changed - Revise the translation
+  "comcol-role.edit.bitstream_read.description": "Správci komunit mohou vytvářet podkomunity nebo kolekce a spravovat nebo přidělovat správu těmto podkomunitám nebo kolekcím. Kromě toho rozhodují o tom, kdo může odesílat záznamy do libovolných podkolekcí, upravovat metadata záznamů (po odeslání) a přidávat (mapovat) existující záznamy z jiných kolekcí (na základě oprávnění).",
 
   // "comcol-role.edit.bitstream_read.anonymous-group": "Default read for incoming bitstreams is currently set to Anonymous.",
-  // TODO New key - Add a translation
-  "comcol-role.edit.bitstream_read.anonymous-group": "Default read for incoming bitstreams is currently set to Anonymous.",
-
+  "comcol-role.edit.bitstream_read.anonymous-group": "Výchozí čtení pro příchozí soubory je v současné době nastaveno na hodnotu Anonymní.",
 
   // "comcol-role.edit.editor.name": "Editors",
-  // TODO New key - Add a translation
-  "comcol-role.edit.editor.name": "Editors",
+  "comcol-role.edit.editor.name": "Editoři",
 
   // "comcol-role.edit.editor.description": "Editors are able to edit the metadata of incoming submissions, and then accept or reject them.",
-  // TODO New key - Add a translation
-  "comcol-role.edit.editor.description": "Editors are able to edit the metadata of incoming submissions, and then accept or reject them.",
-
+  "comcol-role.edit.editor.description": "Editoři mohou upravovat metadata příchozích příspěvků a poté je přijmout nebo odmítnout.",
 
   // "comcol-role.edit.finaleditor.name": "Final editors",
-  // TODO New key - Add a translation
-  "comcol-role.edit.finaleditor.name": "Final editors",
+  "comcol-role.edit.finaleditor.name": "Finální editoři",
 
   // "comcol-role.edit.finaleditor.description": "Final editors are able to edit the metadata of incoming submissions, but will not be able to reject them.",
-  // TODO New key - Add a translation
-  "comcol-role.edit.finaleditor.description": "Final editors are able to edit the metadata of incoming submissions, but will not be able to reject them.",
-
+  "comcol-role.edit.finaleditor.description": "Finální editoři mohou upravovat metadata příchozích příspěvků, ale nebudou je moci odmítnout.",
 
   // "comcol-role.edit.reviewer.name": "Reviewers",
-  // TODO New key - Add a translation
-  "comcol-role.edit.reviewer.name": "Reviewers",
+  "comcol-role.edit.reviewer.name": "Recenzenti",
 
   // "comcol-role.edit.reviewer.description": "Reviewers are able to accept or reject incoming submissions. However, they are not able to edit the submission's metadata.",
-  // TODO New key - Add a translation
-  "comcol-role.edit.reviewer.description": "Reviewers are able to accept or reject incoming submissions. However, they are not able to edit the submission's metadata.",
+  "comcol-role.edit.reviewer.description": "Recenzenti mohou přijímat nebo odmítat příchozí příspěvky. Nemohou však upravovat metadata příspěvků.",
 
+  // "comcol-role.edit.scorereviewers.name": "Score Reviewers",
+  "comcol-role.edit.scorereviewers.name": "Recenzenti výsledků",
 
+  // "comcol-role.edit.scorereviewers.description": "Reviewers are able to give a score to incoming submissions, this will define whether the submission will be rejected or not.",
+  "comcol-role.edit.scorereviewers.description": "Recenzenti mohou hodnotit příchozí příspěvky což určí, zda příspěvek bude zamítnut či nikoliv.",
 
   // "community.form.abstract": "Short Description",
-  // TODO New key - Add a translation
-  "community.form.abstract": "Short Description",
+  "community.form.abstract": "Krátký popis",
 
   // "community.form.description": "Introductory text (HTML)",
-  // TODO New key - Add a translation
-  "community.form.description": "Introductory text (HTML)",
+  "community.form.description": "Úvodní text (HTML)",
 
   // "community.form.errors.title.required": "Please enter a community name",
-  // TODO New key - Add a translation
-  "community.form.errors.title.required": "Please enter a community name",
+  "community.form.errors.title.required": "Zadejte název komunity",
 
   // "community.form.rights": "Copyright text (HTML)",
-  // TODO New key - Add a translation
-  "community.form.rights": "Copyright text (HTML)",
+  "community.form.rights": "Copyright (HTML)",
 
   // "community.form.tableofcontents": "News (HTML)",
-  // TODO New key - Add a translation
-  "community.form.tableofcontents": "News (HTML)",
+  "community.form.tableofcontents": "Novinky (HTML)",
 
   // "community.form.title": "Name",
-  // TODO New key - Add a translation
-  "community.form.title": "Name",
+  "community.form.title": "Název",
 
   // "community.page.edit": "Edit this community",
-  // TODO New key - Add a translation
-  "community.page.edit": "Edit this community",
+  "community.page.edit": "Upravit tuto komunitu",
 
   // "community.page.handle": "Permanent URI for this community",
-  // TODO New key - Add a translation
-  "community.page.handle": "Permanent URI for this community",
+  "community.page.handle": "Stálý URI pro tuto komunitu",
 
   // "community.page.license": "License",
   "community.page.license": "Licence",
@@ -1893,513 +2481,648 @@
   "community.page.news": "Novinky",
 
   // "community.all-lists.head": "Subcommunities and Collections",
+  "community.all-lists.head": "Podkomunity a kolekce",
+
+  // "community.search.results.head": "Search Results",
   // TODO New key - Add a translation
-  "community.all-lists.head": "Subcommunities and Collections",
-
-  // "community.sub-collection-list.head": "Collections of this Community",
-  "community.sub-collection-list.head": "Kolekce v této komunitě",
-
-  // "community.sub-community-list.head": "Communities of this Community",
-  // TODO New key - Add a translation
-  "community.sub-community-list.head": "Communities of this Community",
+  "community.search.results.head": "Search Results",
 
+  // "community.sub-collection-list.head": "Collections in this Community",
+  // TODO Source message changed - Revise the translation
+  "community.sub-collection-list.head": "Kolekce této komunity",
 
+  // "community.sub-community-list.head": "Communities in this Community",
+  // TODO Source message changed - Revise the translation
+  "community.sub-community-list.head": "Komunity této komunity",
 
   // "cookies.consent.accept-all": "Accept all",
-  // TODO New key - Add a translation
-  "cookies.consent.accept-all": "Accept all",
+  "cookies.consent.accept-all": "Přijmout vše",
 
   // "cookies.consent.accept-selected": "Accept selected",
-  // TODO New key - Add a translation
-  "cookies.consent.accept-selected": "Accept selected",
+  "cookies.consent.accept-selected": "Přijmout vybrané",
 
   // "cookies.consent.app.opt-out.description": "This app is loaded by default (but you can opt out)",
-  // TODO New key - Add a translation
-  "cookies.consent.app.opt-out.description": "This app is loaded by default (but you can opt out)",
+  "cookies.consent.app.opt-out.description": "Tato aplikace je načtena ve výchozím nastavení (ale můžete se odhlásit)",
 
   // "cookies.consent.app.opt-out.title": "(opt-out)",
-  // TODO New key - Add a translation
-  "cookies.consent.app.opt-out.title": "(opt-out)",
+  "cookies.consent.app.opt-out.title": "(odhlásit se)",
 
   // "cookies.consent.app.purpose": "purpose",
-  // TODO New key - Add a translation
-  "cookies.consent.app.purpose": "purpose",
+  "cookies.consent.app.purpose": "účel",
 
   // "cookies.consent.app.required.description": "This application is always required",
-  // TODO New key - Add a translation
-  "cookies.consent.app.required.description": "This application is always required",
+  "cookies.consent.app.required.description": "Tato aplikace je vždy vyžadována",
 
   // "cookies.consent.app.required.title": "(always required)",
-  // TODO New key - Add a translation
-  "cookies.consent.app.required.title": "(always required)",
+  "cookies.consent.app.required.title": "(vždy vyžadováno)",
+
+  // "cookies.consent.app.disable-all.description": "Use this switch to enable or disable all services.",
+  "cookies.consent.app.disable-all.description": "Pomocí tohoto přepínače povolíte nebo zakážete všechny služby.",
+
+  // "cookies.consent.app.disable-all.title": "Enable or disable all services",
+  "cookies.consent.app.disable-all.title": "Povolit nebo zakázat všechny služby.",
 
   // "cookies.consent.update": "There were changes since your last visit, please update your consent.",
-  // TODO New key - Add a translation
-  "cookies.consent.update": "There were changes since your last visit, please update your consent.",
+  "cookies.consent.update": "Od vaší poslední návštěvy došlo ke změnám, aktualizujte prosím svůj souhlas.",
 
   // "cookies.consent.close": "Close",
-  // TODO New key - Add a translation
-  "cookies.consent.close": "Close",
+  "cookies.consent.close": "Zavřít",
 
   // "cookies.consent.decline": "Decline",
-  // TODO New key - Add a translation
-  "cookies.consent.decline": "Decline",
+  "cookies.consent.decline": "Odmítnout",
+
+  // "cookies.consent.ok": "That's ok",
+  "cookies.consent.ok": "V pořádku.",
+
+  // "cookies.consent.save": "Save",
+  "cookies.consent.save": "Uložit",
+
+  // "cookies.consent.content-notice.title": "Cookie Consent",
+  "cookies.consent.content-notice.title": "Souhlas se soubory Cookie",
 
   // "cookies.consent.content-notice.description": "We collect and process your personal information for the following purposes: <strong>Authentication, Preferences, Acknowledgement and Statistics</strong>. <br/> To learn more, please read our {privacyPolicy}.",
-  // TODO New key - Add a translation
-  "cookies.consent.content-notice.description": "We collect and process your personal information for the following purposes: <strong>Authentication, Preferences, Acknowledgement and Statistics</strong>. <br/> To learn more, please read our {privacyPolicy}.",
+  "cookies.consent.content-notice.description": "Vaše osobní údaje shromažďujeme a zpracováváme pro následující účely: <strong>Ověření, Preference, Potvrzení a Statistiky</strong>. <br/> Chcete-li se dozvědět více, přečtěte si prosím naše {privacyPolicy}.",
+
+  // "cookies.consent.content-notice.description.no-privacy": "We collect and process your personal information for the following purposes: <strong>Authentication, Preferences, Acknowledgement and Statistics</strong>.",
+  "cookies.consent.content-notice.description.no-privacy": "Vaše osobní údaje shromažďujeme a zpracováváme pro následující účely: <strong>Ověření, Preference, Potvrzení a Statistiky</strong>. <strong>Využíváme osobní údaje pro tyto účely:",
 
   // "cookies.consent.content-notice.learnMore": "Customize",
-  // TODO New key - Add a translation
-  "cookies.consent.content-notice.learnMore": "Customize",
+  "cookies.consent.content-notice.learnMore": "Přizpůsobit",
 
   // "cookies.consent.content-modal.description": "Here you can see and customize the information that we collect about you.",
-  // TODO New key - Add a translation
-  "cookies.consent.content-modal.description": "Here you can see and customize the information that we collect about you.",
+  "cookies.consent.content-modal.description": "Zde můžete zobrazit a přizpůsobit informace, které o vás shromažďujeme.",
 
   // "cookies.consent.content-modal.privacy-policy.name": "privacy policy",
-  // TODO New key - Add a translation
-  "cookies.consent.content-modal.privacy-policy.name": "privacy policy",
+  "cookies.consent.content-modal.privacy-policy.name": "zásady ochrany osobních údajů",
 
   // "cookies.consent.content-modal.privacy-policy.text": "To learn more, please read our {privacyPolicy}.",
-  // TODO New key - Add a translation
-  "cookies.consent.content-modal.privacy-policy.text": "To learn more, please read our {privacyPolicy}.",
+  "cookies.consent.content-modal.privacy-policy.text": "Chcete-li se dozvědět více, přečtěte si prosím naše {privacyPolicy}.",
 
   // "cookies.consent.content-modal.title": "Information that we collect",
-  // TODO New key - Add a translation
-  "cookies.consent.content-modal.title": "Information that we collect",
+  "cookies.consent.content-modal.title": "Informace, které shromažďujeme",
 
+  // "cookies.consent.content-modal.services": "services",
+  "cookies.consent.content-modal.services": "služby",
 
+  // "cookies.consent.content-modal.service": "service",
+  "cookies.consent.content-modal.service": "služba",
 
   // "cookies.consent.app.title.authentication": "Authentication",
-  // TODO New key - Add a translation
-  "cookies.consent.app.title.authentication": "Authentication",
+  "cookies.consent.app.title.authentication": "Ověřování",
 
   // "cookies.consent.app.description.authentication": "Required for signing you in",
-  // TODO New key - Add a translation
-  "cookies.consent.app.description.authentication": "Required for signing you in",
-
+  "cookies.consent.app.description.authentication": "Vyžadováno pro přihlášení",
 
   // "cookies.consent.app.title.preferences": "Preferences",
-  // TODO New key - Add a translation
-  "cookies.consent.app.title.preferences": "Preferences",
+  "cookies.consent.app.title.preferences": "Preference",
 
   // "cookies.consent.app.description.preferences": "Required for saving your preferences",
-  // TODO New key - Add a translation
-  "cookies.consent.app.description.preferences": "Required for saving your preferences",
-
-
+  "cookies.consent.app.description.preferences": "Vyžadováno pro uložení Vašich preferencí",
 
   // "cookies.consent.app.title.acknowledgement": "Acknowledgement",
-  // TODO New key - Add a translation
-  "cookies.consent.app.title.acknowledgement": "Acknowledgement",
+  "cookies.consent.app.title.acknowledgement": "Potvrzení",
 
   // "cookies.consent.app.description.acknowledgement": "Required for saving your acknowledgements and consents",
-  // TODO New key - Add a translation
-  "cookies.consent.app.description.acknowledgement": "Required for saving your acknowledgements and consents",
-
-
+  "cookies.consent.app.description.acknowledgement": "Vyžadováno pro uložení Vašich potvrzení a souhlasů",
 
   // "cookies.consent.app.title.google-analytics": "Google Analytics",
-  // TODO New key - Add a translation
   "cookies.consent.app.title.google-analytics": "Google Analytics",
 
   // "cookies.consent.app.description.google-analytics": "Allows us to track statistical data",
-  // TODO New key - Add a translation
-  "cookies.consent.app.description.google-analytics": "Allows us to track statistical data",
+  "cookies.consent.app.description.google-analytics": "Umožňuje nám sledovat statistické údaje",
 
+  // "cookies.consent.app.title.google-recaptcha": "Google reCaptcha",
+  "cookies.consent.app.title.google-recaptcha": "Google reCaptcha",
 
+  // "cookies.consent.app.description.google-recaptcha": "We use google reCAPTCHA service during registration and password recovery",
+  "cookies.consent.app.description.google-recaptcha": "Při registraci a obnově hesla používáme službu Google reCAPTCHA",
 
   // "cookies.consent.purpose.functional": "Functional",
-  // TODO New key - Add a translation
-  "cookies.consent.purpose.functional": "Functional",
+  "cookies.consent.purpose.functional": "Funkční",
 
   // "cookies.consent.purpose.statistical": "Statistical",
-  // TODO New key - Add a translation
-  "cookies.consent.purpose.statistical": "Statistical",
+  "cookies.consent.purpose.statistical": "Statistický",
 
+  // "cookies.consent.purpose.registration-password-recovery": "Registration and Password recovery",
+  "cookies.consent.purpose.registration-password-recovery": "Registrace a obnovení hesla",
 
-  // "curation-task.task.checklinks.label":  "Check Links in Metadata",
-  // TODO New key - Add a translation
-  "curation-task.task.checklinks.label": "Check Links in Metadata",
+  // "cookies.consent.purpose.sharing": "Sharing",
+  "cookies.consent.purpose.sharing": "Sdílení",
+
+  // "curation-task.task.citationpage.label": "Generate Citation Page",
+  "curation-task.task.citationpage.label": "Vytvořit stránku s citacemi",
+
+  // "curation-task.task.checklinks.label": "Check Links in Metadata",
+  "curation-task.task.checklinks.label": "Zkontrolovat odkazy v metadatech",
 
   // "curation-task.task.noop.label": "NOOP",
-  // TODO New key - Add a translation
   "curation-task.task.noop.label": "NOOP",
 
   // "curation-task.task.profileformats.label": "Profile Bitstream Formats",
-  // TODO New key - Add a translation
-  "curation-task.task.profileformats.label": "Profile Bitstream Formats",
+  "curation-task.task.profileformats.label": "Formáty profilů souboru",
 
   // "curation-task.task.requiredmetadata.label": "Check for Required Metadata",
-  // TODO New key - Add a translation
-  "curation-task.task.requiredmetadata.label": "Check for Required Metadata",
+  "curation-task.task.requiredmetadata.label": "Kontrola požadovaných metadat",
 
   // "curation-task.task.translate.label": "Microsoft Translator",
-  // TODO New key - Add a translation
-  "curation-task.task.translate.label": "Microsoft Translator",
+  "curation-task.task.translate.label": "Překladač Microsoft",
 
   // "curation-task.task.vscan.label": "Virus Scan",
-  // TODO New key - Add a translation
-  "curation-task.task.vscan.label": "Virus Scan",
-
+  "curation-task.task.vscan.label": "Antivirová kontrola",
 
+  // "curation-task.task.registerdoi.label": "Register DOI",
+  "curation-task.task.registerdoi.label": "Zaregistrujte DOI",
 
   // "curation.form.task-select.label": "Task:",
-  // TODO New key - Add a translation
-  "curation.form.task-select.label": "Task:",
+  "curation.form.task-select.label": "Úloha:",
 
   // "curation.form.submit": "Start",
-  // TODO New key - Add a translation
   "curation.form.submit": "Start",
 
   // "curation.form.submit.success.head": "The curation task has been started successfully",
-  // TODO New key - Add a translation
-  "curation.form.submit.success.head": "The curation task has been started successfully",
+  "curation.form.submit.success.head": "Úloha správy byla úspěšně spuštěna",
 
   // "curation.form.submit.success.content": "You will be redirected to the corresponding process page.",
-  // TODO New key - Add a translation
-  "curation.form.submit.success.content": "You will be redirected to the corresponding process page.",
+  "curation.form.submit.success.content": "Budete přesměrováni na příslušnou stránku procesu.",
 
   // "curation.form.submit.error.head": "Running the curation task failed",
-  // TODO New key - Add a translation
-  "curation.form.submit.error.head": "Running the curation task failed",
+  "curation.form.submit.error.head": "Spuštění úlohy správy se nezdařilo.",
 
   // "curation.form.submit.error.content": "An error occured when trying to start the curation task.",
-  // TODO New key - Add a translation
-  "curation.form.submit.error.content": "An error occured when trying to start the curation task.",
+  "curation.form.submit.error.content": "Při pokusu o spuštění úlohy správy došlo k chybě.",
+
+  // "curation.form.submit.error.invalid-handle": "Couldn't determine the handle for this object",
+  "curation.form.submit.error.invalid-handle": "Nepodařilo se určit handle pro tento objekt",
 
   // "curation.form.handle.label": "Handle:",
-  // TODO New key - Add a translation
   "curation.form.handle.label": "Handle:",
 
   // "curation.form.handle.hint": "Hint: Enter [your-handle-prefix]/0 to run a task across entire site (not all tasks may support this capability)",
+  "curation.form.handle.hint": "Nápověda: Zadejte [your-handle-prefix]/0 pro spuštění úlohy na celém webu (ne všechny úlohy mohou tuto možnost podporovat)",
+
+  // "deny-request-copy.email.message": "Dear {{ recipientName }},\nIn response to your request I regret to inform you that it's not possible to send you a copy of the file(s) you have requested, concerning the document: \"{{ itemUrl }}\" ({{ itemName }}), of which I am an author.\n\nBest regards,\n{{ authorName }} <{{ authorEmail }}>",
+  "deny-request-copy.email.message": "V reakci na Vaši žádost Vám bohužel musím oznámit, že Vám není možné zaslat kopii souboru(ů), který(é) jste požadoval(a), týkající se dokumentu: \"{{ itemUrl }}\" ({{ itemName }}), jehož jsem autorem.\n\nS pozdravem,\n{{ authorName }} <{{ authorEmail }}>",
+
+  // "deny-request-copy.email.subject": "Request copy of document",
+  "deny-request-copy.email.subject": "Žádost o kopii dokumentu",
+
+  // "deny-request-copy.error": "An error occurred",
+  "deny-request-copy.error": "Došlo k chybě",
+
+  // "deny-request-copy.header": "Deny document copy request",
+  "deny-request-copy.header": "Zamítnout žádost o kopii",
+
+  // "deny-request-copy.intro": "This message will be sent to the applicant of the request",
+  "deny-request-copy.intro": "Tato zpráva bude zaslána žadateli o kopii",
+
+  // "deny-request-copy.success": "Successfully denied item request",
+  "deny-request-copy.success": "Úspěšně zamítnuta žádost o kopii záznamy",
+
+  // "dropdown.clear": "Clear selection",
   // TODO New key - Add a translation
-  "curation.form.handle.hint": "Hint: Enter [your-handle-prefix]/0 to run a task across entire site (not all tasks may support this capability)",
+  "dropdown.clear": "Clear selection",
 
+  // "dropdown.clear.tooltip": "Clear the selected option",
+  // TODO New key - Add a translation
+  "dropdown.clear.tooltip": "Clear the selected option",
 
+  // "dso.name.untitled": "Untitled",
+  "dso.name.untitled": "Bez názvu",
+
+  // "dso.name.unnamed": "Unnamed",
+  "dso.name.unnamed": "Beze jména",
 
   // "dso-selector.create.collection.head": "New collection",
-  // TODO New key - Add a translation
-  "dso-selector.create.collection.head": "New collection",
+  "dso-selector.create.collection.head": "Nová kolekce",
 
   // "dso-selector.create.collection.sub-level": "Create a new collection in",
-  // TODO New key - Add a translation
-  "dso-selector.create.collection.sub-level": "Create a new collection in",
+  "dso-selector.create.collection.sub-level": "Vytvořit novou kolekci v",
 
   // "dso-selector.create.community.head": "New community",
-  // TODO New key - Add a translation
-  "dso-selector.create.community.head": "New community",
+  "dso-selector.create.community.head": "Nová komunita",
+
+  // "dso-selector.create.community.or-divider": "or",
+  "dso-selector.create.community.or-divider": "nebo",
 
   // "dso-selector.create.community.sub-level": "Create a new community in",
-  // TODO New key - Add a translation
-  "dso-selector.create.community.sub-level": "Create a new community in",
+  "dso-selector.create.community.sub-level": "Vytvořit novou komunitu v",
 
   // "dso-selector.create.community.top-level": "Create a new top-level community",
-  // TODO New key - Add a translation
-  "dso-selector.create.community.top-level": "Create a new top-level community",
+  "dso-selector.create.community.top-level": "Vytvořit novou komunitu nejvyšší úrovně",
 
   // "dso-selector.create.item.head": "New item",
-  // TODO New key - Add a translation
-  "dso-selector.create.item.head": "New item",
+  "dso-selector.create.item.head": "Nový záznam",
 
   // "dso-selector.create.item.sub-level": "Create a new item in",
-  // TODO New key - Add a translation
-  "dso-selector.create.item.sub-level": "Create a new item in",
+  "dso-selector.create.item.sub-level": "Vytvořit nový záznam v",
 
   // "dso-selector.create.submission.head": "New submission",
-  // TODO New key - Add a translation
-  "dso-selector.create.submission.head": "New submission",
+  "dso-selector.create.submission.head": "Nový příspěvek",
 
   // "dso-selector.edit.collection.head": "Edit collection",
-  // TODO New key - Add a translation
-  "dso-selector.edit.collection.head": "Edit collection",
+  "dso-selector.edit.collection.head": "Upravit kolekci",
 
   // "dso-selector.edit.community.head": "Edit community",
-  // TODO New key - Add a translation
-  "dso-selector.edit.community.head": "Edit community",
+  "dso-selector.edit.community.head": "Upravit komunitu",
 
   // "dso-selector.edit.item.head": "Edit item",
-  // TODO New key - Add a translation
-  "dso-selector.edit.item.head": "Edit item",
+  "dso-selector.edit.item.head": "Upravit záznam",
+
+  // "dso-selector.error.title": "An error occurred searching for a {{ type }}",
+  "dso-selector.error.title": "Při hledání {{ type }} došlo k chybě",
 
   // "dso-selector.export-metadata.dspaceobject.head": "Export metadata from",
-  // TODO New key - Add a translation
-  "dso-selector.export-metadata.dspaceobject.head": "Export metadata from",
+  "dso-selector.export-metadata.dspaceobject.head": "Exportovat metadata z",
+
+  // "dso-selector.export-batch.dspaceobject.head": "Export Batch (ZIP) from",
+  "dso-selector.export-batch.dspaceobject.head": "Exportovat dávku (ZIP) z",
+
+  // "dso-selector.import-batch.dspaceobject.head": "Import batch from",
+  "dso-selector.import-batch.dspaceobject.head": "Importovat dávku z",
 
   // "dso-selector.no-results": "No {{ type }} found",
-  // TODO New key - Add a translation
-  "dso-selector.no-results": "No {{ type }} found",
+  "dso-selector.no-results": "Nebyl nalezen žádný {{ type }}",
 
   // "dso-selector.placeholder": "Search for a {{ type }}",
+  "dso-selector.placeholder": "Hledat {{ type }}",
+
+  // "dso-selector.placeholder.type.community": "community",
   // TODO New key - Add a translation
-  "dso-selector.placeholder": "Search for a {{ type }}",
+  "dso-selector.placeholder.type.community": "community",
 
+  // "dso-selector.placeholder.type.collection": "collection",
+  // TODO New key - Add a translation
+  "dso-selector.placeholder.type.collection": "collection",
 
+  // "dso-selector.placeholder.type.item": "item",
+  // TODO New key - Add a translation
+  "dso-selector.placeholder.type.item": "item",
+
+  // "dso-selector.select.collection.head": "Select a collection",
+  "dso-selector.select.collection.head": "Vyberte kolekci",
+
+  // "dso-selector.set-scope.community.head": "Select a search scope",
+  "dso-selector.set-scope.community.head": "Vyberte oblast vyhledávání",
+
+  // "dso-selector.set-scope.community.button": "Search all of DSpace",
+  "dso-selector.set-scope.community.button": "Prohledávat celý repozitář",
+
+  // "dso-selector.set-scope.community.or-divider": "or",
+  "dso-selector.set-scope.community.or-divider": "nebo",
+
+  // "dso-selector.set-scope.community.input-header": "Search for a community or collection",
+  "dso-selector.set-scope.community.input-header": "Vyhledat komunitu nebo kolekci",
+
+  // "dso-selector.claim.item.head": "Profile tips",
+  "dso-selector.claim.item.head": "Tipy na profily",
+
+  // "dso-selector.claim.item.body": "These are existing profiles that may be related to you. If you recognize yourself in one of these profiles, select it and on the detail page, among the options, choose to claim it. Otherwise you can create a new profile from scratch using the button below.",
+  "dso-selector.claim.item.body": "Toto jsou existující profily, které s vámi mohou souviset. Pokud se v některém z těchto profilů poznáváte, vyberte jej a na stránce s podrobnostmi mezi možnostmi zvolte, zda jej chcete nárokovat. V opačném případě si můžete vytvořit nový profil od začátku pomocí tlačítka níže.",
+
+  // "dso-selector.claim.item.not-mine-label": "None of these are mine",
+  "dso-selector.claim.item.not-mine-label": "Žádný z těchto záznamů není můj",
+
+  // "dso-selector.claim.item.create-from-scratch": "Create a new one",
+  "dso-selector.claim.item.create-from-scratch": "Vytvořit nový",
+
+  // "dso-selector.results-could-not-be-retrieved": "Something went wrong, please refresh again ↻",
+  "dso-selector.results-could-not-be-retrieved": "Něco se nepovedlo, zkuste, prosím, načíst znovu ↻",
+
+  // "supervision-group-selector.header": "Supervision Group Selector",
+  "supervision-group-selector.header": "Výběr skupiny supervize",
+
+  // "supervision-group-selector.select.type-of-order.label": "Select a type of Order",
+  "supervision-group-selector.select.type-of-order.label": "Vyberte typ příkazu",
+
+  // "supervision-group-selector.select.type-of-order.option.none": "NONE",
+  "supervision-group-selector.select.type-of-order.option.none": "ŽÁDNÝ",
+
+  // "supervision-group-selector.select.type-of-order.option.editor": "EDITOR",
+  "supervision-group-selector.select.type-of-order.option.editor": "EDITOR",
+
+  // "supervision-group-selector.select.type-of-order.option.observer": "OBSERVER",
+  "supervision-group-selector.select.type-of-order.option.observer": "OBSERVER",
+
+  // "supervision-group-selector.select.group.label": "Select a Group",
+  "supervision-group-selector.select.group.label": "Vyberte skupinu",
+
+  // "supervision-group-selector.button.cancel": "Cancel",
+  "supervision-group-selector.button.cancel": "Zrušit",
+
+  // "supervision-group-selector.button.save": "Save",
+  "supervision-group-selector.button.save": "Uložit",
+
+  // "supervision-group-selector.select.type-of-order.error": "Please select a type of order",
+  "supervision-group-selector.select.type-of-order.error": "Prosím, vyberte typ příkazu",
+
+  // "supervision-group-selector.select.group.error": "Please select a group",
+  "supervision-group-selector.select.group.error": "Prosím, vyberte skupinu",
+
+  // "supervision-group-selector.notification.create.success.title": "Successfully created supervision order for group {{ name }}",
+  "supervision-group-selector.notification.create.success.title": "Úspěšně vytvořen příkaz supervize pro skupinu {{ name }}",
+
+  // "supervision-group-selector.notification.create.failure.title": "Error",
+  "supervision-group-selector.notification.create.failure.title": "Chyba",
+
+  // "supervision-group-selector.notification.create.already-existing": "A supervision order already exists on this item for selected group",
+  "supervision-group-selector.notification.create.already-existing": "Příkaz k supervizi již existuje na tomto záznamu pro vybranou skupinu",
 
   // "confirmation-modal.export-metadata.header": "Export metadata for {{ dsoName }}",
-  // TODO New key - Add a translation
-  "confirmation-modal.export-metadata.header": "Export metadata for {{ dsoName }}",
+  "confirmation-modal.export-metadata.header": "Exportovat metadata pro {{ dsoName }}",
 
   // "confirmation-modal.export-metadata.info": "Are you sure you want to export metadata for {{ dsoName }}",
-  // TODO New key - Add a translation
-  "confirmation-modal.export-metadata.info": "Are you sure you want to export metadata for {{ dsoName }}",
+  "confirmation-modal.export-metadata.info": "Určitě chcete exportovat metadata pro {{ dsoName }}",
 
   // "confirmation-modal.export-metadata.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "confirmation-modal.export-metadata.cancel": "Cancel",
+  "confirmation-modal.export-metadata.cancel": "Zrušit",
 
   // "confirmation-modal.export-metadata.confirm": "Export",
-  // TODO New key - Add a translation
-  "confirmation-modal.export-metadata.confirm": "Export",
+  "confirmation-modal.export-metadata.confirm": "Exportovat",
+
+  // "confirmation-modal.export-batch.header": "Export batch (ZIP) for {{ dsoName }}",
+  "confirmation-modal.export-batch.header": "Exportní dávka (ZIP) pro {{ dsoName }}",
+
+  // "confirmation-modal.export-batch.info": "Are you sure you want to export batch (ZIP) for {{ dsoName }}",
+  "confirmation-modal.export-batch.info": "Určitě chcete exportovat dávku (ZIP) pro {{ dsoName }}",
+
+  // "confirmation-modal.export-batch.cancel": "Cancel",
+  "confirmation-modal.export-batch.cancel": "Zrušit",
+
+  // "confirmation-modal.export-batch.confirm": "Export",
+  "confirmation-modal.export-batch.confirm": "Exportovat",
 
   // "confirmation-modal.delete-eperson.header": "Delete EPerson \"{{ dsoName }}\"",
-  // TODO New key - Add a translation
-  "confirmation-modal.delete-eperson.header": "Delete EPerson \"{{ dsoName }}\"",
+  "confirmation-modal.delete-eperson.header": "Odstranit uživatele \"{{ dsoName }}\"",
 
   // "confirmation-modal.delete-eperson.info": "Are you sure you want to delete EPerson \"{{ dsoName }}\"",
-  // TODO New key - Add a translation
-  "confirmation-modal.delete-eperson.info": "Are you sure you want to delete EPerson \"{{ dsoName }}\"",
+  "confirmation-modal.delete-eperson.info": "Určitě chcete odstranit uživatele \"{{ dsoName }}}\"",
 
   // "confirmation-modal.delete-eperson.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "confirmation-modal.delete-eperson.cancel": "Cancel",
+  "confirmation-modal.delete-eperson.cancel": "Zrušit",
 
   // "confirmation-modal.delete-eperson.confirm": "Delete",
-  // TODO New key - Add a translation
-  "confirmation-modal.delete-eperson.confirm": "Delete",
+  "confirmation-modal.delete-eperson.confirm": "Odstranit",
 
+  // "confirmation-modal.delete-profile.header": "Delete Profile",
+  "confirmation-modal.delete-profile.header": "Odstranit profil",
+
+  // "confirmation-modal.delete-profile.info": "Are you sure you want to delete your profile",
+  "confirmation-modal.delete-profile.info": "Určitě chcete odstranit svůj profil",
+
+  // "confirmation-modal.delete-profile.cancel": "Cancel",
+  "confirmation-modal.delete-profile.cancel": "Zrušit",
+
+  // "confirmation-modal.delete-profile.confirm": "Delete",
+  "confirmation-modal.delete-profile.confirm": "Odstranit",
+
+  // "confirmation-modal.delete-subscription.header": "Delete Subscription",
+  "confirmation-modal.delete-subscription.header": "Zrušit odběr notifikací",
+
+  // "confirmation-modal.delete-subscription.info": "Are you sure you want to delete subscription for \"{{ dsoName }}\"",
+  "confirmation-modal.delete-subscription.info": "Jste si jistí, že chcete odhlásit odběr notifikací \"{{ dsoName }}\"",
+
+  // "confirmation-modal.delete-subscription.cancel": "Cancel",
+  "confirmation-modal.delete-subscription.cancel": "Zrušit",
+
+  // "confirmation-modal.delete-subscription.confirm": "Delete",
+  "confirmation-modal.delete-subscription.confirm": "Smazat",
 
   // "error.bitstream": "Error fetching bitstream",
-  // TODO New key - Add a translation
-  "error.bitstream": "Error fetching bitstream",
+  "error.bitstream": "Chyba při načítání souboru",
 
   // "error.browse-by": "Error fetching items",
-  "error.browse-by": "Chyba během stahování záznamů",
+  "error.browse-by": "Chyba při načítání záznamů",
 
   // "error.collection": "Error fetching collection",
-  "error.collection": "Chyba během stahování kolekce",
+  "error.collection": "Chyba při načítání kolekce",
 
   // "error.collections": "Error fetching collections",
-  // TODO New key - Add a translation
-  "error.collections": "Error fetching collections",
+  "error.collections": "Chyba při načítání kolekce",
 
   // "error.community": "Error fetching community",
-  "error.community": "Chyba během stahování komunity",
+  "error.community": "Chyba při načítání komunity",
 
   // "error.identifier": "No item found for the identifier",
-  // TODO New key - Add a translation
-  "error.identifier": "No item found for the identifier",
+  "error.identifier": "Pro identifikátor nebyl nalezen žádný záznam",
 
   // "error.default": "Error",
   "error.default": "Chyba",
 
   // "error.item": "Error fetching item",
-  "error.item": "Chyba během stahování záznamu",
+  "error.item": "Chyba při načítání záznamu",
 
   // "error.items": "Error fetching items",
-  // TODO New key - Add a translation
-  "error.items": "Error fetching items",
+  "error.items": "Chyba při načítání záznamů",
 
   // "error.objects": "Error fetching objects",
-  "error.objects": "Chyba během stahování objektů",
+  "error.objects": "Chyba při načítání objektů",
 
   // "error.recent-submissions": "Error fetching recent submissions",
-  "error.recent-submissions": "Chyba během stahování posledních příspěvků",
+  "error.recent-submissions": "Chyba při načítání nedávných příspěvků",
 
   // "error.search-results": "Error fetching search results",
-  "error.search-results": "Chyba během stahování výsledků hledání",
+  "error.search-results": "Chyba při načítání výsledků vyhledávání",
+
+  // "error.invalid-search-query": "Search query is not valid. Please check <a href=\"https://solr.apache.org/guide/query-syntax-and-parsing.html\" target=\"_blank\">Solr query syntax</a> best practices for further information about this error.",
+  "error.invalid-search-query": "Vyhledávací dotaz není platný. Další informace o této chybě naleznete v osvědčených postupech <a href=\"https://solr.apache.org/guide/query-syntax-and-parsing.html\" target=\"_blank\">Solr query syntax</a>.",
 
   // "error.sub-collections": "Error fetching sub-collections",
-  "error.sub-collections": "Chyba během stahování subkolekcí",
+  "error.sub-collections": "Chyba při načítání podkolekcí",
 
   // "error.sub-communities": "Error fetching sub-communities",
-  // TODO New key - Add a translation
-  "error.sub-communities": "Error fetching sub-communities",
+  "error.sub-communities": "Chyba při načítání podkomunit",
 
   // "error.submission.sections.init-form-error": "An error occurred during section initialize, please check your input-form configuration. Details are below : <br> <br>",
-  // TODO New key - Add a translation
-  "error.submission.sections.init-form-error": "An error occurred during section initialize, please check your input-form configuration. Details are below : <br> <br>",
+  "error.submission.sections.init-form-error": "Při inicializaci sekce došlo k chybě, zkontrolujte prosím konfiguraci vstupního formuláře. Podrobnosti jsou uvedeny níže : <br> <br>",
 
   // "error.top-level-communities": "Error fetching top-level communities",
-  "error.top-level-communities": "Chyba během stahování komunit nejvyšší úrovně",
+  "error.top-level-communities": "Chyba při načítání komunit nejvyšší úrovně",
 
   // "error.validation.license.notgranted": "You must grant this license to complete your submission. If you are unable to grant this license at this time you may save your work and return later or remove the submission.",
-  "error.validation.license.notgranted": "Pro dokončení zaslání Musíte udělit licenci. Pokud v tuto chvíli tuto licenci nemůžete udělit, můžete svou práci uložit a později se k svému příspěveku vrátit nebo jej smazat.",
+  "error.validation.license.notgranted": "Bez udělení licence nelze záznam dokončit. Pokud v tuto chvíli nemůžete licenci udělit, uložte svou práci a vraťte se k příspěvku později nebo jej smažte.",
 
   // "error.validation.pattern": "This input is restricted by the current pattern: {{ pattern }}.",
-  // TODO New key - Add a translation
-  "error.validation.pattern": "This input is restricted by the current pattern: {{ pattern }}.",
+  "error.validation.pattern": "Toto zadání je omezeno aktuálním vzorcem: {{ pattern }}.",
 
   // "error.validation.filerequired": "The file upload is mandatory",
+  "error.validation.filerequired": "Nahrání souboru je povinné",
+
+  // "error.validation.required": "This field is required",
+  "error.validation.required": "Toto pole je povinné",
+
+  // "error.validation.NotValidEmail": "This is not a valid email",
+  "error.validation.NotValidEmail": "Tento e-mail není platný e-mail",
+
+  // "error.validation.emailTaken": "This email is already taken",
+  "error.validation.emailTaken": "Tento e-mail je již obsazen",
+
+  // "error.validation.groupExists": "This group already exists",
+  "error.validation.groupExists": "Tato skupina již existuje",
+
+  // "error.validation.metadata.name.invalid-pattern": "This field cannot contain dots, commas or spaces. Please use the Element & Qualifier fields instead",
+  "error.validation.metadata.name.invalid-pattern": "Toto pole nesmí obsahovat tečky, čárky nebo mezery. Místo toho použijte schéma Dublin Core",
+
+  // "error.validation.metadata.name.max-length": "This field may not contain more than 32 characters",
+  "error.validation.metadata.name.max-length": "Toto pole nesmí obsahovat více než 32 znaků",
+
+  // "error.validation.metadata.namespace.max-length": "This field may not contain more than 256 characters",
+  "error.validation.metadata.namespace.max-length": "Toto pole nesmí obsahovat více než 256 znaků",
+
+  // "error.validation.metadata.element.invalid-pattern": "This field cannot contain dots, commas or spaces. Please use the Qualifier field instead",
+  "error.validation.metadata.element.invalid-pattern": "Toto pole nesmí obsahovat tečky, čárky nebo mezery. Místo toho použijte pole kvalifikátorů",
+
+  // "error.validation.metadata.element.max-length": "This field may not contain more than 64 characters",
+  "error.validation.metadata.element.max-length": "Toto pole nesmí obsahovat více než 64 znaků",
+
+  // "error.validation.metadata.qualifier.invalid-pattern": "This field cannot contain dots, commas or spaces",
+  "error.validation.metadata.qualifier.invalid-pattern": "Toto pole nesmí obsahovat tečky, čárky nebo mezery",
+
+  // "error.validation.metadata.qualifier.max-length": "This field may not contain more than 64 characters",
+  "error.validation.metadata.qualifier.max-length": "Toto pole nesmí obsahovat více než 64 znaků",
+
+  // "feed.description": "Syndication feed",
+  "feed.description": "Synchronizační kanál",
+
+  // "file-download-link.restricted": "Restricted bitstream",
   // TODO New key - Add a translation
-  "error.validation.filerequired": "The file upload is mandatory",
-
-
+  "file-download-link.restricted": "Restricted bitstream",
 
   // "file-section.error.header": "Error obtaining files for this item",
-  // TODO New key - Add a translation
-  "file-section.error.header": "Error obtaining files for this item",
-
-
+  "file-section.error.header": "Chyba při získávání souborů pro tento záznam",
 
   // "footer.copyright": "copyright © 2002-{{ year }}",
   "footer.copyright": "copyright © 2002-{{ year }}",
 
   // "footer.link.dspace": "DSpace software",
-  "footer.link.dspace": "software DSpace",
+  "footer.link.dspace": "DSpace software",
 
   // "footer.link.lyrasis": "LYRASIS",
   "footer.link.lyrasis": "LYRASIS",
 
   // "footer.link.cookies": "Cookie settings",
-  // TODO New key - Add a translation
-  "footer.link.cookies": "Cookie settings",
+  "footer.link.cookies": "Nastavení souborů cookie",
 
   // "footer.link.privacy-policy": "Privacy policy",
+  "footer.link.privacy-policy": "Zásady ochrany osobních údajů",
+
+  // "footer.link.end-user-agreement": "End User Agreement",
+  "footer.link.end-user-agreement": "Smlouva s koncovým uživatelem",
+
+  // "footer.link.feedback": "Send Feedback",
+  "footer.link.feedback": "Odeslat zpětnou vazbu",
+
+  // "footer.link.coar-notify-support": "COAR Notify",
   // TODO New key - Add a translation
-  "footer.link.privacy-policy": "Privacy policy",
-
-  // "footer.link.end-user-agreement":"End User Agreement",
-  // TODO New key - Add a translation
-  "footer.link.end-user-agreement": "End User Agreement",
-
-
+  "footer.link.coar-notify-support": "COAR Notify",
 
   // "forgot-email.form.header": "Forgot Password",
-  // TODO New key - Add a translation
-  "forgot-email.form.header": "Forgot Password",
+  "forgot-email.form.header": "Zapomenuté heslo",
 
-  // "forgot-email.form.info": "Enter Register an account to subscribe to collections for email updates, and submit new items to DSpace.",
-  // TODO New key - Add a translation
-  "forgot-email.form.info": "Enter Register an account to subscribe to collections for email updates, and submit new items to DSpace.",
+  // "forgot-email.form.info": "Enter the email address associated with the account.",
+  // TODO Source message changed - Revise the translation
+  "forgot-email.form.info": "Zadejte e-mailovou adresu přidruženou k účtu.",
 
   // "forgot-email.form.email": "Email Address *",
-  // TODO New key - Add a translation
-  "forgot-email.form.email": "Email Address *",
+  "forgot-email.form.email": "E-mailová adresa *",
 
   // "forgot-email.form.email.error.required": "Please fill in an email address",
-  // TODO New key - Add a translation
-  "forgot-email.form.email.error.required": "Please fill in an email address",
+  "forgot-email.form.email.error.required": "Vyplňte prosím e-mailovou adresu",
 
-  // "forgot-email.form.email.error.pattern": "Please fill in a valid email address",
-  // TODO New key - Add a translation
-  "forgot-email.form.email.error.pattern": "Please fill in a valid email address",
+  // "forgot-email.form.email.error.not-email-form": "Please fill in a valid email address",
+  "forgot-email.form.email.error.not-email-form": "Vyplňte prosím platnou e-mailovou adresu",
 
-  // "forgot-email.form.email.hint": "This address will be verified and used as your login name.",
-  // TODO New key - Add a translation
-  "forgot-email.form.email.hint": "This address will be verified and used as your login name.",
+  // "forgot-email.form.email.hint": "An email will be sent to this address with a further instructions.",
+  // TODO Source message changed - Revise the translation
+  "forgot-email.form.email.hint": "Na tuto adresu bude zaslán e-mail s dalšími pokyny.",
 
-  // "forgot-email.form.submit": "Submit",
-  // TODO New key - Add a translation
-  "forgot-email.form.submit": "Submit",
+  // "forgot-email.form.submit": "Reset password",
+  // TODO Source message changed - Revise the translation
+  "forgot-email.form.submit": "Obnovit heslo",
 
-  // "forgot-email.form.success.head": "Verification email sent",
-  // TODO New key - Add a translation
-  "forgot-email.form.success.head": "Verification email sent",
+  // "forgot-email.form.success.head": "Password reset email sent",
+  // TODO Source message changed - Revise the translation
+  "forgot-email.form.success.head": "E-mail pro obnovení hesla odeslán",
 
   // "forgot-email.form.success.content": "An email has been sent to {{ email }} containing a special URL and further instructions.",
-  // TODO New key - Add a translation
-  "forgot-email.form.success.content": "An email has been sent to {{ email }} containing a special URL and further instructions.",
-
-  // "forgot-email.form.error.head": "Error when trying to register email",
-  // TODO New key - Add a translation
-  "forgot-email.form.error.head": "Error when trying to register email",
-
-  // "forgot-email.form.error.content": "An error occured when registering the following email address: {{ email }}",
-  // TODO New key - Add a translation
-  "forgot-email.form.error.content": "An error occured when registering the following email address: {{ email }}",
+  "forgot-email.form.success.content": "Na adresu {{ email }} byl odeslán e-mail obsahující speciální URL a další instrukce.",
 
+  // "forgot-email.form.error.head": "Error when trying to reset password",
+  // TODO Source message changed - Revise the translation
+  "forgot-email.form.error.head": "Chyba při pokusu o obnovení hesla",
 
+  // "forgot-email.form.error.content": "An error occured when attempting to reset the password for the account associated with the following email address: {{ email }}",
+  "forgot-email.form.error.content": "Při pokusu o obnovení hesla k účtu přiřazenému k následující e-mailové adrese došlo k chybě: {{ email }}",
 
   // "forgot-password.title": "Forgot Password",
-  // TODO New key - Add a translation
-  "forgot-password.title": "Forgot Password",
+  "forgot-password.title": "Zapomenuté heslo",
 
   // "forgot-password.form.head": "Forgot Password",
-  // TODO New key - Add a translation
-  "forgot-password.form.head": "Forgot Password",
+  "forgot-password.form.head": "Zapomenuté heslo",
 
-  // "forgot-password.form.info": "Enter a new password in the box below, and confirm it by typing it again into the second box. It should be at least six characters long.",
-  // TODO New key - Add a translation
-  "forgot-password.form.info": "Enter a new password in the box below, and confirm it by typing it again into the second box. It should be at least six characters long.",
+  // "forgot-password.form.info": "Enter a new password in the box below, and confirm it by typing it again into the second box.",
+  // TODO Source message changed - Revise the translation
+  "forgot-password.form.info": "Zadejte nové heslo do níže uvedeného pole a potvrďte jej opětovným zadáním do druhého pole.",
 
   // "forgot-password.form.card.security": "Security",
-  // TODO New key - Add a translation
-  "forgot-password.form.card.security": "Security",
+  "forgot-password.form.card.security": "Zabezpečení",
 
   // "forgot-password.form.identification.header": "Identify",
-  // TODO New key - Add a translation
-  "forgot-password.form.identification.header": "Identify",
+  "forgot-password.form.identification.header": "Identifikace",
 
   // "forgot-password.form.identification.email": "Email address: ",
-  // TODO New key - Add a translation
-  "forgot-password.form.identification.email": "Email address: ",
+  "forgot-password.form.identification.email": "E-mailová adresa: ",
 
   // "forgot-password.form.label.password": "Password",
-  // TODO New key - Add a translation
-  "forgot-password.form.label.password": "Password",
+  "forgot-password.form.label.password": "Heslo",
 
   // "forgot-password.form.label.passwordrepeat": "Retype to confirm",
-  // TODO New key - Add a translation
-  "forgot-password.form.label.passwordrepeat": "Retype to confirm",
+  "forgot-password.form.label.passwordrepeat": "Zadejte znovu pro ověření",
 
-  // "forgot-password.form.error.empty-password": "Please enter a password in the box below.",
-  // TODO New key - Add a translation
-  "forgot-password.form.error.empty-password": "Please enter a password in the box below.",
+  // "forgot-password.form.error.empty-password": "Please enter a password in the boxes above.",
+  // TODO Source message changed - Revise the translation
+  "forgot-password.form.error.empty-password": "Zadejte prosím heslo do níže uvedeného pole.",
 
   // "forgot-password.form.error.matching-passwords": "The passwords do not match.",
-  // TODO New key - Add a translation
-  "forgot-password.form.error.matching-passwords": "The passwords do not match.",
-
-  // "forgot-password.form.error.password-length": "The password should be at least 6 characters long.",
-  // TODO New key - Add a translation
-  "forgot-password.form.error.password-length": "The password should be at least 6 characters long.",
+  "forgot-password.form.error.matching-passwords": "Hesla se neshodují.",
 
   // "forgot-password.form.notification.error.title": "Error when trying to submit new password",
-  // TODO New key - Add a translation
-  "forgot-password.form.notification.error.title": "Error when trying to submit new password",
+  "forgot-password.form.notification.error.title": "Chyba při pokusu o zadání nového hesla",
 
   // "forgot-password.form.notification.success.content": "The password reset was successful. You have been logged in as the created user.",
-  // TODO New key - Add a translation
-  "forgot-password.form.notification.success.content": "The password reset was successful. You have been logged in as the created user.",
+  "forgot-password.form.notification.success.content": "Změna hesla byla úspěšná. Byli jste přihlášeni jako vytvořený uživatel.",
 
   // "forgot-password.form.notification.success.title": "Password reset completed",
-  // TODO New key - Add a translation
-  "forgot-password.form.notification.success.title": "Password reset completed",
+  "forgot-password.form.notification.success.title": "Obnovení hesla bylo dokončeno",
 
   // "forgot-password.form.submit": "Submit password",
-  // TODO New key - Add a translation
-  "forgot-password.form.submit": "Submit password",
+  "forgot-password.form.submit": "Odeslat heslo",
 
-
-
-  // "form.add": "Add",
-  // TODO New key - Add a translation
-  "form.add": "Add",
+  // "form.add": "Add more",
+  "form.add": "Přidat další",
 
   // "form.add-help": "Click here to add the current entry and to add another one",
-  // TODO New key - Add a translation
-  "form.add-help": "Click here to add the current entry and to add another one",
+  "form.add-help": "Klikněte zde pro přidání aktuálního záznamu a pro přidání dalšího",
 
   // "form.cancel": "Cancel",
   "form.cancel": "Zrušit",
 
   // "form.clear": "Clear",
-  // TODO New key - Add a translation
-  "form.clear": "Clear",
+  "form.clear": "Vymazat",
 
   // "form.clear-help": "Click here to remove the selected value",
-  // TODO New key - Add a translation
-  "form.clear-help": "Click here to remove the selected value",
+  "form.clear-help": "Klikněte zde pro odstranění vybrané hodnoty",
+
+  // "form.discard": "Discard",
+  "form.discard": "Vyřadit",
+
+  // "form.drag": "Drag",
+  "form.drag": "Přetáhnout",
 
   // "form.edit": "Edit",
-  // TODO New key - Add a translation
-  "form.edit": "Edit",
+  "form.edit": "Upravit",
 
   // "form.edit-help": "Click here to edit the selected value",
-  // TODO New key - Add a translation
-  "form.edit-help": "Click here to edit the selected value",
+  "form.edit-help": "Klikněte zde pro úpravu vybrané hodnoty",
 
   // "form.first-name": "First name",
   "form.first-name": "Křestní jméno",
@@ -2408,1274 +3131,1834 @@
   "form.group-collapse": "Sbalit",
 
   // "form.group-collapse-help": "Click here to collapse",
-  "form.group-collapse-help": "Kliknutím sem sbalíte",
+  "form.group-collapse-help": "Klikněte zde pro sbalení",
 
   // "form.group-expand": "Expand",
   "form.group-expand": "Rozbalit",
 
   // "form.group-expand-help": "Click here to expand and add more elements",
-  "form.group-expand-help": "Kliknutím sem rozbalíte a přidáte další prvky",
+  "form.group-expand-help": "Klikněte zde pro rozbalení a přidání dalších prvků",
 
   // "form.last-name": "Last name",
   "form.last-name": "Příjmení",
 
   // "form.loading": "Loading...",
-  "form.loading": "Načítá se...",
+  "form.loading": "Načítání...",
 
   // "form.lookup": "Lookup",
-  // TODO New key - Add a translation
-  "form.lookup": "Lookup",
+  "form.lookup": "Vyhledat",
 
   // "form.lookup-help": "Click here to look up an existing relation",
-  // TODO New key - Add a translation
-  "form.lookup-help": "Click here to look up an existing relation",
+  "form.lookup-help": "Klikněte zde pro vyhledání existujícího vztahu",
 
   // "form.no-results": "No results found",
-  "form.no-results": "Nebyli nalezeny žádné výsledky",
+  "form.no-results": "Nebyly nalezeny žádné výsledky",
 
   // "form.no-value": "No value entered",
-  "form.no-value": "Nebyla zadána hodnota",
+  "form.no-value": "Nebyla zadána žádná hodnota",
+
+  // "form.other-information.email": "Email",
+  "form.other-information.email": "Email",
+
+  // "form.other-information.first-name": "First Name",
+  "form.other-information.first-name": "Jméno",
+
+  // "form.other-information.insolr": "In Solr Index",
+  "form.other-information.insolr": "Zaindexováno v Solr",
+
+  // "form.other-information.institution": "Institution",
+  "form.other-information.institution": "Instituce",
+
+  // "form.other-information.last-name": "Last Name",
+  "form.other-information.last-name": "Příjmení",
+
+  // "form.other-information.orcid": "ORCID",
+  "form.other-information.orcid": "ORCID",
 
   // "form.remove": "Remove",
-  "form.remove": "Smazat",
+  "form.remove": "Odstranit",
 
   // "form.save": "Save",
-  // TODO New key - Add a translation
-  "form.save": "Save",
+  "form.save": "Uložit",
 
   // "form.save-help": "Save changes",
-  // TODO New key - Add a translation
-  "form.save-help": "Save changes",
+  "form.save-help": "Uložit změny",
 
   // "form.search": "Search",
   "form.search": "Hledat",
 
   // "form.search-help": "Click here to look for an existing correspondence",
+  "form.search-help": "Klikněte zde pro vyhledání existující korespondence",
+
+  // "form.submit": "Save",
+  // TODO Source message changed - Revise the translation
+  "form.submit": "Uložit",
+
+  // "form.create": "Create",
+  "form.create": "Vytvořit",
+
+  // "form.number-picker.decrement": "Decrement {{field}}",
   // TODO New key - Add a translation
-  "form.search-help": "Click here to look for an existing correspondence",
+  "form.number-picker.decrement": "Decrement {{field}}",
 
-  // "form.submit": "Submit",
-  "form.submit": "Odeslat",
+  // "form.number-picker.increment": "Increment {{field}}",
+  // TODO New key - Add a translation
+  "form.number-picker.increment": "Increment {{field}}",
 
+  // "form.repeatable.sort.tip": "Drop the item in the new position",
+  "form.repeatable.sort.tip": "Přetáhněte záznam na novou pozici",
 
+  // "grant-deny-request-copy.deny": "Don't send copy",
+  "grant-deny-request-copy.deny": "Neposílat kopii",
+
+  // "grant-deny-request-copy.email.back": "Back",
+  "grant-deny-request-copy.email.back": "Zpět",
+
+  // "grant-deny-request-copy.email.message": "Optional additional message",
+  "grant-deny-request-copy.email.message": "Zpráva",
+
+  // "grant-deny-request-copy.email.message.empty": "Please enter a message",
+  "grant-deny-request-copy.email.message.empty": "Zadejte prosím zprávu",
+
+  // "grant-deny-request-copy.email.permissions.info": "You may use this occasion to reconsider the access restrictions on the document, to avoid having to respond to these requests. If you’d like to ask the repository administrators to remove these restrictions, please check the box below.",
+  "grant-deny-request-copy.email.permissions.info": "Při této příležitosti můžete přehodnotit omezení přístupu k dokumentu, abyste nemuseli na tyto žádosti odpovídat. Pokud chcete požádat správce úložiště o zrušení těchto omezení, zaškrtněte prosím políčko níže.",
+
+  // "grant-deny-request-copy.email.permissions.label": "Change to open access",
+  "grant-deny-request-copy.email.permissions.label": "Změnit na otevřený přístup",
+
+  // "grant-deny-request-copy.email.send": "Send",
+  "grant-deny-request-copy.email.send": "Odeslat",
+
+  // "grant-deny-request-copy.email.subject": "Subject",
+  "grant-deny-request-copy.email.subject": "Předmět",
+
+  // "grant-deny-request-copy.email.subject.empty": "Please enter a subject",
+  "grant-deny-request-copy.email.subject.empty": "Zadejte prosím předmět zprávy",
+
+  // "grant-deny-request-copy.grant": "Send copy",
+  "grant-deny-request-copy.grant": "Odeslat kopii",
+
+  // "grant-deny-request-copy.header": "Document copy request",
+  "grant-deny-request-copy.header": "Žádost o kopii dokumentu",
+
+  // "grant-deny-request-copy.home-page": "Take me to the home page",
+  "grant-deny-request-copy.home-page": "Návrat na domovskou stránku",
+
+  // "grant-deny-request-copy.intro1": "If you are one of the authors of the document <a href='{{ url }}'>{{ name }}</a>, then please use one of the options below to respond to the user's request.",
+  "grant-deny-request-copy.intro1": "Pokud jste jedním z autorů dokumentu <a href='{{ url }}'>{{ name }}</a>, použijte prosím jednu z níže uvedených možností, abyste odpověděli na žádost uživatele.",
+
+  // "grant-deny-request-copy.intro2": "After choosing an option, you will be presented with a suggested email reply which you may edit.",
+  "grant-deny-request-copy.intro2": "Po výběru možnosti se zobrazí návrh e-mailové odpovědi, který můžete upravit.",
+
+  // "grant-deny-request-copy.processed": "This request has already been processed. You can use the button below to get back to the home page.",
+  "grant-deny-request-copy.processed": "Tato žádost již byla zpracována. Pomocí níže uvedeného tlačítka se můžete vrátit na domovskou stránku.",
+
+  // "grant-request-copy.email.subject": "Request copy of document",
+  "grant-request-copy.email.subject": "Žádost o kopii dokumentu",
+
+  // "grant-request-copy.error": "An error occurred",
+  "grant-request-copy.error": "Došlo k chybě",
+
+  // "grant-request-copy.header": "Grant document copy request",
+  "grant-request-copy.header": "Žádost o kopii dokumentu",
+
+  // "grant-request-copy.intro": "A message will be sent to the applicant of the request. The requested document(s) will be attached.",
+  "grant-request-copy.intro": "Tato zpráva bude zaslána žadateli. Požadovaný(é) dokument(y) bude(ou) přiložen(y).",
+
+  // "grant-request-copy.success": "Successfully granted item request",
+  "grant-request-copy.success": "Úspěšně vyřízená žádost o záznam",
+
+  // "health.breadcrumbs": "Health",
+  "health.breadcrumbs": "Stav systému",
+
+  // "health-page.heading": "Health",
+  "health-page.heading": "Stav systému",
+
+  // "health-page.info-tab": "Info",
+  "health-page.info-tab": "Informace",
+
+  // "health-page.status-tab": "Status",
+  "health-page.status-tab": "Stav",
+
+  // "health-page.error.msg": "The health check service is temporarily unavailable",
+  "health-page.error.msg": "Služba kontrolující stav systému je momentálně nedostupná.",
+
+  // "health-page.property.status": "Status code",
+  "health-page.property.status": "Stavový kód",
+
+  // "health-page.section.db.title": "Database",
+  "health-page.section.db.title": "Databáze",
+
+  // "health-page.section.geoIp.title": "GeoIp",
+  "health-page.section.geoIp.title": "GeoIp",
+
+  // "health-page.section.solrAuthorityCore.title": "Solr: authority core",
+  "health-page.section.solrAuthorityCore.title": "Solr: authority core",
+
+  // "health-page.section.solrOaiCore.title": "Solr: oai core",
+  "health-page.section.solrOaiCore.title": "Solr: oai core",
+
+  // "health-page.section.solrSearchCore.title": "Solr: search core",
+  // TODO New key - Add a translation
+  "health-page.section.solrSearchCore.title": "Solr: search core",
+
+  // "health-page.section.solrStatisticsCore.title": "Solr: statistics core",
+  "health-page.section.solrStatisticsCore.title": "Solr: statistics core",
+
+  // "health-page.section-info.app.title": "Application Backend",
+  "health-page.section-info.app.title": "Application Backend",
+
+  // "health-page.section-info.java.title": "Java",
+  "health-page.section-info.java.title": "Java",
+
+  // "health-page.status": "Status",
+  "health-page.status": "Status",
+
+  // "health-page.status.ok.info": "Operational",
+  "health-page.status.ok.info": "Funkční",
+
+  // "health-page.status.error.info": "Problems detected",
+  "health-page.status.error.info": "Zjištěny problémy",
+
+  // "health-page.status.warning.info": "Possible issues detected",
+  "health-page.status.warning.info": "Zjištěny možné problémy",
+
+  // "health-page.title": "Health",
+  "health-page.title": "Stav systému",
+
+  // "health-page.section.no-issues": "No issues detected",
+  "health-page.section.no-issues": "Nebyly zjištěny žádné problémy",
 
   // "home.description": "",
   "home.description": "",
 
   // "home.breadcrumbs": "Home",
-  // TODO New key - Add a translation
-  "home.breadcrumbs": "Home",
+  "home.breadcrumbs": "Domů",
 
-  // "home.title": "DSpace Angular :: Home",
-  "home.title": "DSpace Angular :: Domů",
+  // "home.search-form.placeholder": "Search the repository ...",
+  "home.search-form.placeholder": "Hledat v repozitáři...",
+
+  // "home.title": "Home",
+  "home.title": "Domů",
 
   // "home.top-level-communities.head": "Communities in DSpace",
-  "home.top-level-communities.head": "Komunity v DSpace",
+  "home.top-level-communities.head": "Komunity",
 
   // "home.top-level-communities.help": "Select a community to browse its collections.",
-  "home.top-level-communities.help": "Vybráním komunity můžete prohlížet její kolekce.",
-
-
+  "home.top-level-communities.help": "Vyberte komunitu a procházejte její kolekce.",
 
   // "info.end-user-agreement.accept": "I have read and I agree to the End User Agreement",
-  // TODO New key - Add a translation
-  "info.end-user-agreement.accept": "I have read and I agree to the End User Agreement",
+  "info.end-user-agreement.accept": "Přečetl/a jsem si a souhlasím se smlouvou s koncovým uživatelem",
 
   // "info.end-user-agreement.accept.error": "An error occurred accepting the End User Agreement",
-  // TODO New key - Add a translation
-  "info.end-user-agreement.accept.error": "An error occurred accepting the End User Agreement",
+  "info.end-user-agreement.accept.error": "Při přijímání dohody s koncovým uživatelem došlo k chybě",
 
   // "info.end-user-agreement.accept.success": "Successfully updated the End User Agreement",
-  // TODO New key - Add a translation
-  "info.end-user-agreement.accept.success": "Successfully updated the End User Agreement",
+  "info.end-user-agreement.accept.success": "Smlouva s koncovým uživatelem byla úspěšně aktualizována",
 
   // "info.end-user-agreement.breadcrumbs": "End User Agreement",
-  // TODO New key - Add a translation
-  "info.end-user-agreement.breadcrumbs": "End User Agreement",
+  "info.end-user-agreement.breadcrumbs": "Smlouva s koncovým uživatelem",
 
   // "info.end-user-agreement.buttons.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "info.end-user-agreement.buttons.cancel": "Cancel",
+  "info.end-user-agreement.buttons.cancel": "Zrušit",
 
   // "info.end-user-agreement.buttons.save": "Save",
-  // TODO New key - Add a translation
-  "info.end-user-agreement.buttons.save": "Save",
+  "info.end-user-agreement.buttons.save": "Uložit",
 
   // "info.end-user-agreement.head": "End User Agreement",
-  // TODO New key - Add a translation
-  "info.end-user-agreement.head": "End User Agreement",
+  "info.end-user-agreement.head": "Smlouva s koncovým uživatelem",
 
   // "info.end-user-agreement.title": "End User Agreement",
-  // TODO New key - Add a translation
-  "info.end-user-agreement.title": "End User Agreement",
+  "info.end-user-agreement.title": "Smlouva s koncovým uživatelem",
+
+  // "info.end-user-agreement.hosting-country": "the United States",
+  "info.end-user-agreement.hosting-country": "Česká republika",
 
   // "info.privacy.breadcrumbs": "Privacy Statement",
-  // TODO New key - Add a translation
-  "info.privacy.breadcrumbs": "Privacy Statement",
+  "info.privacy.breadcrumbs": "Prohlášení o ochraně osobních údajů",
 
   // "info.privacy.head": "Privacy Statement",
-  // TODO New key - Add a translation
-  "info.privacy.head": "Privacy Statement",
+  "info.privacy.head": "Prohlášení o ochraně osobních údajů",
 
   // "info.privacy.title": "Privacy Statement",
+  "info.privacy.title": "Prohlášení o ochraně osobních údajů",
+
+  // "info.feedback.breadcrumbs": "Feedback",
+  "info.feedback.breadcrumbs": "Zpětná vazba",
+
+  // "info.feedback.head": "Feedback",
+  "info.feedback.head": "Zpětná vazba",
+
+  // "info.feedback.title": "Feedback",
+  "info.feedback.title": "Zpětná vazba",
+
+  // "info.feedback.info": "Thanks for sharing your feedback about the DSpace system. Your comments are appreciated!",
+  "info.feedback.info": "Děkujeme za zpětnou vazbu k systému DSpace. Vašich připomínek si vážíme!",
+
+  // "info.feedback.email_help": "This address will be used to follow up on your feedback.",
+  "info.feedback.email_help": "Tato adresa bude použita pro následné vyřízení vaší zpětné vazby.",
+
+  // "info.feedback.send": "Send Feedback",
+  "info.feedback.send": "Odeslat zpětnou vazbu",
+
+  // "info.feedback.comments": "Comments",
+  "info.feedback.comments": "Komentáře",
+
+  // "info.feedback.email-label": "Your Email",
+  "info.feedback.email-label": "Váš e-mail",
+
+  // "info.feedback.create.success": "Feedback Sent Successfully!",
+  "info.feedback.create.success": "Zpětná vazba úspěšně odeslána!",
+
+  // "info.feedback.error.email.required": "A valid email address is required",
+  "info.feedback.error.email.required": "Je vyžadována platná e-mailová adresa",
+
+  // "info.feedback.error.message.required": "A comment is required",
+  "info.feedback.error.message.required": "Je vyžadován komentář",
+
+  // "info.feedback.page-label": "Page",
+  "info.feedback.page-label": "Stránka",
+
+  // "info.feedback.page_help": "The page related to your feedback",
+  "info.feedback.page_help": "Stránka, která se týká vaší zpětné vazby",
+
+  // "info.coar-notify-support.title": "COAR Notify Support",
   // TODO New key - Add a translation
-  "info.privacy.title": "Privacy Statement",
+  "info.coar-notify-support.title": "COAR Notify Support",
 
-
-
-  // "item.alerts.private": "This item is private",
+  // "info.coar-notify-support.breadcrumbs": "COAR Notify Support",
   // TODO New key - Add a translation
-  "item.alerts.private": "This item is private",
+  "info.coar-notify-support.breadcrumbs": "COAR Notify Support",
+
+  // "item.alerts.private": "This item is non-discoverable",
+  "item.alerts.private": "Tento záznam je nevyhledatelný",
 
   // "item.alerts.withdrawn": "This item has been withdrawn",
+  "item.alerts.withdrawn": "Tento záznam byl stažen",
+
+  // "item.alerts.reinstate-request": "Request reinstate",
   // TODO New key - Add a translation
-  "item.alerts.withdrawn": "This item has been withdrawn",
-
+  "item.alerts.reinstate-request": "Request reinstate",
 
+  // "quality-assurance.event.table.person-who-requested": "Requested by",
+  // TODO New key - Add a translation
+  "quality-assurance.event.table.person-who-requested": "Requested by",
 
   // "item.edit.authorizations.heading": "With this editor you can view and alter the policies of an item, plus alter policies of individual item components: bundles and bitstreams. Briefly, an item is a container of bundles, and bundles are containers of bitstreams. Containers usually have ADD/REMOVE/READ/WRITE policies, while bitstreams only have READ/WRITE policies.",
-  // TODO New key - Add a translation
-  "item.edit.authorizations.heading": "With this editor you can view and alter the policies of an item, plus alter policies of individual item components: bundles and bitstreams. Briefly, an item is a container of bundles, and bundles are containers of bitstreams. Containers usually have ADD/REMOVE/READ/WRITE policies, while bitstreams only have READ/WRITE policies.",
+  "item.edit.authorizations.heading": "Pomocí tohoto editoru můžete zobrazit a měnit politiky záznamu a také měnit politiky jednotlivých součástí záznamu: svazků a souborů. Stručně řečeno, záznam je kontejnerem svazků a svazky jsou kontejnery souborů. Kontejnery mají obvykle zásady ADD/REMOVE/READ/WRITE, zatímco soubory mají pouze zásady READ/WRITE.",
 
   // "item.edit.authorizations.title": "Edit item's Policies",
-  // TODO New key - Add a translation
-  "item.edit.authorizations.title": "Edit item's Policies",
+  "item.edit.authorizations.title": "Upravit politiky záznamu",
 
-
-
-  // "item.badge.private": "Private",
-  // TODO New key - Add a translation
-  "item.badge.private": "Private",
+  // "item.badge.private": "Non-discoverable",
+  // TODO Source message changed - Revise the translation
+  "item.badge.private": "Nedohledatelné",
 
   // "item.badge.withdrawn": "Withdrawn",
-  // TODO New key - Add a translation
-  "item.badge.withdrawn": "Withdrawn",
-
-
+  "item.badge.withdrawn": "Vyřazeno",
 
   // "item.bitstreams.upload.bundle": "Bundle",
-  // TODO New key - Add a translation
-  "item.bitstreams.upload.bundle": "Bundle",
+  "item.bitstreams.upload.bundle": "Svazek",
 
-  // "item.bitstreams.upload.bundle.placeholder": "Select a bundle",
-  // TODO New key - Add a translation
-  "item.bitstreams.upload.bundle.placeholder": "Select a bundle",
+  // "item.bitstreams.upload.bundle.placeholder": "Select a bundle or input new bundle name",
+  // TODO Source message changed - Revise the translation
+  "item.bitstreams.upload.bundle.placeholder": "Vyberte svazek nebo zadejte nový název svazku",
 
   // "item.bitstreams.upload.bundle.new": "Create bundle",
-  // TODO New key - Add a translation
-  "item.bitstreams.upload.bundle.new": "Create bundle",
+  "item.bitstreams.upload.bundle.new": "Vytvořit svazek",
 
   // "item.bitstreams.upload.bundles.empty": "This item doesn't contain any bundles to upload a bitstream to.",
-  // TODO New key - Add a translation
-  "item.bitstreams.upload.bundles.empty": "This item doesn't contain any bundles to upload a bitstream to.",
+  "item.bitstreams.upload.bundles.empty": "Tento záznam neobsahuje žádné svazky, do kterých by bylo možné nahrát soubor.",
 
   // "item.bitstreams.upload.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "item.bitstreams.upload.cancel": "Cancel",
+  "item.bitstreams.upload.cancel": "Zrušit",
 
   // "item.bitstreams.upload.drop-message": "Drop a file to upload",
-  // TODO New key - Add a translation
-  "item.bitstreams.upload.drop-message": "Drop a file to upload",
+  "item.bitstreams.upload.drop-message": "Přetáhnout soubor k nahrání",
 
   // "item.bitstreams.upload.item": "Item: ",
-  // TODO New key - Add a translation
-  "item.bitstreams.upload.item": "Item: ",
+  "item.bitstreams.upload.item": "Záznam: ",
 
   // "item.bitstreams.upload.notifications.bundle.created.content": "Successfully created new bundle.",
-  // TODO New key - Add a translation
-  "item.bitstreams.upload.notifications.bundle.created.content": "Successfully created new bundle.",
+  "item.bitstreams.upload.notifications.bundle.created.content": "Úspěšně vytvořen nový svazek.",
 
   // "item.bitstreams.upload.notifications.bundle.created.title": "Created bundle",
-  // TODO New key - Add a translation
-  "item.bitstreams.upload.notifications.bundle.created.title": "Created bundle",
+  "item.bitstreams.upload.notifications.bundle.created.title": "Vytvořit svazek",
 
   // "item.bitstreams.upload.notifications.upload.failed": "Upload failed. Please verify the content before retrying.",
-  // TODO New key - Add a translation
-  "item.bitstreams.upload.notifications.upload.failed": "Upload failed. Please verify the content before retrying.",
+  "item.bitstreams.upload.notifications.upload.failed": "Nahrávání se nezdařilo. Před dalším pokusem ověřte obsah.",
 
   // "item.bitstreams.upload.title": "Upload bitstream",
-  // TODO New key - Add a translation
-  "item.bitstreams.upload.title": "Upload bitstream",
-
-
+  "item.bitstreams.upload.title": "Nahrát soubor",
 
   // "item.edit.bitstreams.bundle.edit.buttons.upload": "Upload",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.bundle.edit.buttons.upload": "Upload",
+  "item.edit.bitstreams.bundle.edit.buttons.upload": "Nahrát",
 
   // "item.edit.bitstreams.bundle.displaying": "Currently displaying {{ amount }} bitstreams of {{ total }}.",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.bundle.displaying": "Currently displaying {{ amount }} bitstreams of {{ total }}.",
+  "item.edit.bitstreams.bundle.displaying": "Aktuálně zobrazuje {{ amount }} souborů z {{ total }}.",
 
   // "item.edit.bitstreams.bundle.load.all": "Load all ({{ total }})",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.bundle.load.all": "Load all ({{ total }})",
+  "item.edit.bitstreams.bundle.load.all": "Načíst všechny ({{ total }})",
 
   // "item.edit.bitstreams.bundle.load.more": "Load more",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.bundle.load.more": "Load more",
+  "item.edit.bitstreams.bundle.load.more": "Načíst více",
 
   // "item.edit.bitstreams.bundle.name": "BUNDLE: {{ name }}",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.bundle.name": "BUNDLE: {{ name }}",
+  "item.edit.bitstreams.bundle.name": "Svazek: {{ name }}",
 
   // "item.edit.bitstreams.discard-button": "Discard",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.discard-button": "Discard",
+  "item.edit.bitstreams.discard-button": "Zahodit",
 
   // "item.edit.bitstreams.edit.buttons.download": "Download",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.edit.buttons.download": "Download",
+  "item.edit.bitstreams.edit.buttons.download": "Stáhnout",
 
   // "item.edit.bitstreams.edit.buttons.drag": "Drag",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.edit.buttons.drag": "Drag",
+  "item.edit.bitstreams.edit.buttons.drag": "Přetáhnout",
 
   // "item.edit.bitstreams.edit.buttons.edit": "Edit",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.edit.buttons.edit": "Edit",
+  "item.edit.bitstreams.edit.buttons.edit": "Upravit",
 
   // "item.edit.bitstreams.edit.buttons.remove": "Remove",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.edit.buttons.remove": "Remove",
+  "item.edit.bitstreams.edit.buttons.remove": "Odstranit",
 
   // "item.edit.bitstreams.edit.buttons.undo": "Undo changes",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.edit.buttons.undo": "Undo changes",
+  "item.edit.bitstreams.edit.buttons.undo": "Vrátit změny",
 
   // "item.edit.bitstreams.empty": "This item doesn't contain any bitstreams. Click the upload button to create one.",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.empty": "This item doesn't contain any bitstreams. Click the upload button to create one.",
+  "item.edit.bitstreams.empty": "Tento záznam neobsahuje žádné soubory. Klikněte na tlačítko pro nahrání a nějaký vytvořte.",
 
   // "item.edit.bitstreams.headers.actions": "Actions",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.headers.actions": "Actions",
+  "item.edit.bitstreams.headers.actions": "Akce",
 
   // "item.edit.bitstreams.headers.bundle": "Bundle",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.headers.bundle": "Bundle",
+  "item.edit.bitstreams.headers.bundle": "Svazek",
 
   // "item.edit.bitstreams.headers.description": "Description",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.headers.description": "Description",
+  "item.edit.bitstreams.headers.description": "Popis",
 
   // "item.edit.bitstreams.headers.format": "Format",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.headers.format": "Format",
+  "item.edit.bitstreams.headers.format": "Formát",
 
   // "item.edit.bitstreams.headers.name": "Name",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.headers.name": "Name",
+  "item.edit.bitstreams.headers.name": "Název",
 
   // "item.edit.bitstreams.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button",
+  "item.edit.bitstreams.notifications.discarded.content": "Vaše změny byly zahozeny. Pro obnovení změn klikněte na tlačítko 'Vrátit změny'",
 
   // "item.edit.bitstreams.notifications.discarded.title": "Changes discarded",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.notifications.discarded.title": "Changes discarded",
+  "item.edit.bitstreams.notifications.discarded.title": "Zahozené změny",
 
   // "item.edit.bitstreams.notifications.move.failed.title": "Error moving bitstreams",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.notifications.move.failed.title": "Error moving bitstreams",
+  "item.edit.bitstreams.notifications.move.failed.title": "Chyba při přesunu souborů",
 
   // "item.edit.bitstreams.notifications.move.saved.content": "Your move changes to this item's bitstreams and bundles have been saved.",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.notifications.move.saved.content": "Your move changes to this item's bitstreams and bundles have been saved.",
+  "item.edit.bitstreams.notifications.move.saved.content": "Vaše změny v souborech a svazcích tohoto záznamu byly uloženy.",
 
   // "item.edit.bitstreams.notifications.move.saved.title": "Move changes saved",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.notifications.move.saved.title": "Move changes saved",
+  "item.edit.bitstreams.notifications.move.saved.title": "Změny uloženy",
 
   // "item.edit.bitstreams.notifications.outdated.content": "The item you're currently working on has been changed by another user. Your current changes are discarded to prevent conflicts",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.notifications.outdated.content": "The item you're currently working on has been changed by another user. Your current changes are discarded to prevent conflicts",
+  "item.edit.bitstreams.notifications.outdated.content": "Záznam, na kterém právě pracujete, byl změněn jiným uživatelem. Vaše aktuální změny byly zahozeny, aby se zabránilo konfliktům",
 
   // "item.edit.bitstreams.notifications.outdated.title": "Changes outdated",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.notifications.outdated.title": "Changes outdated",
+  "item.edit.bitstreams.notifications.outdated.title": "Změny jsou zastaralé",
 
   // "item.edit.bitstreams.notifications.remove.failed.title": "Error deleting bitstream",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.notifications.remove.failed.title": "Error deleting bitstream",
+  "item.edit.bitstreams.notifications.remove.failed.title": "Chyba při odstraňování souboru.",
 
   // "item.edit.bitstreams.notifications.remove.saved.content": "Your removal changes to this item's bitstreams have been saved.",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.notifications.remove.saved.content": "Your removal changes to this item's bitstreams have been saved.",
+  "item.edit.bitstreams.notifications.remove.saved.content": "Vaše změny odstranění souborů u tohoto záznamu byly uloženy.",
 
   // "item.edit.bitstreams.notifications.remove.saved.title": "Removal changes saved",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.notifications.remove.saved.title": "Removal changes saved",
+  "item.edit.bitstreams.notifications.remove.saved.title": "Odstranění změn uloženo",
 
   // "item.edit.bitstreams.reinstate-button": "Undo",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.reinstate-button": "Undo",
+  "item.edit.bitstreams.reinstate-button": "Vrátit zpět",
 
   // "item.edit.bitstreams.save-button": "Save",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.save-button": "Save",
+  "item.edit.bitstreams.save-button": "Uložit",
 
   // "item.edit.bitstreams.upload-button": "Upload",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.upload-button": "Upload",
-
-
+  "item.edit.bitstreams.upload-button": "Nahrát",
 
   // "item.edit.delete.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "item.edit.delete.cancel": "Cancel",
+  "item.edit.delete.cancel": "Zrušit",
 
   // "item.edit.delete.confirm": "Delete",
-  // TODO New key - Add a translation
-  "item.edit.delete.confirm": "Delete",
+  "item.edit.delete.confirm": "Smazat",
 
   // "item.edit.delete.description": "Are you sure this item should be completely deleted? Caution: At present, no tombstone would be left.",
-  // TODO New key - Add a translation
-  "item.edit.delete.description": "Are you sure this item should be completely deleted? Caution: At present, no tombstone would be left.",
+  "item.edit.delete.description": "Jste si jisti, že má být tento záznam zcela odstraněn? Pozor: V současné době by nezůstala žádná poznámka.",
 
   // "item.edit.delete.error": "An error occurred while deleting the item",
-  // TODO New key - Add a translation
-  "item.edit.delete.error": "An error occurred while deleting the item",
+  "item.edit.delete.error": "Při mazání záznamu došlo k chybě",
 
   // "item.edit.delete.header": "Delete item: {{ id }}",
-  // TODO New key - Add a translation
-  "item.edit.delete.header": "Delete item: {{ id }}",
+  "item.edit.delete.header": "Smazat záznam: {{ id }}",
 
   // "item.edit.delete.success": "The item has been deleted",
-  // TODO New key - Add a translation
-  "item.edit.delete.success": "The item has been deleted",
+  "item.edit.delete.success": "Záznam byl odstraněn",
 
   // "item.edit.head": "Edit Item",
-  // TODO New key - Add a translation
-  "item.edit.head": "Edit Item",
+  "item.edit.head": "Upravit záznam",
 
   // "item.edit.breadcrumbs": "Edit Item",
-  // TODO New key - Add a translation
-  "item.edit.breadcrumbs": "Edit Item",
+  "item.edit.breadcrumbs": "Upravit záznam",
 
+  // "item.edit.tabs.disabled.tooltip": "You're not authorized to access this tab",
+  "item.edit.tabs.disabled.tooltip": "K této kartě nemáte oprávnění",
 
   // "item.edit.tabs.mapper.head": "Collection Mapper",
-  // TODO New key - Add a translation
-  "item.edit.tabs.mapper.head": "Collection Mapper",
+  "item.edit.tabs.mapper.head": "Mapování do jiných kolekcí",
 
   // "item.edit.tabs.item-mapper.title": "Item Edit - Collection Mapper",
-  // TODO New key - Add a translation
-  "item.edit.tabs.item-mapper.title": "Item Edit - Collection Mapper",
+  "item.edit.tabs.item-mapper.title": "Upravit záznam - Mapování do jiných kolekcí",
+
+  // "item.edit.identifiers.doi.status.UNKNOWN": "Unknown",
+  "item.edit.identifiers.doi.status.UNKNOWN": "Neznámý",
+
+  // "item.edit.identifiers.doi.status.TO_BE_REGISTERED": "Queued for registration",
+  "item.edit.identifiers.doi.status.TO_BE_REGISTERED": "Čeká na registraci",
+
+  // "item.edit.identifiers.doi.status.TO_BE_RESERVED": "Queued for reservation",
+  "item.edit.identifiers.doi.status.TO_BE_RESERVED": "Čeká na rezervaci",
+
+  // "item.edit.identifiers.doi.status.IS_REGISTERED": "Registered",
+  "item.edit.identifiers.doi.status.IS_REGISTERED": "Registrováno",
+
+  // "item.edit.identifiers.doi.status.IS_RESERVED": "Reserved",
+  "item.edit.identifiers.doi.status.IS_RESERVED": "Rezervováno",
+
+  // "item.edit.identifiers.doi.status.UPDATE_RESERVED": "Reserved (update queued)",
+  "item.edit.identifiers.doi.status.UPDATE_RESERVED": "Rezervováno (aktualizace ve frontě)",
+
+  // "item.edit.identifiers.doi.status.UPDATE_REGISTERED": "Registered (update queued)",
+  "item.edit.identifiers.doi.status.UPDATE_REGISTERED": "Registrováno (aktualizace ve frontě)",
+
+  // "item.edit.identifiers.doi.status.UPDATE_BEFORE_REGISTRATION": "Queued for update and registration",
+  "item.edit.identifiers.doi.status.UPDATE_BEFORE_REGISTRATION": "Čeká na aktualizaci a registraci",
+
+  // "item.edit.identifiers.doi.status.TO_BE_DELETED": "Queued for deletion",
+  "item.edit.identifiers.doi.status.TO_BE_DELETED": "Ve frontě na smazání",
+
+  // "item.edit.identifiers.doi.status.DELETED": "Deleted",
+  "item.edit.identifiers.doi.status.DELETED": "Smazáno",
+
+  // "item.edit.identifiers.doi.status.PENDING": "Pending (not registered)",
+  "item.edit.identifiers.doi.status.PENDING": "Čeká na vyřízení (nezaregistrováno)",
+
+  // "item.edit.identifiers.doi.status.MINTED": "Minted (not registered)",
+  "item.edit.identifiers.doi.status.MINTED": "Vydáno (nezaregistrováno)",
+
+  // "item.edit.tabs.status.buttons.register-doi.label": "Register a new or pending DOI",
+  "item.edit.tabs.status.buttons.register-doi.label": "Registrovat nové nebo čekající DOI",
+
+  // "item.edit.tabs.status.buttons.register-doi.button": "Register DOI...",
+  "item.edit.tabs.status.buttons.register-doi.button": "Zaregistrujte DOI...",
+
+  // "item.edit.register-doi.header": "Register a new or pending DOI",
+  "item.edit.register-doi.header": "Registrovat nové nebo čekající DOI",
+
+  // "item.edit.register-doi.description": "Review any pending identifiers and item metadata below and click Confirm to proceed with DOI registration, or Cancel to back out",
+  "item.edit.register-doi.description": "Níže zkontrolujte všechny identifikátory a metadata ve frontě. Zvolte \"Potvrdit\" pro pokračování v registraci DOI nebo \"Zrušit\" pro přerušení procesu.",
+
+  // "item.edit.register-doi.confirm": "Confirm",
+  "item.edit.register-doi.confirm": "Potvrdit",
+
+  // "item.edit.register-doi.cancel": "Cancel",
+  "item.edit.register-doi.cancel": "Zrušit",
+
+  // "item.edit.register-doi.success": "DOI queued for registration successfully.",
+  "item.edit.register-doi.success": "DOI ve frontě úspěšně zaregistrováno.",
+
+  // "item.edit.register-doi.error": "Error registering DOI",
+  "item.edit.register-doi.error": "Chyba při registraci DOI",
+
+  // "item.edit.register-doi.to-update": "The following DOI has already been minted and will be queued for registration online",
+  "item.edit.register-doi.to-update": "Toto DOI již bylo vydáno a bude zařazeno k online registraci",
 
   // "item.edit.item-mapper.buttons.add": "Map item to selected collections",
-  // TODO New key - Add a translation
-  "item.edit.item-mapper.buttons.add": "Map item to selected collections",
+  "item.edit.item-mapper.buttons.add": "Mapovat záznam do vybraných kolekcí",
 
   // "item.edit.item-mapper.buttons.remove": "Remove item's mapping for selected collections",
-  // TODO New key - Add a translation
-  "item.edit.item-mapper.buttons.remove": "Remove item's mapping for selected collections",
+  "item.edit.item-mapper.buttons.remove": "Odebrat mapování záznamu pro vybrané kolekce",
 
   // "item.edit.item-mapper.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "item.edit.item-mapper.cancel": "Cancel",
+  "item.edit.item-mapper.cancel": "Zrušit",
 
   // "item.edit.item-mapper.description": "This is the item mapper tool that allows administrators to map this item to other collections. You can search for collections and map them, or browse the list of collections the item is currently mapped to.",
-  // TODO New key - Add a translation
-  "item.edit.item-mapper.description": "This is the item mapper tool that allows administrators to map this item to other collections. You can search for collections and map them, or browse the list of collections the item is currently mapped to.",
+  "item.edit.item-mapper.description": "Toto je nástroj pro mapování záznamů, který umožňuje správcům mapovat tento záznam do jiné kolekce. Můžete vyhledávat kolekce a mapovat je nebo procházet seznam kolekcí, ke kterým je záznam aktuálně mapována.",
 
   // "item.edit.item-mapper.head": "Item Mapper - Map Item to Collections",
-  // TODO New key - Add a translation
-  "item.edit.item-mapper.head": "Item Mapper - Map Item to Collections",
+  "item.edit.item-mapper.head": "Mapování do jiných kolekcí - mapovat záznam do kolekcí",
 
   // "item.edit.item-mapper.item": "Item: \"<b>{{name}}</b>\"",
-  // TODO New key - Add a translation
-  "item.edit.item-mapper.item": "Item: \"<b>{{name}}</b>\"",
+  "item.edit.item-mapper.item": "Záznam: \"<b>{{name}}</b>\"",
 
   // "item.edit.item-mapper.no-search": "Please enter a query to search",
-  // TODO New key - Add a translation
-  "item.edit.item-mapper.no-search": "Please enter a query to search",
+  "item.edit.item-mapper.no-search": "Zadejte prosím dotaz pro vyhledávání",
 
   // "item.edit.item-mapper.notifications.add.error.content": "Errors occurred for mapping of item to {{amount}} collections.",
-  // TODO New key - Add a translation
-  "item.edit.item-mapper.notifications.add.error.content": "Errors occurred for mapping of item to {{amount}} collections.",
+  "item.edit.item-mapper.notifications.add.error.content": "Při mapování záznamu do {{amount}} kolekcí  došlo k chybám.",
 
   // "item.edit.item-mapper.notifications.add.error.head": "Mapping errors",
-  // TODO New key - Add a translation
-  "item.edit.item-mapper.notifications.add.error.head": "Mapping errors",
+  "item.edit.item-mapper.notifications.add.error.head": "Chyby při mapování",
 
   // "item.edit.item-mapper.notifications.add.success.content": "Successfully mapped item to {{amount}} collections.",
-  // TODO New key - Add a translation
-  "item.edit.item-mapper.notifications.add.success.content": "Successfully mapped item to {{amount}} collections.",
+  "item.edit.item-mapper.notifications.add.success.content": "Úspěšné mapování záznamu do {{amount}} kolekcí .",
 
   // "item.edit.item-mapper.notifications.add.success.head": "Mapping completed",
-  // TODO New key - Add a translation
-  "item.edit.item-mapper.notifications.add.success.head": "Mapping completed",
+  "item.edit.item-mapper.notifications.add.success.head": "Mapování dokončeno",
 
   // "item.edit.item-mapper.notifications.remove.error.content": "Errors occurred for the removal of the mapping to {{amount}} collections.",
-  // TODO New key - Add a translation
-  "item.edit.item-mapper.notifications.remove.error.content": "Errors occurred for the removal of the mapping to {{amount}} collections.",
+  "item.edit.item-mapper.notifications.remove.error.content": "Při odstraňování mapování do {{amount}} kolekcí  došlo k chybám.",
 
   // "item.edit.item-mapper.notifications.remove.error.head": "Removal of mapping errors",
-  // TODO New key - Add a translation
-  "item.edit.item-mapper.notifications.remove.error.head": "Removal of mapping errors",
+  "item.edit.item-mapper.notifications.remove.error.head": "Odstranění chyb při mapování",
 
   // "item.edit.item-mapper.notifications.remove.success.content": "Successfully removed mapping of item to {{amount}} collections.",
-  // TODO New key - Add a translation
-  "item.edit.item-mapper.notifications.remove.success.content": "Successfully removed mapping of item to {{amount}} collections.",
+  "item.edit.item-mapper.notifications.remove.success.content": "Úspěšně odstraněno mapování záznamu do {{amount}} kolekcí .",
 
   // "item.edit.item-mapper.notifications.remove.success.head": "Removal of mapping completed",
-  // TODO New key - Add a translation
-  "item.edit.item-mapper.notifications.remove.success.head": "Removal of mapping completed",
+  "item.edit.item-mapper.notifications.remove.success.head": "Odstranění mapování dokončeno",
+
+  // "item.edit.item-mapper.search-form.placeholder": "Search collections...",
+  "item.edit.item-mapper.search-form.placeholder": "Hledat kolekce...",
 
   // "item.edit.item-mapper.tabs.browse": "Browse mapped collections",
-  // TODO New key - Add a translation
-  "item.edit.item-mapper.tabs.browse": "Browse mapped collections",
+  "item.edit.item-mapper.tabs.browse": "Procházet mapované kolekce",
 
   // "item.edit.item-mapper.tabs.map": "Map new collections",
-  // TODO New key - Add a translation
-  "item.edit.item-mapper.tabs.map": "Map new collections",
-
-
+  "item.edit.item-mapper.tabs.map": "Mapovat nové kolekce",
 
   // "item.edit.metadata.add-button": "Add",
-  // TODO New key - Add a translation
-  "item.edit.metadata.add-button": "Add",
+  "item.edit.metadata.add-button": "Přidat",
 
   // "item.edit.metadata.discard-button": "Discard",
+  "item.edit.metadata.discard-button": "Vyřadit",
+
+  // "item.edit.metadata.edit.language": "Edit language",
   // TODO New key - Add a translation
-  "item.edit.metadata.discard-button": "Discard",
+  "item.edit.metadata.edit.language": "Edit language",
+
+  // "item.edit.metadata.edit.value": "Edit value",
+  // TODO New key - Add a translation
+  "item.edit.metadata.edit.value": "Edit value",
+
+  // "item.edit.metadata.edit.authority.key": "Edit authority key",
+  // TODO New key - Add a translation
+  "item.edit.metadata.edit.authority.key": "Edit authority key",
+
+  // "item.edit.metadata.edit.buttons.confirm": "Confirm",
+  "item.edit.metadata.edit.buttons.confirm": "Potvrdit",
+
+  // "item.edit.metadata.edit.buttons.drag": "Drag to reorder",
+  "item.edit.metadata.edit.buttons.drag": "Přetažením změnit pořadí",
 
   // "item.edit.metadata.edit.buttons.edit": "Edit",
-  // TODO New key - Add a translation
-  "item.edit.metadata.edit.buttons.edit": "Edit",
+  "item.edit.metadata.edit.buttons.edit": "Upravit",
 
   // "item.edit.metadata.edit.buttons.remove": "Remove",
-  // TODO New key - Add a translation
-  "item.edit.metadata.edit.buttons.remove": "Remove",
+  "item.edit.metadata.edit.buttons.remove": "Odstranit",
 
   // "item.edit.metadata.edit.buttons.undo": "Undo changes",
-  // TODO New key - Add a translation
-  "item.edit.metadata.edit.buttons.undo": "Undo changes",
+  "item.edit.metadata.edit.buttons.undo": "Vrátit změny",
 
   // "item.edit.metadata.edit.buttons.unedit": "Stop editing",
-  // TODO New key - Add a translation
-  "item.edit.metadata.edit.buttons.unedit": "Stop editing",
+  "item.edit.metadata.edit.buttons.unedit": "Zastavit úpravy",
+
+  // "item.edit.metadata.edit.buttons.virtual": "This is a virtual metadata value, i.e. a value inherited from a related entity. It can’t be modified directly. Add or remove the corresponding relationship in the \"Relationships\" tab",
+  "item.edit.metadata.edit.buttons.virtual": "Tato hodnota metadat je virtuální, tedy děděná z provázané entity. Nemůže být změněna napřímo. Přidejte či odeberte příslušný vztah na záložce \"Vztahy\".",
 
   // "item.edit.metadata.empty": "The item currently doesn't contain any metadata. Click Add to start adding a metadata value.",
-  // TODO New key - Add a translation
-  "item.edit.metadata.empty": "The item currently doesn't contain any metadata. Click Add to start adding a metadata value.",
+  "item.edit.metadata.empty": "Záznam aktuálně neobsahuje žádná metadata. Kliknutím na tlačítko Přidat začněte přidávat hodnotu metadat.",
 
   // "item.edit.metadata.headers.edit": "Edit",
-  // TODO New key - Add a translation
-  "item.edit.metadata.headers.edit": "Edit",
+  "item.edit.metadata.headers.edit": "Upravit",
 
   // "item.edit.metadata.headers.field": "Field",
-  // TODO New key - Add a translation
-  "item.edit.metadata.headers.field": "Field",
+  "item.edit.metadata.headers.field": "Pole",
 
   // "item.edit.metadata.headers.language": "Lang",
-  // TODO New key - Add a translation
-  "item.edit.metadata.headers.language": "Lang",
+  "item.edit.metadata.headers.language": "Jazyk",
 
   // "item.edit.metadata.headers.value": "Value",
+  "item.edit.metadata.headers.value": "Hodnota",
+
+  // "item.edit.metadata.metadatafield": "Edit field",
   // TODO New key - Add a translation
-  "item.edit.metadata.headers.value": "Value",
+  "item.edit.metadata.metadatafield": "Edit field",
+
+  // "item.edit.metadata.metadatafield.error": "An error occurred validating the metadata field",
+  "item.edit.metadata.metadatafield.error": "Při ověřování metadatového pole se vyskytla chyba",
 
   // "item.edit.metadata.metadatafield.invalid": "Please choose a valid metadata field",
-  // TODO New key - Add a translation
-  "item.edit.metadata.metadatafield.invalid": "Please choose a valid metadata field",
+  "item.edit.metadata.metadatafield.invalid": "Prosím, vyberte platné metadatové pole",
 
   // "item.edit.metadata.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button",
-  // TODO New key - Add a translation
-  "item.edit.metadata.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button",
+  "item.edit.metadata.notifications.discarded.content": "Vaše změny byly zahozeny. Pro obnovení změn klikněte na tlačítko 'Vrátit změny'",
 
-  // "item.edit.metadata.notifications.discarded.title": "Changed discarded",
-  // TODO New key - Add a translation
-  "item.edit.metadata.notifications.discarded.title": "Changed discarded",
+  // "item.edit.metadata.notifications.discarded.title": "Changes discarded",
+  // TODO Source message changed - Revise the translation
+  "item.edit.metadata.notifications.discarded.title": "Zahozené změny",
 
   // "item.edit.metadata.notifications.error.title": "An error occurred",
-  // TODO New key - Add a translation
-  "item.edit.metadata.notifications.error.title": "An error occurred",
+  "item.edit.metadata.notifications.error.title": "Došlo k chybě",
 
   // "item.edit.metadata.notifications.invalid.content": "Your changes were not saved. Please make sure all fields are valid before you save.",
-  // TODO New key - Add a translation
-  "item.edit.metadata.notifications.invalid.content": "Your changes were not saved. Please make sure all fields are valid before you save.",
+  "item.edit.metadata.notifications.invalid.content": "Vaše změny nebyly uloženy. Před uložením se prosím ujistěte, že jsou všechna pole platná.",
 
   // "item.edit.metadata.notifications.invalid.title": "Metadata invalid",
-  // TODO New key - Add a translation
-  "item.edit.metadata.notifications.invalid.title": "Metadata invalid",
+  "item.edit.metadata.notifications.invalid.title": "Neplatná metadata",
 
   // "item.edit.metadata.notifications.outdated.content": "The item you're currently working on has been changed by another user. Your current changes are discarded to prevent conflicts",
-  // TODO New key - Add a translation
-  "item.edit.metadata.notifications.outdated.content": "The item you're currently working on has been changed by another user. Your current changes are discarded to prevent conflicts",
+  "item.edit.metadata.notifications.outdated.content": "Záznam, na kterém právě pracujete, byl změněn jiným uživatelem. Vaše aktuální změny byly zahozeny, aby se zabránilo konfliktům",
 
-  // "item.edit.metadata.notifications.outdated.title": "Changed outdated",
-  // TODO New key - Add a translation
-  "item.edit.metadata.notifications.outdated.title": "Changed outdated",
+  // "item.edit.metadata.notifications.outdated.title": "Changes outdated",
+  // TODO Source message changed - Revise the translation
+  "item.edit.metadata.notifications.outdated.title": "Změny jsou zastaralé",
 
   // "item.edit.metadata.notifications.saved.content": "Your changes to this item's metadata were saved.",
-  // TODO New key - Add a translation
-  "item.edit.metadata.notifications.saved.content": "Your changes to this item's metadata were saved.",
+  "item.edit.metadata.notifications.saved.content": "Vaše změny metadat tohoto záznamu byly uloženy.",
 
   // "item.edit.metadata.notifications.saved.title": "Metadata saved",
-  // TODO New key - Add a translation
-  "item.edit.metadata.notifications.saved.title": "Metadata saved",
+  "item.edit.metadata.notifications.saved.title": "Metadata uložena",
 
   // "item.edit.metadata.reinstate-button": "Undo",
-  // TODO New key - Add a translation
-  "item.edit.metadata.reinstate-button": "Undo",
+  "item.edit.metadata.reinstate-button": "Vrátit zpět",
+
+  // "item.edit.metadata.reset-order-button": "Undo reorder",
+  "item.edit.metadata.reset-order-button": "Vrátit zpět příkaz",
 
   // "item.edit.metadata.save-button": "Save",
+  "item.edit.metadata.save-button": "Uložit",
+
+  // "item.edit.metadata.authority.label": "Authority: ",
   // TODO New key - Add a translation
-  "item.edit.metadata.save-button": "Save",
+  "item.edit.metadata.authority.label": "Authority: ",
 
+  // "item.edit.metadata.edit.buttons.open-authority-edition": "Unlock the authority key value for manual editing",
+  // TODO New key - Add a translation
+  "item.edit.metadata.edit.buttons.open-authority-edition": "Unlock the authority key value for manual editing",
 
+  // "item.edit.metadata.edit.buttons.close-authority-edition": "Lock the authority key value for manual editing",
+  // TODO New key - Add a translation
+  "item.edit.metadata.edit.buttons.close-authority-edition": "Lock the authority key value for manual editing",
 
   // "item.edit.modify.overview.field": "Field",
-  // TODO New key - Add a translation
-  "item.edit.modify.overview.field": "Field",
+  "item.edit.modify.overview.field": "Pole",
 
   // "item.edit.modify.overview.language": "Language",
-  // TODO New key - Add a translation
-  "item.edit.modify.overview.language": "Language",
+  "item.edit.modify.overview.language": "Jazyk",
 
   // "item.edit.modify.overview.value": "Value",
-  // TODO New key - Add a translation
-  "item.edit.modify.overview.value": "Value",
+  "item.edit.modify.overview.value": "Hodnota",
 
+  // "item.edit.move.cancel": "Back",
+  // TODO Source message changed - Revise the translation
+  "item.edit.move.cancel": "Zpět",
 
+  // "item.edit.move.save-button": "Save",
+  "item.edit.move.save-button": "Uložit",
 
-  // "item.edit.move.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "item.edit.move.cancel": "Cancel",
+  // "item.edit.move.discard-button": "Discard",
+  "item.edit.move.discard-button": "Vyřadit",
 
   // "item.edit.move.description": "Select the collection you wish to move this item to. To narrow down the list of displayed collections, you can enter a search query in the box.",
-  // TODO New key - Add a translation
-  "item.edit.move.description": "Select the collection you wish to move this item to. To narrow down the list of displayed collections, you can enter a search query in the box.",
+  "item.edit.move.description": "Vyberte kolekci, do které chcete tento záznam přesunout. Chcete-li omezit seznam zobrazených kolekcí, můžete do pole zadat vyhledávací dotaz.",
 
   // "item.edit.move.error": "An error occurred when attempting to move the item",
-  // TODO New key - Add a translation
-  "item.edit.move.error": "An error occurred when attempting to move the item",
+  "item.edit.move.error": "Při pokusu o přesun záznamu došlo k chybě",
 
   // "item.edit.move.head": "Move item: {{id}}",
-  // TODO New key - Add a translation
-  "item.edit.move.head": "Move item: {{id}}",
+  "item.edit.move.head": "Přesunout záznam: {{id}}",
 
   // "item.edit.move.inheritpolicies.checkbox": "Inherit policies",
-  // TODO New key - Add a translation
-  "item.edit.move.inheritpolicies.checkbox": "Inherit policies",
+  "item.edit.move.inheritpolicies.checkbox": "Zdědit politiky",
 
   // "item.edit.move.inheritpolicies.description": "Inherit the default policies of the destination collection",
+  "item.edit.move.inheritpolicies.description": "Zdědit výchozí politiky cílové kolekce",
+
+  // "item.edit.move.inheritpolicies.tooltip": "Warning: When enabled, the read access policy for the item and any files associated with the item will be replaced by the default read access policy of the collection. This cannot be undone.",
   // TODO New key - Add a translation
-  "item.edit.move.inheritpolicies.description": "Inherit the default policies of the destination collection",
+  "item.edit.move.inheritpolicies.tooltip": "Warning: When enabled, the read access policy for the item and any files associated with the item will be replaced by the default read access policy of the collection. This cannot be undone.",
 
   // "item.edit.move.move": "Move",
-  // TODO New key - Add a translation
-  "item.edit.move.move": "Move",
+  "item.edit.move.move": "Přesunout",
 
   // "item.edit.move.processing": "Moving...",
-  // TODO New key - Add a translation
-  "item.edit.move.processing": "Moving...",
+  "item.edit.move.processing": "Přesouvám...",
 
   // "item.edit.move.search.placeholder": "Enter a search query to look for collections",
-  // TODO New key - Add a translation
-  "item.edit.move.search.placeholder": "Enter a search query to look for collections",
+  "item.edit.move.search.placeholder": "Zadejte vyhledávací dotaz pro hledání kolekcí",
 
   // "item.edit.move.success": "The item has been moved successfully",
-  // TODO New key - Add a translation
-  "item.edit.move.success": "The item has been moved successfully",
+  "item.edit.move.success": "Záznam byl úspěšně přesunut",
 
   // "item.edit.move.title": "Move item",
-  // TODO New key - Add a translation
-  "item.edit.move.title": "Move item",
-
-
+  "item.edit.move.title": "Přesunout záznam",
 
   // "item.edit.private.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "item.edit.private.cancel": "Cancel",
+  "item.edit.private.cancel": "Zrušit",
 
-  // "item.edit.private.confirm": "Make it Private",
-  // TODO New key - Add a translation
-  "item.edit.private.confirm": "Make it Private",
+  // "item.edit.private.confirm": "Make it non-discoverable",
+  // TODO Source message changed - Revise the translation
+  "item.edit.private.confirm": "Učinit nedohledatelným",
 
-  // "item.edit.private.description": "Are you sure this item should be made private in the archive?",
-  // TODO New key - Add a translation
-  "item.edit.private.description": "Are you sure this item should be made private in the archive?",
+  // "item.edit.private.description": "Are you sure this item should be made non-discoverable in the archive?",
+  // TODO Source message changed - Revise the translation
+  "item.edit.private.description": "Jste si jisti, že by tento záznam neměl být v archivu objeven?",
 
-  // "item.edit.private.error": "An error occurred while making the item private",
-  // TODO New key - Add a translation
-  "item.edit.private.error": "An error occurred while making the item private",
-
-  // "item.edit.private.header": "Make item private: {{ id }}",
-  // TODO New key - Add a translation
-  "item.edit.private.header": "Make item private: {{ id }}",
-
-  // "item.edit.private.success": "The item is now private",
-  // TODO New key - Add a translation
-  "item.edit.private.success": "The item is now private",
+  // "item.edit.private.error": "An error occurred while making the item non-discoverable",
+  // TODO Source message changed - Revise the translation
+  "item.edit.private.error": "Při změně stavu záznamu na nedohledatelný došlo k chybě",
 
+  // "item.edit.private.header": "Make item non-discoverable: {{ id }}",
+  "item.edit.private.header": "Změnit stav záznamu na nedohledatelný: {{ id }}",
 
+  // "item.edit.private.success": "The item is now non-discoverable",
+  // TODO Source message changed - Revise the translation
+  "item.edit.private.success": "Záznam je nyní nedohledatelný",
 
   // "item.edit.public.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "item.edit.public.cancel": "Cancel",
+  "item.edit.public.cancel": "Zrušit",
 
-  // "item.edit.public.confirm": "Make it Public",
-  // TODO New key - Add a translation
-  "item.edit.public.confirm": "Make it Public",
+  // "item.edit.public.confirm": "Make it discoverable",
+  // TODO Source message changed - Revise the translation
+  "item.edit.public.confirm": "Učinit dohledatelným",
 
-  // "item.edit.public.description": "Are you sure this item should be made public in the archive?",
-  // TODO New key - Add a translation
-  "item.edit.public.description": "Are you sure this item should be made public in the archive?",
+  // "item.edit.public.description": "Are you sure this item should be made discoverable in the archive?",
+  // TODO Source message changed - Revise the translation
+  "item.edit.public.description": "Jste si jisti, že by tento záznam měl být v archivu dohledatelný?",
 
-  // "item.edit.public.error": "An error occurred while making the item public",
-  // TODO New key - Add a translation
-  "item.edit.public.error": "An error occurred while making the item public",
-
-  // "item.edit.public.header": "Make item public: {{ id }}",
-  // TODO New key - Add a translation
-  "item.edit.public.header": "Make item public: {{ id }}",
-
-  // "item.edit.public.success": "The item is now public",
-  // TODO New key - Add a translation
-  "item.edit.public.success": "The item is now public",
+  // "item.edit.public.error": "An error occurred while making the item discoverable",
+  // TODO Source message changed - Revise the translation
+  "item.edit.public.error": "Při změně záznamu na dohledatelnou došlo k chybě",
 
+  // "item.edit.public.header": "Make item discoverable: {{ id }}",
+  "item.edit.public.header": "Učinit záznam dohledatelným: {{ id }}",
 
+  // "item.edit.public.success": "The item is now discoverable",
+  // TODO Source message changed - Revise the translation
+  "item.edit.public.success": "Záznam je nyní dohledatelný",
 
   // "item.edit.reinstate.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "item.edit.reinstate.cancel": "Cancel",
+  "item.edit.reinstate.cancel": "Zrušit",
 
   // "item.edit.reinstate.confirm": "Reinstate",
-  // TODO New key - Add a translation
-  "item.edit.reinstate.confirm": "Reinstate",
+  "item.edit.reinstate.confirm": "Obnovit",
 
   // "item.edit.reinstate.description": "Are you sure this item should be reinstated to the archive?",
-  // TODO New key - Add a translation
-  "item.edit.reinstate.description": "Are you sure this item should be reinstated to the archive?",
+  "item.edit.reinstate.description": "Určitě má být tento záznam znovu zařazen do archivu?",
 
   // "item.edit.reinstate.error": "An error occurred while reinstating the item",
-  // TODO New key - Add a translation
-  "item.edit.reinstate.error": "An error occurred while reinstating the item",
+  "item.edit.reinstate.error": "Při obnovování záznamu došlo k chybě",
 
   // "item.edit.reinstate.header": "Reinstate item: {{ id }}",
-  // TODO New key - Add a translation
-  "item.edit.reinstate.header": "Reinstate item: {{ id }}",
+  "item.edit.reinstate.header": "Obnovit záznam: {{ id }}",
 
   // "item.edit.reinstate.success": "The item was reinstated successfully",
-  // TODO New key - Add a translation
-  "item.edit.reinstate.success": "The item was reinstated successfully",
-
-
+  "item.edit.reinstate.success": "Záznam byl úspěšně obnoven",
 
   // "item.edit.relationships.discard-button": "Discard",
-  // TODO New key - Add a translation
-  "item.edit.relationships.discard-button": "Discard",
+  "item.edit.relationships.discard-button": "Vyřadit",
 
   // "item.edit.relationships.edit.buttons.add": "Add",
-  // TODO New key - Add a translation
-  "item.edit.relationships.edit.buttons.add": "Add",
+  "item.edit.relationships.edit.buttons.add": "Přidat",
 
   // "item.edit.relationships.edit.buttons.remove": "Remove",
-  // TODO New key - Add a translation
-  "item.edit.relationships.edit.buttons.remove": "Remove",
+  "item.edit.relationships.edit.buttons.remove": "Odstranit",
 
   // "item.edit.relationships.edit.buttons.undo": "Undo changes",
-  // TODO New key - Add a translation
-  "item.edit.relationships.edit.buttons.undo": "Undo changes",
+  "item.edit.relationships.edit.buttons.undo": "Vrátit změny",
 
   // "item.edit.relationships.no-relationships": "No relationships",
-  // TODO New key - Add a translation
-  "item.edit.relationships.no-relationships": "No relationships",
+  "item.edit.relationships.no-relationships": "Žádné vztahy",
 
   // "item.edit.relationships.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button",
-  // TODO New key - Add a translation
-  "item.edit.relationships.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button",
+  "item.edit.relationships.notifications.discarded.content": "Vaše změny byly zahozeny. Pro obnovení změn klikněte na tlačítko 'Vrátit změny'",
 
   // "item.edit.relationships.notifications.discarded.title": "Changes discarded",
-  // TODO New key - Add a translation
-  "item.edit.relationships.notifications.discarded.title": "Changes discarded",
+  "item.edit.relationships.notifications.discarded.title": "Zahozené změny",
 
   // "item.edit.relationships.notifications.failed.title": "Error editing relationships",
-  // TODO New key - Add a translation
-  "item.edit.relationships.notifications.failed.title": "Error editing relationships",
+  "item.edit.relationships.notifications.failed.title": "Chyba při úpravě vztahů",
 
   // "item.edit.relationships.notifications.outdated.content": "The item you're currently working on has been changed by another user. Your current changes are discarded to prevent conflicts",
-  // TODO New key - Add a translation
-  "item.edit.relationships.notifications.outdated.content": "The item you're currently working on has been changed by another user. Your current changes are discarded to prevent conflicts",
+  "item.edit.relationships.notifications.outdated.content": "Záznam, na kterém právě pracujete, byl změněn jiným uživatelem. Vaše aktuální změny byly zahozeny, aby se zabránilo konfliktům",
 
   // "item.edit.relationships.notifications.outdated.title": "Changes outdated",
-  // TODO New key - Add a translation
-  "item.edit.relationships.notifications.outdated.title": "Changes outdated",
+  "item.edit.relationships.notifications.outdated.title": "Změny jsou zastaralé",
 
   // "item.edit.relationships.notifications.saved.content": "Your changes to this item's relationships were saved.",
-  // TODO New key - Add a translation
-  "item.edit.relationships.notifications.saved.content": "Your changes to this item's relationships were saved.",
+  "item.edit.relationships.notifications.saved.content": "Vaše změny vztahů tohoto záznamu byly uloženy.",
 
   // "item.edit.relationships.notifications.saved.title": "Relationships saved",
-  // TODO New key - Add a translation
-  "item.edit.relationships.notifications.saved.title": "Relationships saved",
+  "item.edit.relationships.notifications.saved.title": "Vztahy uloženy",
 
   // "item.edit.relationships.reinstate-button": "Undo",
-  // TODO New key - Add a translation
-  "item.edit.relationships.reinstate-button": "Undo",
+  "item.edit.relationships.reinstate-button": "Vrátit zpět",
 
   // "item.edit.relationships.save-button": "Save",
-  // TODO New key - Add a translation
-  "item.edit.relationships.save-button": "Save",
+  "item.edit.relationships.save-button": "Uložit",
 
   // "item.edit.relationships.no-entity-type": "Add 'dspace.entity.type' metadata to enable relationships for this item",
-  // TODO New key - Add a translation
-  "item.edit.relationships.no-entity-type": "Add 'dspace.entity.type' metadata to enable relationships for this item",
-
+  "item.edit.relationships.no-entity-type": "Přidat metadata 'dspace.entity.type' pro povolení vztahů pro tuto záznam",
 
+  // "item.edit.return": "Back",
+  "item.edit.return": "Zpět",
 
   // "item.edit.tabs.bitstreams.head": "Bitstreams",
-  // TODO New key - Add a translation
-  "item.edit.tabs.bitstreams.head": "Bitstreams",
+  "item.edit.tabs.bitstreams.head": "Soubory",
 
   // "item.edit.tabs.bitstreams.title": "Item Edit - Bitstreams",
-  // TODO New key - Add a translation
-  "item.edit.tabs.bitstreams.title": "Item Edit - Bitstreams",
+  "item.edit.tabs.bitstreams.title": "Úprava záznamu - soubor",
 
   // "item.edit.tabs.curate.head": "Curate",
-  // TODO New key - Add a translation
-  "item.edit.tabs.curate.head": "Curate",
+  "item.edit.tabs.curate.head": "Spravovat",
 
   // "item.edit.tabs.curate.title": "Item Edit - Curate",
-  // TODO New key - Add a translation
-  "item.edit.tabs.curate.title": "Item Edit - Curate",
+  "item.edit.tabs.curate.title": "Úprava záznamu - spravovat",
+
+  // "item.edit.curate.title": "Curate Item: {{item}}",
+  "item.edit.curate.title": "Spravovat záznam: {{item}}",
+
+  // "item.edit.tabs.access-control.head": "Access Control",
+  "item.edit.tabs.access-control.head": "Řízení přístupu",
+
+  // "item.edit.tabs.access-control.title": "Item Edit - Access Control",
+  "item.edit.tabs.access-control.title": "Úprava záznamu - Řízení přístupu",
 
   // "item.edit.tabs.metadata.head": "Metadata",
-  // TODO New key - Add a translation
   "item.edit.tabs.metadata.head": "Metadata",
 
   // "item.edit.tabs.metadata.title": "Item Edit -  Metadata",
-  // TODO New key - Add a translation
-  "item.edit.tabs.metadata.title": "Item Edit -  Metadata",
+  "item.edit.tabs.metadata.title": "Úprava záznamu - Metadata",
 
   // "item.edit.tabs.relationships.head": "Relationships",
-  // TODO New key - Add a translation
-  "item.edit.tabs.relationships.head": "Relationships",
+  "item.edit.tabs.relationships.head": "Vztahy",
 
   // "item.edit.tabs.relationships.title": "Item Edit - Relationships",
-  // TODO New key - Add a translation
-  "item.edit.tabs.relationships.title": "Item Edit - Relationships",
+  "item.edit.tabs.relationships.title": "Úprava záznamu - Vztahy",
 
   // "item.edit.tabs.status.buttons.authorizations.button": "Authorizations...",
-  // TODO New key - Add a translation
-  "item.edit.tabs.status.buttons.authorizations.button": "Authorizations...",
+  "item.edit.tabs.status.buttons.authorizations.button": "Autorizace...",
 
   // "item.edit.tabs.status.buttons.authorizations.label": "Edit item's authorization policies",
-  // TODO New key - Add a translation
-  "item.edit.tabs.status.buttons.authorizations.label": "Edit item's authorization policies",
+  "item.edit.tabs.status.buttons.authorizations.label": "Upravit zásady autorizace záznamu",
 
   // "item.edit.tabs.status.buttons.delete.button": "Permanently delete",
-  // TODO New key - Add a translation
-  "item.edit.tabs.status.buttons.delete.button": "Permanently delete",
+  "item.edit.tabs.status.buttons.delete.button": "Trvale odstranit",
 
   // "item.edit.tabs.status.buttons.delete.label": "Completely expunge item",
-  // TODO New key - Add a translation
-  "item.edit.tabs.status.buttons.delete.label": "Completely expunge item",
+  "item.edit.tabs.status.buttons.delete.label": "Úplně vymazat záznam",
 
   // "item.edit.tabs.status.buttons.mappedCollections.button": "Mapped collections",
-  // TODO New key - Add a translation
-  "item.edit.tabs.status.buttons.mappedCollections.button": "Mapped collections",
+  "item.edit.tabs.status.buttons.mappedCollections.button": "Mapované kolekce",
 
   // "item.edit.tabs.status.buttons.mappedCollections.label": "Manage mapped collections",
-  // TODO New key - Add a translation
-  "item.edit.tabs.status.buttons.mappedCollections.label": "Manage mapped collections",
+  "item.edit.tabs.status.buttons.mappedCollections.label": "Spravovat mapované kolekce",
 
   // "item.edit.tabs.status.buttons.move.button": "Move this Item to a different Collection",
-  // TODO New key - Add a translation
-  "item.edit.tabs.status.buttons.move.button": "Move this Item to a different Collection",
+  "item.edit.tabs.status.buttons.move.button": "Přesunout...",
 
   // "item.edit.tabs.status.buttons.move.label": "Move item to another collection",
-  // TODO New key - Add a translation
-  "item.edit.tabs.status.buttons.move.label": "Move item to another collection",
+  "item.edit.tabs.status.buttons.move.label": "Přesunout záznam do jiné kolekce",
 
-  // "item.edit.tabs.status.buttons.private.button": "Make it private...",
-  // TODO New key - Add a translation
-  "item.edit.tabs.status.buttons.private.button": "Make it private...",
+  // "item.edit.tabs.status.buttons.private.button": "Make it non-discoverable...",
+  // TODO Source message changed - Revise the translation
+  "item.edit.tabs.status.buttons.private.button": "Učinit nedohledatelným...",
 
-  // "item.edit.tabs.status.buttons.private.label": "Make item private",
-  // TODO New key - Add a translation
-  "item.edit.tabs.status.buttons.private.label": "Make item private",
+  // "item.edit.tabs.status.buttons.private.label": "Make item non-discoverable",
+  // TODO Source message changed - Revise the translation
+  "item.edit.tabs.status.buttons.private.label": "Učinit záznam nedohledatelným",
 
-  // "item.edit.tabs.status.buttons.public.button": "Make it public...",
-  // TODO New key - Add a translation
-  "item.edit.tabs.status.buttons.public.button": "Make it public...",
+  // "item.edit.tabs.status.buttons.public.button": "Make it discoverable...",
+  // TODO Source message changed - Revise the translation
+  "item.edit.tabs.status.buttons.public.button": "Učinit dohledatelným...",
 
-  // "item.edit.tabs.status.buttons.public.label": "Make item public",
-  // TODO New key - Add a translation
-  "item.edit.tabs.status.buttons.public.label": "Make item public",
+  // "item.edit.tabs.status.buttons.public.label": "Make item discoverable",
+  // TODO Source message changed - Revise the translation
+  "item.edit.tabs.status.buttons.public.label": "Učinit záznam dohledatelným",
 
   // "item.edit.tabs.status.buttons.reinstate.button": "Reinstate...",
-  // TODO New key - Add a translation
-  "item.edit.tabs.status.buttons.reinstate.button": "Reinstate...",
+  "item.edit.tabs.status.buttons.reinstate.button": "Obnovit...",
 
   // "item.edit.tabs.status.buttons.reinstate.label": "Reinstate item into the repository",
-  // TODO New key - Add a translation
-  "item.edit.tabs.status.buttons.reinstate.label": "Reinstate item into the repository",
+  "item.edit.tabs.status.buttons.reinstate.label": "Obnovit záznam do repozitáře",
+
+  // "item.edit.tabs.status.buttons.unauthorized": "You're not authorized to perform this action",
+  "item.edit.tabs.status.buttons.unauthorized": "Nejste oprávněni provést tuto akci",
 
   // "item.edit.tabs.status.buttons.withdraw.button": "Withdraw this item",
-  // TODO New key - Add a translation
-  "item.edit.tabs.status.buttons.withdraw.button": "Withdraw this item",
+  "item.edit.tabs.status.buttons.withdraw.button": "Odstranit...",
 
   // "item.edit.tabs.status.buttons.withdraw.label": "Withdraw item from the repository",
-  // TODO New key - Add a translation
-  "item.edit.tabs.status.buttons.withdraw.label": "Withdraw item from the repository",
+  "item.edit.tabs.status.buttons.withdraw.label": "Odstranit záznam z repozitáře",
 
   // "item.edit.tabs.status.description": "Welcome to the item management page. From here you can withdraw, reinstate, move or delete the item. You may also update or add new metadata / bitstreams on the other tabs.",
-  // TODO New key - Add a translation
-  "item.edit.tabs.status.description": "Welcome to the item management page. From here you can withdraw, reinstate, move or delete the item. You may also update or add new metadata / bitstreams on the other tabs.",
+  "item.edit.tabs.status.description": "Vítejte na stránce pro správu záznamů. Odtud můžete záznam stáhnout, obnovit, přesunout nebo odstranit. Na ostatních záložkách můžete také aktualizovat nebo přidávat nová metadata / bitové toky.",
 
   // "item.edit.tabs.status.head": "Status",
-  // TODO New key - Add a translation
   "item.edit.tabs.status.head": "Status",
 
   // "item.edit.tabs.status.labels.handle": "Handle",
-  // TODO New key - Add a translation
   "item.edit.tabs.status.labels.handle": "Handle",
 
   // "item.edit.tabs.status.labels.id": "Item Internal ID",
-  // TODO New key - Add a translation
-  "item.edit.tabs.status.labels.id": "Item Internal ID",
+  "item.edit.tabs.status.labels.id": "Položka Internal ID",
 
   // "item.edit.tabs.status.labels.itemPage": "Item Page",
-  // TODO New key - Add a translation
-  "item.edit.tabs.status.labels.itemPage": "Item Page",
+  "item.edit.tabs.status.labels.itemPage": "Stránka záznamu",
 
   // "item.edit.tabs.status.labels.lastModified": "Last Modified",
-  // TODO New key - Add a translation
-  "item.edit.tabs.status.labels.lastModified": "Last Modified",
+  "item.edit.tabs.status.labels.lastModified": "Poslední úprava",
 
   // "item.edit.tabs.status.title": "Item Edit -  Status",
-  // TODO New key - Add a translation
-  "item.edit.tabs.status.title": "Item Edit -  Status",
+  "item.edit.tabs.status.title": "Úprava záznamu - Status",
 
   // "item.edit.tabs.versionhistory.head": "Version History",
-  // TODO New key - Add a translation
-  "item.edit.tabs.versionhistory.head": "Version History",
+  "item.edit.tabs.versionhistory.head": "Historie verzí",
 
   // "item.edit.tabs.versionhistory.title": "Item Edit - Version History",
-  // TODO New key - Add a translation
-  "item.edit.tabs.versionhistory.title": "Item Edit - Version History",
+  "item.edit.tabs.versionhistory.title": "Úprava záznamu - Historie verzí",
 
   // "item.edit.tabs.versionhistory.under-construction": "Editing or adding new versions is not yet possible in this user interface.",
-  // TODO New key - Add a translation
-  "item.edit.tabs.versionhistory.under-construction": "Editing or adding new versions is not yet possible in this user interface.",
+  "item.edit.tabs.versionhistory.under-construction": "V tomto uživatelském rozhraní zatím není možné upravovat nebo přidávat nové verze.",
 
   // "item.edit.tabs.view.head": "View Item",
-  // TODO New key - Add a translation
-  "item.edit.tabs.view.head": "View Item",
+  "item.edit.tabs.view.head": "Zobrazit záznam",
 
   // "item.edit.tabs.view.title": "Item Edit -  View",
-  // TODO New key - Add a translation
-  "item.edit.tabs.view.title": "Item Edit -  View",
-
-
+  "item.edit.tabs.view.title": "Úprava záznamu - zobrazení",
 
   // "item.edit.withdraw.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "item.edit.withdraw.cancel": "Cancel",
+  "item.edit.withdraw.cancel": "Zrušit",
 
   // "item.edit.withdraw.confirm": "Withdraw",
-  // TODO New key - Add a translation
-  "item.edit.withdraw.confirm": "Withdraw",
+  "item.edit.withdraw.confirm": "Potvrdit",
 
   // "item.edit.withdraw.description": "Are you sure this item should be withdrawn from the archive?",
-  // TODO New key - Add a translation
-  "item.edit.withdraw.description": "Are you sure this item should be withdrawn from the archive?",
+  "item.edit.withdraw.description": "Jste si jisti, že by tento záznam měl být odebrán z archivu?",
 
   // "item.edit.withdraw.error": "An error occurred while withdrawing the item",
-  // TODO New key - Add a translation
-  "item.edit.withdraw.error": "An error occurred while withdrawing the item",
+  "item.edit.withdraw.error": "Při odebírání záznamu došlo k chybě",
 
   // "item.edit.withdraw.header": "Withdraw item: {{ id }}",
-  // TODO New key - Add a translation
-  "item.edit.withdraw.header": "Withdraw item: {{ id }}",
+  "item.edit.withdraw.header": "Odebrat záznam: {{ id }}",
 
   // "item.edit.withdraw.success": "The item was withdrawn successfully",
-  // TODO New key - Add a translation
-  "item.edit.withdraw.success": "The item was withdrawn successfully",
-
+  "item.edit.withdraw.success": "Záznam byl úspěšně odebrán",
 
+  // "item.orcid.return": "Back",
+  "item.orcid.return": "Zpět",
 
   // "item.listelement.badge": "Item",
-  // TODO New key - Add a translation
-  "item.listelement.badge": "Item",
+  "item.listelement.badge": "Záznam",
 
   // "item.page.description": "Description",
-  // TODO New key - Add a translation
-  "item.page.description": "Description",
+  "item.page.description": "Popis",
 
   // "item.page.journal-issn": "Journal ISSN",
-  // TODO New key - Add a translation
-  "item.page.journal-issn": "Journal ISSN",
+  "item.page.journal-issn": "ISSN časopisu",
 
   // "item.page.journal-title": "Journal Title",
-  // TODO New key - Add a translation
-  "item.page.journal-title": "Journal Title",
+  "item.page.journal-title": "Název časopisu",
 
   // "item.page.publisher": "Publisher",
-  // TODO New key - Add a translation
-  "item.page.publisher": "Publisher",
+  "item.page.publisher": "Nakladatel",
 
   // "item.page.titleprefix": "Item: ",
-  // TODO New key - Add a translation
-  "item.page.titleprefix": "Item: ",
+  "item.page.titleprefix": "Záznam: ",
 
   // "item.page.volume-title": "Volume Title",
-  // TODO New key - Add a translation
-  "item.page.volume-title": "Volume Title",
+  "item.page.volume-title": "Název svazku",
 
   // "item.search.results.head": "Item Search Results",
+  "item.search.results.head": "Výsleky vyhledávání",
+
+  // "item.search.title": "Item Search",
+  "item.search.title": "Hledat",
+
+  // "item.truncatable-part.show-more": "Show more",
+  "item.truncatable-part.show-more": "Zobrazit více",
+
+  // "item.truncatable-part.show-less": "Collapse",
+  "item.truncatable-part.show-less": "Sbalit",
+
+  // "item.qa-event-notification.check.notification-info": "There are {{num}} pending suggestions related to your account",
   // TODO New key - Add a translation
-  "item.search.results.head": "Item Search Results",
+  "item.qa-event-notification.check.notification-info": "There are {{num}} pending suggestions related to your account",
 
-  // "item.search.title": "DSpace Angular :: Item Search",
+  // "item.qa-event-notification-info.check.button": "View",
   // TODO New key - Add a translation
-  "item.search.title": "DSpace Angular :: Item Search",
+  "item.qa-event-notification-info.check.button": "View",
 
+  // "mydspace.qa-event-notification.check.notification-info": "There are {{num}} pending suggestions related to your account",
+  // TODO New key - Add a translation
+  "mydspace.qa-event-notification.check.notification-info": "There are {{num}} pending suggestions related to your account",
 
+  // "mydspace.qa-event-notification-info.check.button": "View",
+  // TODO New key - Add a translation
+  "mydspace.qa-event-notification-info.check.button": "View",
+
+  // "workflow-item.search.result.delete-supervision.modal.header": "Delete Supervision Order",
+  "workflow-item.search.result.delete-supervision.modal.header": "Smazat příkaz k supervizi",
+
+  // "workflow-item.search.result.delete-supervision.modal.info": "Are you sure you want to delete Supervision Order",
+  "workflow-item.search.result.delete-supervision.modal.info": "Jste si jistí, že chcete smazat příkaz k supervizi?",
+
+  // "workflow-item.search.result.delete-supervision.modal.cancel": "Cancel",
+  "workflow-item.search.result.delete-supervision.modal.cancel": "Zrušit",
+
+  // "workflow-item.search.result.delete-supervision.modal.confirm": "Delete",
+  "workflow-item.search.result.delete-supervision.modal.confirm": "Smazat",
+
+  // "workflow-item.search.result.notification.deleted.success": "Successfully deleted supervision order \"{{name}}\"",
+  "workflow-item.search.result.notification.deleted.success": "Úspěšně smazán příkaz k supervizi \"{{name}}\"",
+
+  // "workflow-item.search.result.notification.deleted.failure": "Failed to delete supervision order \"{{name}}\"",
+  "workflow-item.search.result.notification.deleted.failure": "Při mazání příkazu supervize \"{{name}}\" došlo k chybě",
+
+  // "workflow-item.search.result.list.element.supervised-by": "Supervised by:",
+  "workflow-item.search.result.list.element.supervised-by": "Dohlížející autorita:",
+
+  // "workflow-item.search.result.list.element.supervised.remove-tooltip": "Remove supervision group",
+  "workflow-item.search.result.list.element.supervised.remove-tooltip": "Odebrat dohlížející autoritu",
+
+  // "confidence.indicator.help-text.accepted": "This authority value has been confirmed as accurate by an interactive user",
+  // TODO New key - Add a translation
+  "confidence.indicator.help-text.accepted": "This authority value has been confirmed as accurate by an interactive user",
+
+  // "confidence.indicator.help-text.uncertain": "Value is singular and valid but has not been seen and accepted by a human so it is still uncertain",
+  // TODO New key - Add a translation
+  "confidence.indicator.help-text.uncertain": "Value is singular and valid but has not been seen and accepted by a human so it is still uncertain",
+
+  // "confidence.indicator.help-text.ambiguous": "There are multiple matching authority values of equal validity",
+  // TODO New key - Add a translation
+  "confidence.indicator.help-text.ambiguous": "There are multiple matching authority values of equal validity",
+
+  // "confidence.indicator.help-text.notfound": "There are no matching answers in the authority",
+  // TODO New key - Add a translation
+  "confidence.indicator.help-text.notfound": "There are no matching answers in the authority",
+
+  // "confidence.indicator.help-text.failed": "The authority encountered an internal failure",
+  // TODO New key - Add a translation
+  "confidence.indicator.help-text.failed": "The authority encountered an internal failure",
+
+  // "confidence.indicator.help-text.rejected": "The authority recommends this submission be rejected",
+  // TODO New key - Add a translation
+  "confidence.indicator.help-text.rejected": "The authority recommends this submission be rejected",
+
+  // "confidence.indicator.help-text.novalue": "No reasonable confidence value was returned from the authority",
+  // TODO New key - Add a translation
+  "confidence.indicator.help-text.novalue": "No reasonable confidence value was returned from the authority",
+
+  // "confidence.indicator.help-text.unset": "Confidence was never recorded for this value",
+  // TODO New key - Add a translation
+  "confidence.indicator.help-text.unset": "Confidence was never recorded for this value",
+
+  // "confidence.indicator.help-text.unknown": "Unknown confidence value",
+  // TODO New key - Add a translation
+  "confidence.indicator.help-text.unknown": "Unknown confidence value",
 
   // "item.page.abstract": "Abstract",
   "item.page.abstract": "Abstrakt",
 
   // "item.page.author": "Authors",
-  "item.page.author": "Autor",
+  "item.page.author": "Autoři",
 
   // "item.page.citation": "Citation",
-  // TODO New key - Add a translation
-  "item.page.citation": "Citation",
+  "item.page.citation": "Citace",
 
   // "item.page.collections": "Collections",
   "item.page.collections": "Kolekce",
 
+  // "item.page.collections.loading": "Loading...",
+  "item.page.collections.loading": "Načítá se...",
+
+  // "item.page.collections.load-more": "Load more",
+  "item.page.collections.load-more": "Načíst další",
+
   // "item.page.date": "Date",
   "item.page.date": "Datum",
 
   // "item.page.edit": "Edit this item",
-  // TODO New key - Add a translation
-  "item.page.edit": "Edit this item",
+  "item.page.edit": "Upravit tento záznam",
 
   // "item.page.files": "Files",
   "item.page.files": "Soubory",
 
   // "item.page.filesection.description": "Description:",
-  // TODO New key - Add a translation
-  "item.page.filesection.description": "Description:",
+  "item.page.filesection.description": "Popis:",
 
   // "item.page.filesection.download": "Download",
   "item.page.filesection.download": "Stáhnout",
 
   // "item.page.filesection.format": "Format:",
-  // TODO New key - Add a translation
-  "item.page.filesection.format": "Format:",
+  "item.page.filesection.format": "Formát:",
 
   // "item.page.filesection.name": "Name:",
-  // TODO New key - Add a translation
-  "item.page.filesection.name": "Name:",
+  "item.page.filesection.name": "Název:",
 
   // "item.page.filesection.size": "Size:",
-  // TODO New key - Add a translation
-  "item.page.filesection.size": "Size:",
+  "item.page.filesection.size": "Velikost:",
 
   // "item.page.journal.search.title": "Articles in this journal",
-  // TODO New key - Add a translation
-  "item.page.journal.search.title": "Articles in this journal",
+  "item.page.journal.search.title": "Články v tomto časopise",
 
   // "item.page.link.full": "Full item page",
-  "item.page.link.full": "Úplný záznam",
+  "item.page.link.full": "Zobrazit úplný záznam",
 
   // "item.page.link.simple": "Simple item page",
-  "item.page.link.simple": "Minimální záznam",
+  "item.page.link.simple": "Zobrazit minimální záznam",
+
+  // "item.page.orcid.title": "ORCID",
+  "item.page.orcid.title": "ORCID",
+
+  // "item.page.orcid.tooltip": "Open ORCID setting page",
+  "item.page.orcid.tooltip": "Otevřít stránku nastavení ORCID",
 
   // "item.page.person.search.title": "Articles by this author",
-  // TODO New key - Add a translation
-  "item.page.person.search.title": "Articles by this author",
+  "item.page.person.search.title": "Články tohoto autora",
 
   // "item.page.related-items.view-more": "Show {{ amount }} more",
-  // TODO New key - Add a translation
-  "item.page.related-items.view-more": "Show {{ amount }} more",
+  "item.page.related-items.view-more": "Zobrazit {{ amount }} více",
 
   // "item.page.related-items.view-less": "Hide last {{ amount }}",
-  // TODO New key - Add a translation
-  "item.page.related-items.view-less": "Hide last {{ amount }}",
+  "item.page.related-items.view-less": "Skrýt poslední {{ amount }}",
 
   // "item.page.relationships.isAuthorOfPublication": "Publications",
-  // TODO New key - Add a translation
-  "item.page.relationships.isAuthorOfPublication": "Publications",
+  "item.page.relationships.isAuthorOfPublication": "Publikace",
 
   // "item.page.relationships.isJournalOfPublication": "Publications",
-  // TODO New key - Add a translation
-  "item.page.relationships.isJournalOfPublication": "Publications",
+  "item.page.relationships.isJournalOfPublication": "Publikace",
 
   // "item.page.relationships.isOrgUnitOfPerson": "Authors",
-  // TODO New key - Add a translation
-  "item.page.relationships.isOrgUnitOfPerson": "Authors",
+  "item.page.relationships.isOrgUnitOfPerson": "Autoři",
 
   // "item.page.relationships.isOrgUnitOfProject": "Research Projects",
-  // TODO New key - Add a translation
-  "item.page.relationships.isOrgUnitOfProject": "Research Projects",
+  "item.page.relationships.isOrgUnitOfProject": "Výzkumné projekty",
 
   // "item.page.subject": "Keywords",
-  // TODO New key - Add a translation
-  "item.page.subject": "Keywords",
+  "item.page.subject": "Klíčová slova",
 
   // "item.page.uri": "URI",
-  "item.page.uri": "URI",
+  "item.page.uri": "Permanentní identifikátor",
 
   // "item.page.bitstreams.view-more": "Show more",
-  // TODO New key - Add a translation
-  "item.page.bitstreams.view-more": "Show more",
+  "item.page.bitstreams.view-more": "Zobrazit více",
 
   // "item.page.bitstreams.collapse": "Collapse",
-  // TODO New key - Add a translation
-  "item.page.bitstreams.collapse": "Collapse",
+  "item.page.bitstreams.collapse": "Sbalit",
 
-  // "item.page.filesection.original.bundle" : "Original bundle",
+  // "item.page.bitstreams.primary": "Primary",
   // TODO New key - Add a translation
-  "item.page.filesection.original.bundle": "Original bundle",
+  "item.page.bitstreams.primary": "Primary",
 
-  // "item.page.filesection.license.bundle" : "License bundle",
+  // "item.page.filesection.original.bundle": "Original bundle",
+  "item.page.filesection.original.bundle": "Původní svazek",
+
+  // "item.page.filesection.license.bundle": "License bundle",
+  "item.page.filesection.license.bundle": "Licence svazku",
+
+  // "item.page.return": "Back",
+  "item.page.return": "Zpět",
+
+  // "item.page.version.create": "Create new version",
+  "item.page.version.create": "Vytvořit novou verzi",
+
+  // "item.page.withdrawn": "Request a withdrawal for this item",
   // TODO New key - Add a translation
-  "item.page.filesection.license.bundle": "License bundle",
+  "item.page.withdrawn": "Request a withdrawal for this item",
+
+  // "item.page.reinstate": "Request reinstatement",
+  // TODO New key - Add a translation
+  "item.page.reinstate": "Request reinstatement",
+
+  // "item.page.version.hasDraft": "A new version cannot be created because there is an inprogress submission in the version history",
+  "item.page.version.hasDraft": "Nová verze nemůže být vytvořena, protože v historii verzí už další rozpracovaná verze existuje.",
+
+  // "item.page.claim.button": "Claim",
+  "item.page.claim.button": "Převzít",
+
+  // "item.page.claim.tooltip": "Claim this item as profile",
+  "item.page.claim.tooltip": "Prohlásit tento záznam za profil",
+
+  // "item.page.image.alt.ROR": "ROR logo",
+  // TODO New key - Add a translation
+  "item.page.image.alt.ROR": "ROR logo",
 
   // "item.preview.dc.identifier.uri": "Identifier:",
-  // TODO New key - Add a translation
-  "item.preview.dc.identifier.uri": "Identifier:",
+  "item.preview.dc.identifier.uri": "Identifikátor:",
 
   // "item.preview.dc.contributor.author": "Authors:",
-  // TODO New key - Add a translation
-  "item.preview.dc.contributor.author": "Authors:",
+  "item.preview.dc.contributor.author": "Autoři:",
 
   // "item.preview.dc.date.issued": "Published date:",
-  // TODO New key - Add a translation
-  "item.preview.dc.date.issued": "Published date:",
+  "item.preview.dc.date.issued": "Datum vydání:",
 
   // "item.preview.dc.description.abstract": "Abstract:",
-  // TODO New key - Add a translation
-  "item.preview.dc.description.abstract": "Abstract:",
+  "item.preview.dc.description.abstract": "Abstrakt:",
 
   // "item.preview.dc.identifier.other": "Other identifier:",
-  // TODO New key - Add a translation
-  "item.preview.dc.identifier.other": "Other identifier:",
+  "item.preview.dc.identifier.other": "Další identifikátor:",
 
   // "item.preview.dc.language.iso": "Language:",
-  // TODO New key - Add a translation
-  "item.preview.dc.language.iso": "Language:",
+  "item.preview.dc.language.iso": "Jazyk:",
 
   // "item.preview.dc.subject": "Subjects:",
-  // TODO New key - Add a translation
-  "item.preview.dc.subject": "Subjects:",
+  "item.preview.dc.subject": "Témata:",
 
   // "item.preview.dc.title": "Title:",
-  // TODO New key - Add a translation
-  "item.preview.dc.title": "Title:",
+  "item.preview.dc.title": "Název:",
+
+  // "item.preview.dc.type": "Type:",
+  "item.preview.dc.type": "Typ:",
+
+  // "item.preview.oaire.citation.issue": "Issue",
+  "item.preview.oaire.citation.issue": "Číslo",
+
+  // "item.preview.oaire.citation.volume": "Volume",
+  "item.preview.oaire.citation.volume": "Ročník",
+
+  // "item.preview.dc.relation.issn": "ISSN",
+  "item.preview.dc.relation.issn": "ISSN",
+
+  // "item.preview.dc.identifier.isbn": "ISBN",
+  "item.preview.dc.identifier.isbn": "ISBN",
+
+  // "item.preview.dc.identifier": "Identifier:",
+  "item.preview.dc.identifier": "Identifikátor:",
+
+  // "item.preview.dc.relation.ispartof": "Journal or Series",
+  "item.preview.dc.relation.ispartof": "Časopis nebo seriál",
+
+  // "item.preview.dc.identifier.doi": "DOI",
+  "item.preview.dc.identifier.doi": "DOI",
+
+  // "item.preview.dc.publisher": "Publisher:",
+  "item.preview.dc.publisher": "Nakladatel:",
 
   // "item.preview.person.familyName": "Surname:",
-  // TODO New key - Add a translation
-  "item.preview.person.familyName": "Surname:",
+  "item.preview.person.familyName": "Příjmení:",
 
   // "item.preview.person.givenName": "Name:",
-  // TODO New key - Add a translation
-  "item.preview.person.givenName": "Name:",
+  "item.preview.person.givenName": "Jméno:",
 
   // "item.preview.person.identifier.orcid": "ORCID:",
-  // TODO New key - Add a translation
   "item.preview.person.identifier.orcid": "ORCID:",
 
+  // "item.preview.project.funder.name": "Funder:",
+  "item.preview.project.funder.name": "Financující subjekt:",
+
+  // "item.preview.project.funder.identifier": "Funder Identifier:",
+  "item.preview.project.funder.identifier": "Identifikátor financujícího subjektu:",
+
+  // "item.preview.oaire.awardNumber": "Funding ID:",
+  "item.preview.oaire.awardNumber": "Identifikátor zdroje financování:",
+
+  // "item.preview.dc.title.alternative": "Acronym:",
+  "item.preview.dc.title.alternative": "Zkratka:",
+
+  // "item.preview.dc.coverage.spatial": "Jurisdiction:",
+  "item.preview.dc.coverage.spatial": "Příslušnost:",
+
+  // "item.preview.oaire.fundingStream": "Funding Stream:",
+  "item.preview.oaire.fundingStream": "Tok finančních prostředků:",
+
+  // "item.preview.oairecerif.identifier.url": "URL",
+  // TODO New key - Add a translation
+  "item.preview.oairecerif.identifier.url": "URL",
+
+  // "item.preview.organization.address.addressCountry": "Country",
+  // TODO New key - Add a translation
+  "item.preview.organization.address.addressCountry": "Country",
+
+  // "item.preview.organization.foundingDate": "Founding Date",
+  // TODO New key - Add a translation
+  "item.preview.organization.foundingDate": "Founding Date",
+
+  // "item.preview.organization.identifier.crossrefid": "Crossref ID",
+  // TODO New key - Add a translation
+  "item.preview.organization.identifier.crossrefid": "Crossref ID",
+
+  // "item.preview.organization.identifier.isni": "ISNI",
+  // TODO New key - Add a translation
+  "item.preview.organization.identifier.isni": "ISNI",
+
+  // "item.preview.organization.identifier.ror": "ROR ID",
+  // TODO New key - Add a translation
+  "item.preview.organization.identifier.ror": "ROR ID",
+
+  // "item.preview.organization.legalName": "Legal Name",
+  // TODO New key - Add a translation
+  "item.preview.organization.legalName": "Legal Name",
+
+  // "item.preview.dspace.entity.type": "Entity Type:",
+  // TODO New key - Add a translation
+  "item.preview.dspace.entity.type": "Entity Type:",
 
   // "item.select.confirm": "Confirm selected",
-  // TODO New key - Add a translation
-  "item.select.confirm": "Confirm selected",
+  "item.select.confirm": "Potvrdit vybrané",
 
   // "item.select.empty": "No items to show",
+  "item.select.empty": "Žádné záznamy k zobrazení",
+
+  // "item.select.table.selected": "Selected items",
   // TODO New key - Add a translation
-  "item.select.empty": "No items to show",
+  "item.select.table.selected": "Selected items",
+
+  // "item.select.table.select": "Select item",
+  // TODO New key - Add a translation
+  "item.select.table.select": "Select item",
+
+  // "item.select.table.deselect": "Deselect item",
+  // TODO New key - Add a translation
+  "item.select.table.deselect": "Deselect item",
 
   // "item.select.table.author": "Author",
-  // TODO New key - Add a translation
-  "item.select.table.author": "Author",
+  "item.select.table.author": "Autor",
 
   // "item.select.table.collection": "Collection",
-  // TODO New key - Add a translation
-  "item.select.table.collection": "Collection",
+  "item.select.table.collection": "Kolekce",
 
   // "item.select.table.title": "Title",
-  // TODO New key - Add a translation
-  "item.select.table.title": "Title",
-
+  "item.select.table.title": "Název",
 
   // "item.version.history.empty": "There are no other versions for this item yet.",
-  // TODO New key - Add a translation
-  "item.version.history.empty": "There are no other versions for this item yet.",
+  "item.version.history.empty": "Pro tento záznam zatím neexistují žádné další verze.",
 
   // "item.version.history.head": "Version History",
-  // TODO New key - Add a translation
-  "item.version.history.head": "Version History",
+  "item.version.history.head": "Historie verzí",
 
-  // "item.version.history.return": "Return",
-  // TODO New key - Add a translation
-  "item.version.history.return": "Return",
+  // "item.version.history.return": "Back",
+  // TODO Source message changed - Revise the translation
+  "item.version.history.return": "Zpět",
 
   // "item.version.history.selected": "Selected version",
-  // TODO New key - Add a translation
-  "item.version.history.selected": "Selected version",
+  "item.version.history.selected": "Vybraná verze",
+
+  // "item.version.history.selected.alert": "You are currently viewing version {{version}} of the item.",
+  "item.version.history.selected.alert": "Právě si prohlížíte verzi {{version}} záznamu.",
 
   // "item.version.history.table.version": "Version",
-  // TODO New key - Add a translation
-  "item.version.history.table.version": "Version",
+  "item.version.history.table.version": "Verze",
 
   // "item.version.history.table.item": "Item",
-  // TODO New key - Add a translation
-  "item.version.history.table.item": "Item",
+  "item.version.history.table.item": "Záznam",
 
   // "item.version.history.table.editor": "Editor",
-  // TODO New key - Add a translation
-  "item.version.history.table.editor": "Editor",
+  "item.version.history.table.editor": "Upravit",
 
   // "item.version.history.table.date": "Date",
-  // TODO New key - Add a translation
-  "item.version.history.table.date": "Date",
+  "item.version.history.table.date": "Datum",
 
   // "item.version.history.table.summary": "Summary",
-  // TODO New key - Add a translation
-  "item.version.history.table.summary": "Summary",
+  "item.version.history.table.summary": "Souhrn",
 
+  // "item.version.history.table.workspaceItem": "Workspace item",
+  "item.version.history.table.workspaceItem": "Položka pracovního prostoru",
 
+  // "item.version.history.table.workflowItem": "Workflow item",
+  "item.version.history.table.workflowItem": "Záznam ve workflow",
+
+  // "item.version.history.table.actions": "Action",
+  "item.version.history.table.actions": "Akce",
+
+  // "item.version.history.table.action.editWorkspaceItem": "Edit workspace item",
+  "item.version.history.table.action.editWorkspaceItem": "Upravit záznam pracovního prostoru",
+
+  // "item.version.history.table.action.editSummary": "Edit summary",
+  "item.version.history.table.action.editSummary": "Upravit souhrn",
+
+  // "item.version.history.table.action.saveSummary": "Save summary edits",
+  "item.version.history.table.action.saveSummary": "Uložit úpravy souhrnu",
+
+  // "item.version.history.table.action.discardSummary": "Discard summary edits",
+  "item.version.history.table.action.discardSummary": "Vyřadit souhrnné úpravy",
+
+  // "item.version.history.table.action.newVersion": "Create new version from this one",
+  "item.version.history.table.action.newVersion": "Vytvořit novou verzi z této verze",
+
+  // "item.version.history.table.action.deleteVersion": "Delete version",
+  "item.version.history.table.action.deleteVersion": "Smazat verzi",
+
+  // "item.version.history.table.action.hasDraft": "A new version cannot be created because there is an inprogress submission in the version history",
+  "item.version.history.table.action.hasDraft": "Nová verze nemůže být vytvořena, protože v historii verzí už další rozpracovaná verze existuje.",
 
   // "item.version.notice": "This is not the latest version of this item. The latest version can be found <a href='{{destination}}'>here</a>.",
+  "item.version.notice": "Toto není nejnovější verze tohoto záznamu. Nejnovější verzi naleznete <a href='{{destination}}'>zde</a>.",
+
+  // "item.version.create.modal.header": "New version",
+  "item.version.create.modal.header": "Nová verze",
+
+  // "item.qa.withdrawn.modal.header": "Request withdrawal",
   // TODO New key - Add a translation
-  "item.version.notice": "This is not the latest version of this item. The latest version can be found <a href='{{destination}}'>here</a>.",
+  "item.qa.withdrawn.modal.header": "Request withdrawal",
 
+  // "item.qa.reinstate.modal.header": "Request reinstate",
+  // TODO New key - Add a translation
+  "item.qa.reinstate.modal.header": "Request reinstate",
 
+  // "item.qa.reinstate.create.modal.header": "New version",
+  // TODO New key - Add a translation
+  "item.qa.reinstate.create.modal.header": "New version",
+
+  // "item.version.create.modal.text": "Create a new version for this item",
+  "item.version.create.modal.text": "Vytvořit novou verzi pro tento záznam",
+
+  // "item.version.create.modal.text.startingFrom": "starting from version {{version}}",
+  "item.version.create.modal.text.startingFrom": "počínaje verzí {{version}}",
+
+  // "item.version.create.modal.button.confirm": "Create",
+  "item.version.create.modal.button.confirm": "Vytvořit",
+
+  // "item.version.create.modal.button.confirm.tooltip": "Create new version",
+  "item.version.create.modal.button.confirm.tooltip": "Vytvořit novou verzi",
+
+  // "item.qa.withdrawn-reinstate.modal.button.confirm.tooltip": "Send request",
+  // TODO New key - Add a translation
+  "item.qa.withdrawn-reinstate.modal.button.confirm.tooltip": "Send request",
+
+  // "qa-withdrown.create.modal.button.confirm": "Withdraw",
+  // TODO New key - Add a translation
+  "qa-withdrown.create.modal.button.confirm": "Withdraw",
+
+  // "qa-reinstate.create.modal.button.confirm": "Reinstate",
+  // TODO New key - Add a translation
+  "qa-reinstate.create.modal.button.confirm": "Reinstate",
+
+  // "item.version.create.modal.button.cancel": "Cancel",
+  "item.version.create.modal.button.cancel": "Zrušit",
+
+  // "item.qa.withdrawn-reinstate.create.modal.button.cancel": "Cancel",
+  // TODO New key - Add a translation
+  "item.qa.withdrawn-reinstate.create.modal.button.cancel": "Cancel",
+
+  // "item.version.create.modal.button.cancel.tooltip": "Do not create new version",
+  "item.version.create.modal.button.cancel.tooltip": "Nevytvářet novou verzi",
+
+  // "item.qa.withdrawn-reinstate.create.modal.button.cancel.tooltip": "Do not send request",
+  // TODO New key - Add a translation
+  "item.qa.withdrawn-reinstate.create.modal.button.cancel.tooltip": "Do not send request",
+
+  // "item.version.create.modal.form.summary.label": "Summary",
+  "item.version.create.modal.form.summary.label": "Souhrn",
+
+  // "qa-withdrawn.create.modal.form.summary.label": "You are requesting to withdraw this item",
+  // TODO New key - Add a translation
+  "qa-withdrawn.create.modal.form.summary.label": "You are requesting to withdraw this item",
+
+  // "qa-withdrawn.create.modal.form.summary2.label": "Please enter the reason for the withdrawal",
+  // TODO New key - Add a translation
+  "qa-withdrawn.create.modal.form.summary2.label": "Please enter the reason for the withdrawal",
+
+  // "qa-reinstate.create.modal.form.summary.label": "You are requesting to reinstate this item",
+  // TODO New key - Add a translation
+  "qa-reinstate.create.modal.form.summary.label": "You are requesting to reinstate this item",
+
+  // "qa-reinstate.create.modal.form.summary2.label": "Please enter the reason for the reinstatment",
+  // TODO New key - Add a translation
+  "qa-reinstate.create.modal.form.summary2.label": "Please enter the reason for the reinstatment",
+
+  // "item.version.create.modal.form.summary.placeholder": "Insert the summary for the new version",
+  "item.version.create.modal.form.summary.placeholder": "Vložit souhrn nové verze",
+
+  // "qa-withdrown.modal.form.summary.placeholder": "Enter the reason for the withdrawal",
+  // TODO New key - Add a translation
+  "qa-withdrown.modal.form.summary.placeholder": "Enter the reason for the withdrawal",
+
+  // "qa-reinstate.modal.form.summary.placeholder": "Enter the reason for the reinstatement",
+  // TODO New key - Add a translation
+  "qa-reinstate.modal.form.summary.placeholder": "Enter the reason for the reinstatement",
+
+  // "item.version.create.modal.submitted.header": "Creating new version...",
+  "item.version.create.modal.submitted.header": "Vytváření nové verze...",
+
+  // "item.qa.withdrawn.modal.submitted.header": "Sending withdrawn request...",
+  // TODO New key - Add a translation
+  "item.qa.withdrawn.modal.submitted.header": "Sending withdrawn request...",
+
+  // "correction-type.manage-relation.action.notification.reinstate": "Reinstate request sent.",
+  // TODO New key - Add a translation
+  "correction-type.manage-relation.action.notification.reinstate": "Reinstate request sent.",
+
+  // "correction-type.manage-relation.action.notification.withdrawn": "Withdraw request sent.",
+  // TODO New key - Add a translation
+  "correction-type.manage-relation.action.notification.withdrawn": "Withdraw request sent.",
+
+  // "item.version.create.modal.submitted.text": "The new version is being created. This may take some time if the item has a lot of relationships.",
+  "item.version.create.modal.submitted.text": "Vytváří se nová verze. To může nějakou dobu trvat, pokud má záznam mnoho vztahů.",
+
+  // "item.version.create.notification.success": "New version has been created with version number {{version}}",
+  "item.version.create.notification.success": "Byla vytvořena nová verze s číslem verze {{version}}",
+
+  // "item.version.create.notification.failure": "New version has not been created",
+  "item.version.create.notification.failure": "Nová verze nebyla vytvořena",
+
+  // "item.version.create.notification.inProgress": "A new version cannot be created because there is an inprogress submission in the version history",
+  "item.version.create.notification.inProgress": "Nová verze nemůže být vytvořena, protože v historii verzí už další rozpracovaná verze existuje.",
+
+  // "item.version.delete.modal.header": "Delete version",
+  "item.version.delete.modal.header": "Smazat verzi",
+
+  // "item.version.delete.modal.text": "Do you want to delete version {{version}}?",
+  "item.version.delete.modal.text": "Chcete smazat verzi {{version}}?",
+
+  // "item.version.delete.modal.button.confirm": "Delete",
+  "item.version.delete.modal.button.confirm": "Smazat",
+
+  // "item.version.delete.modal.button.confirm.tooltip": "Delete this version",
+  "item.version.delete.modal.button.confirm.tooltip": "Smazat tuto verzi",
+
+  // "item.version.delete.modal.button.cancel": "Cancel",
+  "item.version.delete.modal.button.cancel": "Zrušit",
+
+  // "item.version.delete.modal.button.cancel.tooltip": "Do not delete this version",
+  "item.version.delete.modal.button.cancel.tooltip": "Nemažte tuto verzi",
+
+  // "item.version.delete.notification.success": "Version number {{version}} has been deleted",
+  "item.version.delete.notification.success": "Verze číslo {{version}} byla odstraněna",
+
+  // "item.version.delete.notification.failure": "Version number {{version}} has not been deleted",
+  "item.version.delete.notification.failure": "Verze číslo {{version}} nebyla odstraněna",
+
+  // "item.version.edit.notification.success": "The summary of version number {{version}} has been changed",
+  "item.version.edit.notification.success": "Souhrn verze číslo {{version}} byl změněn",
+
+  // "item.version.edit.notification.failure": "The summary of version number {{version}} has not been changed",
+  "item.version.edit.notification.failure": "Souhrn verze číslo {{version}} nebyl změněn",
+
+  // "itemtemplate.edit.metadata.add-button": "Add",
+  "itemtemplate.edit.metadata.add-button": "Přidat",
+
+  // "itemtemplate.edit.metadata.discard-button": "Discard",
+  "itemtemplate.edit.metadata.discard-button": "Vyřadit",
+
+  // "itemtemplate.edit.metadata.edit.language": "Edit language",
+  // TODO New key - Add a translation
+  "itemtemplate.edit.metadata.edit.language": "Edit language",
+
+  // "itemtemplate.edit.metadata.edit.value": "Edit value",
+  // TODO New key - Add a translation
+  "itemtemplate.edit.metadata.edit.value": "Edit value",
+
+  // "itemtemplate.edit.metadata.edit.buttons.confirm": "Confirm",
+  "itemtemplate.edit.metadata.edit.buttons.confirm": "Potvrdit",
+
+  // "itemtemplate.edit.metadata.edit.buttons.drag": "Drag to reorder",
+  "itemtemplate.edit.metadata.edit.buttons.drag": "Změnit pořadí přetažením",
+
+  // "itemtemplate.edit.metadata.edit.buttons.edit": "Edit",
+  "itemtemplate.edit.metadata.edit.buttons.edit": "Upravit",
+
+  // "itemtemplate.edit.metadata.edit.buttons.remove": "Remove",
+  "itemtemplate.edit.metadata.edit.buttons.remove": "Odstranit",
+
+  // "itemtemplate.edit.metadata.edit.buttons.undo": "Undo changes",
+  "itemtemplate.edit.metadata.edit.buttons.undo": "Vrátit změny",
+
+  // "itemtemplate.edit.metadata.edit.buttons.unedit": "Stop editing",
+  "itemtemplate.edit.metadata.edit.buttons.unedit": "Zastavit úpravy",
+
+  // "itemtemplate.edit.metadata.empty": "The item template currently doesn't contain any metadata. Click Add to start adding a metadata value.",
+  "itemtemplate.edit.metadata.empty": "Šablona záznamu aktuálně neobsahuje žádná metadata. Kliknutím na Přidat začnete vyplňovat hodnotu metadat.",
+
+  // "itemtemplate.edit.metadata.headers.edit": "Edit",
+  "itemtemplate.edit.metadata.headers.edit": "Upravit",
+
+  // "itemtemplate.edit.metadata.headers.field": "Field",
+  "itemtemplate.edit.metadata.headers.field": "Pole",
+
+  // "itemtemplate.edit.metadata.headers.language": "Lang",
+  "itemtemplate.edit.metadata.headers.language": "Jazyk",
+
+  // "itemtemplate.edit.metadata.headers.value": "Value",
+  "itemtemplate.edit.metadata.headers.value": "Hodnota",
+
+  // "itemtemplate.edit.metadata.metadatafield": "Edit field",
+  // TODO New key - Add a translation
+  "itemtemplate.edit.metadata.metadatafield": "Edit field",
+
+  // "itemtemplate.edit.metadata.metadatafield.error": "An error occurred validating the metadata field",
+  "itemtemplate.edit.metadata.metadatafield.error": "Při ověřování metadatového pole se vyskytla chyba",
+
+  // "itemtemplate.edit.metadata.metadatafield.invalid": "Please choose a valid metadata field",
+  "itemtemplate.edit.metadata.metadatafield.invalid": "Prosím zvolte platné metadatové pole",
+
+  // "itemtemplate.edit.metadata.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button",
+  "itemtemplate.edit.metadata.notifications.discarded.content": "Vaše změny byly zahozeny. Pro obnovení změn klikněte na tlačítko 'Vrátit změny'",
+
+  // "itemtemplate.edit.metadata.notifications.discarded.title": "Changes discarded",
+  "itemtemplate.edit.metadata.notifications.discarded.title": "Změny byly zahozeny",
+
+  // "itemtemplate.edit.metadata.notifications.error.title": "An error occurred",
+  "itemtemplate.edit.metadata.notifications.error.title": "Vyskytla se chyba",
+
+  // "itemtemplate.edit.metadata.notifications.invalid.content": "Your changes were not saved. Please make sure all fields are valid before you save.",
+  "itemtemplate.edit.metadata.notifications.invalid.content": "Vaše změny nebyly uloženy. Před uložením se prosím ujistěte, že jsou všechna pole platná.",
+
+  // "itemtemplate.edit.metadata.notifications.invalid.title": "Metadata invalid",
+  "itemtemplate.edit.metadata.notifications.invalid.title": "Neplatná metadata",
+
+  // "itemtemplate.edit.metadata.notifications.outdated.content": "The item template you're currently working on has been changed by another user. Your current changes are discarded to prevent conflicts",
+  "itemtemplate.edit.metadata.notifications.outdated.content": "Šablona záznamu, na které pracujete, byla změněna jiným uživatelem. Vaše změny byly zahozeny, aby se předešlo chybám.",
+
+  // "itemtemplate.edit.metadata.notifications.outdated.title": "Changes outdated",
+  "itemtemplate.edit.metadata.notifications.outdated.title": "Změny jsou zastaralé",
+
+  // "itemtemplate.edit.metadata.notifications.saved.content": "Your changes to this item template's metadata were saved.",
+  "itemtemplate.edit.metadata.notifications.saved.content": "Vaše změny v šabloně metadat tohoto záznamu byly uloženy.",
+
+  // "itemtemplate.edit.metadata.notifications.saved.title": "Metadata saved",
+  "itemtemplate.edit.metadata.notifications.saved.title": "Metadata uložena",
+
+  // "itemtemplate.edit.metadata.reinstate-button": "Undo",
+  "itemtemplate.edit.metadata.reinstate-button": "Vrátit zpět",
+
+  // "itemtemplate.edit.metadata.reset-order-button": "Undo reorder",
+  "itemtemplate.edit.metadata.reset-order-button": "Vrátit zpět příkaz",
+
+  // "itemtemplate.edit.metadata.save-button": "Save",
+  "itemtemplate.edit.metadata.save-button": "Uložit",
 
   // "journal.listelement.badge": "Journal",
-  // TODO New key - Add a translation
-  "journal.listelement.badge": "Journal",
+  "journal.listelement.badge": "Časopis",
 
   // "journal.page.description": "Description",
-  // TODO New key - Add a translation
-  "journal.page.description": "Description",
+  "journal.page.description": "Popis",
 
   // "journal.page.edit": "Edit this item",
-  // TODO New key - Add a translation
-  "journal.page.edit": "Edit this item",
+  "journal.page.edit": "Upravit tento záznam",
 
   // "journal.page.editor": "Editor-in-Chief",
-  // TODO New key - Add a translation
-  "journal.page.editor": "Editor-in-Chief",
+  "journal.page.editor": "Šéfredaktor",
 
   // "journal.page.issn": "ISSN",
-  // TODO New key - Add a translation
   "journal.page.issn": "ISSN",
 
   // "journal.page.publisher": "Publisher",
-  // TODO New key - Add a translation
-  "journal.page.publisher": "Publisher",
+  "journal.page.publisher": "Nakladatel",
 
   // "journal.page.titleprefix": "Journal: ",
-  // TODO New key - Add a translation
-  "journal.page.titleprefix": "Journal: ",
+  "journal.page.titleprefix": "Časopis: ",
 
   // "journal.search.results.head": "Journal Search Results",
-  // TODO New key - Add a translation
-  "journal.search.results.head": "Journal Search Results",
-
-  // "journal.search.title": "DSpace Angular :: Journal Search",
-  // TODO New key - Add a translation
-  "journal.search.title": "DSpace Angular :: Journal Search",
+  "journal.search.results.head": "Výsledky vyhledávání časopisu",
 
+  // "journal-relationships.search.results.head": "Journal Search Results",
+  "journal-relationships.search.results.head": "Výsledky vyhledávání časopisu",
 
+  // "journal.search.title": "Journal Search",
+  "journal.search.title": "Vyhledávání časopisu",
 
   // "journalissue.listelement.badge": "Journal Issue",
-  // TODO New key - Add a translation
-  "journalissue.listelement.badge": "Journal Issue",
+  "journalissue.listelement.badge": "Číslo časopisu",
 
   // "journalissue.page.description": "Description",
-  // TODO New key - Add a translation
-  "journalissue.page.description": "Description",
+  "journalissue.page.description": "Popis",
 
   // "journalissue.page.edit": "Edit this item",
-  // TODO New key - Add a translation
-  "journalissue.page.edit": "Edit this item",
+  "journalissue.page.edit": "Upravit tento záznam",
 
   // "journalissue.page.issuedate": "Issue Date",
-  // TODO New key - Add a translation
-  "journalissue.page.issuedate": "Issue Date",
+  "journalissue.page.issuedate": "Datum vydání",
 
   // "journalissue.page.journal-issn": "Journal ISSN",
-  // TODO New key - Add a translation
-  "journalissue.page.journal-issn": "Journal ISSN",
+  "journalissue.page.journal-issn": "ISSN časopisu",
 
   // "journalissue.page.journal-title": "Journal Title",
-  // TODO New key - Add a translation
-  "journalissue.page.journal-title": "Journal Title",
+  "journalissue.page.journal-title": "Název časopisu",
 
   // "journalissue.page.keyword": "Keywords",
-  // TODO New key - Add a translation
-  "journalissue.page.keyword": "Keywords",
+  "journalissue.page.keyword": "Klíčová slova",
 
   // "journalissue.page.number": "Number",
-  // TODO New key - Add a translation
-  "journalissue.page.number": "Number",
+  "journalissue.page.number": "Číslo",
 
   // "journalissue.page.titleprefix": "Journal Issue: ",
+  "journalissue.page.titleprefix": "Číslo časopisu: ",
+
+  // "journalissue.search.results.head": "Journal Issue Search Results",
   // TODO New key - Add a translation
-  "journalissue.page.titleprefix": "Journal Issue: ",
-
-
+  "journalissue.search.results.head": "Journal Issue Search Results",
 
   // "journalvolume.listelement.badge": "Journal Volume",
-  // TODO New key - Add a translation
-  "journalvolume.listelement.badge": "Journal Volume",
+  "journalvolume.listelement.badge": "Ročník časopisu",
 
   // "journalvolume.page.description": "Description",
-  // TODO New key - Add a translation
-  "journalvolume.page.description": "Description",
+  "journalvolume.page.description": "Popis",
 
   // "journalvolume.page.edit": "Edit this item",
-  // TODO New key - Add a translation
-  "journalvolume.page.edit": "Edit this item",
+  "journalvolume.page.edit": "Upravit tento záznam",
 
   // "journalvolume.page.issuedate": "Issue Date",
-  // TODO New key - Add a translation
-  "journalvolume.page.issuedate": "Issue Date",
+  "journalvolume.page.issuedate": "Datum vydání",
 
   // "journalvolume.page.titleprefix": "Journal Volume: ",
-  // TODO New key - Add a translation
-  "journalvolume.page.titleprefix": "Journal Volume: ",
+  "journalvolume.page.titleprefix": "Ročník časopisu: ",
 
   // "journalvolume.page.volume": "Volume",
+  "journalvolume.page.volume": "Ročník",
+
+  // "journalvolume.search.results.head": "Journal Volume Search Results",
   // TODO New key - Add a translation
-  "journalvolume.page.volume": "Volume",
+  "journalvolume.search.results.head": "Journal Volume Search Results",
 
+  // "iiifsearchable.listelement.badge": "Document Media",
+  "iiifsearchable.listelement.badge": "Média dokumentů",
 
+  // "iiifsearchable.page.titleprefix": "Document: ",
+  "iiifsearchable.page.titleprefix": "Dokument: ",
+
+  // "iiifsearchable.page.doi": "Permanent Link: ",
+  "iiifsearchable.page.doi": "Trvalý odkaz: ",
+
+  // "iiifsearchable.page.issue": "Issue: ",
+  "iiifsearchable.page.issue": "Číslo: ",
+
+  // "iiifsearchable.page.description": "Description: ",
+  "iiifsearchable.page.description": "Popis: ",
+
+  // "iiifviewer.fullscreen.notice": "Use full screen for better viewing.",
+  "iiifviewer.fullscreen.notice": "Použijte celou obrazovku pro lepší zobrazení.",
+
+  // "iiif.listelement.badge": "Image Media",
+  "iiif.listelement.badge": "Média obrázku",
+
+  // "iiif.page.titleprefix": "Image: ",
+  "iiif.page.titleprefix": "Obrázek: ",
+
+  // "iiif.page.doi": "Permanent Link: ",
+  "iiif.page.doi": "Trvalý odkaz: ",
+
+  // "iiif.page.issue": "Issue: ",
+  "iiif.page.issue": "Číslo: ",
+
+  // "iiif.page.description": "Description: ",
+  "iiif.page.description": "Popis: ",
 
   // "loading.bitstream": "Loading bitstream...",
-  // TODO New key - Add a translation
-  "loading.bitstream": "Loading bitstream...",
+  "loading.bitstream": "Načítá se soubor...",
 
   // "loading.bitstreams": "Loading bitstreams...",
-  // TODO New key - Add a translation
-  "loading.bitstreams": "Loading bitstreams...",
+  "loading.bitstreams": "Načítají se soubory...",
 
   // "loading.browse-by": "Loading items...",
   "loading.browse-by": "Načítají se záznamy...",
 
   // "loading.browse-by-page": "Loading page...",
-  // TODO New key - Add a translation
-  "loading.browse-by-page": "Loading page...",
+  "loading.browse-by-page": "Načítá se stránka...",
 
   // "loading.collection": "Loading collection...",
   "loading.collection": "Načítá se kolekce...",
 
   // "loading.collections": "Loading collections...",
-  // TODO New key - Add a translation
-  "loading.collections": "Loading collections...",
+  "loading.collections": "Načítají se kolekce...",
 
   // "loading.content-source": "Loading content source...",
-  // TODO New key - Add a translation
-  "loading.content-source": "Loading content source...",
+  "loading.content-source": "Načítá se zdroj obsahu...",
 
   // "loading.community": "Loading community...",
   "loading.community": "Načítá se komunita...",
@@ -3687,34 +4970,29 @@
   "loading.item": "Načítá se záznam...",
 
   // "loading.items": "Loading items...",
-  // TODO New key - Add a translation
-  "loading.items": "Loading items...",
+  "loading.items": "Načítají se záznamy...",
 
   // "loading.mydspace-results": "Loading items...",
-  // TODO New key - Add a translation
-  "loading.mydspace-results": "Loading items...",
+  "loading.mydspace-results": "Načítají se záznamy...",
 
   // "loading.objects": "Loading...",
   "loading.objects": "Načítá se...",
 
   // "loading.recent-submissions": "Loading recent submissions...",
-  "loading.recent-submissions": "Načítají se poslední příspěvky...",
+  "loading.recent-submissions": "Načítají se nejnovější příspěvky...",
 
   // "loading.search-results": "Loading search results...",
-  "loading.search-results": "Načítají se výsledky hledání...",
+  "loading.search-results": "Načítají se výsledky vyhledávání...",
 
   // "loading.sub-collections": "Loading sub-collections...",
-  "loading.sub-collections": "Načítají se subkolekce...",
+  "loading.sub-collections": "Načítají se podkolekce...",
 
   // "loading.sub-communities": "Loading sub-communities...",
-  // TODO New key - Add a translation
-  "loading.sub-communities": "Loading sub-communities...",
+  "loading.sub-communities": "Načítají se podkomunity...",
 
   // "loading.top-level-communities": "Loading top-level communities...",
   "loading.top-level-communities": "Načítají se komunity nejvyšší úrovně...",
 
-
-
   // "login.form.email": "Email address",
   "login.form.email": "E-mailová adresa",
 
@@ -3722,33 +5000,31 @@
   "login.form.forgot-password": "Zapomněli jste své heslo?",
 
   // "login.form.header": "Please log in to DSpace",
-  "login.form.header": "Prosím, přihlaste se do DSpace",
+  "login.form.header": "Přihlaste se prosím do DSpace",
 
   // "login.form.new-user": "New user? Click here to register.",
-  "login.form.new-user": "Nový uživatel? Zaregistrujte se kliknutím sem.",
+  "login.form.new-user": "Jste nový uživatel? Klikněte zde pro registraci.",
 
-  // "login.form.or-divider": "or",
-  // TODO New key - Add a translation
-  "login.form.or-divider": "or",
+  // "login.form.oidc": "Log in with OIDC",
+  "login.form.oidc": "Přihlásit se pomocí OIDC",
+
+  // "login.form.orcid": "Log in with ORCID",
+  "login.form.orcid": "Přihlásit se pomocí ORCID",
 
   // "login.form.password": "Password",
   "login.form.password": "Heslo",
 
   // "login.form.shibboleth": "Log in with Shibboleth",
-  // TODO New key - Add a translation
-  "login.form.shibboleth": "Log in with Shibboleth",
+  "login.form.shibboleth": "Přihlásit se pomocí Shibboleth",
 
   // "login.form.submit": "Log in",
   "login.form.submit": "Přihlásit se",
 
   // "login.title": "Login",
-  "login.title": "Přihlásit se",
+  "login.title": "Přihlášení",
 
   // "login.breadcrumbs": "Login",
-  // TODO New key - Add a translation
-  "login.breadcrumbs": "Login",
-
-
+  "login.breadcrumbs": "Přihlášení",
 
   // "logout.form.header": "Log out from DSpace",
   "logout.form.header": "Odhlásit se z DSpace",
@@ -3757,559 +5033,806 @@
   "logout.form.submit": "Odhlásit se",
 
   // "logout.title": "Logout",
-  "logout.title": "Odhlásit se",
+  "logout.title": "Odhlášení",
 
-
-
-  // "menu.header.admin": "Admin",
+  // "menu.header.nav.description": "Admin navigation bar",
   // TODO New key - Add a translation
+  "menu.header.nav.description": "Admin navigation bar",
+
+  // "menu.header.admin": "Management",
   "menu.header.admin": "Admin",
 
   // "menu.header.image.logo": "Repository logo",
-  // TODO New key - Add a translation
-  "menu.header.image.logo": "Repository logo",
-
+  "menu.header.image.logo": "Logo repozitáře",
 
+  // "menu.header.admin.description": "Management menu",
+  "menu.header.admin.description": "Management menu",
 
   // "menu.section.access_control": "Access Control",
-  // TODO New key - Add a translation
-  "menu.section.access_control": "Access Control",
+  "menu.section.access_control": "Řízení přístupu",
 
   // "menu.section.access_control_authorizations": "Authorizations",
-  // TODO New key - Add a translation
-  "menu.section.access_control_authorizations": "Authorizations",
+  "menu.section.access_control_authorizations": "Oprávnění",
+
+  // "menu.section.access_control_bulk": "Bulk Access Management",
+  "menu.section.access_control_bulk": "Hromadná správa přístupu",
 
   // "menu.section.access_control_groups": "Groups",
-  // TODO New key - Add a translation
-  "menu.section.access_control_groups": "Groups",
+  "menu.section.access_control_groups": "Skupiny",
 
   // "menu.section.access_control_people": "People",
+  "menu.section.access_control_people": "Lidé",
+
+  // "menu.section.reports": "Reports",
   // TODO New key - Add a translation
-  "menu.section.access_control_people": "People",
+  "menu.section.reports": "Reports",
 
+  // "menu.section.reports.collections": "Filtered Collections",
+  // TODO New key - Add a translation
+  "menu.section.reports.collections": "Filtered Collections",
 
+  // "menu.section.reports.queries": "Metadata Query",
+  // TODO New key - Add a translation
+  "menu.section.reports.queries": "Metadata Query",
 
   // "menu.section.admin_search": "Admin Search",
-  // TODO New key - Add a translation
-  "menu.section.admin_search": "Admin Search",
-
-
+  "menu.section.admin_search": "Administrátorské vyhledávání",
 
   // "menu.section.browse_community": "This Community",
-  // TODO New key - Add a translation
-  "menu.section.browse_community": "This Community",
+  "menu.section.browse_community": "Tato komunita",
 
   // "menu.section.browse_community_by_author": "By Author",
-  // TODO New key - Add a translation
-  "menu.section.browse_community_by_author": "By Author",
+  "menu.section.browse_community_by_author": "Podle autora",
 
   // "menu.section.browse_community_by_issue_date": "By Issue Date",
-  // TODO New key - Add a translation
-  "menu.section.browse_community_by_issue_date": "By Issue Date",
+  "menu.section.browse_community_by_issue_date": "Podle data vydání",
 
   // "menu.section.browse_community_by_title": "By Title",
-  // TODO New key - Add a translation
-  "menu.section.browse_community_by_title": "By Title",
+  "menu.section.browse_community_by_title": "Podle názvu",
 
   // "menu.section.browse_global": "All of DSpace",
-  // TODO New key - Add a translation
-  "menu.section.browse_global": "All of DSpace",
+  "menu.section.browse_global": "Procházet podle",
 
   // "menu.section.browse_global_by_author": "By Author",
-  // TODO New key - Add a translation
-  "menu.section.browse_global_by_author": "By Author",
+  "menu.section.browse_global_by_author": "Podle autora",
 
   // "menu.section.browse_global_by_dateissued": "By Issue Date",
-  // TODO New key - Add a translation
-  "menu.section.browse_global_by_dateissued": "By Issue Date",
+  "menu.section.browse_global_by_dateissued": "Podle data vydání",
 
   // "menu.section.browse_global_by_subject": "By Subject",
+  "menu.section.browse_global_by_subject": "Podle předmětu",
+
+  // "menu.section.browse_global_by_srsc": "By Subject Category",
+  "menu.section.browse_global_by_srsc": "Podle předmětové kategorie",
+
+  // "menu.section.browse_global_by_nsi": "By Norwegian Science Index",
   // TODO New key - Add a translation
-  "menu.section.browse_global_by_subject": "By Subject",
+  "menu.section.browse_global_by_nsi": "By Norwegian Science Index",
 
   // "menu.section.browse_global_by_title": "By Title",
-  // TODO New key - Add a translation
-  "menu.section.browse_global_by_title": "By Title",
+  "menu.section.browse_global_by_title": "Podle názvu",
 
   // "menu.section.browse_global_communities_and_collections": "Communities & Collections",
-  // TODO New key - Add a translation
-  "menu.section.browse_global_communities_and_collections": "Communities & Collections",
-
-
+  "menu.section.browse_global_communities_and_collections": "Komunity & kolekce",
 
   // "menu.section.control_panel": "Control Panel",
-  // TODO New key - Add a translation
-  "menu.section.control_panel": "Control Panel",
+  "menu.section.control_panel": "Ovládací panel",
 
   // "menu.section.curation_task": "Curation Task",
-  // TODO New key - Add a translation
-  "menu.section.curation_task": "Curation Task",
-
-
+  "menu.section.curation_task": "Úloha správy",
 
   // "menu.section.edit": "Edit",
-  // TODO New key - Add a translation
-  "menu.section.edit": "Edit",
+  "menu.section.edit": "Upravit",
 
   // "menu.section.edit_collection": "Collection",
-  // TODO New key - Add a translation
-  "menu.section.edit_collection": "Collection",
+  "menu.section.edit_collection": "Kolekce",
 
   // "menu.section.edit_community": "Community",
-  // TODO New key - Add a translation
-  "menu.section.edit_community": "Community",
+  "menu.section.edit_community": "Komunita",
 
   // "menu.section.edit_item": "Item",
-  // TODO New key - Add a translation
-  "menu.section.edit_item": "Item",
-
-
+  "menu.section.edit_item": "Záznam",
 
   // "menu.section.export": "Export",
-  // TODO New key - Add a translation
   "menu.section.export": "Export",
 
   // "menu.section.export_collection": "Collection",
-  // TODO New key - Add a translation
-  "menu.section.export_collection": "Collection",
+  "menu.section.export_collection": "Kolekce",
 
   // "menu.section.export_community": "Community",
-  // TODO New key - Add a translation
-  "menu.section.export_community": "Community",
+  "menu.section.export_community": "Komunita",
 
   // "menu.section.export_item": "Item",
-  // TODO New key - Add a translation
-  "menu.section.export_item": "Item",
+  "menu.section.export_item": "Záznam",
 
   // "menu.section.export_metadata": "Metadata",
-  // TODO New key - Add a translation
   "menu.section.export_metadata": "Metadata",
 
-
+  // "menu.section.export_batch": "Batch Export (ZIP)",
+  "menu.section.export_batch": "Dávkový export (ZIP)",
 
   // "menu.section.icon.access_control": "Access Control menu section",
+  "menu.section.icon.access_control": "Sekce menu Řízení přístupu",
+
+  // "menu.section.icon.reports": "Reports menu section",
   // TODO New key - Add a translation
-  "menu.section.icon.access_control": "Access Control menu section",
+  "menu.section.icon.reports": "Reports menu section",
 
   // "menu.section.icon.admin_search": "Admin search menu section",
-  // TODO New key - Add a translation
-  "menu.section.icon.admin_search": "Admin search menu section",
+  "menu.section.icon.admin_search": "Sekce menu Administrátorské vyhledávání",
 
   // "menu.section.icon.control_panel": "Control Panel menu section",
-  // TODO New key - Add a translation
-  "menu.section.icon.control_panel": "Control Panel menu section",
+  "menu.section.icon.control_panel": "Sekce menu Ovládací panel",
 
-  // "menu.section.icon.curation_task": "Curation Task menu section",
-  // TODO New key - Add a translation
-  "menu.section.icon.curation_task": "Curation Task menu section",
+  // "menu.section.icon.curation_tasks": "Curation Task menu section",
+  "menu.section.icon.curation_tasks": "Sekce menu úloha správy",
 
   // "menu.section.icon.edit": "Edit menu section",
-  // TODO New key - Add a translation
-  "menu.section.icon.edit": "Edit menu section",
+  "menu.section.icon.edit": "Sekce menu Upravit",
 
   // "menu.section.icon.export": "Export menu section",
-  // TODO New key - Add a translation
-  "menu.section.icon.export": "Export menu section",
+  "menu.section.icon.export": "Sekce menu Exportovat",
 
   // "menu.section.icon.find": "Find menu section",
-  // TODO New key - Add a translation
-  "menu.section.icon.find": "Find menu section",
+  "menu.section.icon.find": "Sekce menu Najít",
+
+  // "menu.section.icon.health": "Health check menu section",
+  "menu.section.icon.health": "Sekce menu Kontrola stavu",
 
   // "menu.section.icon.import": "Import menu section",
-  // TODO New key - Add a translation
-  "menu.section.icon.import": "Import menu section",
+  "menu.section.icon.import": "Sekce menu Importovat",
 
   // "menu.section.icon.new": "New menu section",
-  // TODO New key - Add a translation
-  "menu.section.icon.new": "New menu section",
+  "menu.section.icon.new": "Sekce menu Nový",
 
   // "menu.section.icon.pin": "Pin sidebar",
-  // TODO New key - Add a translation
-  "menu.section.icon.pin": "Pin sidebar",
+  "menu.section.icon.pin": "Připnout postranní panel",
 
-  // "menu.section.icon.processes": "Processes menu section",
-  // TODO New key - Add a translation
-  "menu.section.icon.processes": "Processes menu section",
+  // "menu.section.icon.processes": "Processes Health",
+  // TODO Source message changed - Revise the translation
+  "menu.section.icon.processes": "zdravotní stav procesů",
 
   // "menu.section.icon.registries": "Registries menu section",
-  // TODO New key - Add a translation
-  "menu.section.icon.registries": "Registries menu section",
+  "menu.section.icon.registries": "Sekce menu Registry",
 
   // "menu.section.icon.statistics_task": "Statistics Task menu section",
-  // TODO New key - Add a translation
-  "menu.section.icon.statistics_task": "Statistics Task menu section",
+  "menu.section.icon.statistics_task": "Sekce menu Statistická úloha",
+
+  // "menu.section.icon.workflow": "Administer workflow menu section",
+  "menu.section.icon.workflow": "Sekce menu pro administrativní workflow",
 
   // "menu.section.icon.unpin": "Unpin sidebar",
+  "menu.section.icon.unpin": "Odepnout postranní panel",
+
+  // "menu.section.icon.notifications": "Notifications menu section",
   // TODO New key - Add a translation
-  "menu.section.icon.unpin": "Unpin sidebar",
-
-
+  "menu.section.icon.notifications": "Notifications menu section",
 
   // "menu.section.import": "Import",
-  // TODO New key - Add a translation
-  "menu.section.import": "Import",
+  "menu.section.import": "Importovat",
 
   // "menu.section.import_batch": "Batch Import (ZIP)",
-  // TODO New key - Add a translation
-  "menu.section.import_batch": "Batch Import (ZIP)",
+  "menu.section.import_batch": "Dávkový import (ZIP)",
 
   // "menu.section.import_metadata": "Metadata",
-  // TODO New key - Add a translation
   "menu.section.import_metadata": "Metadata",
 
-
-
   // "menu.section.new": "New",
-  // TODO New key - Add a translation
-  "menu.section.new": "New",
+  "menu.section.new": "Nový",
 
   // "menu.section.new_collection": "Collection",
-  // TODO New key - Add a translation
-  "menu.section.new_collection": "Collection",
+  "menu.section.new_collection": "Kolekce",
 
   // "menu.section.new_community": "Community",
-  // TODO New key - Add a translation
-  "menu.section.new_community": "Community",
+  "menu.section.new_community": "Komunita",
 
   // "menu.section.new_item": "Item",
-  // TODO New key - Add a translation
-  "menu.section.new_item": "Item",
+  "menu.section.new_item": "Záznam",
 
   // "menu.section.new_item_version": "Item Version",
-  // TODO New key - Add a translation
-  "menu.section.new_item_version": "Item Version",
+  "menu.section.new_item_version": "Verze záznamu",
 
   // "menu.section.new_process": "Process",
+  "menu.section.new_process": "Proces",
+
+  // "menu.section.notifications": "Notifications",
   // TODO New key - Add a translation
-  "menu.section.new_process": "Process",
+  "menu.section.notifications": "Notifications",
 
+  // "menu.section.quality-assurance": "Quality Assurance",
+  // TODO New key - Add a translation
+  "menu.section.quality-assurance": "Quality Assurance",
 
+  // "menu.section.notifications_publication-claim": "Publication Claim",
+  // TODO New key - Add a translation
+  "menu.section.notifications_publication-claim": "Publication Claim",
 
   // "menu.section.pin": "Pin sidebar",
-  // TODO New key - Add a translation
-  "menu.section.pin": "Pin sidebar",
+  "menu.section.pin": "Připnout postranní panel",
 
   // "menu.section.unpin": "Unpin sidebar",
-  // TODO New key - Add a translation
-  "menu.section.unpin": "Unpin sidebar",
-
-
+  "menu.section.unpin": "Odepnout postranní panel",
 
   // "menu.section.processes": "Processes",
-  // TODO New key - Add a translation
-  "menu.section.processes": "Processes",
-
+  "menu.section.processes": "Procesy",
 
+  // "menu.section.health": "Health",
+  "menu.section.health": "Stav systému",
 
   // "menu.section.registries": "Registries",
-  // TODO New key - Add a translation
-  "menu.section.registries": "Registries",
+  "menu.section.registries": "Registry",
 
   // "menu.section.registries_format": "Format",
-  // TODO New key - Add a translation
-  "menu.section.registries_format": "Format",
+  "menu.section.registries_format": "Formát",
 
   // "menu.section.registries_metadata": "Metadata",
-  // TODO New key - Add a translation
   "menu.section.registries_metadata": "Metadata",
 
-
-
   // "menu.section.statistics": "Statistics",
-  // TODO New key - Add a translation
-  "menu.section.statistics": "Statistics",
+  "menu.section.statistics": "Statistika",
 
   // "menu.section.statistics_task": "Statistics Task",
-  // TODO New key - Add a translation
-  "menu.section.statistics_task": "Statistics Task",
-
-
+  "menu.section.statistics_task": "Statistická úloha",
 
   // "menu.section.toggle.access_control": "Toggle Access Control section",
+  "menu.section.toggle.access_control": "Přepnout sekci Řízení přístupu",
+
+  // "menu.section.toggle.reports": "Toggle Reports section",
   // TODO New key - Add a translation
-  "menu.section.toggle.access_control": "Toggle Access Control section",
+  "menu.section.toggle.reports": "Toggle Reports section",
 
   // "menu.section.toggle.control_panel": "Toggle Control Panel section",
-  // TODO New key - Add a translation
-  "menu.section.toggle.control_panel": "Toggle Control Panel section",
+  "menu.section.toggle.control_panel": "Přepnout sekci ovládacího panelu",
 
   // "menu.section.toggle.curation_task": "Toggle Curation Task section",
-  // TODO New key - Add a translation
-  "menu.section.toggle.curation_task": "Toggle Curation Task section",
+  "menu.section.toggle.curation_task": "Přepnout sekci úloha správy",
 
   // "menu.section.toggle.edit": "Toggle Edit section",
-  // TODO New key - Add a translation
-  "menu.section.toggle.edit": "Toggle Edit section",
+  "menu.section.toggle.edit": "Přepnout sekci Úpravy",
 
   // "menu.section.toggle.export": "Toggle Export section",
-  // TODO New key - Add a translation
-  "menu.section.toggle.export": "Toggle Export section",
+  "menu.section.toggle.export": "Přepnout sekci Export",
 
   // "menu.section.toggle.find": "Toggle Find section",
-  // TODO New key - Add a translation
-  "menu.section.toggle.find": "Toggle Find section",
+  "menu.section.toggle.find": "Přepnout sekci Najít",
 
   // "menu.section.toggle.import": "Toggle Import section",
-  // TODO New key - Add a translation
-  "menu.section.toggle.import": "Toggle Import section",
+  "menu.section.toggle.import": "Přepnout sekci Import",
 
   // "menu.section.toggle.new": "Toggle New section",
-  // TODO New key - Add a translation
-  "menu.section.toggle.new": "Toggle New section",
+  "menu.section.toggle.new": "Přepnout sekci Nová",
 
   // "menu.section.toggle.registries": "Toggle Registries section",
-  // TODO New key - Add a translation
-  "menu.section.toggle.registries": "Toggle Registries section",
+  "menu.section.toggle.registries": "Přepnout sekci Registry",
 
   // "menu.section.toggle.statistics_task": "Toggle Statistics Task section",
-  // TODO New key - Add a translation
-  "menu.section.toggle.statistics_task": "Toggle Statistics Task section",
-
+  "menu.section.toggle.statistics_task": "Přepnout sekci Statistická úloha",
 
   // "menu.section.workflow": "Administer Workflow",
-  // TODO New key - Add a translation
-  "menu.section.workflow": "Administer Workflow",
+  "menu.section.workflow": "Spravovat workflow",
 
+  // "metadata-export-search.tooltip": "Export search results as CSV",
+  "metadata-export-search.tooltip": "Exportovat výsledky vyhledávání jako CSV",
+
+  // "metadata-export-search.submit.success": "The export was started successfully",
+  "metadata-export-search.submit.success": "Export byl úspěšně spuštěn",
+
+  // "metadata-export-search.submit.error": "Starting the export has failed",
+  "metadata-export-search.submit.error": "Spuštění exportu se nezdařilo",
+
+  // "mydspace.breadcrumbs": "MyDSpace",
+  "mydspace.breadcrumbs": "Můj DSpace",
 
   // "mydspace.description": "",
-  // TODO New key - Add a translation
   "mydspace.description": "",
 
-  // "mydspace.general.text-here": "here",
-  // TODO New key - Add a translation
-  "mydspace.general.text-here": "here",
-
   // "mydspace.messages.controller-help": "Select this option to send a message to item's submitter.",
-  // TODO New key - Add a translation
-  "mydspace.messages.controller-help": "Select this option to send a message to item's submitter.",
+  "mydspace.messages.controller-help": "Zvolte tuto možnost, chcete-li odeslat zprávu odesílateli záznamu.",
 
   // "mydspace.messages.description-placeholder": "Insert your message here...",
-  // TODO New key - Add a translation
-  "mydspace.messages.description-placeholder": "Insert your message here...",
+  "mydspace.messages.description-placeholder": "Zde vložte svou zprávu...",
 
   // "mydspace.messages.hide-msg": "Hide message",
-  // TODO New key - Add a translation
-  "mydspace.messages.hide-msg": "Hide message",
+  "mydspace.messages.hide-msg": "Skrýt zprávu",
 
   // "mydspace.messages.mark-as-read": "Mark as read",
-  // TODO New key - Add a translation
-  "mydspace.messages.mark-as-read": "Mark as read",
+  "mydspace.messages.mark-as-read": "Označit jako přečtené",
 
   // "mydspace.messages.mark-as-unread": "Mark as unread",
-  // TODO New key - Add a translation
-  "mydspace.messages.mark-as-unread": "Mark as unread",
+  "mydspace.messages.mark-as-unread": "Označit jako nepřečtené",
 
   // "mydspace.messages.no-content": "No content.",
-  // TODO New key - Add a translation
-  "mydspace.messages.no-content": "No content.",
+  "mydspace.messages.no-content": "Žádný obsah.",
 
   // "mydspace.messages.no-messages": "No messages yet.",
-  // TODO New key - Add a translation
-  "mydspace.messages.no-messages": "No messages yet.",
+  "mydspace.messages.no-messages": "Zatím žádné zprávy.",
 
   // "mydspace.messages.send-btn": "Send",
-  // TODO New key - Add a translation
-  "mydspace.messages.send-btn": "Send",
+  "mydspace.messages.send-btn": "Odeslat",
 
   // "mydspace.messages.show-msg": "Show message",
-  // TODO New key - Add a translation
-  "mydspace.messages.show-msg": "Show message",
+  "mydspace.messages.show-msg": "Zobrazit zprávu",
 
   // "mydspace.messages.subject-placeholder": "Subject...",
-  // TODO New key - Add a translation
-  "mydspace.messages.subject-placeholder": "Subject...",
+  "mydspace.messages.subject-placeholder": "Předmět...",
 
   // "mydspace.messages.submitter-help": "Select this option to send a message to controller.",
-  // TODO New key - Add a translation
-  "mydspace.messages.submitter-help": "Select this option to send a message to controller.",
+  "mydspace.messages.submitter-help": "Zvolte tuto možnost, chcete-li odeslat zprávu správci.",
 
   // "mydspace.messages.title": "Messages",
-  // TODO New key - Add a translation
-  "mydspace.messages.title": "Messages",
+  "mydspace.messages.title": "Zprávy",
 
   // "mydspace.messages.to": "To",
-  // TODO New key - Add a translation
-  "mydspace.messages.to": "To",
+  "mydspace.messages.to": "Komu",
 
   // "mydspace.new-submission": "New submission",
-  // TODO New key - Add a translation
-  "mydspace.new-submission": "New submission",
+  "mydspace.new-submission": "Nový příspěvek",
 
   // "mydspace.new-submission-external": "Import metadata from external source",
-  // TODO New key - Add a translation
-  "mydspace.new-submission-external": "Import metadata from external source",
+  "mydspace.new-submission-external": "Importovat metadata z externího zdroje",
 
   // "mydspace.new-submission-external-short": "Import metadata",
-  // TODO New key - Add a translation
-  "mydspace.new-submission-external-short": "Import metadata",
+  "mydspace.new-submission-external-short": "Importovat metadata",
 
   // "mydspace.results.head": "Your submissions",
-  // TODO New key - Add a translation
-  "mydspace.results.head": "Your submissions",
+  "mydspace.results.head": "Vaše záznamy",
 
   // "mydspace.results.no-abstract": "No Abstract",
-  // TODO New key - Add a translation
-  "mydspace.results.no-abstract": "No Abstract",
+  "mydspace.results.no-abstract": "Žádný abstrakt",
 
   // "mydspace.results.no-authors": "No Authors",
-  // TODO New key - Add a translation
-  "mydspace.results.no-authors": "No Authors",
+  "mydspace.results.no-authors": "Žádní autoři",
 
   // "mydspace.results.no-collections": "No Collections",
-  // TODO New key - Add a translation
-  "mydspace.results.no-collections": "No Collections",
+  "mydspace.results.no-collections": "Žádné kolekce",
 
   // "mydspace.results.no-date": "No Date",
-  // TODO New key - Add a translation
-  "mydspace.results.no-date": "No Date",
+  "mydspace.results.no-date": "Žádné datum",
 
   // "mydspace.results.no-files": "No Files",
-  // TODO New key - Add a translation
-  "mydspace.results.no-files": "No Files",
+  "mydspace.results.no-files": "Žádné soubory",
 
   // "mydspace.results.no-results": "There were no items to show",
-  // TODO New key - Add a translation
-  "mydspace.results.no-results": "There were no items to show",
+  "mydspace.results.no-results": "Nebyly zde žádné záznamy k zobrazení",
 
   // "mydspace.results.no-title": "No title",
-  // TODO New key - Add a translation
-  "mydspace.results.no-title": "No title",
+  "mydspace.results.no-title": "Žádný název",
 
-  // "mydspace.results.no-uri": "No Uri",
-  // TODO New key - Add a translation
-  "mydspace.results.no-uri": "No Uri",
+  // "mydspace.results.no-uri": "No URI",
+  // TODO Source message changed - Revise the translation
+  "mydspace.results.no-uri": "Žádné Uri",
 
-  // "mydspace.show.workflow": "All tasks",
-  // TODO New key - Add a translation
-  "mydspace.show.workflow": "All tasks",
+  // "mydspace.search-form.placeholder": "Search in MyDSpace...",
+  "mydspace.search-form.placeholder": "Hledat v mém dspace...",
+
+  // "mydspace.show.workflow": "Workflow tasks",
+  // TODO Source message changed - Revise the translation
+  "mydspace.show.workflow": "Úlohy workflow",
 
   // "mydspace.show.workspace": "Your Submissions",
-  // TODO New key - Add a translation
-  "mydspace.show.workspace": "Your Submissions",
+  // TODO Source message changed - Revise the translation
+  "mydspace.show.workspace": "Vaše záznamy",
 
-  // "mydspace.status.archived": "Archived",
-  // TODO New key - Add a translation
-  "mydspace.status.archived": "Archived",
+  // "mydspace.show.supervisedWorkspace": "Supervised items",
+  "mydspace.show.supervisedWorkspace": "Záznamy pod dohledem",
 
-  // "mydspace.status.validation": "Validation",
-  // TODO New key - Add a translation
-  "mydspace.status.validation": "Validation",
+  // "mydspace.status.mydspaceArchived": "Archived",
+  "mydspace.status.mydspaceArchived": "Archivováno",
 
-  // "mydspace.status.waiting-for-controller": "Waiting for controller",
-  // TODO New key - Add a translation
-  "mydspace.status.waiting-for-controller": "Waiting for controller",
+  // "mydspace.status.mydspaceValidation": "Validation",
+  "mydspace.status.mydspaceValidation": "Ověřování",
 
-  // "mydspace.status.workflow": "Workflow",
-  // TODO New key - Add a translation
-  "mydspace.status.workflow": "Workflow",
+  // "mydspace.status.mydspaceWaitingController": "Waiting for reviewer",
+  "mydspace.status.mydspaceWaitingController": "Čeká na kontrolu",
 
-  // "mydspace.status.workspace": "Workspace",
+  // "mydspace.status.mydspaceWorkflow": "Workflow",
   // TODO New key - Add a translation
-  "mydspace.status.workspace": "Workspace",
+  "mydspace.status.mydspaceWorkflow": "Workflow",
+
+  // "mydspace.status.mydspaceWorkspace": "Workspace",
+  "mydspace.status.mydspaceWorkspace": "Pracovní prostor",
 
   // "mydspace.title": "MyDSpace",
-  // TODO New key - Add a translation
-  "mydspace.title": "MyDSpace",
+  "mydspace.title": "Můj DSpace",
 
   // "mydspace.upload.upload-failed": "Error creating new workspace. Please verify the content uploaded before retry.",
-  // TODO New key - Add a translation
-  "mydspace.upload.upload-failed": "Error creating new workspace. Please verify the content uploaded before retry.",
+  "mydspace.upload.upload-failed": "Chyba při vytváření nového pracovního prostoru. Před dalším pokusem ověřte nahraný obsah.",
 
   // "mydspace.upload.upload-failed-manyentries": "Unprocessable file. Detected too many entries but allowed only one for file.",
-  // TODO New key - Add a translation
-  "mydspace.upload.upload-failed-manyentries": "Unprocessable file. Detected too many entries but allowed only one for file.",
+  "mydspace.upload.upload-failed-manyentries": "Nezpracovatelný soubor. Zjištěno příliš mnoho záznamů, ale povolen pouze jeden pro soubor",
 
   // "mydspace.upload.upload-failed-moreonefile": "Unprocessable request. Only one file is allowed.",
-  // TODO New key - Add a translation
-  "mydspace.upload.upload-failed-moreonefile": "Unprocessable request. Only one file is allowed.",
+  "mydspace.upload.upload-failed-moreonefile": "Nezpracovatelný požadavek. Je povolen pouze jeden soubor.",
 
   // "mydspace.upload.upload-multiple-successful": "{{qty}} new workspace items created.",
-  // TODO New key - Add a translation
-  "mydspace.upload.upload-multiple-successful": "{{qty}} new workspace items created.",
-
-  // "mydspace.upload.upload-successful": "New workspace item created. Click {{here}} for edit it.",
-  // TODO New key - Add a translation
-  "mydspace.upload.upload-successful": "New workspace item created. Click {{here}} for edit it.",
+  "mydspace.upload.upload-multiple-successful": "{{qty}} nově vytvořené záznamy pracovního prostoru.",
 
   // "mydspace.view-btn": "View",
+  "mydspace.view-btn": "Zobrazit",
+
+  // "nav.expandable-navbar-section-suffix": "(submenu)",
   // TODO New key - Add a translation
-  "mydspace.view-btn": "View",
+  "nav.expandable-navbar-section-suffix": "(submenu)",
 
+  // "notification.suggestion": "We found <b>{{count}} publications</b> in the {{source}} that seems to be related to your profile.<br>",
+  // TODO New key - Add a translation
+  "notification.suggestion": "We found <b>{{count}} publications</b> in the {{source}} that seems to be related to your profile.<br>",
 
+  // "notification.suggestion.review": "review the suggestions",
+  // TODO New key - Add a translation
+  "notification.suggestion.review": "review the suggestions",
+
+  // "notification.suggestion.please": "Please",
+  // TODO New key - Add a translation
+  "notification.suggestion.please": "Please",
 
   // "nav.browse.header": "All of DSpace",
-  // TODO New key - Add a translation
-  "nav.browse.header": "All of DSpace",
+  "nav.browse.header": "Celý repozitář",
 
   // "nav.community-browse.header": "By Community",
-  // TODO New key - Add a translation
-  "nav.community-browse.header": "By Community",
+  "nav.community-browse.header": "Podle komunity",
+
+  // "nav.context-help-toggle": "Toggle context help",
+  "nav.context-help-toggle": "Zobrazení nápovědy a tipů",
 
   // "nav.language": "Language switch",
-  // TODO New key - Add a translation
-  "nav.language": "Language switch",
+  "nav.language": "Přepínání jazyků",
 
   // "nav.login": "Log In",
   "nav.login": "Přihlásit se",
 
+  // "nav.user-profile-menu-and-logout": "User profile menu and log out",
+  "nav.user-profile-menu-and-logout": "Menu uživatelského profilu a odhlášení",
+
   // "nav.logout": "Log Out",
   "nav.logout": "Odhlásit se",
 
+  // "nav.main.description": "Main navigation bar",
+  "nav.main.description": "Hlavní navigační panel",
+
   // "nav.mydspace": "MyDSpace",
-  // TODO New key - Add a translation
-  "nav.mydspace": "MyDSpace",
+  "nav.mydspace": "Můj DSpace",
 
   // "nav.profile": "Profile",
-  // TODO New key - Add a translation
-  "nav.profile": "Profile",
+  "nav.profile": "Profil",
 
   // "nav.search": "Search",
-  // TODO New key - Add a translation
-  "nav.search": "Search",
+  "nav.search": "Hledat",
+
+  // "nav.search.button": "Submit search",
+  "nav.search.button": "Vyhledat",
 
   // "nav.statistics.header": "Statistics",
-  // TODO New key - Add a translation
-  "nav.statistics.header": "Statistics",
+  "nav.statistics.header": "Statistika",
 
   // "nav.stop-impersonating": "Stop impersonating EPerson",
+  "nav.stop-impersonating": "Přestat vystupovat jako jiný uživatel",
+
+  // "nav.subscriptions": "Subscriptions",
+  "nav.subscriptions": "Nastavení notifikací",
+
+  // "nav.toggle": "Toggle navigation",
+  "nav.toggle": "Přepnout navigaci",
+
+  // "nav.user.description": "User profile bar",
+  "nav.user.description": "Panel uživatelského profilu ",
+
+  // "none.listelement.badge": "Item",
+  "none.listelement.badge": "Záznam",
+
+  // "quality-assurance.title": "Quality Assurance",
   // TODO New key - Add a translation
-  "nav.stop-impersonating": "Stop impersonating EPerson",
+  "quality-assurance.title": "Quality Assurance",
 
+  // "quality-assurance.topics.description": "Below you can see all the topics received from the subscriptions to {{source}}.",
+  // TODO New key - Add a translation
+  "quality-assurance.topics.description": "Below you can see all the topics received from the subscriptions to {{source}}.",
 
+  // "quality-assurance.source.description": "Below you can see all the notification's sources.",
+  // TODO New key - Add a translation
+  "quality-assurance.source.description": "Below you can see all the notification's sources.",
+
+  // "quality-assurance.topics": "Current Topics",
+  // TODO New key - Add a translation
+  "quality-assurance.topics": "Current Topics",
+
+  // "quality-assurance.source": "Current Sources",
+  // TODO New key - Add a translation
+  "quality-assurance.source": "Current Sources",
+
+  // "quality-assurance.table.topic": "Topic",
+  // TODO New key - Add a translation
+  "quality-assurance.table.topic": "Topic",
+
+  // "quality-assurance.table.source": "Source",
+  // TODO New key - Add a translation
+  "quality-assurance.table.source": "Source",
+
+  // "quality-assurance.table.last-event": "Last Event",
+  // TODO New key - Add a translation
+  "quality-assurance.table.last-event": "Last Event",
+
+  // "quality-assurance.table.actions": "Actions",
+  // TODO New key - Add a translation
+  "quality-assurance.table.actions": "Actions",
+
+  // "quality-assurance.source-list.button.detail": "Show topics for {{param}}",
+  // TODO New key - Add a translation
+  "quality-assurance.source-list.button.detail": "Show topics for {{param}}",
+
+  // "quality-assurance.topics-list.button.detail": "Show suggestions for {{param}}",
+  // TODO New key - Add a translation
+  "quality-assurance.topics-list.button.detail": "Show suggestions for {{param}}",
+
+  // "quality-assurance.noTopics": "No topics found.",
+  // TODO New key - Add a translation
+  "quality-assurance.noTopics": "No topics found.",
+
+  // "quality-assurance.noSource": "No sources found.",
+  // TODO New key - Add a translation
+  "quality-assurance.noSource": "No sources found.",
+
+  // "notifications.events.title": "Quality Assurance Suggestions",
+  // TODO New key - Add a translation
+  "notifications.events.title": "Quality Assurance Suggestions",
+
+  // "quality-assurance.topic.error.service.retrieve": "An error occurred while loading the Quality Assurance topics",
+  // TODO New key - Add a translation
+  "quality-assurance.topic.error.service.retrieve": "An error occurred while loading the Quality Assurance topics",
+
+  // "quality-assurance.source.error.service.retrieve": "An error occurred while loading the Quality Assurance source",
+  // TODO New key - Add a translation
+  "quality-assurance.source.error.service.retrieve": "An error occurred while loading the Quality Assurance source",
+
+  // "quality-assurance.loading": "Loading ...",
+  // TODO New key - Add a translation
+  "quality-assurance.loading": "Loading ...",
+
+  // "quality-assurance.events.topic": "Topic:",
+  // TODO New key - Add a translation
+  "quality-assurance.events.topic": "Topic:",
+
+  // "quality-assurance.noEvents": "No suggestions found.",
+  // TODO New key - Add a translation
+  "quality-assurance.noEvents": "No suggestions found.",
+
+  // "quality-assurance.event.table.trust": "Trust",
+  // TODO New key - Add a translation
+  "quality-assurance.event.table.trust": "Trust",
+
+  // "quality-assurance.event.table.publication": "Publication",
+  // TODO New key - Add a translation
+  "quality-assurance.event.table.publication": "Publication",
+
+  // "quality-assurance.event.table.details": "Details",
+  // TODO New key - Add a translation
+  "quality-assurance.event.table.details": "Details",
+
+  // "quality-assurance.event.table.project-details": "Project details",
+  // TODO New key - Add a translation
+  "quality-assurance.event.table.project-details": "Project details",
+
+  // "quality-assurance.event.table.reasons": "Reasons",
+  // TODO New key - Add a translation
+  "quality-assurance.event.table.reasons": "Reasons",
+
+  // "quality-assurance.event.table.actions": "Actions",
+  // TODO New key - Add a translation
+  "quality-assurance.event.table.actions": "Actions",
+
+  // "quality-assurance.event.action.accept": "Accept suggestion",
+  // TODO New key - Add a translation
+  "quality-assurance.event.action.accept": "Accept suggestion",
+
+  // "quality-assurance.event.action.ignore": "Ignore suggestion",
+  // TODO New key - Add a translation
+  "quality-assurance.event.action.ignore": "Ignore suggestion",
+
+  // "quality-assurance.event.action.undo": "Delete",
+  // TODO New key - Add a translation
+  "quality-assurance.event.action.undo": "Delete",
+
+  // "quality-assurance.event.action.reject": "Reject suggestion",
+  // TODO New key - Add a translation
+  "quality-assurance.event.action.reject": "Reject suggestion",
+
+  // "quality-assurance.event.action.import": "Import project and accept suggestion",
+  // TODO New key - Add a translation
+  "quality-assurance.event.action.import": "Import project and accept suggestion",
+
+  // "quality-assurance.event.table.pidtype": "PID Type:",
+  // TODO New key - Add a translation
+  "quality-assurance.event.table.pidtype": "PID Type:",
+
+  // "quality-assurance.event.table.pidvalue": "PID Value:",
+  // TODO New key - Add a translation
+  "quality-assurance.event.table.pidvalue": "PID Value:",
+
+  // "quality-assurance.event.table.subjectValue": "Subject Value:",
+  // TODO New key - Add a translation
+  "quality-assurance.event.table.subjectValue": "Subject Value:",
+
+  // "quality-assurance.event.table.abstract": "Abstract:",
+  // TODO New key - Add a translation
+  "quality-assurance.event.table.abstract": "Abstract:",
+
+  // "quality-assurance.event.table.suggestedProject": "OpenAIRE Suggested Project data",
+  // TODO New key - Add a translation
+  "quality-assurance.event.table.suggestedProject": "OpenAIRE Suggested Project data",
+
+  // "quality-assurance.event.table.project": "Project title:",
+  // TODO New key - Add a translation
+  "quality-assurance.event.table.project": "Project title:",
+
+  // "quality-assurance.event.table.acronym": "Acronym:",
+  // TODO New key - Add a translation
+  "quality-assurance.event.table.acronym": "Acronym:",
+
+  // "quality-assurance.event.table.code": "Code:",
+  // TODO New key - Add a translation
+  "quality-assurance.event.table.code": "Code:",
+
+  // "quality-assurance.event.table.funder": "Funder:",
+  // TODO New key - Add a translation
+  "quality-assurance.event.table.funder": "Funder:",
+
+  // "quality-assurance.event.table.fundingProgram": "Funding program:",
+  // TODO New key - Add a translation
+  "quality-assurance.event.table.fundingProgram": "Funding program:",
+
+  // "quality-assurance.event.table.jurisdiction": "Jurisdiction:",
+  // TODO New key - Add a translation
+  "quality-assurance.event.table.jurisdiction": "Jurisdiction:",
+
+  // "quality-assurance.events.back": "Back to topics",
+  // TODO New key - Add a translation
+  "quality-assurance.events.back": "Back to topics",
+
+  // "quality-assurance.events.back-to-sources": "Back to sources",
+  // TODO New key - Add a translation
+  "quality-assurance.events.back-to-sources": "Back to sources",
+
+  // "quality-assurance.event.table.less": "Show less",
+  // TODO New key - Add a translation
+  "quality-assurance.event.table.less": "Show less",
+
+  // "quality-assurance.event.table.more": "Show more",
+  // TODO New key - Add a translation
+  "quality-assurance.event.table.more": "Show more",
+
+  // "quality-assurance.event.project.found": "Bound to the local record:",
+  // TODO New key - Add a translation
+  "quality-assurance.event.project.found": "Bound to the local record:",
+
+  // "quality-assurance.event.project.notFound": "No local record found",
+  // TODO New key - Add a translation
+  "quality-assurance.event.project.notFound": "No local record found",
+
+  // "quality-assurance.event.sure": "Are you sure?",
+  // TODO New key - Add a translation
+  "quality-assurance.event.sure": "Are you sure?",
+
+  // "quality-assurance.event.ignore.description": "This operation can't be undone. Ignore this suggestion?",
+  // TODO New key - Add a translation
+  "quality-assurance.event.ignore.description": "This operation can't be undone. Ignore this suggestion?",
+
+  // "quality-assurance.event.undo.description": "This operation can't be undone!",
+  // TODO New key - Add a translation
+  "quality-assurance.event.undo.description": "This operation can't be undone!",
+
+  // "quality-assurance.event.reject.description": "This operation can't be undone. Reject this suggestion?",
+  // TODO New key - Add a translation
+  "quality-assurance.event.reject.description": "This operation can't be undone. Reject this suggestion?",
+
+  // "quality-assurance.event.accept.description": "No DSpace project selected. A new project will be created based on the suggestion data.",
+  // TODO New key - Add a translation
+  "quality-assurance.event.accept.description": "No DSpace project selected. A new project will be created based on the suggestion data.",
+
+  // "quality-assurance.event.action.cancel": "Cancel",
+  // TODO New key - Add a translation
+  "quality-assurance.event.action.cancel": "Cancel",
+
+  // "quality-assurance.event.action.saved": "Your decision has been saved successfully.",
+  // TODO New key - Add a translation
+  "quality-assurance.event.action.saved": "Your decision has been saved successfully.",
+
+  // "quality-assurance.event.action.error": "An error has occurred. Your decision has not been saved.",
+  // TODO New key - Add a translation
+  "quality-assurance.event.action.error": "An error has occurred. Your decision has not been saved.",
+
+  // "quality-assurance.event.modal.project.title": "Choose a project to bound",
+  // TODO New key - Add a translation
+  "quality-assurance.event.modal.project.title": "Choose a project to bound",
+
+  // "quality-assurance.event.modal.project.publication": "Publication:",
+  // TODO New key - Add a translation
+  "quality-assurance.event.modal.project.publication": "Publication:",
+
+  // "quality-assurance.event.modal.project.bountToLocal": "Bound to the local record:",
+  // TODO New key - Add a translation
+  "quality-assurance.event.modal.project.bountToLocal": "Bound to the local record:",
+
+  // "quality-assurance.event.modal.project.select": "Project search",
+  // TODO New key - Add a translation
+  "quality-assurance.event.modal.project.select": "Project search",
+
+  // "quality-assurance.event.modal.project.search": "Search",
+  // TODO New key - Add a translation
+  "quality-assurance.event.modal.project.search": "Search",
+
+  // "quality-assurance.event.modal.project.clear": "Clear",
+  // TODO New key - Add a translation
+  "quality-assurance.event.modal.project.clear": "Clear",
+
+  // "quality-assurance.event.modal.project.cancel": "Cancel",
+  // TODO New key - Add a translation
+  "quality-assurance.event.modal.project.cancel": "Cancel",
+
+  // "quality-assurance.event.modal.project.bound": "Bound project",
+  // TODO New key - Add a translation
+  "quality-assurance.event.modal.project.bound": "Bound project",
+
+  // "quality-assurance.event.modal.project.remove": "Remove",
+  // TODO New key - Add a translation
+  "quality-assurance.event.modal.project.remove": "Remove",
+
+  // "quality-assurance.event.modal.project.placeholder": "Enter a project name",
+  // TODO New key - Add a translation
+  "quality-assurance.event.modal.project.placeholder": "Enter a project name",
+
+  // "quality-assurance.event.modal.project.notFound": "No project found.",
+  // TODO New key - Add a translation
+  "quality-assurance.event.modal.project.notFound": "No project found.",
+
+  // "quality-assurance.event.project.bounded": "The project has been linked successfully.",
+  // TODO New key - Add a translation
+  "quality-assurance.event.project.bounded": "The project has been linked successfully.",
+
+  // "quality-assurance.event.project.removed": "The project has been successfully unlinked.",
+  // TODO New key - Add a translation
+  "quality-assurance.event.project.removed": "The project has been successfully unlinked.",
+
+  // "quality-assurance.event.project.error": "An error has occurred. No operation performed.",
+  // TODO New key - Add a translation
+  "quality-assurance.event.project.error": "An error has occurred. No operation performed.",
+
+  // "quality-assurance.event.reason": "Reason",
+  // TODO New key - Add a translation
+  "quality-assurance.event.reason": "Reason",
 
   // "orgunit.listelement.badge": "Organizational Unit",
-  // TODO New key - Add a translation
-  "orgunit.listelement.badge": "Organizational Unit",
+  "orgunit.listelement.badge": "Organizační jednotka",
+
+  // "orgunit.listelement.no-title": "Untitled",
+  "orgunit.listelement.no-title": "Bez názvu",
 
   // "orgunit.page.city": "City",
-  // TODO New key - Add a translation
-  "orgunit.page.city": "City",
+  "orgunit.page.city": "Město",
 
   // "orgunit.page.country": "Country",
-  // TODO New key - Add a translation
-  "orgunit.page.country": "Country",
+  "orgunit.page.country": "Země",
 
   // "orgunit.page.dateestablished": "Date established",
-  // TODO New key - Add a translation
-  "orgunit.page.dateestablished": "Date established",
+  "orgunit.page.dateestablished": "Datum založení.",
 
   // "orgunit.page.description": "Description",
-  // TODO New key - Add a translation
-  "orgunit.page.description": "Description",
+  "orgunit.page.description": "Popis",
 
   // "orgunit.page.edit": "Edit this item",
-  // TODO New key - Add a translation
-  "orgunit.page.edit": "Edit this item",
+  "orgunit.page.edit": "Upravit tento záznam",
 
   // "orgunit.page.id": "ID",
-  // TODO New key - Add a translation
   "orgunit.page.id": "ID",
 
   // "orgunit.page.titleprefix": "Organizational Unit: ",
+  "orgunit.page.titleprefix": "Organizační jednotka: ",
+
+  // "orgunit.page.ror": "ROR Identifier",
   // TODO New key - Add a translation
-  "orgunit.page.titleprefix": "Organizational Unit: ",
-
+  "orgunit.page.ror": "ROR Identifier",
 
+  // "pagination.options.description": "Pagination options",
+  "pagination.options.description": "Možnosti stránkování",
 
   // "pagination.results-per-page": "Results Per Page",
   "pagination.results-per-page": "Výsledků na stránku",
@@ -4318,931 +5841,1131 @@
   "pagination.showing.detail": "{{ range }} z {{ total }}",
 
   // "pagination.showing.label": "Now showing ",
-  "pagination.showing.label": "Zobrazují se záznamy ",
+  "pagination.showing.label": "Nyní se zobrazuje ",
 
   // "pagination.sort-direction": "Sort Options",
-  "pagination.sort-direction": "Seřazení",
-
-
+  "pagination.sort-direction": "Možnosti řazení",
 
   // "person.listelement.badge": "Person",
-  // TODO New key - Add a translation
-  "person.listelement.badge": "Person",
+  "person.listelement.badge": "Osoba",
 
   // "person.listelement.no-title": "No name found",
-  // TODO New key - Add a translation
-  "person.listelement.no-title": "No name found",
+  "person.listelement.no-title": "Nebylo nalezeno žádné jméno",
 
   // "person.page.birthdate": "Birth Date",
-  // TODO New key - Add a translation
-  "person.page.birthdate": "Birth Date",
+  "person.page.birthdate": "Datum narození",
 
   // "person.page.edit": "Edit this item",
-  // TODO New key - Add a translation
-  "person.page.edit": "Edit this item",
+  "person.page.edit": "Upravit tento záznam",
 
   // "person.page.email": "Email Address",
-  // TODO New key - Add a translation
-  "person.page.email": "Email Address",
+  "person.page.email": "Emailová adresa",
 
   // "person.page.firstname": "First Name",
-  // TODO New key - Add a translation
-  "person.page.firstname": "First Name",
+  "person.page.firstname": "Křestní jméno",
 
   // "person.page.jobtitle": "Job Title",
-  // TODO New key - Add a translation
-  "person.page.jobtitle": "Job Title",
+  "person.page.jobtitle": "Název pracovní pozice",
 
   // "person.page.lastname": "Last Name",
-  // TODO New key - Add a translation
-  "person.page.lastname": "Last Name",
+  "person.page.lastname": "Příjmení",
+
+  // "person.page.name": "Name",
+  "person.page.name": "Jméno",
 
   // "person.page.link.full": "Show all metadata",
-  // TODO New key - Add a translation
-  "person.page.link.full": "Show all metadata",
+  "person.page.link.full": "Zobrazit všechna metadata",
 
   // "person.page.orcid": "ORCID",
-  // TODO New key - Add a translation
   "person.page.orcid": "ORCID",
 
   // "person.page.staffid": "Staff ID",
-  // TODO New key - Add a translation
-  "person.page.staffid": "Staff ID",
+  "person.page.staffid": "ID zaměstnance",
 
   // "person.page.titleprefix": "Person: ",
-  // TODO New key - Add a translation
-  "person.page.titleprefix": "Person: ",
+  "person.page.titleprefix": "Osoba: ",
 
   // "person.search.results.head": "Person Search Results",
-  // TODO New key - Add a translation
-  "person.search.results.head": "Person Search Results",
-
-  // "person.search.title": "DSpace Angular :: Person Search",
-  // TODO New key - Add a translation
-  "person.search.title": "DSpace Angular :: Person Search",
+  "person.search.results.head": "Výsledky vyhledávání osob",
 
+  // "person-relationships.search.results.head": "Person Search Results",
+  "person-relationships.search.results.head": "Výsledky vyhledávání osob",
 
+  // "person.search.title": "Person Search",
+  "person.search.title": "Vyhledávání osob",
 
   // "process.new.select-parameters": "Parameters",
+  "process.new.select-parameters": "Parametry",
+
+  // "process.new.select-parameter": "Select parameter",
   // TODO New key - Add a translation
-  "process.new.select-parameters": "Parameters",
+  "process.new.select-parameter": "Select parameter",
+
+  // "process.new.add-parameter": "Add a parameter...",
+  // TODO New key - Add a translation
+  "process.new.add-parameter": "Add a parameter...",
+
+  // "process.new.delete-parameter": "Delete parameter",
+  // TODO New key - Add a translation
+  "process.new.delete-parameter": "Delete parameter",
+
+  // "process.new.parameter.label": "Parameter value",
+  // TODO New key - Add a translation
+  "process.new.parameter.label": "Parameter value",
 
   // "process.new.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "process.new.cancel": "Cancel",
+  "process.new.cancel": "Zrušit",
 
-  // "process.new.submit": "Submit",
-  // TODO New key - Add a translation
-  "process.new.submit": "Submit",
+  // "process.new.submit": "Save",
+  // TODO Source message changed - Revise the translation
+  "process.new.submit": "Uložit",
 
   // "process.new.select-script": "Script",
-  // TODO New key - Add a translation
-  "process.new.select-script": "Script",
+  "process.new.select-script": "Skript",
 
   // "process.new.select-script.placeholder": "Choose a script...",
-  // TODO New key - Add a translation
-  "process.new.select-script.placeholder": "Choose a script...",
+  "process.new.select-script.placeholder": "Vyberte skript...",
 
   // "process.new.select-script.required": "Script is required",
-  // TODO New key - Add a translation
-  "process.new.select-script.required": "Script is required",
+  "process.new.select-script.required": "Je vyžadován skript",
 
   // "process.new.parameter.file.upload-button": "Select file...",
-  // TODO New key - Add a translation
-  "process.new.parameter.file.upload-button": "Select file...",
+  "process.new.parameter.file.upload-button": "Vyberte soubor...",
 
   // "process.new.parameter.file.required": "Please select a file",
-  // TODO New key - Add a translation
-  "process.new.parameter.file.required": "Please select a file",
+  "process.new.parameter.file.required": "Vyberte prosím soubor",
 
   // "process.new.parameter.string.required": "Parameter value is required",
-  // TODO New key - Add a translation
-  "process.new.parameter.string.required": "Parameter value is required",
+  "process.new.parameter.string.required": "Hodnota parametru je povinná",
 
   // "process.new.parameter.type.value": "value",
-  // TODO New key - Add a translation
-  "process.new.parameter.type.value": "value",
+  "process.new.parameter.type.value": "hodnota",
 
   // "process.new.parameter.type.file": "file",
-  // TODO New key - Add a translation
-  "process.new.parameter.type.file": "file",
+  "process.new.parameter.type.file": "soubor",
 
   // "process.new.parameter.required.missing": "The following parameters are required but still missing:",
-  // TODO New key - Add a translation
-  "process.new.parameter.required.missing": "The following parameters are required but still missing:",
+  "process.new.parameter.required.missing": "Následující parametry jsou povinné, ale stále chybí:",
 
   // "process.new.notification.success.title": "Success",
-  // TODO New key - Add a translation
-  "process.new.notification.success.title": "Success",
+  "process.new.notification.success.title": "Proběhlo úspěšně",
 
   // "process.new.notification.success.content": "The process was successfully created",
-  // TODO New key - Add a translation
-  "process.new.notification.success.content": "The process was successfully created",
+  "process.new.notification.success.content": "Proces byl úspěšně vytvořen",
 
   // "process.new.notification.error.title": "Error",
-  // TODO New key - Add a translation
-  "process.new.notification.error.title": "Error",
+  "process.new.notification.error.title": "Chyba",
 
   // "process.new.notification.error.content": "An error occurred while creating this process",
-  // TODO New key - Add a translation
-  "process.new.notification.error.content": "An error occurred while creating this process",
+  "process.new.notification.error.content": "Při vytváření tohoto procesu došlo k chybě",
+
+  // "process.new.notification.error.max-upload.content": "The file exceeds the maximum upload size",
+  "process.new.notification.error.max-upload.content": "Soubor přesáhl povolený limit na velikost souboru",
 
   // "process.new.header": "Create a new process",
-  // TODO New key - Add a translation
-  "process.new.header": "Create a new process",
+  "process.new.header": "Vytvořit nový proces",
 
   // "process.new.title": "Create a new process",
-  // TODO New key - Add a translation
-  "process.new.title": "Create a new process",
+  "process.new.title": "Vytvořit nový proces",
 
   // "process.new.breadcrumbs": "Create a new process",
-  // TODO New key - Add a translation
-  "process.new.breadcrumbs": "Create a new process",
+  "process.new.breadcrumbs": "Vytvořit nový proces",
 
+  // "process.detail.arguments": "Arguments",
+  "process.detail.arguments": "Argumenty",
 
+  // "process.detail.arguments.empty": "This process doesn't contain any arguments",
+  "process.detail.arguments.empty": "Tento proces neobsahuje žádné argumenty",
 
-  // "process.detail.arguments" : "Arguments",
-  // TODO New key - Add a translation
-  "process.detail.arguments": "Arguments",
+  // "process.detail.back": "Back",
+  "process.detail.back": "Zpět",
 
-  // "process.detail.arguments.empty" : "This process doesn't contain any arguments",
-  // TODO New key - Add a translation
-  "process.detail.arguments.empty": "This process doesn't contain any arguments",
-
-  // "process.detail.back" : "Back",
-  // TODO New key - Add a translation
-  "process.detail.back": "Back",
-
-  // "process.detail.output" : "Process Output",
-  // TODO New key - Add a translation
-  "process.detail.output": "Process Output",
+  // "process.detail.output": "Process Output",
+  "process.detail.output": "Výstup procesu",
 
   // "process.detail.logs.button": "Retrieve process output",
-  // TODO New key - Add a translation
-  "process.detail.logs.button": "Retrieve process output",
+  "process.detail.logs.button": "Získat výstup procesu",
 
   // "process.detail.logs.loading": "Retrieving",
-  // TODO New key - Add a translation
-  "process.detail.logs.loading": "Retrieving",
+  "process.detail.logs.loading": "Načítá se",
 
   // "process.detail.logs.none": "This process has no output",
-  // TODO New key - Add a translation
-  "process.detail.logs.none": "This process has no output",
+  "process.detail.logs.none": "Tento proces nemá žádný výstup",
 
-  // "process.detail.output-files" : "Output Files",
-  // TODO New key - Add a translation
-  "process.detail.output-files": "Output Files",
+  // "process.detail.output-files": "Output Files",
+  "process.detail.output-files": "Výstupní soubory",
 
-  // "process.detail.output-files.empty" : "This process doesn't contain any output files",
-  // TODO New key - Add a translation
-  "process.detail.output-files.empty": "This process doesn't contain any output files",
+  // "process.detail.output-files.empty": "This process doesn't contain any output files",
+  "process.detail.output-files.empty": "Tento proces neobsahuje žádné výstupní soubory",
 
-  // "process.detail.script" : "Script",
-  // TODO New key - Add a translation
-  "process.detail.script": "Script",
+  // "process.detail.script": "Script",
+  "process.detail.script": "Skript",
 
-  // "process.detail.title" : "Process: {{ id }} - {{ name }}",
-  // TODO New key - Add a translation
-  "process.detail.title": "Process: {{ id }} - {{ name }}",
+  // "process.detail.title": "Process: {{ id }} - {{ name }}",
+  "process.detail.title": "Proces: {{ id }} - {{ name }}",
 
-  // "process.detail.start-time" : "Start time",
-  // TODO New key - Add a translation
-  "process.detail.start-time": "Start time",
+  // "process.detail.start-time": "Start time",
+  "process.detail.start-time": "Čas zahájení",
 
-  // "process.detail.end-time" : "Finish time",
-  // TODO New key - Add a translation
-  "process.detail.end-time": "Finish time",
+  // "process.detail.end-time": "Finish time",
+  "process.detail.end-time": "Čas zakončení",
 
-  // "process.detail.status" : "Status",
-  // TODO New key - Add a translation
+  // "process.detail.status": "Status",
   "process.detail.status": "Status",
 
-  // "process.detail.create" : "Create similar process",
+  // "process.detail.create": "Create similar process",
+  "process.detail.create": "Vytvořit podobný proces",
+
+  // "process.detail.actions": "Actions",
+  "process.detail.actions": "Akce",
+
+  // "process.detail.delete.button": "Delete process",
+  "process.detail.delete.button": "Smazat proces",
+
+  // "process.detail.delete.header": "Delete process",
+  "process.detail.delete.header": "Smazat proces",
+
+  // "process.detail.delete.body": "Are you sure you want to delete the current process?",
+  "process.detail.delete.body": "Určitě chcete smazat aktuální proces?",
+
+  // "process.detail.delete.cancel": "Cancel",
+  "process.detail.delete.cancel": "Zrušit",
+
+  // "process.detail.delete.confirm": "Delete process",
+  "process.detail.delete.confirm": "Smazat proces",
+
+  // "process.detail.delete.success": "The process was successfully deleted.",
+  "process.detail.delete.success": "Proces byl úspěšně smazán.",
+
+  // "process.detail.delete.error": "Something went wrong when deleting the process",
+  "process.detail.delete.error": "Při mazání procesu se něco pokazilo",
+
+  // "process.detail.refreshing": "Auto-refreshing…",
   // TODO New key - Add a translation
-  "process.detail.create": "Create similar process",
+  "process.detail.refreshing": "Auto-refreshing…",
 
-
-
-  // "process.overview.table.finish" : "Finish time",
+  // "process.overview.table.completed.info": "Finish time (UTC)",
   // TODO New key - Add a translation
-  "process.overview.table.finish": "Finish time",
+  "process.overview.table.completed.info": "Finish time (UTC)",
 
-  // "process.overview.table.id" : "Process ID",
+  // "process.overview.table.completed.title": "Succeeded processes",
   // TODO New key - Add a translation
-  "process.overview.table.id": "Process ID",
+  "process.overview.table.completed.title": "Succeeded processes",
 
-  // "process.overview.table.name" : "Name",
+  // "process.overview.table.empty": "No matching processes found.",
   // TODO New key - Add a translation
-  "process.overview.table.name": "Name",
+  "process.overview.table.empty": "No matching processes found.",
 
-  // "process.overview.table.start" : "Start time",
+  // "process.overview.table.failed.info": "Finish time (UTC)",
   // TODO New key - Add a translation
-  "process.overview.table.start": "Start time",
+  "process.overview.table.failed.info": "Finish time (UTC)",
 
-  // "process.overview.table.status" : "Status",
+  // "process.overview.table.failed.title": "Failed processes",
   // TODO New key - Add a translation
+  "process.overview.table.failed.title": "Failed processes",
+
+  // "process.overview.table.finish": "Finish time (UTC)",
+  "process.overview.table.finish": "Čas ukončení (UTC)",
+
+  // "process.overview.table.id": "Process ID",
+  "process.overview.table.id": "ID procesu",
+
+  // "process.overview.table.name": "Name",
+  "process.overview.table.name": "Název",
+
+  // "process.overview.table.running.info": "Start time (UTC)",
+  // TODO New key - Add a translation
+  "process.overview.table.running.info": "Start time (UTC)",
+
+  // "process.overview.table.running.title": "Running processes",
+  // TODO New key - Add a translation
+  "process.overview.table.running.title": "Running processes",
+
+  // "process.overview.table.scheduled.info": "Creation time (UTC)",
+  // TODO New key - Add a translation
+  "process.overview.table.scheduled.info": "Creation time (UTC)",
+
+  // "process.overview.table.scheduled.title": "Scheduled processes",
+  // TODO New key - Add a translation
+  "process.overview.table.scheduled.title": "Scheduled processes",
+
+  // "process.overview.table.start": "Start time (UTC)",
+  "process.overview.table.start": "Čas zahájení (UTC)",
+
+  // "process.overview.table.status": "Status",
   "process.overview.table.status": "Status",
 
-  // "process.overview.table.user" : "User",
-  // TODO New key - Add a translation
-  "process.overview.table.user": "User",
+  // "process.overview.table.user": "User",
+  "process.overview.table.user": "Uživatel",
 
   // "process.overview.title": "Processes Overview",
-  // TODO New key - Add a translation
-  "process.overview.title": "Processes Overview",
+  "process.overview.title": "Přehled procesů",
 
   // "process.overview.breadcrumbs": "Processes Overview",
-  // TODO New key - Add a translation
-  "process.overview.breadcrumbs": "Processes Overview",
+  "process.overview.breadcrumbs": "Přehled procesů",
 
   // "process.overview.new": "New",
-  // TODO New key - Add a translation
-  "process.overview.new": "New",
+  "process.overview.new": "Nový",
 
+  // "process.overview.table.actions": "Actions",
+  "process.overview.table.actions": "Akce",
+
+  // "process.overview.delete": "Delete {{count}} processes",
+  "process.overview.delete": "Smazat {{count}} procesů",
+
+  // "process.overview.delete-process": "Delete process",
+  // TODO New key - Add a translation
+  "process.overview.delete-process": "Delete process",
+
+  // "process.overview.delete.clear": "Clear delete selection",
+  "process.overview.delete.clear": "Zrušit výběr mazání",
+
+  // "process.overview.delete.processing": "{{count}} process(es) are being deleted. Please wait for the deletion to fully complete. Note that this can take a while.",
+  "process.overview.delete.processing": "Maže se {{count}} procesů. Počkejte prosím na úplné dokončení mazání. To může chvíli trvat.",
+
+  // "process.overview.delete.body": "Are you sure you want to delete {{count}} process(es)?",
+  "process.overview.delete.body": "Určitě chcete smazat {{count}} procesů",
+
+  // "process.overview.delete.header": "Delete processes",
+  "process.overview.delete.header": "Smazat procesy",
+
+  // "process.overview.unknown.user": "Unknown",
+  // TODO New key - Add a translation
+  "process.overview.unknown.user": "Unknown",
+
+  // "process.bulk.delete.error.head": "Error on deleteing process",
+  "process.bulk.delete.error.head": "Chyba při mazání procesu",
+
+  // "process.bulk.delete.error.body": "The process with ID {{processId}} could not be deleted. The remaining processes will continue being deleted. ",
+  "process.bulk.delete.error.body": "Proces s ID {{processId}} se nepodařilo smazat. Zbývající procesy budou nadále mazány. ",
+
+  // "process.bulk.delete.success": "{{count}} process(es) have been succesfully deleted",
+  "process.bulk.delete.success": "{{count}} procesů bylo úspěšně odstraněno",
 
   // "profile.breadcrumbs": "Update Profile",
-  // TODO New key - Add a translation
-  "profile.breadcrumbs": "Update Profile",
+  "profile.breadcrumbs": "Aktualizovat profil",
 
   // "profile.card.identify": "Identify",
-  // TODO New key - Add a translation
-  "profile.card.identify": "Identify",
+  "profile.card.identify": "Identifikace",
 
   // "profile.card.security": "Security",
-  // TODO New key - Add a translation
-  "profile.card.security": "Security",
+  "profile.card.security": "Zabezpečení",
 
-  // "profile.form.submit": "Update Profile",
-  // TODO New key - Add a translation
-  "profile.form.submit": "Update Profile",
+  // "profile.form.submit": "Save",
+  // TODO Source message changed - Revise the translation
+  "profile.form.submit": "Uložit",
 
   // "profile.groups.head": "Authorization groups you belong to",
-  // TODO New key - Add a translation
-  "profile.groups.head": "Authorization groups you belong to",
+  "profile.groups.head": "Autorizační skupiny, do kterých patříte",
 
-  // "profile.head": "Update Profile",
-  // TODO New key - Add a translation
-  "profile.head": "Update Profile",
+  // "profile.special.groups.head": "Authorization special groups you belong to",
+  "profile.special.groups.head": "Speciální autorizační skupiny, do kterých patříte",
 
   // "profile.metadata.form.error.firstname.required": "First Name is required",
-  // TODO New key - Add a translation
-  "profile.metadata.form.error.firstname.required": "First Name is required",
+  "profile.metadata.form.error.firstname.required": "Křestní jméno je povinné",
 
   // "profile.metadata.form.error.lastname.required": "Last Name is required",
-  // TODO New key - Add a translation
-  "profile.metadata.form.error.lastname.required": "Last Name is required",
+  "profile.metadata.form.error.lastname.required": "Příjmení je povinné",
 
   // "profile.metadata.form.label.email": "Email Address",
-  // TODO New key - Add a translation
-  "profile.metadata.form.label.email": "Email Address",
+  "profile.metadata.form.label.email": "E-mailová adresa",
 
   // "profile.metadata.form.label.firstname": "First Name",
-  // TODO New key - Add a translation
-  "profile.metadata.form.label.firstname": "First Name",
+  "profile.metadata.form.label.firstname": "Křestní jméno",
 
   // "profile.metadata.form.label.language": "Language",
-  // TODO New key - Add a translation
-  "profile.metadata.form.label.language": "Language",
+  "profile.metadata.form.label.language": "Jazyk",
 
   // "profile.metadata.form.label.lastname": "Last Name",
-  // TODO New key - Add a translation
-  "profile.metadata.form.label.lastname": "Last Name",
+  "profile.metadata.form.label.lastname": "Příjmení",
 
   // "profile.metadata.form.label.phone": "Contact Telephone",
-  // TODO New key - Add a translation
-  "profile.metadata.form.label.phone": "Contact Telephone",
+  "profile.metadata.form.label.phone": "Kontaktní telefon",
 
   // "profile.metadata.form.notifications.success.content": "Your changes to the profile were saved.",
-  // TODO New key - Add a translation
-  "profile.metadata.form.notifications.success.content": "Your changes to the profile were saved.",
+  "profile.metadata.form.notifications.success.content": "Vaše změny v profilu byly uloženy.",
 
   // "profile.metadata.form.notifications.success.title": "Profile saved",
-  // TODO New key - Add a translation
-  "profile.metadata.form.notifications.success.title": "Profile saved",
+  "profile.metadata.form.notifications.success.title": "Profil uložen",
 
   // "profile.notifications.warning.no-changes.content": "No changes were made to the Profile.",
-  // TODO New key - Add a translation
-  "profile.notifications.warning.no-changes.content": "No changes were made to the Profile.",
+  "profile.notifications.warning.no-changes.content": "V profilu nebyly provedeny žádné změny.",
 
   // "profile.notifications.warning.no-changes.title": "No changes",
-  // TODO New key - Add a translation
-  "profile.notifications.warning.no-changes.title": "No changes",
+  "profile.notifications.warning.no-changes.title": "Žádné změny",
 
   // "profile.security.form.error.matching-passwords": "The passwords do not match.",
-  // TODO New key - Add a translation
-  "profile.security.form.error.matching-passwords": "The passwords do not match.",
+  "profile.security.form.error.matching-passwords": "Hesla se neshodují.",
 
-  // "profile.security.form.error.password-length": "The password should be at least 6 characters long.",
-  // TODO New key - Add a translation
-  "profile.security.form.error.password-length": "The password should be at least 6 characters long.",
-
-  // "profile.security.form.info": "Optionally, you can enter a new password in the box below, and confirm it by typing it again into the second box. It should be at least six characters long.",
-  // TODO New key - Add a translation
-  "profile.security.form.info": "Optionally, you can enter a new password in the box below, and confirm it by typing it again into the second box. It should be at least six characters long.",
+  // "profile.security.form.info": "Optionally, you can enter a new password in the box below, and confirm it by typing it again into the second box.",
+  // TODO Source message changed - Revise the translation
+  "profile.security.form.info": "Volitelně můžete zadat nové heslo do políčka níže a potvrdit je opětovným zadáním do druhého políčka.",
 
   // "profile.security.form.label.password": "Password",
-  // TODO New key - Add a translation
-  "profile.security.form.label.password": "Password",
+  "profile.security.form.label.password": "Heslo",
 
   // "profile.security.form.label.passwordrepeat": "Retype to confirm",
-  // TODO New key - Add a translation
-  "profile.security.form.label.passwordrepeat": "Retype to confirm",
+  "profile.security.form.label.passwordrepeat": "Opakujte pro potvrzení",
+
+  // "profile.security.form.label.current-password": "Current password",
+  "profile.security.form.label.current-password": "Aktuální heslo",
 
   // "profile.security.form.notifications.success.content": "Your changes to the password were saved.",
-  // TODO New key - Add a translation
-  "profile.security.form.notifications.success.content": "Your changes to the password were saved.",
+  "profile.security.form.notifications.success.content": "Vaše změny hesla byly uloženy.",
 
   // "profile.security.form.notifications.success.title": "Password saved",
-  // TODO New key - Add a translation
-  "profile.security.form.notifications.success.title": "Password saved",
+  "profile.security.form.notifications.success.title": "Heslo uloženo",
 
   // "profile.security.form.notifications.error.title": "Error changing passwords",
-  // TODO New key - Add a translation
-  "profile.security.form.notifications.error.title": "Error changing passwords",
+  "profile.security.form.notifications.error.title": "Chyba při změně hesla",
 
-  // "profile.security.form.notifications.error.not-long-enough": "The password has to be at least 6 characters long.",
-  // TODO New key - Add a translation
-  "profile.security.form.notifications.error.not-long-enough": "The password has to be at least 6 characters long.",
+  // "profile.security.form.notifications.error.change-failed": "An error occurred while trying to change the password. Please check if the current password is correct.",
+  "profile.security.form.notifications.error.change-failed": "Při pokusu o změnu hesla došlo k chybě. Zkontrolujte prosím, zda je aktuální heslo správné.",
 
   // "profile.security.form.notifications.error.not-same": "The provided passwords are not the same.",
-  // TODO New key - Add a translation
-  "profile.security.form.notifications.error.not-same": "The provided passwords are not the same.",
+  "profile.security.form.notifications.error.not-same": "Zadaná hesla nejsou stejná.",
+
+  // "profile.security.form.notifications.error.general": "Please fill required fields of security form.",
+  "profile.security.form.notifications.error.general": "Vyplňte prosím povinná pole bezpečnostního formuláře.",
 
   // "profile.title": "Update Profile",
-  // TODO New key - Add a translation
-  "profile.title": "Update Profile",
-
+  "profile.title": "Aktualizovat profil",
 
+  // "profile.card.researcher": "Researcher Profile",
+  "profile.card.researcher": "Profil výzkumníka",
 
   // "project.listelement.badge": "Research Project",
-  // TODO New key - Add a translation
-  "project.listelement.badge": "Research Project",
+  "project.listelement.badge": "Výzkumný projekt",
 
   // "project.page.contributor": "Contributors",
-  // TODO New key - Add a translation
-  "project.page.contributor": "Contributors",
+  "project.page.contributor": "Přispěvatelé",
 
   // "project.page.description": "Description",
-  // TODO New key - Add a translation
-  "project.page.description": "Description",
+  "project.page.description": "Popis",
 
   // "project.page.edit": "Edit this item",
-  // TODO New key - Add a translation
-  "project.page.edit": "Edit this item",
+  "project.page.edit": "Upravit tento záznam",
 
   // "project.page.expectedcompletion": "Expected Completion",
-  // TODO New key - Add a translation
-  "project.page.expectedcompletion": "Expected Completion",
+  "project.page.expectedcompletion": "Předpokládané dokončení",
 
   // "project.page.funder": "Funders",
-  // TODO New key - Add a translation
-  "project.page.funder": "Funders",
+  "project.page.funder": "Poskytovatelé finací",
 
   // "project.page.id": "ID",
-  // TODO New key - Add a translation
   "project.page.id": "ID",
 
   // "project.page.keyword": "Keywords",
-  // TODO New key - Add a translation
-  "project.page.keyword": "Keywords",
+  "project.page.keyword": "Klíčová slova",
 
   // "project.page.status": "Status",
-  // TODO New key - Add a translation
   "project.page.status": "Status",
 
   // "project.page.titleprefix": "Research Project: ",
-  // TODO New key - Add a translation
-  "project.page.titleprefix": "Research Project: ",
+  "project.page.titleprefix": "Výzkumný projekt: ",
 
   // "project.search.results.head": "Project Search Results",
-  // TODO New key - Add a translation
-  "project.search.results.head": "Project Search Results",
-
+  "project.search.results.head": "Výsledky vyhledávání projektu",
 
+  // "project-relationships.search.results.head": "Project Search Results",
+  "project-relationships.search.results.head": "Výsledky vyhledávání projektu",
 
   // "publication.listelement.badge": "Publication",
-  // TODO New key - Add a translation
-  "publication.listelement.badge": "Publication",
+  "publication.listelement.badge": "Publikace",
 
   // "publication.page.description": "Description",
-  // TODO New key - Add a translation
-  "publication.page.description": "Description",
+  "publication.page.description": "Popis",
 
   // "publication.page.edit": "Edit this item",
-  // TODO New key - Add a translation
-  "publication.page.edit": "Edit this item",
+  "publication.page.edit": "Upravit tento záznam",
 
   // "publication.page.journal-issn": "Journal ISSN",
-  // TODO New key - Add a translation
-  "publication.page.journal-issn": "Journal ISSN",
+  "publication.page.journal-issn": "ISSN časopisu",
 
   // "publication.page.journal-title": "Journal Title",
-  // TODO New key - Add a translation
-  "publication.page.journal-title": "Journal Title",
+  "publication.page.journal-title": "Název časopisu",
 
   // "publication.page.publisher": "Publisher",
-  // TODO New key - Add a translation
-  "publication.page.publisher": "Publisher",
+  "publication.page.publisher": "Nakladatel",
 
   // "publication.page.titleprefix": "Publication: ",
-  // TODO New key - Add a translation
-  "publication.page.titleprefix": "Publication: ",
+  "publication.page.titleprefix": "Publikace: ",
 
   // "publication.page.volume-title": "Volume Title",
-  // TODO New key - Add a translation
-  "publication.page.volume-title": "Volume Title",
+  "publication.page.volume-title": "Název svazku",
 
   // "publication.search.results.head": "Publication Search Results",
-  // TODO New key - Add a translation
-  "publication.search.results.head": "Publication Search Results",
+  "publication.search.results.head": "Výsledky vyhledávání publikací",
 
-  // "publication.search.title": "DSpace Angular :: Publication Search",
-  // TODO New key - Add a translation
-  "publication.search.title": "DSpace Angular :: Publication Search",
+  // "publication-relationships.search.results.head": "Publication Search Results",
+  "publication-relationships.search.results.head": "Výsledky vyhledávání publikací",
 
+  // "publication.search.title": "Publication Search",
+  "publication.search.title": "Vyhledávání publikací",
+
+  // "media-viewer.next": "Next",
+  "media-viewer.next": "Další",
+
+  // "media-viewer.previous": "Previous",
+  "media-viewer.previous": "Předchozí",
+
+  // "media-viewer.playlist": "Playlist",
+  "media-viewer.playlist": "Playlist",
+
+  // "suggestion.loading": "Loading ...",
+  // TODO New key - Add a translation
+  "suggestion.loading": "Loading ...",
+
+  // "suggestion.title": "Publication Claim",
+  // TODO New key - Add a translation
+  "suggestion.title": "Publication Claim",
+
+  // "suggestion.title.breadcrumbs": "Publication Claim",
+  // TODO New key - Add a translation
+  "suggestion.title.breadcrumbs": "Publication Claim",
+
+  // "suggestion.targets.description": "Below you can see all the suggestions ",
+  // TODO New key - Add a translation
+  "suggestion.targets.description": "Below you can see all the suggestions ",
+
+  // "suggestion.targets": "Current Suggestions",
+  // TODO New key - Add a translation
+  "suggestion.targets": "Current Suggestions",
+
+  // "suggestion.table.name": "Researcher Name",
+  // TODO New key - Add a translation
+  "suggestion.table.name": "Researcher Name",
+
+  // "suggestion.table.actions": "Actions",
+  // TODO New key - Add a translation
+  "suggestion.table.actions": "Actions",
+
+  // "suggestion.button.review": "Review {{ total }} suggestion(s)",
+  // TODO New key - Add a translation
+  "suggestion.button.review": "Review {{ total }} suggestion(s)",
+
+  // "suggestion.button.review.title": "Review {{ total }} suggestion(s) for ",
+  // TODO New key - Add a translation
+  "suggestion.button.review.title": "Review {{ total }} suggestion(s) for ",
+
+  // "suggestion.noTargets": "No target found.",
+  // TODO New key - Add a translation
+  "suggestion.noTargets": "No target found.",
+
+  // "suggestion.target.error.service.retrieve": "An error occurred while loading the Suggestion targets",
+  // TODO New key - Add a translation
+  "suggestion.target.error.service.retrieve": "An error occurred while loading the Suggestion targets",
+
+  // "suggestion.evidence.type": "Type",
+  // TODO New key - Add a translation
+  "suggestion.evidence.type": "Type",
+
+  // "suggestion.evidence.score": "Score",
+  // TODO New key - Add a translation
+  "suggestion.evidence.score": "Score",
+
+  // "suggestion.evidence.notes": "Notes",
+  // TODO New key - Add a translation
+  "suggestion.evidence.notes": "Notes",
+
+  // "suggestion.approveAndImport": "Approve & import",
+  // TODO New key - Add a translation
+  "suggestion.approveAndImport": "Approve & import",
+
+  // "suggestion.approveAndImport.success": "The suggestion has been imported successfully. <a href='{{ url }}'>View.</a>",
+  // TODO New key - Add a translation
+  "suggestion.approveAndImport.success": "The suggestion has been imported successfully. <a href='{{ url }}'>View.</a>",
+
+  // "suggestion.approveAndImport.bulk": "Approve & import Selected",
+  // TODO New key - Add a translation
+  "suggestion.approveAndImport.bulk": "Approve & import Selected",
+
+  // "suggestion.approveAndImport.bulk.success": "{{ count }} suggestions have been imported successfully ",
+  // TODO New key - Add a translation
+  "suggestion.approveAndImport.bulk.success": "{{ count }} suggestions have been imported successfully ",
+
+  // "suggestion.approveAndImport.bulk.error": "{{ count }} suggestions haven't been imported due to unexpected server errors",
+  // TODO New key - Add a translation
+  "suggestion.approveAndImport.bulk.error": "{{ count }} suggestions haven't been imported due to unexpected server errors",
+
+  // "suggestion.ignoreSuggestion": "Ignore Suggestion",
+  // TODO New key - Add a translation
+  "suggestion.ignoreSuggestion": "Ignore Suggestion",
+
+  // "suggestion.ignoreSuggestion.success": "The suggestion has been discarded",
+  // TODO New key - Add a translation
+  "suggestion.ignoreSuggestion.success": "The suggestion has been discarded",
+
+  // "suggestion.ignoreSuggestion.bulk": "Ignore Suggestion Selected",
+  // TODO New key - Add a translation
+  "suggestion.ignoreSuggestion.bulk": "Ignore Suggestion Selected",
+
+  // "suggestion.ignoreSuggestion.bulk.success": "{{ count }} suggestions have been discarded ",
+  // TODO New key - Add a translation
+  "suggestion.ignoreSuggestion.bulk.success": "{{ count }} suggestions have been discarded ",
+
+  // "suggestion.ignoreSuggestion.bulk.error": "{{ count }} suggestions haven't been discarded due to unexpected server errors",
+  // TODO New key - Add a translation
+  "suggestion.ignoreSuggestion.bulk.error": "{{ count }} suggestions haven't been discarded due to unexpected server errors",
+
+  // "suggestion.seeEvidence": "See evidence",
+  // TODO New key - Add a translation
+  "suggestion.seeEvidence": "See evidence",
+
+  // "suggestion.hideEvidence": "Hide evidence",
+  // TODO New key - Add a translation
+  "suggestion.hideEvidence": "Hide evidence",
+
+  // "suggestion.suggestionFor": "Suggestions for",
+  // TODO New key - Add a translation
+  "suggestion.suggestionFor": "Suggestions for",
+
+  // "suggestion.suggestionFor.breadcrumb": "Suggestions for {{ name }}",
+  // TODO New key - Add a translation
+  "suggestion.suggestionFor.breadcrumb": "Suggestions for {{ name }}",
+
+  // "suggestion.source.openaire": "OpenAIRE Graph",
+  // TODO New key - Add a translation
+  "suggestion.source.openaire": "OpenAIRE Graph",
+
+  // "suggestion.from.source": "from the ",
+  // TODO New key - Add a translation
+  "suggestion.from.source": "from the ",
+
+  // "suggestion.count.missing": "You have no publication claims left",
+  // TODO New key - Add a translation
+  "suggestion.count.missing": "You have no publication claims left",
+
+  // "suggestion.totalScore": "Total Score",
+  // TODO New key - Add a translation
+  "suggestion.totalScore": "Total Score",
+
+  // "suggestion.type.openaire": "OpenAIRE",
+  // TODO New key - Add a translation
+  "suggestion.type.openaire": "OpenAIRE",
 
   // "register-email.title": "New user registration",
-  // TODO New key - Add a translation
-  "register-email.title": "New user registration",
+  "register-email.title": "Registrace nového uživatele",
 
   // "register-page.create-profile.header": "Create Profile",
-  // TODO New key - Add a translation
-  "register-page.create-profile.header": "Create Profile",
+  "register-page.create-profile.header": "Vytvořit profil",
 
   // "register-page.create-profile.identification.header": "Identify",
-  // TODO New key - Add a translation
-  "register-page.create-profile.identification.header": "Identify",
+  "register-page.create-profile.identification.header": "Identifikace",
 
   // "register-page.create-profile.identification.email": "Email Address",
-  // TODO New key - Add a translation
-  "register-page.create-profile.identification.email": "Email Address",
+  "register-page.create-profile.identification.email": "E-mailová adresa",
 
   // "register-page.create-profile.identification.first-name": "First Name *",
-  // TODO New key - Add a translation
-  "register-page.create-profile.identification.first-name": "First Name *",
+  "register-page.create-profile.identification.first-name": "Křestní jméno *",
 
   // "register-page.create-profile.identification.first-name.error": "Please fill in a First Name",
-  // TODO New key - Add a translation
-  "register-page.create-profile.identification.first-name.error": "Please fill in a First Name",
+  "register-page.create-profile.identification.first-name.error": "Vyplňte prosím křesní jméno",
 
   // "register-page.create-profile.identification.last-name": "Last Name *",
-  // TODO New key - Add a translation
-  "register-page.create-profile.identification.last-name": "Last Name *",
+  "register-page.create-profile.identification.last-name": "Příjmení *",
 
   // "register-page.create-profile.identification.last-name.error": "Please fill in a Last Name",
-  // TODO New key - Add a translation
-  "register-page.create-profile.identification.last-name.error": "Please fill in a Last Name",
+  "register-page.create-profile.identification.last-name.error": "Vyplňte prosím příjmení",
 
   // "register-page.create-profile.identification.contact": "Contact Telephone",
-  // TODO New key - Add a translation
-  "register-page.create-profile.identification.contact": "Contact Telephone",
+  "register-page.create-profile.identification.contact": "Kontaktní telefon",
 
   // "register-page.create-profile.identification.language": "Language",
-  // TODO New key - Add a translation
-  "register-page.create-profile.identification.language": "Language",
+  "register-page.create-profile.identification.language": "Jazyk",
 
   // "register-page.create-profile.security.header": "Security",
-  // TODO New key - Add a translation
-  "register-page.create-profile.security.header": "Security",
+  "register-page.create-profile.security.header": "Zabezpečení",
 
-  // "register-page.create-profile.security.info": "Please enter a password in the box below, and confirm it by typing it again into the second box. It should be at least six characters long.",
-  // TODO New key - Add a translation
-  "register-page.create-profile.security.info": "Please enter a password in the box below, and confirm it by typing it again into the second box. It should be at least six characters long.",
+  // "register-page.create-profile.security.info": "Please enter a password in the box below, and confirm it by typing it again into the second box.",
+  // TODO Source message changed - Revise the translation
+  "register-page.create-profile.security.info": "Zadejte prosím heslo do níže uvedeného pole a potvrďte jej opětovným zadáním do druhého pole.",
 
   // "register-page.create-profile.security.label.password": "Password *",
-  // TODO New key - Add a translation
-  "register-page.create-profile.security.label.password": "Password *",
+  "register-page.create-profile.security.label.password": "Heslo *",
 
   // "register-page.create-profile.security.label.passwordrepeat": "Retype to confirm *",
-  // TODO New key - Add a translation
-  "register-page.create-profile.security.label.passwordrepeat": "Retype to confirm *",
+  "register-page.create-profile.security.label.passwordrepeat": "Opakujte pro potvrzení *",
 
   // "register-page.create-profile.security.error.empty-password": "Please enter a password in the box below.",
-  // TODO New key - Add a translation
-  "register-page.create-profile.security.error.empty-password": "Please enter a password in the box below.",
+  "register-page.create-profile.security.error.empty-password": "Zadejte prosím heslo do níže uvedeného pole.",
 
   // "register-page.create-profile.security.error.matching-passwords": "The passwords do not match.",
-  // TODO New key - Add a translation
-  "register-page.create-profile.security.error.matching-passwords": "The passwords do not match.",
-
-  // "register-page.create-profile.security.error.password-length": "The password should be at least 6 characters long.",
-  // TODO New key - Add a translation
-  "register-page.create-profile.security.error.password-length": "The password should be at least 6 characters long.",
+  "register-page.create-profile.security.error.matching-passwords": "Hesla se neshodují.",
 
   // "register-page.create-profile.submit": "Complete Registration",
-  // TODO New key - Add a translation
-  "register-page.create-profile.submit": "Complete Registration",
+  "register-page.create-profile.submit": "Dokončit registraci",
 
   // "register-page.create-profile.submit.error.content": "Something went wrong while registering a new user.",
-  // TODO New key - Add a translation
-  "register-page.create-profile.submit.error.content": "Something went wrong while registering a new user.",
+  "register-page.create-profile.submit.error.content": "Při registraci nového uživatele se něco pokazilo.",
 
   // "register-page.create-profile.submit.error.head": "Registration failed",
-  // TODO New key - Add a translation
-  "register-page.create-profile.submit.error.head": "Registration failed",
+  "register-page.create-profile.submit.error.head": "Registrace se nezdařila",
 
   // "register-page.create-profile.submit.success.content": "The registration was successful. You have been logged in as the created user.",
-  // TODO New key - Add a translation
-  "register-page.create-profile.submit.success.content": "The registration was successful. You have been logged in as the created user.",
+  "register-page.create-profile.submit.success.content": "Registrace proběhla úspěšně. Byli jste přihlášeni jako vytvořený uživatel.",
 
   // "register-page.create-profile.submit.success.head": "Registration completed",
-  // TODO New key - Add a translation
-  "register-page.create-profile.submit.success.head": "Registration completed",
-
+  "register-page.create-profile.submit.success.head": "Registrace byla dokončena",
 
   // "register-page.registration.header": "New user registration",
-  // TODO New key - Add a translation
-  "register-page.registration.header": "New user registration",
+  "register-page.registration.header": "Registrace nového uživatele",
 
   // "register-page.registration.info": "Register an account to subscribe to collections for email updates, and submit new items to DSpace.",
-  // TODO New key - Add a translation
-  "register-page.registration.info": "Register an account to subscribe to collections for email updates, and submit new items to DSpace.",
+  "register-page.registration.info": "Zaregistrujte si účet a přihlaste se k odběru kolekcí pro e-mailové aktualizace a odesílejte nové záznamy do systému DSpace",
 
   // "register-page.registration.email": "Email Address *",
-  // TODO New key - Add a translation
-  "register-page.registration.email": "Email Address *",
+  "register-page.registration.email": "E-mailová adresa *",
 
   // "register-page.registration.email.error.required": "Please fill in an email address",
-  // TODO New key - Add a translation
-  "register-page.registration.email.error.required": "Please fill in an email address",
+  "register-page.registration.email.error.required": "Vyplňte prosím e-mailovou adresu",
 
-  // "register-page.registration.email.error.pattern": "Please fill in a valid email address",
-  // TODO New key - Add a translation
-  "register-page.registration.email.error.pattern": "Please fill in a valid email address",
+  // "register-page.registration.email.error.not-email-form": "Please fill in a valid email address.",
+  "register-page.registration.email.error.not-email-form": "Prosím vyplňte platnou emailovou adresu.",
+
+  // "register-page.registration.email.error.not-valid-domain": "Use email with allowed domains: {{ domains }}",
+  "register-page.registration.email.error.not-valid-domain": "Použijte email s povolenými doménami: {{ domains }}",
 
   // "register-page.registration.email.hint": "This address will be verified and used as your login name.",
-  // TODO New key - Add a translation
-  "register-page.registration.email.hint": "This address will be verified and used as your login name.",
+  "register-page.registration.email.hint": "Tato adresa bude ověřena a použita jako vaše přihlašovací jméno.",
 
   // "register-page.registration.submit": "Register",
-  // TODO New key - Add a translation
-  "register-page.registration.submit": "Register",
+  "register-page.registration.submit": "Registrovat",
 
   // "register-page.registration.success.head": "Verification email sent",
-  // TODO New key - Add a translation
-  "register-page.registration.success.head": "Verification email sent",
+  "register-page.registration.success.head": "Ověřovací e-mail byl odeslán",
 
   // "register-page.registration.success.content": "An email has been sent to {{ email }} containing a special URL and further instructions.",
-  // TODO New key - Add a translation
-  "register-page.registration.success.content": "An email has been sent to {{ email }} containing a special URL and further instructions.",
+  "register-page.registration.success.content": "Na adresu {{ email }} byl odeslán e-mail obsahující speciální  URL adresu a další pokyny.",
 
   // "register-page.registration.error.head": "Error when trying to register email",
-  // TODO New key - Add a translation
-  "register-page.registration.error.head": "Error when trying to register email",
+  "register-page.registration.error.head": "Chyba při pokusu o registraci e-mailu",
 
   // "register-page.registration.error.content": "An error occured when registering the following email address: {{ email }}",
-  // TODO New key - Add a translation
-  "register-page.registration.error.content": "An error occured when registering the following email address: {{ email }}",
+  "register-page.registration.error.content": "Došlo k chybě při registraci následující e-mailové adresy: {{ email }}",
 
+  // "register-page.registration.error.recaptcha": "Error when trying to authenticate with recaptcha",
+  "register-page.registration.error.recaptcha": "Chyba při pokusu o ověření pomocí recaptcha",
 
+  // "register-page.registration.google-recaptcha.must-accept-cookies": "In order to register you must accept the <b>Registration and Password recovery</b> (Google reCaptcha) cookies.",
+  "register-page.registration.google-recaptcha.must-accept-cookies": "Pro registraci musíte přijmout soubory cookie <b>Registrace a obnovení hesla</b> (Google reCaptcha).",
+
+  // "register-page.registration.error.maildomain": "This email address is not on the list of domains who can register. Allowed domains are {{ domains }}",
+  "register-page.registration.error.maildomain": "Tato emailová adresa není na seznamu povolených domén, prostřednictvím kterých se lze registrovat. Povolené domény jsou {{ domains }}",
+
+  // "register-page.registration.google-recaptcha.open-cookie-settings": "Open cookie settings",
+  "register-page.registration.google-recaptcha.open-cookie-settings": "Otevřít nastavení souborů cookie",
+
+  // "register-page.registration.google-recaptcha.notification.title": "Google reCaptcha",
+  "register-page.registration.google-recaptcha.notification.title": "Google reCaptcha",
+
+  // "register-page.registration.google-recaptcha.notification.message.error": "An error occurred during reCaptcha verification",
+  "register-page.registration.google-recaptcha.notification.message.error": "Při ověřování reCaptcha došlo k chybě",
+
+  // "register-page.registration.google-recaptcha.notification.message.expired": "Verification expired. Please verify again.",
+  "register-page.registration.google-recaptcha.notification.message.expired": "Ověření vypršelo. Zopakujte prosím ověření.",
+
+  // "register-page.registration.info.maildomain": "Accounts can be registered for mail addresses of the domains",
+  "register-page.registration.info.maildomain": "Účet může být založen jen na základě emailové adresy na povolených doménách.",
 
   // "relationships.add.error.relationship-type.content": "No suitable match could be found for relationship type {{ type }} between the two items",
-  // TODO New key - Add a translation
-  "relationships.add.error.relationship-type.content": "No suitable match could be found for relationship type {{ type }} between the two items",
+  "relationships.add.error.relationship-type.content": "Pro typ vztahu {{ type }} mezi dvěma záznamy nebyla nalezena žádná vhodná shoda.",
 
   // "relationships.add.error.server.content": "The server returned an error",
-  // TODO New key - Add a translation
-  "relationships.add.error.server.content": "The server returned an error",
+  "relationships.add.error.server.content": "Server vrátil chybu",
 
   // "relationships.add.error.title": "Unable to add relationship",
-  // TODO New key - Add a translation
-  "relationships.add.error.title": "Unable to add relationship",
+  "relationships.add.error.title": "Nelze přidat vztah",
 
   // "relationships.isAuthorOf": "Authors",
-  // TODO New key - Add a translation
-  "relationships.isAuthorOf": "Authors",
+  "relationships.isAuthorOf": "Autoři",
 
   // "relationships.isAuthorOf.Person": "Authors (persons)",
-  // TODO New key - Add a translation
-  "relationships.isAuthorOf.Person": "Authors (persons)",
+  "relationships.isAuthorOf.Person": "Autoři (osoby)",
 
   // "relationships.isAuthorOf.OrgUnit": "Authors (organizational units)",
-  // TODO New key - Add a translation
-  "relationships.isAuthorOf.OrgUnit": "Authors (organizational units)",
+  "relationships.isAuthorOf.OrgUnit": "Autoři (organizační jednotky)",
 
   // "relationships.isIssueOf": "Journal Issues",
+  "relationships.isIssueOf": "Čísla časopisu",
+
+  // "relationships.isIssueOf.JournalIssue": "Journal Issue",
   // TODO New key - Add a translation
-  "relationships.isIssueOf": "Journal Issues",
+  "relationships.isIssueOf.JournalIssue": "Journal Issue",
 
   // "relationships.isJournalIssueOf": "Journal Issue",
-  // TODO New key - Add a translation
-  "relationships.isJournalIssueOf": "Journal Issue",
+  "relationships.isJournalIssueOf": "Číslo časopisu",
 
   // "relationships.isJournalOf": "Journals",
+  "relationships.isJournalOf": "Časopisy",
+
+  // "relationships.isJournalVolumeOf": "Journal Volume",
   // TODO New key - Add a translation
-  "relationships.isJournalOf": "Journals",
+  "relationships.isJournalVolumeOf": "Journal Volume",
 
   // "relationships.isOrgUnitOf": "Organizational Units",
-  // TODO New key - Add a translation
-  "relationships.isOrgUnitOf": "Organizational Units",
+  "relationships.isOrgUnitOf": "Organizační jednotky",
 
   // "relationships.isPersonOf": "Authors",
-  // TODO New key - Add a translation
-  "relationships.isPersonOf": "Authors",
+  "relationships.isPersonOf": "Autoři",
 
   // "relationships.isProjectOf": "Research Projects",
-  // TODO New key - Add a translation
-  "relationships.isProjectOf": "Research Projects",
+  "relationships.isProjectOf": "Výzkumné projekty",
 
   // "relationships.isPublicationOf": "Publications",
-  // TODO New key - Add a translation
-  "relationships.isPublicationOf": "Publications",
+  "relationships.isPublicationOf": "Publikace",
 
   // "relationships.isPublicationOfJournalIssue": "Articles",
-  // TODO New key - Add a translation
-  "relationships.isPublicationOfJournalIssue": "Articles",
+  "relationships.isPublicationOfJournalIssue": "Články",
 
   // "relationships.isSingleJournalOf": "Journal",
-  // TODO New key - Add a translation
-  "relationships.isSingleJournalOf": "Journal",
+  "relationships.isSingleJournalOf": "Časopisu",
 
   // "relationships.isSingleVolumeOf": "Journal Volume",
-  // TODO New key - Add a translation
-  "relationships.isSingleVolumeOf": "Journal Volume",
+  "relationships.isSingleVolumeOf": "Ročník časopisu",
 
   // "relationships.isVolumeOf": "Journal Volumes",
+  "relationships.isVolumeOf": "Ročníky časopisu",
+
+  // "relationships.isVolumeOf.JournalVolume": "Journal Volume",
   // TODO New key - Add a translation
-  "relationships.isVolumeOf": "Journal Volumes",
+  "relationships.isVolumeOf.JournalVolume": "Journal Volume",
 
   // "relationships.isContributorOf": "Contributors",
-  // TODO New key - Add a translation
-  "relationships.isContributorOf": "Contributors",
+  "relationships.isContributorOf": "Přispěvatelé",
 
+  // "relationships.isContributorOf.OrgUnit": "Contributor (Organizational Unit)",
+  "relationships.isContributorOf.OrgUnit": "Přispěvatel (Organizační jednotka)",
 
+  // "relationships.isContributorOf.Person": "Contributor",
+  "relationships.isContributorOf.Person": "Přispěvatel",
+
+  // "relationships.isFundingAgencyOf.OrgUnit": "Funder",
+  "relationships.isFundingAgencyOf.OrgUnit": "Poskytovatel financí",
+
+  // "repository.image.logo": "Repository logo",
+  "repository.image.logo": "Logo repozitáře",
+
+  // "repository.title": "DSpace Repository",
+  "repository.title": "Institucionální digitální repozitář",
+
+  // "repository.title.prefix": "DSpace Repository :: ",
+  "repository.title.prefix": "IDR :: ",
 
   // "resource-policies.add.button": "Add",
-  // TODO New key - Add a translation
-  "resource-policies.add.button": "Add",
+  "resource-policies.add.button": "Přidat",
 
   // "resource-policies.add.for.": "Add a new policy",
-  // TODO New key - Add a translation
-  "resource-policies.add.for.": "Add a new policy",
+  "resource-policies.add.for.": "Přidat novou politiku",
 
   // "resource-policies.add.for.bitstream": "Add a new Bitstream policy",
-  // TODO New key - Add a translation
-  "resource-policies.add.for.bitstream": "Add a new Bitstream policy",
+  "resource-policies.add.for.bitstream": "Přidat novou politiku souboru",
 
   // "resource-policies.add.for.bundle": "Add a new Bundle policy",
-  // TODO New key - Add a translation
-  "resource-policies.add.for.bundle": "Add a new Bundle policy",
+  "resource-policies.add.for.bundle": "Přidat novou politiku svazku",
 
   // "resource-policies.add.for.item": "Add a new Item policy",
-  // TODO New key - Add a translation
-  "resource-policies.add.for.item": "Add a new Item policy",
+  "resource-policies.add.for.item": "Přidat novou politiku záznamu",
 
   // "resource-policies.add.for.community": "Add a new Community policy",
-  // TODO New key - Add a translation
-  "resource-policies.add.for.community": "Add a new Community policy",
+  "resource-policies.add.for.community": "Přidat novou politiku komunity",
 
   // "resource-policies.add.for.collection": "Add a new Collection policy",
-  // TODO New key - Add a translation
-  "resource-policies.add.for.collection": "Add a new Collection policy",
+  "resource-policies.add.for.collection": "Přidat novou politiku kolekce",
 
   // "resource-policies.create.page.heading": "Create new resource policy for ",
-  // TODO New key - Add a translation
-  "resource-policies.create.page.heading": "Create new resource policy for ",
+  "resource-policies.create.page.heading": "Vytvořit novou politiku zdrojů pro ",
 
   // "resource-policies.create.page.failure.content": "An error occurred while creating the resource policy.",
-  // TODO New key - Add a translation
-  "resource-policies.create.page.failure.content": "An error occurred while creating the resource policy.",
+  "resource-policies.create.page.failure.content": "Při vytváření politiky zdrojů došlo k chybě.",
 
   // "resource-policies.create.page.success.content": "Operation successful",
-  // TODO New key - Add a translation
-  "resource-policies.create.page.success.content": "Operation successful",
+  "resource-policies.create.page.success.content": "Operace byla úspěšná",
 
   // "resource-policies.create.page.title": "Create new resource policy",
-  // TODO New key - Add a translation
-  "resource-policies.create.page.title": "Create new resource policy",
+  "resource-policies.create.page.title": "Vytvoření nové politiky zdrojů",
 
   // "resource-policies.delete.btn": "Delete selected",
-  // TODO New key - Add a translation
-  "resource-policies.delete.btn": "Delete selected",
+  "resource-policies.delete.btn": "Smazat vybrané",
 
   // "resource-policies.delete.btn.title": "Delete selected resource policies",
-  // TODO New key - Add a translation
-  "resource-policies.delete.btn.title": "Delete selected resource policies",
+  "resource-policies.delete.btn.title": "Odstranění vybraných politik zdrojů",
 
   // "resource-policies.delete.failure.content": "An error occurred while deleting selected resource policies.",
-  // TODO New key - Add a translation
-  "resource-policies.delete.failure.content": "An error occurred while deleting selected resource policies.",
+  "resource-policies.delete.failure.content": "Při odstraňování vybraných politik zdrojů došlo k chybě.",
 
   // "resource-policies.delete.success.content": "Operation successful",
-  // TODO New key - Add a translation
-  "resource-policies.delete.success.content": "Operation successful",
+  "resource-policies.delete.success.content": "Operace proběhla úspěšně",
 
   // "resource-policies.edit.page.heading": "Edit resource policy ",
-  // TODO New key - Add a translation
-  "resource-policies.edit.page.heading": "Edit resource policy ",
+  "resource-policies.edit.page.heading": "Upravit politiku zdrojů ",
 
   // "resource-policies.edit.page.failure.content": "An error occurred while editing the resource policy.",
-  // TODO New key - Add a translation
-  "resource-policies.edit.page.failure.content": "An error occurred while editing the resource policy.",
+  "resource-policies.edit.page.failure.content": "Při úpravě vybraných politik zdrojů došlo k chybě.",
+
+  // "resource-policies.edit.page.target-failure.content": "An error occurred while editing the target (ePerson or group) of the resource policy.",
+  "resource-policies.edit.page.target-failure.content": "Při úpravě cíle (uživatele nebo skupiny) politiky zdrojů došlo k chybě.",
+
+  // "resource-policies.edit.page.other-failure.content": "An error occurred while editing the resource policy. The target (ePerson or group) has been successfully updated.",
+  "resource-policies.edit.page.other-failure.content": "Při úpravě politiky zdrojů došlo k chybě. Cíl (uživatel nebo skupina) byl úspěšně aktualizován.",
 
   // "resource-policies.edit.page.success.content": "Operation successful",
-  // TODO New key - Add a translation
-  "resource-policies.edit.page.success.content": "Operation successful",
+  "resource-policies.edit.page.success.content": "Operace byla úspěšná",
 
   // "resource-policies.edit.page.title": "Edit resource policy",
-  // TODO New key - Add a translation
-  "resource-policies.edit.page.title": "Edit resource policy",
+  "resource-policies.edit.page.title": "Upravit politiku zdrojů ",
 
   // "resource-policies.form.action-type.label": "Select the action type",
-  // TODO New key - Add a translation
-  "resource-policies.form.action-type.label": "Select the action type",
+  "resource-policies.form.action-type.label": "Vyberte typ akce",
 
   // "resource-policies.form.action-type.required": "You must select the resource policy action.",
-  // TODO New key - Add a translation
-  "resource-policies.form.action-type.required": "You must select the resource policy action.",
+  "resource-policies.form.action-type.required": "Je třeba vybrat akci politiky zdrojů.",
 
   // "resource-policies.form.eperson-group-list.label": "The eperson or group that will be granted the permission",
-  // TODO New key - Add a translation
-  "resource-policies.form.eperson-group-list.label": "The eperson or group that will be granted the permission",
+  "resource-policies.form.eperson-group-list.label": "Uživatel nebo skupina, které bude uděleno oprávnění",
 
   // "resource-policies.form.eperson-group-list.select.btn": "Select",
-  // TODO New key - Add a translation
-  "resource-policies.form.eperson-group-list.select.btn": "Select",
+  "resource-policies.form.eperson-group-list.select.btn": "Vybrat",
 
   // "resource-policies.form.eperson-group-list.tab.eperson": "Search for a ePerson",
-  // TODO New key - Add a translation
-  "resource-policies.form.eperson-group-list.tab.eperson": "Search for a ePerson",
+  "resource-policies.form.eperson-group-list.tab.eperson": "Vyhledat uživatele",
 
   // "resource-policies.form.eperson-group-list.tab.group": "Search for a group",
-  // TODO New key - Add a translation
-  "resource-policies.form.eperson-group-list.tab.group": "Search for a group",
+  "resource-policies.form.eperson-group-list.tab.group": "Vyhledat skupinu",
 
   // "resource-policies.form.eperson-group-list.table.headers.action": "Action",
-  // TODO New key - Add a translation
-  "resource-policies.form.eperson-group-list.table.headers.action": "Action",
+  "resource-policies.form.eperson-group-list.table.headers.action": "Akce",
 
   // "resource-policies.form.eperson-group-list.table.headers.id": "ID",
-  // TODO New key - Add a translation
   "resource-policies.form.eperson-group-list.table.headers.id": "ID",
 
   // "resource-policies.form.eperson-group-list.table.headers.name": "Name",
-  // TODO New key - Add a translation
-  "resource-policies.form.eperson-group-list.table.headers.name": "Name",
+  "resource-policies.form.eperson-group-list.table.headers.name": "Název",
+
+  // "resource-policies.form.eperson-group-list.modal.header": "Cannot change type",
+  "resource-policies.form.eperson-group-list.modal.header": "Typ nelze změnit",
+
+  // "resource-policies.form.eperson-group-list.modal.text1.toGroup": "It is not possible to replace an ePerson with a group.",
+  "resource-policies.form.eperson-group-list.modal.text1.toGroup": "Není možné nahradit uživatele skupinou.",
+
+  // "resource-policies.form.eperson-group-list.modal.text1.toEPerson": "It is not possible to replace a group with an ePerson.",
+  "resource-policies.form.eperson-group-list.modal.text1.toEPerson": "Není možné nahradit skupinu uživatelem.",
+
+  // "resource-policies.form.eperson-group-list.modal.text2": "Delete the current resource policy and create a new one with the desired type.",
+  "resource-policies.form.eperson-group-list.modal.text2": "Odstranit aktuální politiku zdrojů a vytvořit novou s požadovaným typem.",
+
+  // "resource-policies.form.eperson-group-list.modal.close": "Ok",
+  "resource-policies.form.eperson-group-list.modal.close": "Ok",
 
   // "resource-policies.form.date.end.label": "End Date",
-  // TODO New key - Add a translation
-  "resource-policies.form.date.end.label": "End Date",
+  "resource-policies.form.date.end.label": "Datum ukončení",
 
   // "resource-policies.form.date.start.label": "Start Date",
-  // TODO New key - Add a translation
-  "resource-policies.form.date.start.label": "Start Date",
+  "resource-policies.form.date.start.label": "Datum zahájení",
 
   // "resource-policies.form.description.label": "Description",
-  // TODO New key - Add a translation
-  "resource-policies.form.description.label": "Description",
+  "resource-policies.form.description.label": "Popis",
 
   // "resource-policies.form.name.label": "Name",
+  "resource-policies.form.name.label": "Název",
+
+  // "resource-policies.form.name.hint": "Max 30 characters",
   // TODO New key - Add a translation
-  "resource-policies.form.name.label": "Name",
+  "resource-policies.form.name.hint": "Max 30 characters",
 
   // "resource-policies.form.policy-type.label": "Select the policy type",
-  // TODO New key - Add a translation
-  "resource-policies.form.policy-type.label": "Select the policy type",
+  "resource-policies.form.policy-type.label": "vyberte typ politiky",
 
   // "resource-policies.form.policy-type.required": "You must select the resource policy type.",
-  // TODO New key - Add a translation
-  "resource-policies.form.policy-type.required": "You must select the resource policy type.",
+  "resource-policies.form.policy-type.required": "Je třeba vybrat typ politiky zdrojů.",
 
   // "resource-policies.table.headers.action": "Action",
-  // TODO New key - Add a translation
-  "resource-policies.table.headers.action": "Action",
+  "resource-policies.table.headers.action": "Akce",
 
   // "resource-policies.table.headers.date.end": "End Date",
-  // TODO New key - Add a translation
-  "resource-policies.table.headers.date.end": "End Date",
+  "resource-policies.table.headers.date.end": "Datum ukončení",
 
   // "resource-policies.table.headers.date.start": "Start Date",
-  // TODO New key - Add a translation
-  "resource-policies.table.headers.date.start": "Start Date",
+  "resource-policies.table.headers.date.start": "Datum zahájení",
 
   // "resource-policies.table.headers.edit": "Edit",
-  // TODO New key - Add a translation
-  "resource-policies.table.headers.edit": "Edit",
+  "resource-policies.table.headers.edit": "Upravit",
 
   // "resource-policies.table.headers.edit.group": "Edit group",
-  // TODO New key - Add a translation
-  "resource-policies.table.headers.edit.group": "Edit group",
+  "resource-policies.table.headers.edit.group": "Upravit skupinu",
 
   // "resource-policies.table.headers.edit.policy": "Edit policy",
-  // TODO New key - Add a translation
-  "resource-policies.table.headers.edit.policy": "Edit policy",
+  "resource-policies.table.headers.edit.policy": "Upravit politiku",
 
   // "resource-policies.table.headers.eperson": "EPerson",
-  // TODO New key - Add a translation
-  "resource-policies.table.headers.eperson": "EPerson",
+  "resource-policies.table.headers.eperson": "Osoba",
 
   // "resource-policies.table.headers.group": "Group",
+  "resource-policies.table.headers.group": "Skupina",
+
+  // "resource-policies.table.headers.select-all": "Select all",
   // TODO New key - Add a translation
-  "resource-policies.table.headers.group": "Group",
+  "resource-policies.table.headers.select-all": "Select all",
+
+  // "resource-policies.table.headers.deselect-all": "Deselect all",
+  // TODO New key - Add a translation
+  "resource-policies.table.headers.deselect-all": "Deselect all",
+
+  // "resource-policies.table.headers.select": "Select",
+  // TODO New key - Add a translation
+  "resource-policies.table.headers.select": "Select",
+
+  // "resource-policies.table.headers.deselect": "Deselect",
+  // TODO New key - Add a translation
+  "resource-policies.table.headers.deselect": "Deselect",
 
   // "resource-policies.table.headers.id": "ID",
-  // TODO New key - Add a translation
   "resource-policies.table.headers.id": "ID",
 
   // "resource-policies.table.headers.name": "Name",
-  // TODO New key - Add a translation
-  "resource-policies.table.headers.name": "Name",
+  "resource-policies.table.headers.name": "Název",
 
   // "resource-policies.table.headers.policyType": "type",
-  // TODO New key - Add a translation
-  "resource-policies.table.headers.policyType": "type",
+  "resource-policies.table.headers.policyType": "Typ",
 
   // "resource-policies.table.headers.title.for.bitstream": "Policies for Bitstream",
-  // TODO New key - Add a translation
-  "resource-policies.table.headers.title.for.bitstream": "Policies for Bitstream",
+  "resource-policies.table.headers.title.for.bitstream": "Politiky souboru",
 
   // "resource-policies.table.headers.title.for.bundle": "Policies for Bundle",
-  // TODO New key - Add a translation
-  "resource-policies.table.headers.title.for.bundle": "Policies for Bundle",
+  "resource-policies.table.headers.title.for.bundle": "Politiky svazku",
 
   // "resource-policies.table.headers.title.for.item": "Policies for Item",
-  // TODO New key - Add a translation
-  "resource-policies.table.headers.title.for.item": "Policies for Item",
+  "resource-policies.table.headers.title.for.item": "Politiky záznamu",
 
   // "resource-policies.table.headers.title.for.community": "Policies for Community",
-  // TODO New key - Add a translation
-  "resource-policies.table.headers.title.for.community": "Policies for Community",
+  "resource-policies.table.headers.title.for.community": "Politiky komunity",
 
   // "resource-policies.table.headers.title.for.collection": "Policies for Collection",
+  "resource-policies.table.headers.title.for.collection": "Politiky kolekce",
+
+  // "root.skip-to-content": "Skip to main content",
   // TODO New key - Add a translation
-  "resource-policies.table.headers.title.for.collection": "Policies for Collection",
-
-
+  "root.skip-to-content": "Skip to main content",
 
   // "search.description": "",
   "search.description": "",
 
   // "search.switch-configuration.title": "Show",
-  // TODO New key - Add a translation
-  "search.switch-configuration.title": "Show",
+  "search.switch-configuration.title": "Zobrazit",
 
-  // "search.title": "DSpace Angular :: Search",
-  "search.title": "DSpace Angular :: Hledat",
+  // "search.title": "Search",
+  "search.title": "Hledat",
 
   // "search.breadcrumbs": "Search",
-  // TODO New key - Add a translation
-  "search.breadcrumbs": "Search",
+  "search.breadcrumbs": "Hledat",
 
+  // "search.search-form.placeholder": "Search the repository ...",
+  "search.search-form.placeholder": "Hledat v repozitáři...",
+
+  // "search.filters.remove": "Remove filter of type {{ type }} with value {{ value }}",
+  // TODO New key - Add a translation
+  "search.filters.remove": "Remove filter of type {{ type }} with value {{ value }}",
+
+  // "search.filters.applied.f.title": "Title",
+  // TODO New key - Add a translation
+  "search.filters.applied.f.title": "Title",
 
   // "search.filters.applied.f.author": "Author",
   "search.filters.applied.f.author": "Autor",
 
   // "search.filters.applied.f.dateIssued.max": "End date",
-  "search.filters.applied.f.dateIssued.max": "Do data",
+  "search.filters.applied.f.dateIssued.max": "Datum ukončení",
 
   // "search.filters.applied.f.dateIssued.min": "Start date",
-  "search.filters.applied.f.dateIssued.min": "Od data",
+  "search.filters.applied.f.dateIssued.min": "Datum zahájení",
 
   // "search.filters.applied.f.dateSubmitted": "Date submitted",
-  // TODO New key - Add a translation
-  "search.filters.applied.f.dateSubmitted": "Date submitted",
+  "search.filters.applied.f.dateSubmitted": "Datum vložení",
 
-  // "search.filters.applied.f.discoverable": "Private",
-  // TODO New key - Add a translation
-  "search.filters.applied.f.discoverable": "Private",
+  // "search.filters.applied.f.discoverable": "Non-discoverable",
+  // TODO Source message changed - Revise the translation
+  "search.filters.applied.f.discoverable": "Nedohledatelné",
 
   // "search.filters.applied.f.entityType": "Item Type",
-  // TODO New key - Add a translation
-  "search.filters.applied.f.entityType": "Item Type",
+  "search.filters.applied.f.entityType": "Typ záznamu",
 
   // "search.filters.applied.f.has_content_in_original_bundle": "Has files",
   "search.filters.applied.f.has_content_in_original_bundle": "Má soubory",
 
-  // "search.filters.applied.f.itemtype": "Type",
+  // "search.filters.applied.f.original_bundle_filenames": "File name",
   // TODO New key - Add a translation
-  "search.filters.applied.f.itemtype": "Type",
+  "search.filters.applied.f.original_bundle_filenames": "File name",
+
+  // "search.filters.applied.f.original_bundle_descriptions": "File description",
+  // TODO New key - Add a translation
+  "search.filters.applied.f.original_bundle_descriptions": "File description",
+
+  // "search.filters.applied.f.itemtype": "Type",
+  "search.filters.applied.f.itemtype": "Typ",
 
   // "search.filters.applied.f.namedresourcetype": "Status",
-  // TODO New key - Add a translation
   "search.filters.applied.f.namedresourcetype": "Status",
 
   // "search.filters.applied.f.subject": "Subject",
   "search.filters.applied.f.subject": "Předmět",
 
   // "search.filters.applied.f.submitter": "Submitter",
-  // TODO New key - Add a translation
-  "search.filters.applied.f.submitter": "Submitter",
+  "search.filters.applied.f.submitter": "Odesílatel",
 
   // "search.filters.applied.f.jobTitle": "Job Title",
-  // TODO New key - Add a translation
-  "search.filters.applied.f.jobTitle": "Job Title",
+  "search.filters.applied.f.jobTitle": "Název pracovní pozice",
 
   // "search.filters.applied.f.birthDate.max": "End birth date",
-  // TODO New key - Add a translation
-  "search.filters.applied.f.birthDate.max": "End birth date",
+  "search.filters.applied.f.birthDate.max": "Datum narozdení do",
 
   // "search.filters.applied.f.birthDate.min": "Start birth date",
-  // TODO New key - Add a translation
-  "search.filters.applied.f.birthDate.min": "Start birth date",
+  "search.filters.applied.f.birthDate.min": "Datum narození od",
+
+  // "search.filters.applied.f.supervisedBy": "Supervised by",
+  "search.filters.applied.f.supervisedBy": "Pod dohledem",
 
   // "search.filters.applied.f.withdrawn": "Withdrawn",
+  "search.filters.applied.f.withdrawn": "Vyřazeno",
+
+  // "search.filters.applied.operator.equals": "",
   // TODO New key - Add a translation
-  "search.filters.applied.f.withdrawn": "Withdrawn",
+  "search.filters.applied.operator.equals": "",
 
+  // "search.filters.applied.operator.notequals": " not equals",
+  // TODO New key - Add a translation
+  "search.filters.applied.operator.notequals": " not equals",
 
+  // "search.filters.applied.operator.authority": "",
+  // TODO New key - Add a translation
+  "search.filters.applied.operator.authority": "",
+
+  // "search.filters.applied.operator.notauthority": " not authority",
+  // TODO New key - Add a translation
+  "search.filters.applied.operator.notauthority": " not authority",
+
+  // "search.filters.applied.operator.contains": " contains",
+  // TODO New key - Add a translation
+  "search.filters.applied.operator.contains": " contains",
+
+  // "search.filters.applied.operator.notcontains": " not contains",
+  // TODO New key - Add a translation
+  "search.filters.applied.operator.notcontains": " not contains",
+
+  // "search.filters.applied.operator.query": "",
+  // TODO New key - Add a translation
+  "search.filters.applied.operator.query": "",
+
+  // "search.filters.filter.title.head": "Title",
+  // TODO New key - Add a translation
+  "search.filters.filter.title.head": "Title",
+
+  // "search.filters.filter.title.placeholder": "Title",
+  // TODO New key - Add a translation
+  "search.filters.filter.title.placeholder": "Title",
+
+  // "search.filters.filter.title.label": "Search Title",
+  // TODO New key - Add a translation
+  "search.filters.filter.title.label": "Search Title",
 
   // "search.filters.filter.author.head": "Author",
   "search.filters.filter.author.head": "Autor",
@@ -5250,145 +6973,200 @@
   // "search.filters.filter.author.placeholder": "Author name",
   "search.filters.filter.author.placeholder": "Jméno autora",
 
+  // "search.filters.filter.author.label": "Search author name",
+  "search.filters.filter.author.label": "Hledat jméno autora",
+
   // "search.filters.filter.birthDate.head": "Birth Date",
-  // TODO New key - Add a translation
-  "search.filters.filter.birthDate.head": "Birth Date",
+  "search.filters.filter.birthDate.head": "Datum narození",
 
   // "search.filters.filter.birthDate.placeholder": "Birth Date",
-  // TODO New key - Add a translation
-  "search.filters.filter.birthDate.placeholder": "Birth Date",
+  "search.filters.filter.birthDate.placeholder": "Datum narození",
+
+  // "search.filters.filter.birthDate.label": "Search birth date",
+  "search.filters.filter.birthDate.label": "Hledat datum narození",
+
+  // "search.filters.filter.collapse": "Collapse filter",
+  "search.filters.filter.collapse": "Sbalit filtr",
 
   // "search.filters.filter.creativeDatePublished.head": "Date Published",
-  // TODO New key - Add a translation
-  "search.filters.filter.creativeDatePublished.head": "Date Published",
+  "search.filters.filter.creativeDatePublished.head": "Datum zveřejnění",
 
   // "search.filters.filter.creativeDatePublished.placeholder": "Date Published",
-  // TODO New key - Add a translation
-  "search.filters.filter.creativeDatePublished.placeholder": "Date Published",
+  "search.filters.filter.creativeDatePublished.placeholder": "Datum zveřejnění",
+
+  // "search.filters.filter.creativeDatePublished.label": "Search date published",
+  "search.filters.filter.creativeDatePublished.label": "Hledat datum zveřejnění",
 
   // "search.filters.filter.creativeWorkEditor.head": "Editor",
-  // TODO New key - Add a translation
   "search.filters.filter.creativeWorkEditor.head": "Editor",
 
   // "search.filters.filter.creativeWorkEditor.placeholder": "Editor",
-  // TODO New key - Add a translation
   "search.filters.filter.creativeWorkEditor.placeholder": "Editor",
 
+  // "search.filters.filter.creativeWorkEditor.label": "Search editor",
+  "search.filters.filter.creativeWorkEditor.label": "Hledat editora",
+
   // "search.filters.filter.creativeWorkKeywords.head": "Subject",
-  // TODO New key - Add a translation
-  "search.filters.filter.creativeWorkKeywords.head": "Subject",
+  "search.filters.filter.creativeWorkKeywords.head": "Předmět",
 
   // "search.filters.filter.creativeWorkKeywords.placeholder": "Subject",
-  // TODO New key - Add a translation
-  "search.filters.filter.creativeWorkKeywords.placeholder": "Subject",
+  "search.filters.filter.creativeWorkKeywords.placeholder": "Předmět",
+
+  // "search.filters.filter.creativeWorkKeywords.label": "Search subject",
+  "search.filters.filter.creativeWorkKeywords.label": "Předmět hledání",
 
   // "search.filters.filter.creativeWorkPublisher.head": "Publisher",
-  // TODO New key - Add a translation
-  "search.filters.filter.creativeWorkPublisher.head": "Publisher",
+  "search.filters.filter.creativeWorkPublisher.head": "Nakladatel",
 
   // "search.filters.filter.creativeWorkPublisher.placeholder": "Publisher",
-  // TODO New key - Add a translation
-  "search.filters.filter.creativeWorkPublisher.placeholder": "Publisher",
+  "search.filters.filter.creativeWorkPublisher.placeholder": "Nakladatel",
+
+  // "search.filters.filter.creativeWorkPublisher.label": "Search publisher",
+  "search.filters.filter.creativeWorkPublisher.label": "Hledat vydavatele",
 
   // "search.filters.filter.dateIssued.head": "Date",
   "search.filters.filter.dateIssued.head": "Datum",
 
-  // "search.filters.filter.dateIssued.max.placeholder": "Minimum Date",
-  "search.filters.filter.dateIssued.max.placeholder": "Datum od",
+  // "search.filters.filter.dateIssued.max.placeholder": "Maximum Date",
+  // TODO Source message changed - Revise the translation
+  "search.filters.filter.dateIssued.max.placeholder": "Maximální datum",
 
-  // "search.filters.filter.dateIssued.min.placeholder": "Maximum Date",
-  "search.filters.filter.dateIssued.min.placeholder": "Datum do",
+  // "search.filters.filter.dateIssued.max.label": "End",
+  "search.filters.filter.dateIssued.max.label": "Konec",
+
+  // "search.filters.filter.dateIssued.min.placeholder": "Minimum Date",
+  // TODO Source message changed - Revise the translation
+  "search.filters.filter.dateIssued.min.placeholder": "Minimální Datum",
+
+  // "search.filters.filter.dateIssued.min.label": "Start",
+  "search.filters.filter.dateIssued.min.label": "Začátek",
 
   // "search.filters.filter.dateSubmitted.head": "Date submitted",
-  // TODO New key - Add a translation
-  "search.filters.filter.dateSubmitted.head": "Date submitted",
+  "search.filters.filter.dateSubmitted.head": "Datum vložení",
 
   // "search.filters.filter.dateSubmitted.placeholder": "Date submitted",
-  // TODO New key - Add a translation
-  "search.filters.filter.dateSubmitted.placeholder": "Date submitted",
+  "search.filters.filter.dateSubmitted.placeholder": "Datum vložení",
 
-  // "search.filters.filter.discoverable.head": "Private",
-  // TODO New key - Add a translation
-  "search.filters.filter.discoverable.head": "Private",
+  // "search.filters.filter.dateSubmitted.label": "Search date submitted",
+  "search.filters.filter.dateSubmitted.label": "Hledat datum vložení",
+
+  // "search.filters.filter.discoverable.head": "Non-discoverable",
+  // TODO Source message changed - Revise the translation
+  "search.filters.filter.discoverable.head": "Nedohledatelné",
 
   // "search.filters.filter.withdrawn.head": "Withdrawn",
-  // TODO New key - Add a translation
-  "search.filters.filter.withdrawn.head": "Withdrawn",
+  "search.filters.filter.withdrawn.head": "Vyřazeno",
 
   // "search.filters.filter.entityType.head": "Item Type",
-  // TODO New key - Add a translation
-  "search.filters.filter.entityType.head": "Item Type",
+  "search.filters.filter.entityType.head": "Typ záznamu",
 
   // "search.filters.filter.entityType.placeholder": "Item Type",
-  // TODO New key - Add a translation
-  "search.filters.filter.entityType.placeholder": "Item Type",
+  "search.filters.filter.entityType.placeholder": "Typ záznamu",
+
+  // "search.filters.filter.entityType.label": "Search item type",
+  "search.filters.filter.entityType.label": "Hledat typ záznamu",
+
+  // "search.filters.filter.expand": "Expand filter",
+  "search.filters.filter.expand": "Rozbalit filtr",
 
   // "search.filters.filter.has_content_in_original_bundle.head": "Has files",
   "search.filters.filter.has_content_in_original_bundle.head": "Má soubory",
 
-  // "search.filters.filter.itemtype.head": "Type",
+  // "search.filters.filter.original_bundle_filenames.head": "File name",
   // TODO New key - Add a translation
-  "search.filters.filter.itemtype.head": "Type",
+  "search.filters.filter.original_bundle_filenames.head": "File name",
+
+  // "search.filters.filter.original_bundle_filenames.placeholder": "File name",
+  // TODO New key - Add a translation
+  "search.filters.filter.original_bundle_filenames.placeholder": "File name",
+
+  // "search.filters.filter.original_bundle_filenames.label": "Search File name",
+  // TODO New key - Add a translation
+  "search.filters.filter.original_bundle_filenames.label": "Search File name",
+
+  // "search.filters.filter.original_bundle_descriptions.head": "File description",
+  // TODO New key - Add a translation
+  "search.filters.filter.original_bundle_descriptions.head": "File description",
+
+  // "search.filters.filter.original_bundle_descriptions.placeholder": "File description",
+  // TODO New key - Add a translation
+  "search.filters.filter.original_bundle_descriptions.placeholder": "File description",
+
+  // "search.filters.filter.original_bundle_descriptions.label": "Search File description",
+  // TODO New key - Add a translation
+  "search.filters.filter.original_bundle_descriptions.label": "Search File description",
+
+  // "search.filters.filter.itemtype.head": "Type",
+  "search.filters.filter.itemtype.head": "Typ",
 
   // "search.filters.filter.itemtype.placeholder": "Type",
-  // TODO New key - Add a translation
-  "search.filters.filter.itemtype.placeholder": "Type",
+  "search.filters.filter.itemtype.placeholder": "Typ",
+
+  // "search.filters.filter.itemtype.label": "Search type",
+  "search.filters.filter.itemtype.label": "Hledat typ",
 
   // "search.filters.filter.jobTitle.head": "Job Title",
-  // TODO New key - Add a translation
-  "search.filters.filter.jobTitle.head": "Job Title",
+  "search.filters.filter.jobTitle.head": "Název pracovní pozice",
 
   // "search.filters.filter.jobTitle.placeholder": "Job Title",
-  // TODO New key - Add a translation
-  "search.filters.filter.jobTitle.placeholder": "Job Title",
+  "search.filters.filter.jobTitle.placeholder": "Název pracovní pozice",
+
+  // "search.filters.filter.jobTitle.label": "Search job title",
+  "search.filters.filter.jobTitle.label": "Hledat pracovní pozici",
 
   // "search.filters.filter.knowsLanguage.head": "Known language",
-  // TODO New key - Add a translation
-  "search.filters.filter.knowsLanguage.head": "Known language",
+  "search.filters.filter.knowsLanguage.head": "Známý jazyk",
 
   // "search.filters.filter.knowsLanguage.placeholder": "Known language",
-  // TODO New key - Add a translation
-  "search.filters.filter.knowsLanguage.placeholder": "Known language",
+  "search.filters.filter.knowsLanguage.placeholder": "Známý jazyk",
+
+  // "search.filters.filter.knowsLanguage.label": "Search known language",
+  "search.filters.filter.knowsLanguage.label": "Známý jazyk",
 
   // "search.filters.filter.namedresourcetype.head": "Status",
-  // TODO New key - Add a translation
   "search.filters.filter.namedresourcetype.head": "Status",
 
   // "search.filters.filter.namedresourcetype.placeholder": "Status",
-  // TODO New key - Add a translation
   "search.filters.filter.namedresourcetype.placeholder": "Status",
 
+  // "search.filters.filter.namedresourcetype.label": "Search status",
+  "search.filters.filter.namedresourcetype.label": "Hledat status",
+
   // "search.filters.filter.objectpeople.head": "People",
-  // TODO New key - Add a translation
-  "search.filters.filter.objectpeople.head": "People",
+  "search.filters.filter.objectpeople.head": "Lidé",
 
   // "search.filters.filter.objectpeople.placeholder": "People",
-  // TODO New key - Add a translation
-  "search.filters.filter.objectpeople.placeholder": "People",
+  "search.filters.filter.objectpeople.placeholder": "Lidé",
+
+  // "search.filters.filter.objectpeople.label": "Search people",
+  "search.filters.filter.objectpeople.label": "Hledat osoby",
 
   // "search.filters.filter.organizationAddressCountry.head": "Country",
-  // TODO New key - Add a translation
-  "search.filters.filter.organizationAddressCountry.head": "Country",
+  "search.filters.filter.organizationAddressCountry.head": "Země",
 
   // "search.filters.filter.organizationAddressCountry.placeholder": "Country",
-  // TODO New key - Add a translation
-  "search.filters.filter.organizationAddressCountry.placeholder": "Country",
+  "search.filters.filter.organizationAddressCountry.placeholder": "Země",
+
+  // "search.filters.filter.organizationAddressCountry.label": "Search country",
+  "search.filters.filter.organizationAddressCountry.label": "Hledat stát",
 
   // "search.filters.filter.organizationAddressLocality.head": "City",
-  // TODO New key - Add a translation
-  "search.filters.filter.organizationAddressLocality.head": "City",
+  "search.filters.filter.organizationAddressLocality.head": "Město",
 
   // "search.filters.filter.organizationAddressLocality.placeholder": "City",
-  // TODO New key - Add a translation
-  "search.filters.filter.organizationAddressLocality.placeholder": "City",
+  "search.filters.filter.organizationAddressLocality.placeholder": "Město",
+
+  // "search.filters.filter.organizationAddressLocality.label": "Search city",
+  "search.filters.filter.organizationAddressLocality.label": "Hledat město",
 
   // "search.filters.filter.organizationFoundingDate.head": "Date Founded",
-  // TODO New key - Add a translation
-  "search.filters.filter.organizationFoundingDate.head": "Date Founded",
+  "search.filters.filter.organizationFoundingDate.head": "Datum založení",
 
   // "search.filters.filter.organizationFoundingDate.placeholder": "Date Founded",
-  // TODO New key - Add a translation
-  "search.filters.filter.organizationFoundingDate.placeholder": "Date Founded",
+  "search.filters.filter.organizationFoundingDate.placeholder": "Datum založení",
+
+  // "search.filters.filter.organizationFoundingDate.label": "Search date founded",
+  "search.filters.filter.organizationFoundingDate.label": "Hledat datum založení",
 
   // "search.filters.filter.scope.head": "Scope",
   "search.filters.filter.scope.head": "Rozsah",
@@ -5396,6 +7174,9 @@
   // "search.filters.filter.scope.placeholder": "Scope filter",
   "search.filters.filter.scope.placeholder": "Filtr rozsahu",
 
+  // "search.filters.filter.scope.label": "Search scope filter",
+  "search.filters.filter.scope.label": "Filtr rozsahu hledání",
+
   // "search.filters.filter.show-less": "Collapse",
   "search.filters.filter.show-less": "Sbalit",
 
@@ -5408,88 +7189,169 @@
   // "search.filters.filter.subject.placeholder": "Subject",
   "search.filters.filter.subject.placeholder": "Předmět",
 
+  // "search.filters.filter.subject.label": "Search subject",
+  "search.filters.filter.subject.label": "Hledat předmět",
+
   // "search.filters.filter.submitter.head": "Submitter",
-  // TODO New key - Add a translation
-  "search.filters.filter.submitter.head": "Submitter",
+  "search.filters.filter.submitter.head": "Odesílatel",
 
   // "search.filters.filter.submitter.placeholder": "Submitter",
+  "search.filters.filter.submitter.placeholder": "Odesílatel",
+
+  // "search.filters.filter.submitter.label": "Search submitter",
+  "search.filters.filter.submitter.label": "Hledat odesílatele",
+
+  // "search.filters.filter.show-tree": "Browse {{ name }} tree",
+  "search.filters.filter.show-tree": "Procházet {{ name }} podle",
+
+  // "search.filters.filter.funding.head": "Funding",
   // TODO New key - Add a translation
-  "search.filters.filter.submitter.placeholder": "Submitter",
+  "search.filters.filter.funding.head": "Funding",
 
+  // "search.filters.filter.funding.placeholder": "Funding",
+  // TODO New key - Add a translation
+  "search.filters.filter.funding.placeholder": "Funding",
 
+  // "search.filters.filter.supervisedBy.head": "Supervised By",
+  // TODO New key - Add a translation
+  "search.filters.filter.supervisedBy.head": "Supervised By",
+
+  // "search.filters.filter.supervisedBy.placeholder": "Supervised By",
+  // TODO New key - Add a translation
+  "search.filters.filter.supervisedBy.placeholder": "Supervised By",
+
+  // "search.filters.filter.supervisedBy.label": "Search Supervised By",
+  "search.filters.filter.supervisedBy.label": "Hledat dohlížející autoritu",
 
   // "search.filters.entityType.JournalIssue": "Journal Issue",
-  // TODO New key - Add a translation
-  "search.filters.entityType.JournalIssue": "Journal Issue",
+  "search.filters.entityType.JournalIssue": "Číslo časopisu",
 
   // "search.filters.entityType.JournalVolume": "Journal Volume",
-  // TODO New key - Add a translation
-  "search.filters.entityType.JournalVolume": "Journal Volume",
+  "search.filters.entityType.JournalVolume": "Ročník časopisu",
 
   // "search.filters.entityType.OrgUnit": "Organizational Unit",
+  "search.filters.entityType.OrgUnit": "Organizační jednotka",
+
+  // "search.filters.entityType.Person": "Person",
   // TODO New key - Add a translation
-  "search.filters.entityType.OrgUnit": "Organizational Unit",
+  "search.filters.entityType.Person": "Person",
+
+  // "search.filters.entityType.Project": "Project",
+  // TODO New key - Add a translation
+  "search.filters.entityType.Project": "Project",
+
+  // "search.filters.entityType.Publication": "Publication",
+  // TODO New key - Add a translation
+  "search.filters.entityType.Publication": "Publication",
 
   // "search.filters.has_content_in_original_bundle.true": "Yes",
-  // TODO New key - Add a translation
-  "search.filters.has_content_in_original_bundle.true": "Yes",
+  "search.filters.has_content_in_original_bundle.true": "Ano",
 
   // "search.filters.has_content_in_original_bundle.false": "No",
-  // TODO New key - Add a translation
-  "search.filters.has_content_in_original_bundle.false": "No",
+  "search.filters.has_content_in_original_bundle.false": "Ne",
 
   // "search.filters.discoverable.true": "No",
-  // TODO New key - Add a translation
-  "search.filters.discoverable.true": "No",
+  "search.filters.discoverable.true": "Ne",
 
   // "search.filters.discoverable.false": "Yes",
+  "search.filters.discoverable.false": "Ano",
+
+  // "search.filters.namedresourcetype.Archived": "Archived",
   // TODO New key - Add a translation
-  "search.filters.discoverable.false": "Yes",
+  "search.filters.namedresourcetype.Archived": "Archived",
+
+  // "search.filters.namedresourcetype.Validation": "Validation",
+  // TODO New key - Add a translation
+  "search.filters.namedresourcetype.Validation": "Validation",
+
+  // "search.filters.namedresourcetype.Waiting for Controller": "Waiting for reviewer",
+  // TODO New key - Add a translation
+  "search.filters.namedresourcetype.Waiting for Controller": "Waiting for reviewer",
+
+  // "search.filters.namedresourcetype.Workflow": "Workflow",
+  // TODO New key - Add a translation
+  "search.filters.namedresourcetype.Workflow": "Workflow",
+
+  // "search.filters.namedresourcetype.Workspace": "Workspace",
+  // TODO New key - Add a translation
+  "search.filters.namedresourcetype.Workspace": "Workspace",
 
   // "search.filters.withdrawn.true": "Yes",
-  // TODO New key - Add a translation
-  "search.filters.withdrawn.true": "Yes",
+  "search.filters.withdrawn.true": "Ano",
 
   // "search.filters.withdrawn.false": "No",
-  // TODO New key - Add a translation
-  "search.filters.withdrawn.false": "No",
+  "search.filters.withdrawn.false": "Ne",
 
-
-  // "search.filters.head": "Filters",
-  "search.filters.head": "Filtry",
+  // "search.filters.head": "Limit your search",
+  "search.filters.head": "Zúžit hledání",
 
   // "search.filters.reset": "Reset filters",
-  "search.filters.reset": "Obnovit filtry",
+  "search.filters.reset": "Resetovat filtry",
 
+  // "search.filters.search.submit": "Submit",
+  "search.filters.search.submit": "Odeslat",
 
+  // "search.filters.operator.equals.text": "Equals",
+  // TODO New key - Add a translation
+  "search.filters.operator.equals.text": "Equals",
+
+  // "search.filters.operator.notequals.text": "Not Equals",
+  // TODO New key - Add a translation
+  "search.filters.operator.notequals.text": "Not Equals",
+
+  // "search.filters.operator.authority.text": "Authority",
+  // TODO New key - Add a translation
+  "search.filters.operator.authority.text": "Authority",
+
+  // "search.filters.operator.notauthority.text": "Not Authority",
+  // TODO New key - Add a translation
+  "search.filters.operator.notauthority.text": "Not Authority",
+
+  // "search.filters.operator.contains.text": "Contains",
+  // TODO New key - Add a translation
+  "search.filters.operator.contains.text": "Contains",
+
+  // "search.filters.operator.notcontains.text": "Not Contains",
+  // TODO New key - Add a translation
+  "search.filters.operator.notcontains.text": "Not Contains",
+
+  // "search.filters.operator.query.text": "Query",
+  // TODO New key - Add a translation
+  "search.filters.operator.query.text": "Query",
 
   // "search.form.search": "Search",
   "search.form.search": "Hledat",
 
-  // "search.form.search_dspace": "Search DSpace",
-  "search.form.search_dspace": "Hledat v DSpace",
-
-  // "search.form.search_mydspace": "Search MyDSpace",
-  // TODO New key - Add a translation
-  "search.form.search_mydspace": "Search MyDSpace",
-
+  // "search.form.search_dspace": "All repository",
+  // TODO Source message changed - Revise the translation
+  "search.form.search_dspace": "Celý repozitář",
 
+  // "search.form.scope.all": "All of DSpace",
+  "search.form.scope.all": "Celý repozitář",
 
   // "search.results.head": "Search Results",
-  "search.results.head": "Výsledky hledání",
+  "search.results.head": "Výsledky vyhledávání",
 
   // "search.results.no-results": "Your search returned no results. Having trouble finding what you're looking for? Try putting",
-  "search.results.no-results": "Nebyli nalezeny žádné výsledky",
+  "search.results.no-results": "Vaše vyhledávání nevrátilo žádné výsledky. Máte potíže s nalezením toho, co hledáte? Zkuste vložit",
 
   // "search.results.no-results-link": "quotes around it",
-  // TODO New key - Add a translation
-  "search.results.no-results-link": "quotes around it",
+  "search.results.no-results-link": "v uvozovkách",
 
   // "search.results.empty": "Your search returned no results.",
-  // TODO New key - Add a translation
-  "search.results.empty": "Your search returned no results.",
+  "search.results.empty": "Vaše vyhledávání nevrátilo žádné výsledky.",
 
+  // "search.results.view-result": "View",
+  "search.results.view-result": "Zobrazit",
 
+  // "search.results.response.500": "An error occurred during query execution, please try again later",
+  "search.results.response.500": "Při zpracování dotazu došlo k chybě, zkuste to prosím později",
+
+  // "default.search.results.head": "Search Results",
+  "default.search.results.head": "Výsledky vyhledávání",
+
+  // "default-relationships.search.results.head": "Search Results",
+  "default-relationships.search.results.head": "Výsledky vyhledávání",
 
   // "search.sidebar.close": "Back to results",
   "search.sidebar.close": "Zpět na výsledky",
@@ -5498,41 +7360,62 @@
   "search.sidebar.filters.title": "Filtry",
 
   // "search.sidebar.open": "Search Tools",
-  "search.sidebar.open": "Vyhledávací nástroje",
+  "search.sidebar.open": "Nástroje pro vyhledávání",
 
   // "search.sidebar.results": "results",
   "search.sidebar.results": "výsledky",
 
   // "search.sidebar.settings.rpp": "Results per page",
-  "search.sidebar.settings.rpp": "Výsledků na stránku",
+  "search.sidebar.settings.rpp": "Výsledky na stránku",
 
   // "search.sidebar.settings.sort-by": "Sort By",
   "search.sidebar.settings.sort-by": "Řadit dle",
 
+  // "search.sidebar.advanced-search.title": "Advanced Search",
+  // TODO New key - Add a translation
+  "search.sidebar.advanced-search.title": "Advanced Search",
+
+  // "search.sidebar.advanced-search.filter-by": "Filter by",
+  // TODO New key - Add a translation
+  "search.sidebar.advanced-search.filter-by": "Filter by",
+
+  // "search.sidebar.advanced-search.filters": "Filters",
+  // TODO New key - Add a translation
+  "search.sidebar.advanced-search.filters": "Filters",
+
+  // "search.sidebar.advanced-search.operators": "Operators",
+  // TODO New key - Add a translation
+  "search.sidebar.advanced-search.operators": "Operators",
+
+  // "search.sidebar.advanced-search.add": "Add",
+  // TODO New key - Add a translation
+  "search.sidebar.advanced-search.add": "Add",
+
   // "search.sidebar.settings.title": "Settings",
   "search.sidebar.settings.title": "Nastavení",
 
-
-
   // "search.view-switch.show-detail": "Show detail",
-  // TODO New key - Add a translation
-  "search.view-switch.show-detail": "Show detail",
+  "search.view-switch.show-detail": "Zobrazit detail",
 
   // "search.view-switch.show-grid": "Show as grid",
-  "search.view-switch.show-grid": "Zobrazit mřížku",
+  "search.view-switch.show-grid": "Zobrazit jako mřížku",
 
   // "search.view-switch.show-list": "Show as list",
-  "search.view-switch.show-list": "Zobrazit seznam",
+  "search.view-switch.show-list": "Zobrazit jako seznam",
 
+  // "selectable-list-item-control.deselect": "Deselect item",
+  // TODO New key - Add a translation
+  "selectable-list-item-control.deselect": "Deselect item",
 
+  // "selectable-list-item-control.select": "Select item",
+  // TODO New key - Add a translation
+  "selectable-list-item-control.select": "Select item",
 
   // "sorting.ASC": "Ascending",
-  // TODO New key - Add a translation
-  "sorting.ASC": "Ascending",
+  "sorting.ASC": "Vzestupně",
 
   // "sorting.DESC": "Descending",
-  // TODO New key - Add a translation
-  "sorting.DESC": "Descending",
+  "sorting.DESC": "Sestupně",
 
   // "sorting.dc.title.ASC": "Title Ascending",
   "sorting.dc.title.ASC": "Název vzestupně",
@@ -5540,1072 +7423,3610 @@
   // "sorting.dc.title.DESC": "Title Descending",
   "sorting.dc.title.DESC": "Název sestupně",
 
-  // "sorting.score.DESC": "Relevance",
-  "sorting.score.DESC": "Relevance",
+  // "sorting.score.ASC": "Least Relevant",
+  "sorting.score.ASC": "Nejméně relevantní",
 
+  // "sorting.score.DESC": "Most Relevant",
+  // TODO Source message changed - Revise the translation
+  "sorting.score.DESC": "Nejvíce relevantní",
 
+  // "sorting.dc.date.issued.ASC": "Date Issued Ascending",
+  "sorting.dc.date.issued.ASC": "Datum vydání vzestupně",
+
+  // "sorting.dc.date.issued.DESC": "Date Issued Descending",
+  "sorting.dc.date.issued.DESC": "Datum vydání sestupně",
+
+  // "sorting.dc.date.accessioned.ASC": "Accessioned Date Ascending",
+  "sorting.dc.date.accessioned.ASC": "Datum odeslání vzestupně",
+
+  // "sorting.dc.date.accessioned.DESC": "Accessioned Date Descending",
+  "sorting.dc.date.accessioned.DESC": "Datum odeslání sestupně",
+
+  // "sorting.lastModified.ASC": "Last modified Ascending",
+  "sorting.lastModified.ASC": "Naposledy upraveno vzestupně",
+
+  // "sorting.lastModified.DESC": "Last modified Descending",
+  "sorting.lastModified.DESC": "Naposledy upraveno sestupně",
+
+  // "sorting.person.familyName.ASC": "Surname Ascending",
+  // TODO New key - Add a translation
+  "sorting.person.familyName.ASC": "Surname Ascending",
+
+  // "sorting.person.familyName.DESC": "Surname Descending",
+  // TODO New key - Add a translation
+  "sorting.person.familyName.DESC": "Surname Descending",
+
+  // "sorting.person.givenName.ASC": "Name Ascending",
+  // TODO New key - Add a translation
+  "sorting.person.givenName.ASC": "Name Ascending",
+
+  // "sorting.person.givenName.DESC": "Name Descending",
+  // TODO New key - Add a translation
+  "sorting.person.givenName.DESC": "Name Descending",
+
+  // "sorting.person.birthDate.ASC": "Birth Date Ascending",
+  // TODO New key - Add a translation
+  "sorting.person.birthDate.ASC": "Birth Date Ascending",
+
+  // "sorting.person.birthDate.DESC": "Birth Date Descending",
+  // TODO New key - Add a translation
+  "sorting.person.birthDate.DESC": "Birth Date Descending",
 
   // "statistics.title": "Statistics",
-  // TODO New key - Add a translation
-  "statistics.title": "Statistics",
+  "statistics.title": "Statistiky",
 
   // "statistics.header": "Statistics for {{ scope }}",
-  // TODO New key - Add a translation
-  "statistics.header": "Statistics for {{ scope }}",
+  "statistics.header": "Statistiky pro {{ scope }}",
 
   // "statistics.breadcrumbs": "Statistics",
-  // TODO New key - Add a translation
-  "statistics.breadcrumbs": "Statistics",
+  "statistics.breadcrumbs": "Statistika",
 
   // "statistics.page.no-data": "No data available",
-  // TODO New key - Add a translation
-  "statistics.page.no-data": "No data available",
+  "statistics.page.no-data": "Žádná data nejsou k dispozici",
 
   // "statistics.table.no-data": "No data available",
-  // TODO New key - Add a translation
-  "statistics.table.no-data": "No data available",
+  "statistics.table.no-data": "Žádná data nejsou k dispozici",
 
   // "statistics.table.title.TotalVisits": "Total visits",
-  // TODO New key - Add a translation
-  "statistics.table.title.TotalVisits": "Total visits",
+  "statistics.table.title.TotalVisits": "Celkový počet návštěv",
 
   // "statistics.table.title.TotalVisitsPerMonth": "Total visits per month",
-  // TODO New key - Add a translation
-  "statistics.table.title.TotalVisitsPerMonth": "Total visits per month",
+  "statistics.table.title.TotalVisitsPerMonth": "Celkový počet návštěv za měsíc",
 
   // "statistics.table.title.TotalDownloads": "File Visits",
-  // TODO New key - Add a translation
-  "statistics.table.title.TotalDownloads": "File Visits",
+  "statistics.table.title.TotalDownloads": "Návštěvy souborů",
 
   // "statistics.table.title.TopCountries": "Top country views",
-  // TODO New key - Add a translation
-  "statistics.table.title.TopCountries": "Top country views",
+  "statistics.table.title.TopCountries": "Nejvíce zobrazení ze státu",
 
   // "statistics.table.title.TopCities": "Top city views",
-  // TODO New key - Add a translation
-  "statistics.table.title.TopCities": "Top city views",
+  "statistics.table.title.TopCities": "Nejvíce zobrazení z města",
 
   // "statistics.table.header.views": "Views",
-  // TODO New key - Add a translation
-  "statistics.table.header.views": "Views",
+  "statistics.table.header.views": "Zobrazení",
 
+  // "statistics.table.no-name": "(object name could not be loaded)",
+  "statistics.table.no-name": "(název objektu nelze načíst)",
 
+  // "submission.edit.breadcrumbs": "Edit Submission",
+  "submission.edit.breadcrumbs": "Upravit příspěvek",
 
   // "submission.edit.title": "Edit Submission",
-  // TODO New key - Add a translation
-  "submission.edit.title": "Edit Submission",
+  "submission.edit.title": "Upravit příspěvek",
 
-  // "submission.general.cannot_submit": "You have not the privilege to make a new submission.",
-  // TODO New key - Add a translation
-  "submission.general.cannot_submit": "You have not the privilege to make a new submission.",
+  // "submission.general.cancel": "Cancel",
+  "submission.general.cancel": "Zrušit",
+
+  // "submission.general.cannot_submit": "You don't have permission to make a new submission.",
+  // TODO Source message changed - Revise the translation
+  "submission.general.cannot_submit": "Nemáte oprávnění k vytvoření nového příspěvku.",
 
   // "submission.general.deposit": "Deposit",
-  // TODO New key - Add a translation
-  "submission.general.deposit": "Deposit",
+  "submission.general.deposit": "Nahrát",
 
   // "submission.general.discard.confirm.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "submission.general.discard.confirm.cancel": "Cancel",
+  "submission.general.discard.confirm.cancel": "Zrušit",
 
   // "submission.general.discard.confirm.info": "This operation can't be undone. Are you sure?",
-  // TODO New key - Add a translation
-  "submission.general.discard.confirm.info": "This operation can't be undone. Are you sure?",
+  "submission.general.discard.confirm.info": "Tuto operaci nelze vzít zpět. Jste si jisti?",
 
   // "submission.general.discard.confirm.submit": "Yes, I'm sure",
-  // TODO New key - Add a translation
-  "submission.general.discard.confirm.submit": "Yes, I'm sure",
+  "submission.general.discard.confirm.submit": "Ano, jsem si jistý",
 
   // "submission.general.discard.confirm.title": "Discard submission",
-  // TODO New key - Add a translation
-  "submission.general.discard.confirm.title": "Discard submission",
+  "submission.general.discard.confirm.title": "Vyřadit příspěvek",
 
   // "submission.general.discard.submit": "Discard",
+  "submission.general.discard.submit": "Vyřadit",
+
+  // "submission.general.back.submit": "Back",
   // TODO New key - Add a translation
-  "submission.general.discard.submit": "Discard",
+  "submission.general.back.submit": "Back",
+
+  // "submission.general.info.saved": "Saved",
+  "submission.general.info.saved": "Uloženo",
+
+  // "submission.general.info.pending-changes": "Unsaved changes",
+  "submission.general.info.pending-changes": "Neuložené změny",
 
   // "submission.general.save": "Save",
-  // TODO New key - Add a translation
-  "submission.general.save": "Save",
+  "submission.general.save": "Uložit",
 
   // "submission.general.save-later": "Save for later",
-  // TODO New key - Add a translation
-  "submission.general.save-later": "Save for later",
-
+  "submission.general.save-later": "Uložit na později",
 
   // "submission.import-external.page.title": "Import metadata from an external source",
-  // TODO New key - Add a translation
-  "submission.import-external.page.title": "Import metadata from an external source",
+  "submission.import-external.page.title": "Importovat metadata z externího zdroje",
 
   // "submission.import-external.title": "Import metadata from an external source",
-  // TODO New key - Add a translation
-  "submission.import-external.title": "Import metadata from an external source",
+  "submission.import-external.title": "Importovat metadata z externího zdroje",
+
+  // "submission.import-external.title.Journal": "Import a journal from an external source",
+  "submission.import-external.title.Journal": "Importovat časopis z externího zdroje",
+
+  // "submission.import-external.title.JournalIssue": "Import a journal issue from an external source",
+  "submission.import-external.title.JournalIssue": "Importovat číslo časopisu z externího zdroje",
+
+  // "submission.import-external.title.JournalVolume": "Import a journal volume from an external source",
+  "submission.import-external.title.JournalVolume": "Importovat ročník časopisu z externího zdroje",
+
+  // "submission.import-external.title.OrgUnit": "Import a publisher from an external source",
+  "submission.import-external.title.OrgUnit": "Importovat vydavatele z externího zdroje",
+
+  // "submission.import-external.title.Person": "Import a person from an external source",
+  "submission.import-external.title.Person": "Importovat osobu z externího zdroje",
+
+  // "submission.import-external.title.Project": "Import a project from an external source",
+  "submission.import-external.title.Project": "Importovat projekt z externího zdroje",
+
+  // "submission.import-external.title.Publication": "Import a publication from an external source",
+  "submission.import-external.title.Publication": "Importovat publikaci z externího zdroje",
+
+  // "submission.import-external.title.none": "Import metadata from an external source",
+  "submission.import-external.title.none": "Importovat metadata z externího zdroje",
 
   // "submission.import-external.page.hint": "Enter a query above to find items from the web to import in to DSpace.",
-  // TODO New key - Add a translation
-  "submission.import-external.page.hint": "Enter a query above to find items from the web to import in to DSpace.",
+  "submission.import-external.page.hint": "Zadejte výše uvedený dotaz, abyste našli záznamy z webu, které chcete importovat do systému DSpace.",
 
   // "submission.import-external.back-to-my-dspace": "Back to MyDSpace",
-  // TODO New key - Add a translation
-  "submission.import-external.back-to-my-dspace": "Back to MyDSpace",
+  "submission.import-external.back-to-my-dspace": "Zpět do Mého DSpace",
 
   // "submission.import-external.search.placeholder": "Search the external source",
-  // TODO New key - Add a translation
-  "submission.import-external.search.placeholder": "Search the external source",
+  "submission.import-external.search.placeholder": "Prohledat externí zdroj",
 
   // "submission.import-external.search.button": "Search",
-  // TODO New key - Add a translation
-  "submission.import-external.search.button": "Search",
+  "submission.import-external.search.button": "Hledat",
 
   // "submission.import-external.search.button.hint": "Write some words to search",
-  // TODO New key - Add a translation
-  "submission.import-external.search.button.hint": "Write some words to search",
+  "submission.import-external.search.button.hint": "Napište několik slov k vyhledávání",
 
   // "submission.import-external.search.source.hint": "Pick an external source",
-  // TODO New key - Add a translation
-  "submission.import-external.search.source.hint": "Pick an external source",
+  "submission.import-external.search.source.hint": "Vyberte externí zdroj",
 
   // "submission.import-external.source.arxiv": "arXiv",
-  // TODO New key - Add a translation
   "submission.import-external.source.arxiv": "arXiv",
 
-  // "submission.import-external.source.loading": "Loading ...",
+  // "submission.import-external.source.ads": "NASA/ADS",
+  "submission.import-external.source.ads": "NASA/ADS",
+
+  // "submission.import-external.source.cinii": "CiNii",
+  "submission.import-external.source.cinii": "CiNii",
+
+  // "submission.import-external.source.crossref": "Crossref",
+  "submission.import-external.source.crossref": "Crossref",
+
+  // "submission.import-external.source.datacite": "DataCite",
+  "submission.import-external.source.datacite": "DataCite",
+
+  // "submission.import-external.source.doi": "DOI",
   // TODO New key - Add a translation
-  "submission.import-external.source.loading": "Loading ...",
+  "submission.import-external.source.doi": "DOI",
+
+  // "submission.import-external.source.scielo": "SciELO",
+  "submission.import-external.source.scielo": "SciELO",
+
+  // "submission.import-external.source.scopus": "Scopus",
+  "submission.import-external.source.scopus": "Scopus",
+
+  // "submission.import-external.source.vufind": "VuFind",
+  "submission.import-external.source.vufind": "VuFind",
+
+  // "submission.import-external.source.wos": "Web Of Science",
+  "submission.import-external.source.wos": "Web Of Science",
+
+  // "submission.import-external.source.orcidWorks": "ORCID",
+  "submission.import-external.source.orcidWorks": "ORCID",
+
+  // "submission.import-external.source.epo": "European Patent Office (EPO)",
+  "submission.import-external.source.epo": "European Patent Office (EPO)",
+
+  // "submission.import-external.source.loading": "Loading ...",
+  "submission.import-external.source.loading": "Načítá se ...",
 
   // "submission.import-external.source.sherpaJournal": "SHERPA Journals",
-  // TODO New key - Add a translation
   "submission.import-external.source.sherpaJournal": "SHERPA Journals",
 
+  // "submission.import-external.source.sherpaJournalIssn": "SHERPA Journals by ISSN",
+  "submission.import-external.source.sherpaJournalIssn": "SHERPA Journals podle ISSN",
+
   // "submission.import-external.source.sherpaPublisher": "SHERPA Publishers",
-  // TODO New key - Add a translation
   "submission.import-external.source.sherpaPublisher": "SHERPA Publishers",
 
-  // "submission.import-external.source.orcid": "ORCID",
+  // "submission.import-external.source.openaire": "OpenAIRE Authors",
   // TODO New key - Add a translation
+  "submission.import-external.source.openaire": "OpenAIRE Authors",
+
+  // "submission.import-external.source.openaireTitle": "OpenAIRE Titles",
+  // TODO New key - Add a translation
+  "submission.import-external.source.openaireTitle": "OpenAIRE Titles",
+
+  // "submission.import-external.source.openaireFunding": "OpenAIRE Funding",
+  // TODO New key - Add a translation
+  "submission.import-external.source.openaireFunding": "OpenAIRE Funding",
+
+  // "submission.import-external.source.orcid": "ORCID",
   "submission.import-external.source.orcid": "ORCID",
 
   // "submission.import-external.source.pubmed": "Pubmed",
-  // TODO New key - Add a translation
   "submission.import-external.source.pubmed": "Pubmed",
 
+  // "submission.import-external.source.pubmedeu": "Pubmed Europe",
+  "submission.import-external.source.pubmedeu": "Pubmed Europe",
+
   // "submission.import-external.source.lcname": "Library of Congress Names",
-  // TODO New key - Add a translation
   "submission.import-external.source.lcname": "Library of Congress Names",
 
-  // "submission.import-external.preview.title": "Item Preview",
+  // "submission.import-external.source.ror": "Research Organization Registry (ROR)",
   // TODO New key - Add a translation
-  "submission.import-external.preview.title": "Item Preview",
+  "submission.import-external.source.ror": "Research Organization Registry (ROR)",
+
+  // "submission.import-external.preview.title": "Item Preview",
+  "submission.import-external.preview.title": "Náhled záznamu",
+
+  // "submission.import-external.preview.title.Publication": "Publication Preview",
+  "submission.import-external.preview.title.Publication": "Náhled publikace",
+
+  // "submission.import-external.preview.title.none": "Item Preview",
+  "submission.import-external.preview.title.none": "Náhled záznamu",
+
+  // "submission.import-external.preview.title.Journal": "Journal Preview",
+  "submission.import-external.preview.title.Journal": "Náhled časopisu",
+
+  // "submission.import-external.preview.title.OrgUnit": "Organizational Unit Preview",
+  "submission.import-external.preview.title.OrgUnit": "Náhled organizační jednotky",
+
+  // "submission.import-external.preview.title.Person": "Person Preview",
+  "submission.import-external.preview.title.Person": "Náhled osoby",
+
+  // "submission.import-external.preview.title.Project": "Project Preview",
+  "submission.import-external.preview.title.Project": "Náhled projektu",
 
   // "submission.import-external.preview.subtitle": "The metadata below was imported from an external source. It will be pre-filled when you start the submission.",
-  // TODO New key - Add a translation
-  "submission.import-external.preview.subtitle": "The metadata below was imported from an external source. It will be pre-filled when you start the submission.",
+  "submission.import-external.preview.subtitle": "Níže uvedená metadata byla importována z externího zdroje. Budou předvyplněna při zahájení odesílání..",
 
   // "submission.import-external.preview.button.import": "Start submission",
-  // TODO New key - Add a translation
-  "submission.import-external.preview.button.import": "Start submission",
+  "submission.import-external.preview.button.import": "Začít nový příspěvek",
 
   // "submission.import-external.preview.error.import.title": "Submission error",
-  // TODO New key - Add a translation
-  "submission.import-external.preview.error.import.title": "Submission error",
+  "submission.import-external.preview.error.import.title": "Chyba při vytváření nového příspěvku",
 
   // "submission.import-external.preview.error.import.body": "An error occurs during the external source entry import process.",
-  // TODO New key - Add a translation
-  "submission.import-external.preview.error.import.body": "An error occurs during the external source entry import process.",
+  "submission.import-external.preview.error.import.body": "Během procesu importu externí zdrojového záznamu došlo k chybě.",
 
   // "submission.sections.describe.relationship-lookup.close": "Close",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.close": "Close",
+  "submission.sections.describe.relationship-lookup.close": "Zavřít",
 
   // "submission.sections.describe.relationship-lookup.external-source.added": "Successfully added local entry to the selection",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.external-source.added": "Successfully added local entry to the selection",
+  "submission.sections.describe.relationship-lookup.external-source.added": "Lokálně uložený záznam úspěšně přidán do výběru.",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-button-title.isAuthorOfPublication": "Import remote author",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.external-source.import-button-title.isAuthorOfPublication": "Import remote author",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.isAuthorOfPublication": "Importovat externě uloženého autora",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-button-title.Journal": "Import remote journal",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Journal": "Import remote journal",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Journal": "Importovat externě uložený časopis",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-button-title.Journal Issue": "Import remote journal issue",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Journal Issue": "Import remote journal issue",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Journal Issue": "Importovat externě uložené číslo časopisu",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-button-title.Journal Volume": "Import remote journal volume",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Journal Volume": "Import remote journal volume",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Journal Volume": "Importovat externě uložený ročník časopisu",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-button-title.isProjectOfPublication": "Project",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.isProjectOfPublication": "Projekt",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-button-title.none": "Import remote item",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.none": "Importovat externě uložený záznam",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-button-title.Event": "Import remote event",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Event": "Importovat externě uloženou událost",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-button-title.Product": "Import remote product",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Product": "Importovat externě uložený produkt",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-button-title.Equipment": "Import remote equipment",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Equipment": "Importovat externě uložené vybavení",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-button-title.OrgUnit": "Import remote organizational unit",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.OrgUnit": "Importovat externě uloženou organizační jednotku",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-button-title.Funding": "Import remote fund",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Funding": "Importovat fond",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-button-title.Person": "Import remote person",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Person": "Importovat externě uloženou osobu",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-button-title.Patent": "Import remote patent",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Patent": "Importovat externě uložený patent",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-button-title.Project": "Import remote project",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Project": "Importovat externě uložený projekt",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-button-title.Publication": "Import remote publication",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Publication": "Importovat externě uloženou publikaci",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.isProjectOfPublication.added.new-entity": "New Entity Added!",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.isProjectOfPublication.added.new-entity": "Přidána nová entita!",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.isProjectOfPublication.title": "Project",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.isProjectOfPublication.title": "Projekt",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.isAuthorOfPublication.title": "Import Remote Author",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.isAuthorOfPublication.title": "Import Remote Author",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.isAuthorOfPublication.title": "Importovat externě uloženého autora",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.isAuthorOfPublication.added.local-entity": "Successfully added local author to the selection",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.isAuthorOfPublication.added.local-entity": "Successfully added local author to the selection",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.isAuthorOfPublication.added.local-entity": "Lokální autor úspěšně přidán do výběru",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.isAuthorOfPublication.added.new-entity": "Successfully imported and added external author to the selection",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.isAuthorOfPublication.added.new-entity": "Successfully imported and added external author to the selection",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.isAuthorOfPublication.added.new-entity": "Externí autor úspěšně importován a přidán do výběru",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.authority": "Authority",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.authority": "Authority",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.authority": "Autorita",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.authority.new": "Import as a new local authority entry",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.authority.new": "Import as a new local authority entry",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.authority.new": "Importovat jako nový záznam lokální autority",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.cancel": "Cancel",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.cancel": "Zrušit",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.collection": "Select a collection to import new entries to",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.collection": "Select a collection to import new entries to",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.collection": "Vyberte kolekci, do které chcete importovat nové záznamy",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.entities": "Entities",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.entities": "Entities",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.entities": "Entity",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.entities.new": "Import as a new local entity",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.entities.new": "Import as a new local entity",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.entities.new": "Importovat jako novou lokální entitu",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.lcname": "Importing from LC Name",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.lcname": "Importing from LC Name",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.lcname": "Import z LC Name",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.orcid": "Importing from ORCID",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.orcid": "Import z ORCID",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.openaire": "Importing from OpenAIRE Authors",
   // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.orcid": "Importing from ORCID",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.openaire": "Importing from OpenAIRE Authors",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.openaireTitle": "Importing from OpenAIRE Titles",
+  // TODO New key - Add a translation
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.openaireTitle": "Importing from OpenAIRE Titles",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.openaireFunding": "Importing from OpenAIRE Funding",
+  // TODO New key - Add a translation
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.openaireFunding": "Importing from OpenAIRE Funding",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.sherpaJournal": "Importing from Sherpa Journal",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.sherpaJournal": "Importing from Sherpa Journal",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.sherpaJournal": "Import z Sherpa Journal",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.sherpaPublisher": "Importing from Sherpa Publisher",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.sherpaPublisher": "Importing from Sherpa Publisher",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.sherpaPublisher": "Import z Sherpa Publisher",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.pubmed": "Importing from PubMed",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.pubmed": "Importing from PubMed",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.pubmed": "Import z PubMed",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.arxiv": "Importing from arXiv",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.arxiv": "Import z arXiv",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.ror": "Import from ROR",
   // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.arxiv": "Importing from arXiv",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.ror": "Import from ROR",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.import": "Import",
-  // TODO New key - Add a translation
   "submission.sections.describe.relationship-lookup.external-source.import-modal.import": "Import",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal.title": "Import Remote Journal",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal.title": "Import Remote Journal",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal.title": "Importovat externě uložený časopis",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal.added.local-entity": "Successfully added local journal to the selection",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal.added.local-entity": "Successfully added local journal to the selection",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal.added.local-entity": "Lokálně uložený časopis úspěšně přidán do výběru",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal.added.new-entity": "Successfully imported and added external journal to the selection",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal.added.new-entity": "Successfully imported and added external journal to the selection",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal.added.new-entity": "Externě uložený časopis úspěšně importován a přidán do výběru",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Issue.title": "Import Remote Journal Issue",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Issue.title": "Import Remote Journal Issue",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Issue.title": "Importovat externě uložené číslo časopisu",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Issue.added.local-entity": "Successfully added local journal issue to the selection",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Issue.added.local-entity": "Successfully added local journal issue to the selection",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Issue.added.local-entity": "Úspěšně přidáno lokálně uložené číslo časopisu do výběru",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Issue.added.new-entity": "Successfully imported and added external journal issue to the selection",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Issue.added.new-entity": "Successfully imported and added external journal issue to the selection",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Issue.added.new-entity": "Úspěšně importováno a přidáno externě uložené číslo časopisu do výběru",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Volume.title": "Import Remote Journal Volume",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Volume.title": "Import Remote Journal Volume",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Volume.title": "Importovat externě uložený ročník časopisu",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Volume.added.local-entity": "Successfully added local journal volume to the selection",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Volume.added.local-entity": "Successfully added local journal volume to the selection",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Volume.added.local-entity": "Úspěšně přidán lokálně uložený ročník časopisu do výběru",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Volume.added.new-entity": "Successfully imported and added external journal volume to the selection",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Volume.added.new-entity": "Successfully imported and added external journal volume to the selection",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Volume.added.new-entity": "Úspěšně importován a přidán externě uložený ročník časopisu do výběru",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.select": "Select a local match:",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.select": "Vyberte lokální shodu:",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.isOrgUnitOfProject.title": "Import Remote Organization",
   // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.select": "Select a local match:",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.isOrgUnitOfProject.title": "Import Remote Organization",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.isOrgUnitOfProject.added.local-entity": "Successfully added local organization to the selection",
+  // TODO New key - Add a translation
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.isOrgUnitOfProject.added.local-entity": "Successfully added local organization to the selection",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.isOrgUnitOfProject.added.new-entity": "Successfully imported and added external organization to the selection",
+  // TODO New key - Add a translation
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.isOrgUnitOfProject.added.new-entity": "Successfully imported and added external organization to the selection",
 
   // "submission.sections.describe.relationship-lookup.search-tab.deselect-all": "Deselect all",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.deselect-all": "Deselect all",
+  "submission.sections.describe.relationship-lookup.search-tab.deselect-all": "Zrušit výběr všech",
 
   // "submission.sections.describe.relationship-lookup.search-tab.deselect-page": "Deselect page",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.deselect-page": "Deselect page",
+  "submission.sections.describe.relationship-lookup.search-tab.deselect-page": "Zrušit výběr stránky",
 
   // "submission.sections.describe.relationship-lookup.search-tab.loading": "Loading...",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.loading": "Loading...",
+  "submission.sections.describe.relationship-lookup.search-tab.loading": "Načítá se...",
 
   // "submission.sections.describe.relationship-lookup.search-tab.placeholder": "Search query",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.placeholder": "Search query",
+  "submission.sections.describe.relationship-lookup.search-tab.placeholder": "Vyhledávací dotaz",
 
   // "submission.sections.describe.relationship-lookup.search-tab.search": "Go",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.search": "Go",
+  "submission.sections.describe.relationship-lookup.search-tab.search": "Přejít na",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.search-form.placeholder": "Search...",
+  "submission.sections.describe.relationship-lookup.search-tab.search-form.placeholder": "Hledání...",
 
   // "submission.sections.describe.relationship-lookup.search-tab.select-all": "Select all",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.select-all": "Select all",
+  "submission.sections.describe.relationship-lookup.search-tab.select-all": "Vybrat vše",
 
   // "submission.sections.describe.relationship-lookup.search-tab.select-page": "Select page",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.select-page": "Select page",
+  "submission.sections.describe.relationship-lookup.search-tab.select-page": "Vybrat stránku",
 
   // "submission.sections.describe.relationship-lookup.selected": "Selected {{ size }} items",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selected": "Selected {{ size }} items",
+  "submission.sections.describe.relationship-lookup.selected": "Vybrané {{ size }} záznamy",
 
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isAuthorOfPublication": "Local Authors ({{ count }})",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isAuthorOfPublication": "Local Authors ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isAuthorOfPublication": "Lokálně uložení autoři ({{ count }})",
 
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalOfPublication": "Local Journals ({{ count }})",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalOfPublication": "Local Journals ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalOfPublication": "Lokálně uložené časopisy({{ count }})",
+
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.Project": "Local Projects ({{ count }})",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.Project": "Local Projects ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.Project": "Lokálně uložené projekty ({{ count }})",
 
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.Publication": "Local Publications ({{ count }})",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.Publication": "Local Publications ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.Publication": "Lokálně uložené publikace ({{ count }})",
 
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.Person": "Local Authors ({{ count }})",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.Person": "Local Authors ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.Person": "Lokálně uložení autoři ({{ count }})",
 
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.OrgUnit": "Local Organizational Units ({{ count }})",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.OrgUnit": "Local Organizational Units ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.OrgUnit": "Lokálně uložené organizační jednotky ({{ count }})",
 
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.DataPackage": "Local Data Packages ({{ count }})",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.DataPackage": "Local Data Packages ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.DataPackage": "Lokálně uložené datové balíky ({{ count }})",
 
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.DataFile": "Local Data Files ({{ count }})",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.DataFile": "Local Data Files ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.DataFile": "Lokálně uložené datové soubory ({{ count }})",
 
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.Journal": "Local Journals ({{ count }})",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.Journal": "Local Journals ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.Journal": "Lokálně uložené časopisy ({{ count }})",
 
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalIssueOfPublication": "Local Journal Issues ({{ count }})",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalIssueOfPublication": "Local Journal Issues ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalIssueOfPublication": "Lokálně uložená čísla časopisu ({{ count }})",
+
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.JournalIssue": "Local Journal Issues ({{ count }})",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.JournalIssue": "Local Journal Issues ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.JournalIssue": "Lokálně uložená čísla časopisu ({{ count }})",
 
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalVolumeOfPublication": "Local Journal Volumes ({{ count }})",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalVolumeOfPublication": "Local Journal Volumes ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalVolumeOfPublication": "Lokálně uložené ročníky časopisu ({{ count }})",
+
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.JournalVolume": "Local Journal Volumes ({{ count }})",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.JournalVolume": "Local Journal Volumes ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.JournalVolume": "Lokálně uložené ročníky časopisu ({{ count }})",
 
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaJournal": "Sherpa Journals ({{ count }})",
-  // TODO New key - Add a translation
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaJournal": "Sherpa Journals ({{ count }})",
 
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaPublisher": "Sherpa Publishers ({{ count }})",
-  // TODO New key - Add a translation
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaPublisher": "Sherpa Publishers ({{ count }})",
 
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.orcid": "ORCID ({{ count }})",
-  // TODO New key - Add a translation
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.orcid": "ORCID ({{ count }})",
 
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.lcname": "LC Names ({{ count }})",
-  // TODO New key - Add a translation
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.lcname": "LC Names ({{ count }})",
 
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.pubmed": "PubMed ({{ count }})",
-  // TODO New key - Add a translation
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.pubmed": "PubMed ({{ count }})",
 
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.arxiv": "arXiv ({{ count }})",
-  // TODO New key - Add a translation
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.arxiv": "arXiv ({{ count }})",
 
-  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingAgencyOfPublication": "Search for Funding Agencies",
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.ror": "ROR ({{ count }})",
   // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingAgencyOfPublication": "Search for Funding Agencies",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.ror": "ROR ({{ count }})",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.orcidWorks": "ORCID ({{ count }})",
+  // TODO New key - Add a translation
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.orcidWorks": "ORCID ({{ count }})",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.crossref": "Crossref ({{ count }})",
+  // TODO New key - Add a translation
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.crossref": "Crossref ({{ count }})",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.scopus": "Scopus ({{ count }})",
+  // TODO New key - Add a translation
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.scopus": "Scopus ({{ count }})",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.openaire": "OpenAIRE Authors ({{ count }})",
+  // TODO New key - Add a translation
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.openaire": "OpenAIRE Authors ({{ count }})",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.openaireTitle": "OpenAIRE Titles ({{ count }})",
+  // TODO New key - Add a translation
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.openaireTitle": "OpenAIRE Titles ({{ count }})",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.openaireFunding": "OpenAIRE Funding ({{ count }})",
+  // TODO New key - Add a translation
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.openaireFunding": "OpenAIRE Funding ({{ count }})",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaJournalIssn": "Sherpa Journals by ISSN ({{ count }})",
+  // TODO New key - Add a translation
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaJournalIssn": "Sherpa Journals by ISSN ({{ count }})",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingAgencyOfPublication": "Search for Funding Agencies",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingAgencyOfPublication": "Vyhledat financující agentury",
 
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingOfPublication": "Search for Funding",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingOfPublication": "Search for Funding",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingOfPublication": "Vyhledat financování",
 
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isChildOrgUnitOf": "Search for Organizational Units",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isChildOrgUnitOf": "Vyhledat organizační jednotky",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isProjectOfPublication": "Projects",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isProjectOfPublication": "Projekty",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingAgencyOfProject": "Funder of the Project",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingAgencyOfProject": "Poskytovatel financí na projekt",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isPublicationOfAuthor": "Publication of the Author",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isPublicationOfAuthor": "Publikace autora",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isOrgUnitOfProject": "OrgUnit of the Project",
   // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isChildOrgUnitOf": "Search for Organizational Units",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isOrgUnitOfProject": "OrgUnit of the Project",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.isProjectOfPublication": "Project",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isProjectOfPublication": "Projekt",
+
+  // "submission.sections.describe.relationship-lookup.title.isProjectOfPublication": "Projects",
+  "submission.sections.describe.relationship-lookup.title.isProjectOfPublication": "Projekty",
+
+  // "submission.sections.describe.relationship-lookup.title.isFundingAgencyOfProject": "Funder of the Project",
+  "submission.sections.describe.relationship-lookup.title.isFundingAgencyOfProject": "Poskytovatel financí na projekt",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.search-form.placeholder": "Search...",
+  "submission.sections.describe.relationship-lookup.selection-tab.search-form.placeholder": "Hledat...",
 
   // "submission.sections.describe.relationship-lookup.selection-tab.tab-title": "Current Selection ({{ count }})",
+  "submission.sections.describe.relationship-lookup.selection-tab.tab-title": "Aktuální výběr ({{ count }})",
+
+  // "submission.sections.describe.relationship-lookup.title.Journal": "Journal",
   // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.tab-title": "Current Selection ({{ count }})",
+  "submission.sections.describe.relationship-lookup.title.Journal": "Journal",
 
   // "submission.sections.describe.relationship-lookup.title.isJournalIssueOfPublication": "Journal Issues",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.title.isJournalIssueOfPublication": "Journal Issues",
+  "submission.sections.describe.relationship-lookup.title.isJournalIssueOfPublication": "Čísla časopisu",
+
   // "submission.sections.describe.relationship-lookup.title.JournalIssue": "Journal Issues",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.title.JournalIssue": "Journal Issues",
+  "submission.sections.describe.relationship-lookup.title.JournalIssue": "Čísla časopisu",
 
   // "submission.sections.describe.relationship-lookup.title.isJournalVolumeOfPublication": "Journal Volumes",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.title.isJournalVolumeOfPublication": "Journal Volumes",
+  "submission.sections.describe.relationship-lookup.title.isJournalVolumeOfPublication": "Ročníky časopisu",
+
   // "submission.sections.describe.relationship-lookup.title.JournalVolume": "Journal Volumes",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.title.JournalVolume": "Journal Volumes",
+  "submission.sections.describe.relationship-lookup.title.JournalVolume": "Ročníky časopisu",
 
   // "submission.sections.describe.relationship-lookup.title.isJournalOfPublication": "Journals",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.title.isJournalOfPublication": "Journals",
+  "submission.sections.describe.relationship-lookup.title.isJournalOfPublication": "Časopisy",
 
   // "submission.sections.describe.relationship-lookup.title.isAuthorOfPublication": "Authors",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.title.isAuthorOfPublication": "Authors",
+  "submission.sections.describe.relationship-lookup.title.isAuthorOfPublication": "Autoři",
 
   // "submission.sections.describe.relationship-lookup.title.isFundingAgencyOfPublication": "Funding Agency",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.title.isFundingAgencyOfPublication": "Funding Agency",
+  "submission.sections.describe.relationship-lookup.title.isFundingAgencyOfPublication": "Financující agentura",
+
   // "submission.sections.describe.relationship-lookup.title.Project": "Projects",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.title.Project": "Projects",
+  "submission.sections.describe.relationship-lookup.title.Project": "Projekty",
 
   // "submission.sections.describe.relationship-lookup.title.Publication": "Publications",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.title.Publication": "Publications",
+  "submission.sections.describe.relationship-lookup.title.Publication": "Publikace",
 
   // "submission.sections.describe.relationship-lookup.title.Person": "Authors",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.title.Person": "Authors",
+  "submission.sections.describe.relationship-lookup.title.Person": "Autoři",
 
   // "submission.sections.describe.relationship-lookup.title.OrgUnit": "Organizational Units",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.title.OrgUnit": "Organizational Units",
+  "submission.sections.describe.relationship-lookup.title.OrgUnit": "Organizační jednotky",
 
   // "submission.sections.describe.relationship-lookup.title.DataPackage": "Data Packages",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.title.DataPackage": "Data Packages",
+  "submission.sections.describe.relationship-lookup.title.DataPackage": "Datové balíky",
 
   // "submission.sections.describe.relationship-lookup.title.DataFile": "Data Files",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.title.DataFile": "Data Files",
+  "submission.sections.describe.relationship-lookup.title.DataFile": "Datové soubory",
 
   // "submission.sections.describe.relationship-lookup.title.Funding Agency": "Funding Agency",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.title.Funding Agency": "Funding Agency",
+  "submission.sections.describe.relationship-lookup.title.Funding Agency": "Financující agentura",
 
   // "submission.sections.describe.relationship-lookup.title.isFundingOfPublication": "Funding",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.title.isFundingOfPublication": "Funding",
+  "submission.sections.describe.relationship-lookup.title.isFundingOfPublication": "Financování",
 
   // "submission.sections.describe.relationship-lookup.title.isChildOrgUnitOf": "Parent Organizational Unit",
+  "submission.sections.describe.relationship-lookup.title.isChildOrgUnitOf": "Nadřazená organizační jednotka",
+
+  // "submission.sections.describe.relationship-lookup.title.isPublicationOfAuthor": "Publication",
+  "submission.sections.describe.relationship-lookup.title.isPublicationOfAuthor": "Publikace",
+
+  // "submission.sections.describe.relationship-lookup.title.isOrgUnitOfProject": "OrgUnit",
   // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.title.isChildOrgUnitOf": "Parent Organizational Unit",
+  "submission.sections.describe.relationship-lookup.title.isOrgUnitOfProject": "OrgUnit",
 
   // "submission.sections.describe.relationship-lookup.search-tab.toggle-dropdown": "Toggle dropdown",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.toggle-dropdown": "Toggle dropdown",
+  "submission.sections.describe.relationship-lookup.search-tab.toggle-dropdown": "Přepnutí rozbalovacího seznamu",
 
   // "submission.sections.describe.relationship-lookup.selection-tab.settings": "Settings",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.settings": "Settings",
+  "submission.sections.describe.relationship-lookup.selection-tab.settings": "Nastavení",
 
   // "submission.sections.describe.relationship-lookup.selection-tab.no-selection": "Your selection is currently empty.",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.no-selection": "Your selection is currently empty.",
+  "submission.sections.describe.relationship-lookup.selection-tab.no-selection": "Váš výběr je momentálně prázdný.",
 
   // "submission.sections.describe.relationship-lookup.selection-tab.title.isAuthorOfPublication": "Selected Authors",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.title.isAuthorOfPublication": "Selected Authors",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isAuthorOfPublication": "Vybraní autoři",
 
   // "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalOfPublication": "Selected Journals",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalOfPublication": "Selected Journals",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalOfPublication": "Vybrané časopisy",
 
   // "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalVolumeOfPublication": "Selected Journal Volume",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalVolumeOfPublication": "Selected Journal Volume",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalVolumeOfPublication": "Vybraný ročník časopisu",
+
   // "submission.sections.describe.relationship-lookup.selection-tab.title.Project": "Selected Projects",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.title.Project": "Selected Projects",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.Project": "Vybrané projekty",
 
   // "submission.sections.describe.relationship-lookup.selection-tab.title.Publication": "Selected Publications",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.title.Publication": "Selected Publications",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.Publication": "Vybrané publikace",
 
   // "submission.sections.describe.relationship-lookup.selection-tab.title.Person": "Selected Authors",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.title.Person": "Selected Authors",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.Person": "Vybraní Autoři",
 
   // "submission.sections.describe.relationship-lookup.selection-tab.title.OrgUnit": "Selected Organizational Units",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.title.OrgUnit": "Selected Organizational Units",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.OrgUnit": "Vybrané organizační jednotky",
 
   // "submission.sections.describe.relationship-lookup.selection-tab.title.DataPackage": "Selected Data Packages",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.title.DataPackage": "Selected Data Packages",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.DataPackage": "Vybrané datové balíky",
 
   // "submission.sections.describe.relationship-lookup.selection-tab.title.DataFile": "Selected Data Files",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.title.DataFile": "Selected Data Files",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.DataFile": "Vybrané datové soubory",
 
   // "submission.sections.describe.relationship-lookup.selection-tab.title.Journal": "Selected Journals",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.title.Journal": "Selected Journals",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.Journal": "Vybrané časopisy",
 
   // "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalIssueOfPublication": "Selected Issue",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalIssueOfPublication": "Selected Issue",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalIssueOfPublication": "Vybrané číslo časopisu",
+
   // "submission.sections.describe.relationship-lookup.selection-tab.title.JournalVolume": "Selected Journal Volume",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.title.JournalVolume": "Selected Journal Volume",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.JournalVolume": "Vybraný ročník časopisu",
 
   // "submission.sections.describe.relationship-lookup.selection-tab.title.isFundingAgencyOfPublication": "Selected Funding Agency",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.title.isFundingAgencyOfPublication": "Selected Funding Agency",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isFundingAgencyOfPublication": "Vybraná financující agentura",
 
   // "submission.sections.describe.relationship-lookup.selection-tab.title.isFundingOfPublication": "Selected Funding",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.title.isFundingOfPublication": "Selected Funding",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isFundingOfPublication": "Vybrané financování",
+
   // "submission.sections.describe.relationship-lookup.selection-tab.title.JournalIssue": "Selected Issue",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.title.JournalIssue": "Selected Issue",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.JournalIssue": "Vybrané číslo časopisu",
 
   // "submission.sections.describe.relationship-lookup.selection-tab.title.isChildOrgUnitOf": "Selected Organizational Unit",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.title.isChildOrgUnitOf": "Selected Organizational Unit",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isChildOrgUnitOf": "Vybrané organizační jednotka",
 
   // "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaJournal": "Search Results",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaJournal": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaJournal": "Výsledky vyhledávání",
 
   // "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaPublisher": "Search Results",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaPublisher": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaPublisher": "Výsledky vyhledávání",
 
   // "submission.sections.describe.relationship-lookup.selection-tab.title.orcid": "Search Results",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.title.orcid": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.orcid": "Výsledky vyhledávání",
 
   // "submission.sections.describe.relationship-lookup.selection-tab.title.orcidv2": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.orcidv2": "Výsledky vyhledávání",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.openaire": "Search Results",
   // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.title.orcidv2": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.openaire": "Search Results",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.openaireTitle": "Search Results",
+  // TODO New key - Add a translation
+  "submission.sections.describe.relationship-lookup.selection-tab.title.openaireTitle": "Search Results",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.openaireFundin": "Search Results",
+  // TODO New key - Add a translation
+  "submission.sections.describe.relationship-lookup.selection-tab.title.openaireFundin": "Search Results",
 
   // "submission.sections.describe.relationship-lookup.selection-tab.title.lcname": "Search Results",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.title.lcname": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.lcname": "Výsledky vyhledávání",
 
   // "submission.sections.describe.relationship-lookup.selection-tab.title.pubmed": "Search Results",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.title.pubmed": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.pubmed": "Výsledky vyhledávání",
 
   // "submission.sections.describe.relationship-lookup.selection-tab.title.arxiv": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.arxiv": "Výsledky vyhledávání",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.crossref": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.crossref": "Výsledky vyhledávání",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.epo": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.epo": "Výsledky vyhledávání",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.scopus": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.scopus": "Výsledky vyhledávání",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.scielo": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.scielo": "Výsledky vyhledávání",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.wos": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.wos": "Výsledky vyhledávání",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.ror": "Search Results",
   // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.title.arxiv": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.ror": "Search Results",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title": "Výsledky vyhledávání",
 
   // "submission.sections.describe.relationship-lookup.name-variant.notification.content": "Would you like to save \"{{ value }}\" as a name variant for this person so you and others can reuse it for future submissions? If you don't you can still use it for this submission.",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.name-variant.notification.content": "Would you like to save \"{{ value }}\" as a name variant for this person so you and others can reuse it for future submissions? If you don't you can still use it for this submission.",
+  "submission.sections.describe.relationship-lookup.name-variant.notification.content": "Chcete uložit \"{{ value }}\" jako variantu jména pro tuto osobu, abyste ji vy i ostatní mohli opakovaně použít pro budoucí příspěvky? Pokud ne, můžete ji stále použít pro tento příspěvek.",
 
   // "submission.sections.describe.relationship-lookup.name-variant.notification.confirm": "Save a new name variant",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.name-variant.notification.confirm": "Save a new name variant",
+  "submission.sections.describe.relationship-lookup.name-variant.notification.confirm": "Uložit novou variantu názvu",
 
   // "submission.sections.describe.relationship-lookup.name-variant.notification.decline": "Use only for this submission",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.name-variant.notification.decline": "Use only for this submission",
+  "submission.sections.describe.relationship-lookup.name-variant.notification.decline": "Použít pouze pro tento příspěvek",
 
   // "submission.sections.ccLicense.type": "License Type",
-  // TODO New key - Add a translation
-  "submission.sections.ccLicense.type": "License Type",
+  "submission.sections.ccLicense.type": "Typ licence",
 
   // "submission.sections.ccLicense.select": "Select a license type…",
-  // TODO New key - Add a translation
-  "submission.sections.ccLicense.select": "Select a license type…",
+  "submission.sections.ccLicense.select": "Vyberte typ licence...",
 
   // "submission.sections.ccLicense.change": "Change your license type…",
-  // TODO New key - Add a translation
-  "submission.sections.ccLicense.change": "Change your license type…",
+  "submission.sections.ccLicense.change": "Změnit typ licence...",
 
   // "submission.sections.ccLicense.none": "No licenses available",
-  // TODO New key - Add a translation
-  "submission.sections.ccLicense.none": "No licenses available",
+  "submission.sections.ccLicense.none": "Žádné licence nejsou k dispozici",
 
   // "submission.sections.ccLicense.option.select": "Select an option…",
-  // TODO New key - Add a translation
-  "submission.sections.ccLicense.option.select": "Select an option…",
+  "submission.sections.ccLicense.option.select": "Vyberte možnost...",
 
   // "submission.sections.ccLicense.link": "You’ve selected the following license:",
-  // TODO New key - Add a translation
-  "submission.sections.ccLicense.link": "You’ve selected the following license:",
+  "submission.sections.ccLicense.link": "Vybrali jste následující licenci:",
 
   // "submission.sections.ccLicense.confirmation": "I grant the license above",
-  // TODO New key - Add a translation
-  "submission.sections.ccLicense.confirmation": "I grant the license above",
+  "submission.sections.ccLicense.confirmation": "Uděluji výše uvedenou licenci",
 
   // "submission.sections.general.add-more": "Add more",
-  // TODO New key - Add a translation
-  "submission.sections.general.add-more": "Add more",
+  "submission.sections.general.add-more": "Přidat další",
+
+  // "submission.sections.general.cannot_deposit": "Deposit cannot be completed due to errors in the form.<br>Please fill out all required fields to complete the deposit.",
+  "submission.sections.general.cannot_deposit": "Vklad nelze dokončit kvůli chybám ve formuláři.<br>Pro dokončení vkladu vyplňte všechna požadovaná pole.",
 
   // "submission.sections.general.collection": "Collection",
-  // TODO New key - Add a translation
-  "submission.sections.general.collection": "Collection",
+  "submission.sections.general.collection": "Kolekce",
 
   // "submission.sections.general.deposit_error_notice": "There was an issue when submitting the item, please try again later.",
-  // TODO New key - Add a translation
-  "submission.sections.general.deposit_error_notice": "There was an issue when submitting the item, please try again later.",
+  "submission.sections.general.deposit_error_notice": "Při odesílání záznamu došlo k problému, zkuste to prosím později.",
 
   // "submission.sections.general.deposit_success_notice": "Submission deposited successfully.",
-  // TODO New key - Add a translation
-  "submission.sections.general.deposit_success_notice": "Submission deposited successfully.",
+  "submission.sections.general.deposit_success_notice": "Příspěvek úspěšně uložen.",
 
   // "submission.sections.general.discard_error_notice": "There was an issue when discarding the item, please try again later.",
-  // TODO New key - Add a translation
-  "submission.sections.general.discard_error_notice": "There was an issue when discarding the item, please try again later.",
+  "submission.sections.general.discard_error_notice": "Při vyřazování záznamu došlo k problému, zkuste to prosím později.",
 
   // "submission.sections.general.discard_success_notice": "Submission discarded successfully.",
-  // TODO New key - Add a translation
-  "submission.sections.general.discard_success_notice": "Submission discarded successfully.",
+  "submission.sections.general.discard_success_notice": "Příspěvek byl úspěšně vyřazen.",
 
   // "submission.sections.general.metadata-extracted": "New metadata have been extracted and added to the <strong>{{sectionId}}</strong> section.",
-  // TODO New key - Add a translation
-  "submission.sections.general.metadata-extracted": "New metadata have been extracted and added to the <strong>{{sectionId}}</strong> section.",
+  "submission.sections.general.metadata-extracted": "Do sekce <strong>{{sectionId}}</strong> byla extrahována a přidána nová metadata.",
 
   // "submission.sections.general.metadata-extracted-new-section": "New <strong>{{sectionId}}</strong> section has been added to submission.",
-  // TODO New key - Add a translation
-  "submission.sections.general.metadata-extracted-new-section": "New <strong>{{sectionId}}</strong> section has been added to submission.",
+  "submission.sections.general.metadata-extracted-new-section": "Do příspěvku byla přidána nová <strong>{{sectionId}}</strong> sekce.",
 
   // "submission.sections.general.no-collection": "No collection found",
+  "submission.sections.general.no-collection": "Nebyla nalezena žádná kolekce",
+
+  // "submission.sections.general.no-entity": "No entity types found",
   // TODO New key - Add a translation
-  "submission.sections.general.no-collection": "No collection found",
+  "submission.sections.general.no-entity": "No entity types found",
 
   // "submission.sections.general.no-sections": "No options available",
-  // TODO New key - Add a translation
-  "submission.sections.general.no-sections": "No options available",
+  "submission.sections.general.no-sections": "Nejsou k dispozici žádné volby",
 
   // "submission.sections.general.save_error_notice": "There was an issue when saving the item, please try again later.",
-  // TODO New key - Add a translation
-  "submission.sections.general.save_error_notice": "There was an issue when saving the item, please try again later.",
+  "submission.sections.general.save_error_notice": "Při ukládání záznamu došlo k problému, zkuste to prosím později.",
 
   // "submission.sections.general.save_success_notice": "Submission saved successfully.",
-  // TODO New key - Add a translation
-  "submission.sections.general.save_success_notice": "Submission saved successfully.",
+  "submission.sections.general.save_success_notice": "Příspěvek byl úspěšně uložen.",
 
   // "submission.sections.general.search-collection": "Search for a collection",
-  // TODO New key - Add a translation
-  "submission.sections.general.search-collection": "Search for a collection",
+  "submission.sections.general.search-collection": "Vyhledat kolekci",
 
   // "submission.sections.general.sections_not_valid": "There are incomplete sections.",
-  // TODO New key - Add a translation
-  "submission.sections.general.sections_not_valid": "There are incomplete sections.",
+  "submission.sections.general.sections_not_valid": "Existují neúplné sekce.",
 
+  // "submission.sections.identifiers.info": "The following identifiers will be created for your item:",
+  "submission.sections.identifiers.info": "Pro tento záznam budou vytvořeny následující identifikátory:",
 
+  // "submission.sections.identifiers.no_handle": "No handles have been minted for this item.",
+  "submission.sections.identifiers.no_handle": "Tomuto záznamu nebyl přidělen žádný handle.",
+
+  // "submission.sections.identifiers.no_doi": "No DOIs have been minted for this item.",
+  "submission.sections.identifiers.no_doi": "Tomuto záznamu nebylo přiděleno žádné DOI.",
+
+  // "submission.sections.identifiers.handle_label": "Handle: ",
+  "submission.sections.identifiers.handle_label": "Handle: ",
+
+  // "submission.sections.identifiers.doi_label": "DOI: ",
+  "submission.sections.identifiers.doi_label": "DOI: ",
+
+  // "submission.sections.identifiers.otherIdentifiers_label": "Other identifiers: ",
+  "submission.sections.identifiers.otherIdentifiers_label": "Jiné identifikátory: ",
+
+  // "submission.sections.submit.progressbar.accessCondition": "Item access conditions",
+  "submission.sections.submit.progressbar.accessCondition": "Podmínky přístupu k záznamům",
 
   // "submission.sections.submit.progressbar.CClicense": "Creative commons license",
-  // TODO New key - Add a translation
-  "submission.sections.submit.progressbar.CClicense": "Creative commons license",
+  "submission.sections.submit.progressbar.CClicense": "Licence Creative Commons",
 
   // "submission.sections.submit.progressbar.describe.recycle": "Recycle",
-  // TODO New key - Add a translation
-  "submission.sections.submit.progressbar.describe.recycle": "Recycle",
+  "submission.sections.submit.progressbar.describe.recycle": "Opětovně použít",
 
   // "submission.sections.submit.progressbar.describe.stepcustom": "Describe",
-  // TODO New key - Add a translation
-  "submission.sections.submit.progressbar.describe.stepcustom": "Describe",
+  "submission.sections.submit.progressbar.describe.stepcustom": "Popis",
 
   // "submission.sections.submit.progressbar.describe.stepone": "Describe",
-  // TODO New key - Add a translation
-  "submission.sections.submit.progressbar.describe.stepone": "Describe",
+  "submission.sections.submit.progressbar.describe.stepone": "Základní informace o dokumentu",
 
   // "submission.sections.submit.progressbar.describe.steptwo": "Describe",
-  // TODO New key - Add a translation
-  "submission.sections.submit.progressbar.describe.steptwo": "Describe",
+  "submission.sections.submit.progressbar.describe.steptwo": "Popsat",
 
-  // "submission.sections.submit.progressbar.detect-duplicate": "Potential duplicates",
+  // "submission.sections.submit.progressbar.duplicates": "Potential duplicates",
   // TODO New key - Add a translation
-  "submission.sections.submit.progressbar.detect-duplicate": "Potential duplicates",
+  "submission.sections.submit.progressbar.duplicates": "Potential duplicates",
+
+  // "submission.sections.submit.progressbar.identifiers": "Identifiers",
+  "submission.sections.submit.progressbar.identifiers": "Identifikátory",
 
   // "submission.sections.submit.progressbar.license": "Deposit license",
-  // TODO New key - Add a translation
-  "submission.sections.submit.progressbar.license": "Deposit license",
+  "submission.sections.submit.progressbar.license": "Vložit licenci",
+
+  // "submission.sections.submit.progressbar.sherpapolicy": "Sherpa policies",
+  "submission.sections.submit.progressbar.sherpapolicy": "Politiky Sherpa",
 
   // "submission.sections.submit.progressbar.upload": "Upload files",
+  "submission.sections.submit.progressbar.upload": "Nahrát soubory",
+
+  // "submission.sections.submit.progressbar.sherpaPolicies": "Publisher open access policy information",
+  "submission.sections.submit.progressbar.sherpaPolicies": "Informace o politice otevřeného přístupu vydavatele",
+
+  // "submission.sections.sherpa-policy.title-empty": "No publisher policy information available. If your work has an associated ISSN, please enter it above to see any related publisher open access policies.",
+  "submission.sections.sherpa-policy.title-empty": "Nejsou k dispozici žádné informace o politice vydavatele. Pokud má vaše práce přiřazené ISSN, zadejte jej výše, abyste viděli všechny související politiky otevřeného přístupu vydavatele.",
+
+  // "submission.sections.status.errors.title": "Errors",
+  "submission.sections.status.errors.title": "Chyby",
+
+  // "submission.sections.status.valid.title": "Valid",
+  "submission.sections.status.valid.title": "Platný",
+
+  // "submission.sections.status.warnings.title": "Warnings",
+  "submission.sections.status.warnings.title": "Varování",
+
+  // "submission.sections.status.errors.aria": "has errors",
+  "submission.sections.status.errors.aria": "má chyby",
+
+  // "submission.sections.status.valid.aria": "is valid",
+  "submission.sections.status.valid.aria": "je platný",
+
+  // "submission.sections.status.warnings.aria": "has warnings",
+  "submission.sections.status.warnings.aria": "má varování",
+
+  // "submission.sections.status.info.title": "Additional Information",
+  "submission.sections.status.info.title": "Doplňující informace",
+
+  // "submission.sections.status.info.aria": "Additional Information",
+  "submission.sections.status.info.aria": "Doplňující informace",
+
+  // "submission.sections.toggle.open": "Open section",
+  "submission.sections.toggle.open": "Otevřít sekci",
+
+  // "submission.sections.toggle.close": "Close section",
+  "submission.sections.toggle.close": "Zavřít sekci",
+
+  // "submission.sections.toggle.aria.open": "Expand {{sectionHeader}} section",
+  "submission.sections.toggle.aria.open": "Rozbalit {{sectionHeader}} sekci",
+
+  // "submission.sections.toggle.aria.close": "Collapse {{sectionHeader}} section",
+  "submission.sections.toggle.aria.close": "Sbalit {{sectionHeader}} sekci",
+
+  // "submission.sections.upload.primary.make": "Make {{fileName}} the primary bitstream",
   // TODO New key - Add a translation
-  "submission.sections.submit.progressbar.upload": "Upload files",
-
+  "submission.sections.upload.primary.make": "Make {{fileName}} the primary bitstream",
 
+  // "submission.sections.upload.primary.remove": "Remove {{fileName}} as the primary bitstream",
+  // TODO New key - Add a translation
+  "submission.sections.upload.primary.remove": "Remove {{fileName}} as the primary bitstream",
 
   // "submission.sections.upload.delete.confirm.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "submission.sections.upload.delete.confirm.cancel": "Cancel",
+  "submission.sections.upload.delete.confirm.cancel": "Zrušit",
 
   // "submission.sections.upload.delete.confirm.info": "This operation can't be undone. Are you sure?",
-  // TODO New key - Add a translation
-  "submission.sections.upload.delete.confirm.info": "This operation can't be undone. Are you sure?",
+  "submission.sections.upload.delete.confirm.info": "Tuto operaci nelze vzít zpět. Jste si jisti?",
 
   // "submission.sections.upload.delete.confirm.submit": "Yes, I'm sure",
-  // TODO New key - Add a translation
-  "submission.sections.upload.delete.confirm.submit": "Yes, I'm sure",
+  "submission.sections.upload.delete.confirm.submit": "Ano, jsem si jistý",
 
   // "submission.sections.upload.delete.confirm.title": "Delete bitstream",
-  // TODO New key - Add a translation
-  "submission.sections.upload.delete.confirm.title": "Delete bitstream",
+  "submission.sections.upload.delete.confirm.title": "Smazat soubor",
 
   // "submission.sections.upload.delete.submit": "Delete",
-  // TODO New key - Add a translation
-  "submission.sections.upload.delete.submit": "Delete",
+  "submission.sections.upload.delete.submit": "Smazat",
+
+  // "submission.sections.upload.download.title": "Download bitstream",
+  "submission.sections.upload.download.title": "Stáhnout soubor",
 
   // "submission.sections.upload.drop-message": "Drop files to attach them to the item",
-  // TODO New key - Add a translation
-  "submission.sections.upload.drop-message": "Drop files to attach them to the item",
+  "submission.sections.upload.drop-message": "Přetáhnout soubory a připojit je k záznamu",
+
+  // "submission.sections.upload.edit.title": "Edit bitstream",
+  "submission.sections.upload.edit.title": "Upravit soubor",
 
   // "submission.sections.upload.form.access-condition-label": "Access condition type",
-  // TODO New key - Add a translation
-  "submission.sections.upload.form.access-condition-label": "Access condition type",
+  "submission.sections.upload.form.access-condition-label": "Typ podmínky přístupu",
+
+  // "submission.sections.upload.form.access-condition-hint": "Select an access condition to apply on the bitstream once the item is deposited",
+  "submission.sections.upload.form.access-condition-hint": "Vyberte podmínku přístupu, která se použije na soubor poté, co bude záznam uložen",
 
   // "submission.sections.upload.form.date-required": "Date is required.",
-  // TODO New key - Add a translation
-  "submission.sections.upload.form.date-required": "Date is required.",
+  "submission.sections.upload.form.date-required": "Je vyžadováno datum.",
+
+  // "submission.sections.upload.form.date-required-from": "Grant access from date is required.",
+  "submission.sections.upload.form.date-required-from": "Udělit přístup od požadovaného data.",
+
+  // "submission.sections.upload.form.date-required-until": "Grant access until date is required.",
+  "submission.sections.upload.form.date-required-until": "Udělit přístup do požadovaného data.",
 
   // "submission.sections.upload.form.from-label": "Grant access from",
-  // TODO New key - Add a translation
-  "submission.sections.upload.form.from-label": "Grant access from",
+  "submission.sections.upload.form.from-label": "Udělit přístup od",
+
+  // "submission.sections.upload.form.from-hint": "Select the date from which the related access condition is applied",
+  "submission.sections.upload.form.from-hint": "Vyberte datum, od kterého se použije související podmínka přístupu",
 
   // "submission.sections.upload.form.from-placeholder": "From",
-  // TODO New key - Add a translation
-  "submission.sections.upload.form.from-placeholder": "From",
+  "submission.sections.upload.form.from-placeholder": "Od",
 
   // "submission.sections.upload.form.group-label": "Group",
-  // TODO New key - Add a translation
-  "submission.sections.upload.form.group-label": "Group",
+  "submission.sections.upload.form.group-label": "Skupina",
 
   // "submission.sections.upload.form.group-required": "Group is required.",
-  // TODO New key - Add a translation
-  "submission.sections.upload.form.group-required": "Group is required.",
+  "submission.sections.upload.form.group-required": "Je vyžadována skupina.",
 
   // "submission.sections.upload.form.until-label": "Grant access until",
-  // TODO New key - Add a translation
-  "submission.sections.upload.form.until-label": "Grant access until",
+  "submission.sections.upload.form.until-label": "Udělit přístup do",
+
+  // "submission.sections.upload.form.until-hint": "Select the date until which the related access condition is applied",
+  "submission.sections.upload.form.until-hint": "Zvolte datum, do kterého platí související podmínka přístupu",
 
   // "submission.sections.upload.form.until-placeholder": "Until",
-  // TODO New key - Add a translation
-  "submission.sections.upload.form.until-placeholder": "Until",
+  "submission.sections.upload.form.until-placeholder": "Až do",
 
   // "submission.sections.upload.header.policy.default.nolist": "Uploaded files in the {{collectionName}} collection will be accessible according to the following group(s):",
-  // TODO New key - Add a translation
-  "submission.sections.upload.header.policy.default.nolist": "Uploaded files in the {{collectionName}} collection will be accessible according to the following group(s):",
+  "submission.sections.upload.header.policy.default.nolist": "Nahrané soubory v kolekci {{collectionName}} budou přístupné podle následujících skupin:",
 
   // "submission.sections.upload.header.policy.default.withlist": "Please note that uploaded files in the {{collectionName}} collection will be accessible, in addition to what is explicitly decided for the single file, with the following group(s):",
-  // TODO New key - Add a translation
-  "submission.sections.upload.header.policy.default.withlist": "Please note that uploaded files in the {{collectionName}} collection will be accessible, in addition to what is explicitly decided for the single file, with the following group(s):",
+  "submission.sections.upload.header.policy.default.withlist": "Vezměte prosím na vědomí, že nahrané soubory v kolekci {{collectionName}} budou kromě toho, co je explicitně rozhodnuto pro jednotlivý soubor, přístupné podle následujících skupin:",
 
   // "submission.sections.upload.info": "Here you will find all the files currently in the item. You can update the file metadata and access conditions or <strong>upload additional files by dragging & dropping them anywhere on the page.</strong>",
-  // TODO New key - Add a translation
-  "submission.sections.upload.info": "Here you will find all the files currently in the item. You can update the file metadata and access conditions or <strong>upload additional files by dragging & dropping them anywhere on the page.</strong>",
+  "submission.sections.upload.info": "Zde najdete všechny soubory, které jsou aktuálně v záznamu. Můžete aktualizovat metadata souborů a podmínky přístupu nebo <strong>nahrát další soubory pouhým přetažením kdekoli na stránku</strong>.",
 
   // "submission.sections.upload.no-entry": "No",
-  // TODO New key - Add a translation
-  "submission.sections.upload.no-entry": "No",
+  "submission.sections.upload.no-entry": "Ne",
 
   // "submission.sections.upload.no-file-uploaded": "No file uploaded yet.",
-  // TODO New key - Add a translation
-  "submission.sections.upload.no-file-uploaded": "No file uploaded yet.",
+  "submission.sections.upload.no-file-uploaded": "Zatím nebyl nahrán žádný soubor.",
 
   // "submission.sections.upload.save-metadata": "Save metadata",
-  // TODO New key - Add a translation
-  "submission.sections.upload.save-metadata": "Save metadata",
+  "submission.sections.upload.save-metadata": "Uložit metadata",
 
   // "submission.sections.upload.undo": "Cancel",
-  // TODO New key - Add a translation
-  "submission.sections.upload.undo": "Cancel",
+  "submission.sections.upload.undo": "Zrušit",
 
   // "submission.sections.upload.upload-failed": "Upload failed",
-  // TODO New key - Add a translation
-  "submission.sections.upload.upload-failed": "Upload failed",
+  "submission.sections.upload.upload-failed": "Nahrání se nezdařilo",
 
   // "submission.sections.upload.upload-successful": "Upload successful",
+  "submission.sections.upload.upload-successful": "Úspěšně nahráno",
+
+  // "submission.sections.accesses.form.discoverable-description": "When checked, this item will be discoverable in search/browse. When unchecked, the item will only be available via a direct link and will never appear in search/browse.",
+  "submission.sections.accesses.form.discoverable-description": "Když je zaškrtnuto, bude tento záznam zjistitelný ve vyhledávání/prohlížení. Když není zaškrtnuto, záznam bude dostupný pouze prostřednictvím přímého odkazu a nikdy se nezobrazí ve vyhledávání/přehledu.",
+
+  // "submission.sections.accesses.form.discoverable-label": "Discoverable",
+  "submission.sections.accesses.form.discoverable-label": "Dohledatelné",
+
+  // "submission.sections.accesses.form.access-condition-label": "Access condition type",
+  "submission.sections.accesses.form.access-condition-label": "Typ podmínky přístupu",
+
+  // "submission.sections.accesses.form.access-condition-hint": "Select an access condition to apply on the item once it is deposited",
+  "submission.sections.accesses.form.access-condition-hint": "Zvolte podmínku přístupu, která se použije na záznam po jeho uložení",
+
+  // "submission.sections.accesses.form.date-required": "Date is required.",
+  "submission.sections.accesses.form.date-required": "Je vyžadováno datum.",
+
+  // "submission.sections.accesses.form.date-required-from": "Grant access from date is required.",
+  "submission.sections.accesses.form.date-required-from": "Udělit přístup od požadovaného data.",
+
+  // "submission.sections.accesses.form.date-required-until": "Grant access until date is required.",
+  "submission.sections.accesses.form.date-required-until": "Udělit přístup do požadovaného data.",
+
+  // "submission.sections.accesses.form.from-label": "Grant access from",
+  "submission.sections.accesses.form.from-label": "Udělit přístup od",
+
+  // "submission.sections.accesses.form.from-hint": "Select the date from which the related access condition is applied",
+  "submission.sections.accesses.form.from-hint": "Vyberte datum, od kterého se použije související podmínka přístupu",
+
+  // "submission.sections.accesses.form.from-placeholder": "From",
+  "submission.sections.accesses.form.from-placeholder": "Od",
+
+  // "submission.sections.accesses.form.group-label": "Group",
+  "submission.sections.accesses.form.group-label": "Skupina",
+
+  // "submission.sections.accesses.form.group-required": "Group is required.",
+  "submission.sections.accesses.form.group-required": "Skupina je vyžadována.",
+
+  // "submission.sections.accesses.form.until-label": "Grant access until",
+  "submission.sections.accesses.form.until-label": "Udělit přístup do",
+
+  // "submission.sections.accesses.form.until-hint": "Select the date until which the related access condition is applied",
+  "submission.sections.accesses.form.until-hint": "Zvolte datum, do kterého platí související podmínka přístupu",
+
+  // "submission.sections.accesses.form.until-placeholder": "Until",
+  "submission.sections.accesses.form.until-placeholder": "Do",
+
+  // "submission.sections.duplicates.none": "No duplicates were detected.",
   // TODO New key - Add a translation
-  "submission.sections.upload.upload-successful": "Upload successful",
+  "submission.sections.duplicates.none": "No duplicates were detected.",
 
-
-
-  // "submission.submit.title": "Submission",
+  // "submission.sections.duplicates.detected": "Potential duplicates were detected. Please review the list below.",
   // TODO New key - Add a translation
-  "submission.submit.title": "Submission",
+  "submission.sections.duplicates.detected": "Potential duplicates were detected. Please review the list below.",
 
+  // "submission.sections.duplicates.in-workspace": "This item is in workspace",
+  // TODO New key - Add a translation
+  "submission.sections.duplicates.in-workspace": "This item is in workspace",
 
+  // "submission.sections.duplicates.in-workflow": "This item is in workflow",
+  // TODO New key - Add a translation
+  "submission.sections.duplicates.in-workflow": "This item is in workflow",
+
+  // "submission.sections.license.granted-label": "I confirm the license above",
+  "submission.sections.license.granted-label": "Potvrzuji výše uvedenou licenci",
+
+  // "submission.sections.license.required": "You must accept the license",
+  "submission.sections.license.required": "Musíte souhlasit s licencí",
+
+  // "submission.sections.license.notgranted": "You must accept the license",
+  "submission.sections.license.notgranted": "Musíte licenci přijmout",
+
+  // "submission.sections.sherpa.publication.information": "Publication information",
+  "submission.sections.sherpa.publication.information": "Informace o publikaci",
+
+  // "submission.sections.sherpa.publication.information.title": "Title",
+  "submission.sections.sherpa.publication.information.title": "Název",
+
+  // "submission.sections.sherpa.publication.information.issns": "ISSNs",
+  "submission.sections.sherpa.publication.information.issns": "ISSN",
+
+  // "submission.sections.sherpa.publication.information.url": "URL",
+  "submission.sections.sherpa.publication.information.url": "URL",
+
+  // "submission.sections.sherpa.publication.information.publishers": "Publisher",
+  "submission.sections.sherpa.publication.information.publishers": "Nakladatel",
+
+  // "submission.sections.sherpa.publication.information.romeoPub": "Romeo Pub",
+  "submission.sections.sherpa.publication.information.romeoPub": "Romeo Pub",
+
+  // "submission.sections.sherpa.publication.information.zetoPub": "Zeto Pub",
+  "submission.sections.sherpa.publication.information.zetoPub": "Zeto Pub",
+
+  // "submission.sections.sherpa.publisher.policy": "Publisher Policy",
+  "submission.sections.sherpa.publisher.policy": "Politika nakladatele",
+
+  // "submission.sections.sherpa.publisher.policy.description": "The below information was found via Sherpa Romeo. Based on the policies of your publisher, it provides advice regarding whether an embargo may be necessary and/or which files you are allowed to upload. If you have questions, please contact your site administrator via the feedback form in the footer.",
+  "submission.sections.sherpa.publisher.policy.description": "Níže uvedené informace byly zjištěny prostřednictvím Sherpa Romeo. Na základě zásad vašeho vydavatele poskytuje rady ohledně toho, zda může být nutné embargo a/nebo které soubory smíte nahrát. Pokud máte dotazy, obraťte se na správce webu prostřednictvím formuláře pro zpětnou vazbu v zápatí.",
+
+  // "submission.sections.sherpa.publisher.policy.openaccess": "Open Access pathways permitted by this journal's policy are listed below by article version. Click on a pathway for a more detailed view",
+  "submission.sections.sherpa.publisher.policy.openaccess": "Cesty otevřeného přístupu povolené politikou tohoto časopisu jsou uvedeny níže podle verze článku. Kliknutím na cestu získáte podrobnější zobrazení.",
+
+  // "submission.sections.sherpa.publisher.policy.more.information": "For more information, please see the following links:",
+  "submission.sections.sherpa.publisher.policy.more.information": "Další informace naleznete na následujících odkazech:",
+
+  // "submission.sections.sherpa.publisher.policy.version": "Version",
+  "submission.sections.sherpa.publisher.policy.version": "Verze",
+
+  // "submission.sections.sherpa.publisher.policy.embargo": "Embargo",
+  "submission.sections.sherpa.publisher.policy.embargo": "Embargo",
+
+  // "submission.sections.sherpa.publisher.policy.noembargo": "No Embargo",
+  "submission.sections.sherpa.publisher.policy.noembargo": "Bez embarga",
+
+  // "submission.sections.sherpa.publisher.policy.nolocation": "None",
+  "submission.sections.sherpa.publisher.policy.nolocation": "Bez místa",
+
+  // "submission.sections.sherpa.publisher.policy.license": "License",
+  "submission.sections.sherpa.publisher.policy.license": "Licence",
+
+  // "submission.sections.sherpa.publisher.policy.prerequisites": "Prerequisites",
+  "submission.sections.sherpa.publisher.policy.prerequisites": "Předpoklady",
+
+  // "submission.sections.sherpa.publisher.policy.location": "Location",
+  "submission.sections.sherpa.publisher.policy.location": "Místo",
+
+  // "submission.sections.sherpa.publisher.policy.conditions": "Conditions",
+  "submission.sections.sherpa.publisher.policy.conditions": "Podmínky",
+
+  // "submission.sections.sherpa.publisher.policy.refresh": "Refresh",
+  "submission.sections.sherpa.publisher.policy.refresh": "Aktualizovat",
+
+  // "submission.sections.sherpa.record.information": "Record Information",
+  "submission.sections.sherpa.record.information": "Informace o záznamu",
+
+  // "submission.sections.sherpa.record.information.id": "ID",
+  "submission.sections.sherpa.record.information.id": "ID",
+
+  // "submission.sections.sherpa.record.information.date.created": "Date Created",
+  "submission.sections.sherpa.record.information.date.created": "Vytvořeno",
+
+  // "submission.sections.sherpa.record.information.date.modified": "Last Modified",
+  "submission.sections.sherpa.record.information.date.modified": "Naposledy upraveno",
+
+  // "submission.sections.sherpa.record.information.uri": "URI",
+  "submission.sections.sherpa.record.information.uri": "URI",
+
+  // "submission.sections.sherpa.error.message": "There was an error retrieving sherpa informations",
+  "submission.sections.sherpa.error.message": "Při načítání informací ze služby Sherpa došlo k chybě",
+
+  // "submission.submit.breadcrumbs": "New submission",
+  "submission.submit.breadcrumbs": "Nově podaný záznam",
+
+  // "submission.submit.title": "New submission",
+  "submission.submit.title": "Nový příspěvek",
 
   // "submission.workflow.generic.delete": "Delete",
-  // TODO New key - Add a translation
-  "submission.workflow.generic.delete": "Delete",
+  "submission.workflow.generic.delete": "Smazat",
 
-  // "submission.workflow.generic.delete-help": "If you would to discard this item, select \"Delete\".  You will then be asked to confirm it.",
-  // TODO New key - Add a translation
-  "submission.workflow.generic.delete-help": "If you would to discard this item, select \"Delete\".  You will then be asked to confirm it.",
+  // "submission.workflow.generic.delete-help": "Select this option to discard this item. You will then be asked to confirm it.",
+  // TODO Source message changed - Revise the translation
+  "submission.workflow.generic.delete-help": "Pokud chcete tento záznam vyřadit, zvolte \"Smazat\". Poté budete vyzváni k potvrzení.",
 
   // "submission.workflow.generic.edit": "Edit",
-  // TODO New key - Add a translation
-  "submission.workflow.generic.edit": "Edit",
+  "submission.workflow.generic.edit": "Upravit",
 
   // "submission.workflow.generic.edit-help": "Select this option to change the item's metadata.",
-  // TODO New key - Add a translation
-  "submission.workflow.generic.edit-help": "Select this option to change the item's metadata.",
+  "submission.workflow.generic.edit-help": "Zvolte tuto možnost, chcete-li změnit metadata záznamu.",
 
   // "submission.workflow.generic.view": "View",
-  // TODO New key - Add a translation
-  "submission.workflow.generic.view": "View",
+  "submission.workflow.generic.view": "Zobrazit",
 
   // "submission.workflow.generic.view-help": "Select this option to view the item's metadata.",
-  // TODO New key - Add a translation
-  "submission.workflow.generic.view-help": "Select this option to view the item's metadata.",
+  "submission.workflow.generic.view-help": "Tuto možnost vyberte, chcete-li zobrazit metadata záznamu.",
 
+  // "submission.workflow.generic.submit_select_reviewer": "Select Reviewer",
+  "submission.workflow.generic.submit_select_reviewer": "Vybrat recenzenta",
 
+  // "submission.workflow.generic.submit_select_reviewer-help": "",
+  "submission.workflow.generic.submit_select_reviewer-help": "",
+
+  // "submission.workflow.generic.submit_score": "Rate",
+  "submission.workflow.generic.submit_score": "Hodnotit",
+
+  // "submission.workflow.generic.submit_score-help": "",
+  "submission.workflow.generic.submit_score-help": "",
 
   // "submission.workflow.tasks.claimed.approve": "Approve",
-  // TODO New key - Add a translation
-  "submission.workflow.tasks.claimed.approve": "Approve",
+  "submission.workflow.tasks.claimed.approve": "Schválit",
 
   // "submission.workflow.tasks.claimed.approve_help": "If you have reviewed the item and it is suitable for inclusion in the collection, select \"Approve\".",
-  // TODO New key - Add a translation
-  "submission.workflow.tasks.claimed.approve_help": "If you have reviewed the item and it is suitable for inclusion in the collection, select \"Approve\".",
+  "submission.workflow.tasks.claimed.approve_help": "Pokud jste záznam zkontrolovali a je vhodný pro zařazení do kolekce, vyberte možnost \"Schválit\".",
 
   // "submission.workflow.tasks.claimed.edit": "Edit",
-  // TODO New key - Add a translation
-  "submission.workflow.tasks.claimed.edit": "Edit",
+  "submission.workflow.tasks.claimed.edit": "Upravit",
 
   // "submission.workflow.tasks.claimed.edit_help": "Select this option to change the item's metadata.",
-  // TODO New key - Add a translation
-  "submission.workflow.tasks.claimed.edit_help": "Select this option to change the item's metadata.",
+  "submission.workflow.tasks.claimed.edit_help": "Zvolte tuto možnost, chcete-li změnit metadata záznamu.",
+
+  // "submission.workflow.tasks.claimed.decline": "Decline",
+  "submission.workflow.tasks.claimed.decline": "Odmítnout",
+
+  // "submission.workflow.tasks.claimed.decline_help": "",
+  "submission.workflow.tasks.claimed.decline_help": "",
 
   // "submission.workflow.tasks.claimed.reject.reason.info": "Please enter your reason for rejecting the submission into the box below, indicating whether the submitter may fix a problem and resubmit.",
-  // TODO New key - Add a translation
-  "submission.workflow.tasks.claimed.reject.reason.info": "Please enter your reason for rejecting the submission into the box below, indicating whether the submitter may fix a problem and resubmit.",
+  "submission.workflow.tasks.claimed.reject.reason.info": "Do níže uvedeného pole zadejte důvod odmítnutí podání a uveďte, zda může odesílatel problém odstranit a podání znovu odeslat.",
 
   // "submission.workflow.tasks.claimed.reject.reason.placeholder": "Describe the reason of reject",
-  // TODO New key - Add a translation
-  "submission.workflow.tasks.claimed.reject.reason.placeholder": "Describe the reason of reject",
+  "submission.workflow.tasks.claimed.reject.reason.placeholder": "Popište důvod odmítnutí",
 
   // "submission.workflow.tasks.claimed.reject.reason.submit": "Reject item",
-  // TODO New key - Add a translation
-  "submission.workflow.tasks.claimed.reject.reason.submit": "Reject item",
+  "submission.workflow.tasks.claimed.reject.reason.submit": "Odmítnout záznam",
 
   // "submission.workflow.tasks.claimed.reject.reason.title": "Reason",
-  // TODO New key - Add a translation
-  "submission.workflow.tasks.claimed.reject.reason.title": "Reason",
+  "submission.workflow.tasks.claimed.reject.reason.title": "Důvod",
 
   // "submission.workflow.tasks.claimed.reject.submit": "Reject",
-  // TODO New key - Add a translation
-  "submission.workflow.tasks.claimed.reject.submit": "Reject",
+  "submission.workflow.tasks.claimed.reject.submit": "Odmítnout",
 
   // "submission.workflow.tasks.claimed.reject_help": "If you have reviewed the item and found it is <strong>not</strong> suitable for inclusion in the collection, select \"Reject\".  You will then be asked to enter a message indicating why the item is unsuitable, and whether the submitter should change something and resubmit.",
-  // TODO New key - Add a translation
-  "submission.workflow.tasks.claimed.reject_help": "If you have reviewed the item and found it is <strong>not</strong> suitable for inclusion in the collection, select \"Reject\".  You will then be asked to enter a message indicating why the item is unsuitable, and whether the submitter should change something and resubmit.",
+  "submission.workflow.tasks.claimed.reject_help": "Pokud jste záznam zkontrolovali a zjistili, že <strong>není</strong> vhodný pro zařazení do kolekce, vyberte \"Odmítnout\".  Poté budete vyzváni k zadání zprávy, ve které uvedete, proč je záznam nevhodný, a zda by měl odesílatel něco změnit a znovu odeslat.",
 
   // "submission.workflow.tasks.claimed.return": "Return to pool",
-  // TODO New key - Add a translation
-  "submission.workflow.tasks.claimed.return": "Return to pool",
+  "submission.workflow.tasks.claimed.return": "Vrátit do fondu",
 
   // "submission.workflow.tasks.claimed.return_help": "Return the task to the pool so that another user may perform the task.",
-  // TODO New key - Add a translation
-  "submission.workflow.tasks.claimed.return_help": "Return the task to the pool so that another user may perform the task.",
-
-
+  "submission.workflow.tasks.claimed.return_help": "Vrátit úlohu do fondu, aby ji mohl provést jiný uživatel.",
 
   // "submission.workflow.tasks.generic.error": "Error occurred during operation...",
-  // TODO New key - Add a translation
-  "submission.workflow.tasks.generic.error": "Error occurred during operation...",
+  "submission.workflow.tasks.generic.error": "Během operace došlo k chybě...",
 
   // "submission.workflow.tasks.generic.processing": "Processing...",
-  // TODO New key - Add a translation
-  "submission.workflow.tasks.generic.processing": "Processing...",
+  "submission.workflow.tasks.generic.processing": "Zpracování...",
 
   // "submission.workflow.tasks.generic.submitter": "Submitter",
-  // TODO New key - Add a translation
-  "submission.workflow.tasks.generic.submitter": "Submitter",
+  "submission.workflow.tasks.generic.submitter": "Odesílatel",
 
   // "submission.workflow.tasks.generic.success": "Operation successful",
-  // TODO New key - Add a translation
-  "submission.workflow.tasks.generic.success": "Operation successful",
-
-
+  "submission.workflow.tasks.generic.success": "Operace proběhla úspěšně",
 
   // "submission.workflow.tasks.pool.claim": "Claim",
-  // TODO New key - Add a translation
-  "submission.workflow.tasks.pool.claim": "Claim",
+  "submission.workflow.tasks.pool.claim": "Převzít",
 
   // "submission.workflow.tasks.pool.claim_help": "Assign this task to yourself.",
-  // TODO New key - Add a translation
-  "submission.workflow.tasks.pool.claim_help": "Assign this task to yourself.",
+  "submission.workflow.tasks.pool.claim_help": "Přiřaďte si tento úkol.",
 
   // "submission.workflow.tasks.pool.hide-detail": "Hide detail",
-  // TODO New key - Add a translation
-  "submission.workflow.tasks.pool.hide-detail": "Hide detail",
+  "submission.workflow.tasks.pool.hide-detail": "Skrýt detail",
 
   // "submission.workflow.tasks.pool.show-detail": "Show detail",
+  "submission.workflow.tasks.pool.show-detail": "Zobrazit detail",
+
+  // "submission.workflow.tasks.duplicates": "potential duplicates were detected for this item. Claim and edit this item to see details.",
   // TODO New key - Add a translation
-  "submission.workflow.tasks.pool.show-detail": "Show detail",
+  "submission.workflow.tasks.duplicates": "potential duplicates were detected for this item. Claim and edit this item to see details.",
 
+  // "submission.workspace.generic.view": "View",
+  "submission.workspace.generic.view": "Zobrazit",
 
+  // "submission.workspace.generic.view-help": "Select this option to view the item's metadata.",
+  "submission.workspace.generic.view-help": "Zvolte tuto možnost pro zobrazení metadat záznamu.",
+
+  // "submitter.empty": "N/A",
+  "submitter.empty": "N/A",
+
+  // "subscriptions.title": "Subscriptions",
+  "subscriptions.title": "Notifikace",
+
+  // "subscriptions.item": "Subscriptions for items",
+  "subscriptions.item": "Notifikace na změny záznamů",
+
+  // "subscriptions.collection": "Subscriptions for collections",
+  "subscriptions.collection": "Notifikace na změny v kolekcích",
+
+  // "subscriptions.community": "Subscriptions for communities",
+  "subscriptions.community": "Notifikace na změny v komunitách",
+
+  // "subscriptions.subscription_type": "Subscription type",
+  "subscriptions.subscription_type": "Typ notifikace",
+
+  // "subscriptions.frequency": "Subscription frequency",
+  "subscriptions.frequency": "Frekvence notifikací",
+
+  // "subscriptions.frequency.D": "Daily",
+  "subscriptions.frequency.D": "Denní frekvence",
+
+  // "subscriptions.frequency.M": "Monthly",
+  "subscriptions.frequency.M": "Měsíční frekvence",
+
+  // "subscriptions.frequency.W": "Weekly",
+  "subscriptions.frequency.W": "Týdenní frekvence",
+
+  // "subscriptions.tooltip": "Subscribe",
+  "subscriptions.tooltip": "Potvrdit",
+
+  // "subscriptions.modal.title": "Subscriptions",
+  "subscriptions.modal.title": "Notifikace",
+
+  // "subscriptions.modal.type-frequency": "Type and frequency",
+  "subscriptions.modal.type-frequency": "Typ a frekvence notifikací",
+
+  // "subscriptions.modal.close": "Close",
+  "subscriptions.modal.close": "Zavřít",
+
+  // "subscriptions.modal.delete-info": "To remove this subscription, please visit the \"Subscriptions\" page under your user profile",
+  "subscriptions.modal.delete-info": "Pokud chcete zrušit notifikace, navštivte prosím Nastavení notifikací pod Vaším uživatelským profilem",
+
+  // "subscriptions.modal.new-subscription-form.type.content": "Content",
+  "subscriptions.modal.new-subscription-form.type.content": "Obsah",
+
+  // "subscriptions.modal.new-subscription-form.frequency.D": "Daily",
+  "subscriptions.modal.new-subscription-form.frequency.D": "Denní frekvence",
+
+  // "subscriptions.modal.new-subscription-form.frequency.W": "Weekly",
+  "subscriptions.modal.new-subscription-form.frequency.W": "Týdenní frekvence",
+
+  // "subscriptions.modal.new-subscription-form.frequency.M": "Monthly",
+  "subscriptions.modal.new-subscription-form.frequency.M": "Měsíční frekvence",
+
+  // "subscriptions.modal.new-subscription-form.submit": "Submit",
+  "subscriptions.modal.new-subscription-form.submit": "Potvrdit",
+
+  // "subscriptions.modal.new-subscription-form.processing": "Processing...",
+  "subscriptions.modal.new-subscription-form.processing": "Zpracování...",
+
+  // "subscriptions.modal.create.success": "Subscribed to {{ type }} successfully.",
+  "subscriptions.modal.create.success": "Nastavení notifikace {{ type }} bylo úspěšně zpracováno.",
+
+  // "subscriptions.modal.delete.success": "Subscription deleted successfully",
+  "subscriptions.modal.delete.success": "Notifikace byla zrušena.",
+
+  // "subscriptions.modal.update.success": "Subscription to {{ type }} updated successfully",
+  "subscriptions.modal.update.success": "Notifikace {{ type }} byla aktualizována.",
+
+  // "subscriptions.modal.create.error": "An error occurs during the subscription creation",
+  "subscriptions.modal.create.error": "Během nastavování notifikce došlo k chybě.",
+
+  // "subscriptions.modal.delete.error": "An error occurs during the subscription delete",
+  "subscriptions.modal.delete.error": "Během rušení notifikce došlo k chybě.",
+
+  // "subscriptions.modal.update.error": "An error occurs during the subscription update",
+  "subscriptions.modal.update.error": "Během aktualizace notifikce došlo k chybě.",
+
+  // "subscriptions.table.dso": "Subject",
+  "subscriptions.table.dso": "Předmět",
+
+  // "subscriptions.table.subscription_type": "Subscription Type",
+  "subscriptions.table.subscription_type": "Typ notifikace",
+
+  // "subscriptions.table.subscription_frequency": "Subscription Frequency",
+  "subscriptions.table.subscription_frequency": "Frekvence notifikace",
+
+  // "subscriptions.table.action": "Action",
+  "subscriptions.table.action": "Akce",
+
+  // "subscriptions.table.edit": "Edit",
+  "subscriptions.table.edit": "Editovat",
+
+  // "subscriptions.table.delete": "Delete",
+  "subscriptions.table.delete": "Smazat",
+
+  // "subscriptions.table.not-available": "Not available",
+  "subscriptions.table.not-available": "Nedostupné",
+
+  // "subscriptions.table.not-available-message": "The subscribed item has been deleted, or you don't currently have the permission to view it",
+  "subscriptions.table.not-available-message": "Záznam byl smazán, nebo nemáte oprávnění zobrazit si tento záznam.",
+
+  // "subscriptions.table.empty.message": "You do not have any subscriptions at this time. To subscribe to email updates for a Community or Collection, use the subscription button on the object's page.",
+  "subscriptions.table.empty.message": "Momentálně nemáte nastavené žádné notifikace. K nastavení emailových notifikací na komunitu či kolekci, klikněte prosím na tlačítko notifikací u příslušné komunity či kolekce.",
+
+  // "thumbnail.default.alt": "Thumbnail Image",
+  "thumbnail.default.alt": "Náhled",
+
+  // "thumbnail.default.placeholder": "No Thumbnail Available",
+  "thumbnail.default.placeholder": "Náhled není k dispozici",
+
+  // "thumbnail.project.alt": "Project Logo",
+  "thumbnail.project.alt": "Logo projektu",
+
+  // "thumbnail.project.placeholder": "Project Placeholder Image",
+  "thumbnail.project.placeholder": "Dočasné logo projektu",
+
+  // "thumbnail.orgunit.alt": "OrgUnit Logo",
+  "thumbnail.orgunit.alt": "Logo organizační jednotky",
+
+  // "thumbnail.orgunit.placeholder": "OrgUnit Placeholder Image",
+  "thumbnail.orgunit.placeholder": "Dočasné logo organizační jednotky",
+
+  // "thumbnail.person.alt": "Profile Picture",
+  "thumbnail.person.alt": "Profilový obrázek",
+
+  // "thumbnail.person.placeholder": "No Profile Picture Available",
+  "thumbnail.person.placeholder": "Dočasný profilový obrázek",
 
   // "title": "DSpace",
   "title": "DSpace",
 
-
-
   // "vocabulary-treeview.header": "Hierarchical tree view",
-  // TODO New key - Add a translation
-  "vocabulary-treeview.header": "Hierarchical tree view",
+  "vocabulary-treeview.header": "Hierarchické stromové zobrazení",
 
   // "vocabulary-treeview.load-more": "Load more",
-  // TODO New key - Add a translation
-  "vocabulary-treeview.load-more": "Load more",
+  "vocabulary-treeview.load-more": "Další",
 
   // "vocabulary-treeview.search.form.reset": "Reset",
-  // TODO New key - Add a translation
-  "vocabulary-treeview.search.form.reset": "Reset",
+  "vocabulary-treeview.search.form.reset": "Resetovat",
 
   // "vocabulary-treeview.search.form.search": "Search",
+  "vocabulary-treeview.search.form.search": "Hledat",
+
+  // "vocabulary-treeview.search.form.search-placeholder": "Filter results by typing the first few letters",
   // TODO New key - Add a translation
-  "vocabulary-treeview.search.form.search": "Search",
+  "vocabulary-treeview.search.form.search-placeholder": "Filter results by typing the first few letters",
 
   // "vocabulary-treeview.search.no-result": "There were no items to show",
-  // TODO New key - Add a translation
-  "vocabulary-treeview.search.no-result": "There were no items to show",
+  "vocabulary-treeview.search.no-result": "Nebyly zobrazeny žádné záznamy",
 
   // "vocabulary-treeview.tree.description.nsi": "The Norwegian Science Index",
-  // TODO New key - Add a translation
-  "vocabulary-treeview.tree.description.nsi": "The Norwegian Science Index",
+  "vocabulary-treeview.tree.description.nsi": "Norský vědecký index",
 
   // "vocabulary-treeview.tree.description.srsc": "Research Subject Categories",
-  // TODO New key - Add a translation
-  "vocabulary-treeview.tree.description.srsc": "Research Subject Categories",
-
+  "vocabulary-treeview.tree.description.srsc": "Kategorie předmětů výzkumu",
 
+  // "vocabulary-treeview.info": "Select a subject to add as search filter",
+  "vocabulary-treeview.info": "Vyberte předmět, aby mohl být použit jako filtr pro vyhledávání",
 
   // "uploader.browse": "browse",
-  // TODO New key - Add a translation
-  "uploader.browse": "browse",
+  "uploader.browse": "procházet",
 
   // "uploader.drag-message": "Drag & Drop your files here",
-  // TODO New key - Add a translation
-  "uploader.drag-message": "Drag & Drop your files here",
+  "uploader.drag-message": "Přetáhněte sem své soubory",
+
+  // "uploader.delete.btn-title": "Delete",
+  "uploader.delete.btn-title": "Smazat",
 
   // "uploader.or": ", or ",
-  // TODO New key - Add a translation
-  "uploader.or": ", or ",
+  "uploader.or": ", nebo ",
 
   // "uploader.processing": "Processing uploaded file(s)... (it's now safe to close this page)",
-  // TODO New key - Add a translation
-  "uploader.processing": "Processing uploaded file(s)... (it's now safe to close this page)",
+  "uploader.processing": "Zpracovávám nahrané soubory... (nyní je bezpečné tuto stránku zavřít)",
 
   // "uploader.queue-length": "Queue length",
-  // TODO New key - Add a translation
-  "uploader.queue-length": "Queue length",
+  "uploader.queue-length": "Délka fronty",
 
   // "virtual-metadata.delete-item.info": "Select the types for which you want to save the virtual metadata as real metadata",
-  // TODO New key - Add a translation
-  "virtual-metadata.delete-item.info": "Select the types for which you want to save the virtual metadata as real metadata",
+  "virtual-metadata.delete-item.info": "Vyberte typy, pro které chcete uložit virtuální metadata jako skutečná metadata",
 
   // "virtual-metadata.delete-item.modal-head": "The virtual metadata of this relation",
-  // TODO New key - Add a translation
-  "virtual-metadata.delete-item.modal-head": "The virtual metadata of this relation",
+  "virtual-metadata.delete-item.modal-head": "Virtuální metadata tohoto vztahu",
 
   // "virtual-metadata.delete-relationship.modal-head": "Select the items for which you want to save the virtual metadata as real metadata",
-  // TODO New key - Add a translation
-  "virtual-metadata.delete-relationship.modal-head": "Select the items for which you want to save the virtual metadata as real metadata",
+  "virtual-metadata.delete-relationship.modal-head": "Vyberte záznamy, pro které chcete uložit virtuální metadata jako skutečná metadata",
 
+  // "supervisedWorkspace.search.results.head": "Supervised Items",
+  "supervisedWorkspace.search.results.head": "Záznamy pod dohledem",
 
+  // "workspace.search.results.head": "Your submissions",
+  "workspace.search.results.head": "Moje záznamy",
 
   // "workflowAdmin.search.results.head": "Administer Workflow",
+  "workflowAdmin.search.results.head": "Spravovat workflow",
+
+  // "workflow.search.results.head": "Workflow tasks",
+  "workflow.search.results.head": "Úlohy workflow",
+
+  // "supervision.search.results.head": "Workflow and Workspace tasks",
+  "supervision.search.results.head": "Úlohy Workflow a osobního pracovního prostoru",
+
+  // "orgunit.search.results.head": "Organizational Unit Search Results",
   // TODO New key - Add a translation
-  "workflowAdmin.search.results.head": "Administer Workflow",
+  "orgunit.search.results.head": "Organizational Unit Search Results",
 
+  // "workflow-item.edit.breadcrumbs": "Edit workflowitem",
+  "workflow-item.edit.breadcrumbs": "Upravit workflow",
 
+  // "workflow-item.edit.title": "Edit workflowitem",
+  "workflow-item.edit.title": "Upravit workflow",
 
   // "workflow-item.delete.notification.success.title": "Deleted",
-  // TODO New key - Add a translation
-  "workflow-item.delete.notification.success.title": "Deleted",
+  "workflow-item.delete.notification.success.title": "Odstraněno",
 
   // "workflow-item.delete.notification.success.content": "This workflow item was successfully deleted",
-  // TODO New key - Add a translation
-  "workflow-item.delete.notification.success.content": "This workflow item was successfully deleted",
+  "workflow-item.delete.notification.success.content": "Tento záznam ve workflow byl úspěšně odstraněn",
 
   // "workflow-item.delete.notification.error.title": "Something went wrong",
-  // TODO New key - Add a translation
-  "workflow-item.delete.notification.error.title": "Something went wrong",
+  "workflow-item.delete.notification.error.title": "Něco se pokazilo",
 
   // "workflow-item.delete.notification.error.content": "The workflow item could not be deleted",
-  // TODO New key - Add a translation
-  "workflow-item.delete.notification.error.content": "The workflow item could not be deleted",
+  "workflow-item.delete.notification.error.content": "Záznam ve workflow se nepodařilo odstranit",
 
   // "workflow-item.delete.title": "Delete workflow item",
-  // TODO New key - Add a translation
-  "workflow-item.delete.title": "Delete workflow item",
+  "workflow-item.delete.title": "Smazat záznam ve workflow",
 
   // "workflow-item.delete.header": "Delete workflow item",
-  // TODO New key - Add a translation
-  "workflow-item.delete.header": "Delete workflow item",
+  "workflow-item.delete.header": "Smazat záznam ve workflow",
 
   // "workflow-item.delete.button.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "workflow-item.delete.button.cancel": "Cancel",
+  "workflow-item.delete.button.cancel": "Zrušit",
 
   // "workflow-item.delete.button.confirm": "Delete",
-  // TODO New key - Add a translation
-  "workflow-item.delete.button.confirm": "Delete",
-
+  "workflow-item.delete.button.confirm": "Smazat",
 
   // "workflow-item.send-back.notification.success.title": "Sent back to submitter",
-  // TODO New key - Add a translation
-  "workflow-item.send-back.notification.success.title": "Sent back to submitter",
+  "workflow-item.send-back.notification.success.title": "Vráceno zpět odesílateli",
 
   // "workflow-item.send-back.notification.success.content": "This workflow item was successfully sent back to the submitter",
-  // TODO New key - Add a translation
-  "workflow-item.send-back.notification.success.content": "This workflow item was successfully sent back to the submitter",
+  "workflow-item.send-back.notification.success.content": "Tento záznam ve workflow byl úspěšně vrácen zpět odesílateli",
 
   // "workflow-item.send-back.notification.error.title": "Something went wrong",
-  // TODO New key - Add a translation
-  "workflow-item.send-back.notification.error.title": "Something went wrong",
+  "workflow-item.send-back.notification.error.title": "Něco se pokazilo",
 
   // "workflow-item.send-back.notification.error.content": "The workflow item could not be sent back to the submitter",
-  // TODO New key - Add a translation
-  "workflow-item.send-back.notification.error.content": "The workflow item could not be sent back to the submitter",
+  "workflow-item.send-back.notification.error.content": "Záznam ve workflow se nepodařilo vrátit zpět odesílateli",
 
   // "workflow-item.send-back.title": "Send workflow item back to submitter",
-  // TODO New key - Add a translation
-  "workflow-item.send-back.title": "Send workflow item back to submitter",
+  "workflow-item.send-back.title": "Vrátit záznam ve workflow zpět odesílateli",
 
   // "workflow-item.send-back.header": "Send workflow item back to submitter",
-  // TODO New key - Add a translation
-  "workflow-item.send-back.header": "Send workflow item back to submitter",
+  "workflow-item.send-back.header": "Vrátit záznam ve workflow zpět odesílateli",
 
   // "workflow-item.send-back.button.cancel": "Cancel",
+  "workflow-item.send-back.button.cancel": "Zrušit",
+
+  // "workflow-item.send-back.button.confirm": "Send back",
+  // TODO Source message changed - Revise the translation
+  "workflow-item.send-back.button.confirm": "Odeslat zpět",
+
+  // "workflow-item.view.breadcrumbs": "Workflow View",
+  "workflow-item.view.breadcrumbs": "Zobrazení workflow",
+
+  // "workspace-item.view.breadcrumbs": "Workspace View",
+  "workspace-item.view.breadcrumbs": "Zobrazení pracovního prostoru",
+
+  // "workspace-item.view.title": "Workspace View",
+  "workspace-item.view.title": "Zobrazení pracovního prostoru",
+
+  // "workspace-item.delete.breadcrumbs": "Workspace Delete",
+  "workspace-item.delete.breadcrumbs": "Vymazat obsah pracovního prostoru",
+
+  // "workspace-item.delete.header": "Delete workspace item",
+  "workspace-item.delete.header": "Smazat záznam v pracovním prostoru",
+
+  // "workspace-item.delete.button.confirm": "Delete",
+  "workspace-item.delete.button.confirm": "Smazat",
+
+  // "workspace-item.delete.button.cancel": "Cancel",
+  "workspace-item.delete.button.cancel": "Zrušit",
+
+  // "workspace-item.delete.notification.success.title": "Deleted",
+  "workspace-item.delete.notification.success.title": "Smazáno",
+
+  // "workspace-item.delete.title": "This workspace item was successfully deleted",
+  "workspace-item.delete.title": "Záznam v pracovním prostoru byl úspěšně odstraněn",
+
+  // "workspace-item.delete.notification.error.title": "Something went wrong",
+  "workspace-item.delete.notification.error.title": "Něco se pokazilo",
+
+  // "workspace-item.delete.notification.error.content": "The workspace item could not be deleted",
+  "workspace-item.delete.notification.error.content": "Záznam v pracovním prostoru nemohl být odstraněn",
+
+  // "workflow-item.advanced.title": "Advanced workflow",
+  "workflow-item.advanced.title": "Pokročilé workflow",
+
+  // "workflow-item.selectrevieweraction.notification.success.title": "Selected reviewer",
+  "workflow-item.selectrevieweraction.notification.success.title": "Vybrat recenzenta",
+
+  // "workflow-item.selectrevieweraction.notification.success.content": "The reviewer for this workflow item has been successfully selected",
+  "workflow-item.selectrevieweraction.notification.success.content": "Recenzent pro tento záznam byl úspěšně vybrán",
+
+  // "workflow-item.selectrevieweraction.notification.error.title": "Something went wrong",
+  "workflow-item.selectrevieweraction.notification.error.title": "Něco se pokazilo",
+
+  // "workflow-item.selectrevieweraction.notification.error.content": "Couldn't select the reviewer for this workflow item",
+  "workflow-item.selectrevieweraction.notification.error.content": "Nebylo možné vybrat recenzenta pro tento záznam",
+
+  // "workflow-item.selectrevieweraction.title": "Select Reviewer",
+  "workflow-item.selectrevieweraction.title": "Vybrat recenzenta",
+
+  // "workflow-item.selectrevieweraction.header": "Select Reviewer",
+  "workflow-item.selectrevieweraction.header": "Vybrat recenzenta",
+
+  // "workflow-item.selectrevieweraction.button.cancel": "Cancel",
+  "workflow-item.selectrevieweraction.button.cancel": "Zrušit",
+
+  // "workflow-item.selectrevieweraction.button.confirm": "Confirm",
+  "workflow-item.selectrevieweraction.button.confirm": "Potvrdit",
+
+  // "workflow-item.scorereviewaction.notification.success.title": "Rating review",
+  "workflow-item.scorereviewaction.notification.success.title": "Hodnocení kontroly",
+
+  // "workflow-item.scorereviewaction.notification.success.content": "The rating for this item workflow item has been successfully submitted",
+  "workflow-item.scorereviewaction.notification.success.content": "Hodnocení tohoto záznamu bylo úspěšně zaznamenáno",
+
+  // "workflow-item.scorereviewaction.notification.error.title": "Something went wrong",
+  "workflow-item.scorereviewaction.notification.error.title": "Něco se pokazilo",
+
+  // "workflow-item.scorereviewaction.notification.error.content": "Couldn't rate this item",
+  "workflow-item.scorereviewaction.notification.error.content": "Nebylo možné zkontrolovat tento záznam",
+
+  // "workflow-item.scorereviewaction.title": "Rate this item",
+  "workflow-item.scorereviewaction.title": "Ohodnotit tento záznam",
+
+  // "workflow-item.scorereviewaction.header": "Rate this item",
+  "workflow-item.scorereviewaction.header": "Ohodnotit tento záznam",
+
+  // "workflow-item.scorereviewaction.button.cancel": "Cancel",
+  "workflow-item.scorereviewaction.button.cancel": "Zrušit",
+
+  // "workflow-item.scorereviewaction.button.confirm": "Confirm",
+  "workflow-item.scorereviewaction.button.confirm": "Potvrdit",
+
+  // "idle-modal.header": "Session will expire soon",
+  "idle-modal.header": "Relace brzy vyprší",
+
+  // "idle-modal.info": "For security reasons, user sessions expire after {{ timeToExpire }} minutes of inactivity. Your session will expire soon. Would you like to extend it or log out?",
+  "idle-modal.info": "Z bezpečnostních důvodů relace uživatelů vyprší po {{ timeToExpire }} minutách nečinnosti. Vaše relace brzy vyprší. Chcete ji prodloužit nebo se odhlásit?",
+
+  // "idle-modal.log-out": "Log out",
+  "idle-modal.log-out": "Odhlásit se",
+
+  // "idle-modal.extend-session": "Extend session",
+  "idle-modal.extend-session": "Prodloužit relaci",
+
+  // "researcher.profile.action.processing": "Processing...",
+  "researcher.profile.action.processing": "Zpracovává se...",
+
+  // "researcher.profile.associated": "Researcher profile associated",
+  "researcher.profile.associated": "Profil výzkumníka propojen",
+
+  // "researcher.profile.change-visibility.fail": "An unexpected error occurs while changing the profile visibility",
+  "researcher.profile.change-visibility.fail": "Při změně viditelnosti profilu došlo k neočekávané chybě",
+
+  // "researcher.profile.create.new": "Create new",
+  "researcher.profile.create.new": "Vytvořit nový",
+
+  // "researcher.profile.create.success": "Researcher profile created successfully",
+  "researcher.profile.create.success": "Profil výzkumníka byl úspěšně vytvořen",
+
+  // "researcher.profile.create.fail": "An error occurs during the researcher profile creation",
+  "researcher.profile.create.fail": "Při vytváření profilu výzkumníka došlo k chybě",
+
+  // "researcher.profile.delete": "Delete",
+  "researcher.profile.delete": "Smazat",
+
+  // "researcher.profile.expose": "Expose",
+  "researcher.profile.expose": "Vystavit",
+
+  // "researcher.profile.hide": "Hide",
+  "researcher.profile.hide": "Skrýt",
+
+  // "researcher.profile.not.associated": "Researcher profile not yet associated",
+  "researcher.profile.not.associated": "Není propojeno s profilem výzkumníka",
+
+  // "researcher.profile.view": "View",
+  "researcher.profile.view": "Zobrazit",
+
+  // "researcher.profile.private.visibility": "PRIVATE",
+  "researcher.profile.private.visibility": "SOUKROMÉ",
+
+  // "researcher.profile.public.visibility": "PUBLIC",
+  "researcher.profile.public.visibility": "VEŘEJNÉ",
+
+  // "researcher.profile.status": "Status:",
+  "researcher.profile.status": "Status:",
+
+  // "researcherprofile.claim.not-authorized": "You are not authorized to claim this item. For more details contact the administrator(s).",
+  "researcherprofile.claim.not-authorized": "Nemáte oprávnění nárokovat tento záznam. Pro více informací kontaktujte správce(y).",
+
+  // "researcherprofile.error.claim.body": "An error occurred while claiming the profile, please try again later",
+  "researcherprofile.error.claim.body": "Při nárokování profilu došlo k chybě, zkuste to prosím později",
+
+  // "researcherprofile.error.claim.title": "Error",
+  "researcherprofile.error.claim.title": "Chyba",
+
+  // "researcherprofile.success.claim.body": "Profile claimed with success",
+  "researcherprofile.success.claim.body": "Profil byl úspěšně nárokován",
+
+  // "researcherprofile.success.claim.title": "Success",
+  "researcherprofile.success.claim.title": "Povedlo se",
+
+  // "person.page.orcid.create": "Create an ORCID ID",
+  "person.page.orcid.create": "Vytvořit ORCID ID",
+
+  // "person.page.orcid.granted-authorizations": "Granted authorizations",
+  "person.page.orcid.granted-authorizations": "Udělená oprávnění",
+
+  // "person.page.orcid.grant-authorizations": "Grant authorizations",
+  "person.page.orcid.grant-authorizations": "Udělit oprávnění",
+
+  // "person.page.orcid.link": "Connect to ORCID ID",
+  "person.page.orcid.link": "Propojit s ORCID ID",
+
+  // "person.page.orcid.link.processing": "Linking profile to ORCID...",
+  "person.page.orcid.link.processing": "Propojení profilu s ORCID...",
+
+  // "person.page.orcid.link.error.message": "Something went wrong while connecting the profile with ORCID. If the problem persists, contact the administrator.",
+  "person.page.orcid.link.error.message": "Něco se pokazilo při propojování profilu s ORCID. Pokud problém přetrvává, kontaktujte správce.",
+
+  // "person.page.orcid.orcid-not-linked-message": "The ORCID iD of this profile ({{ orcid }}) has not yet been connected to an account on the ORCID registry or the connection is expired.",
+  "person.page.orcid.orcid-not-linked-message": "ORCID iD tohoto profilu ({{ orcid }}) ještě nebyl propojen s účtem v registru ORCID nebo platnost propojení vypršela.",
+
+  // "person.page.orcid.unlink": "Disconnect from ORCID",
+  "person.page.orcid.unlink": "Odpojit od ORCID",
+
+  // "person.page.orcid.unlink.processing": "Processing...",
+  "person.page.orcid.unlink.processing": "Zpracovává se...",
+
+  // "person.page.orcid.missing-authorizations": "Missing authorizations",
+  "person.page.orcid.missing-authorizations": "Chybějící oprávnění",
+
+  // "person.page.orcid.missing-authorizations-message": "The following authorizations are missing:",
+  "person.page.orcid.missing-authorizations-message": "Chybí následující oprávnění:",
+
+  // "person.page.orcid.no-missing-authorizations-message": "Great! This box is empty, so you have granted all access rights to use all functions offers by your institution.",
+  "person.page.orcid.no-missing-authorizations-message": "Skvělé! Toto pole je prázdné, takže jste udělili všechna přístupová práva k používání všech funkcí, které vaše instituce nabízí.",
+
+  // "person.page.orcid.no-orcid-message": "No ORCID iD associated yet. By clicking on the button below it is possible to link this profile with an ORCID account.",
+  "person.page.orcid.no-orcid-message": "Profil není propojen s ORCID iD. Kliknutím na tlačítko níže je možné tento profil propojit s ORCID.",
+
+  // "person.page.orcid.profile-preferences": "Profile preferences",
+  "person.page.orcid.profile-preferences": "Preference profilu",
+
+  // "person.page.orcid.funding-preferences": "Funding preferences",
+  "person.page.orcid.funding-preferences": "Preference zdrojů financování",
+
+  // "person.page.orcid.publications-preferences": "Publication preferences",
+  "person.page.orcid.publications-preferences": "Preference publikací",
+
+  // "person.page.orcid.remove-orcid-message": "If you need to remove your ORCID, please contact the repository administrator",
+  "person.page.orcid.remove-orcid-message": "Pokud potřebujete odebrat ORCID, kontaktujte prosím správce úložiště",
+
+  // "person.page.orcid.save.preference.changes": "Update settings",
+  "person.page.orcid.save.preference.changes": "Aktualizovat nastavení",
+
+  // "person.page.orcid.sync-profile.affiliation": "Affiliation",
+  "person.page.orcid.sync-profile.affiliation": "Afiliace",
+
+  // "person.page.orcid.sync-profile.biographical": "Biographical data",
+  "person.page.orcid.sync-profile.biographical": "Biografické údaje",
+
+  // "person.page.orcid.sync-profile.education": "Education",
+  "person.page.orcid.sync-profile.education": "Vzdělání",
+
+  // "person.page.orcid.sync-profile.identifiers": "Identifiers",
+  "person.page.orcid.sync-profile.identifiers": "Identifikátory",
+
+  // "person.page.orcid.sync-fundings.all": "All fundings",
+  "person.page.orcid.sync-fundings.all": "Všechny zdroje financování",
+
+  // "person.page.orcid.sync-fundings.mine": "My fundings",
+  "person.page.orcid.sync-fundings.mine": "Mé zdroje financování",
+
+  // "person.page.orcid.sync-fundings.my_selected": "Selected fundings",
+  "person.page.orcid.sync-fundings.my_selected": "Vybrané zdroje financování",
+
+  // "person.page.orcid.sync-fundings.disabled": "Disabled",
+  "person.page.orcid.sync-fundings.disabled": "Zakázáno",
+
+  // "person.page.orcid.sync-publications.all": "All publications",
+  "person.page.orcid.sync-publications.all": "Všechny publikace",
+
+  // "person.page.orcid.sync-publications.mine": "My publications",
+  "person.page.orcid.sync-publications.mine": "Moje publikace",
+
+  // "person.page.orcid.sync-publications.my_selected": "Selected publications",
+  "person.page.orcid.sync-publications.my_selected": "Vybrané publikace",
+
+  // "person.page.orcid.sync-publications.disabled": "Disabled",
+  "person.page.orcid.sync-publications.disabled": "Zakázáno",
+
+  // "person.page.orcid.sync-queue.discard": "Discard the change and do not synchronize with the ORCID registry",
+  "person.page.orcid.sync-queue.discard": "Zahodit změnu a nesynchronizovat s registrem ORCID",
+
+  // "person.page.orcid.sync-queue.discard.error": "The discarding of the ORCID queue record failed",
+  "person.page.orcid.sync-queue.discard.error": "Zahození změny registru ORCID se nezdařilo",
+
+  // "person.page.orcid.sync-queue.discard.success": "The ORCID queue record have been discarded successfully",
+  "person.page.orcid.sync-queue.discard.success": "Změna registru ORCID byla úspěšně zahozena",
+
+  // "person.page.orcid.sync-queue.empty-message": "The ORCID queue registry is empty",
+  "person.page.orcid.sync-queue.empty-message": "Registr fronty ORCID je prázdný",
+
+  // "person.page.orcid.sync-queue.table.header.type": "Type",
+  "person.page.orcid.sync-queue.table.header.type": "Typ",
+
+  // "person.page.orcid.sync-queue.table.header.description": "Description",
+  "person.page.orcid.sync-queue.table.header.description": "Popis",
+
+  // "person.page.orcid.sync-queue.table.header.action": "Action",
+  "person.page.orcid.sync-queue.table.header.action": "Akce",
+
+  // "person.page.orcid.sync-queue.description.affiliation": "Affiliations",
+  "person.page.orcid.sync-queue.description.affiliation": "Afiliace",
+
+  // "person.page.orcid.sync-queue.description.country": "Country",
+  "person.page.orcid.sync-queue.description.country": "Země",
+
+  // "person.page.orcid.sync-queue.description.education": "Educations",
+  "person.page.orcid.sync-queue.description.education": "Vzdělání",
+
+  // "person.page.orcid.sync-queue.description.external_ids": "External ids",
+  "person.page.orcid.sync-queue.description.external_ids": "Externí identifikátory",
+
+  // "person.page.orcid.sync-queue.description.other_names": "Other names",
+  "person.page.orcid.sync-queue.description.other_names": "Další jména",
+
+  // "person.page.orcid.sync-queue.description.qualification": "Qualifications",
+  "person.page.orcid.sync-queue.description.qualification": "Kvalifikace",
+
+  // "person.page.orcid.sync-queue.description.researcher_urls": "Researcher urls",
+  "person.page.orcid.sync-queue.description.researcher_urls": "URL výzkumníka",
+
+  // "person.page.orcid.sync-queue.description.keywords": "Keywords",
+  "person.page.orcid.sync-queue.description.keywords": "Klíčová slova",
+
+  // "person.page.orcid.sync-queue.tooltip.insert": "Add a new entry in the ORCID registry",
+  "person.page.orcid.sync-queue.tooltip.insert": "Přidat nový záznam do registru ORCID",
+
+  // "person.page.orcid.sync-queue.tooltip.update": "Update this entry on the ORCID registry",
+  "person.page.orcid.sync-queue.tooltip.update": "Aktualizovat tento záznam v registru ORCID",
+
+  // "person.page.orcid.sync-queue.tooltip.delete": "Remove this entry from the ORCID registry",
+  "person.page.orcid.sync-queue.tooltip.delete": "Odstranit tento záznam z registru ORCID",
+
+  // "person.page.orcid.sync-queue.tooltip.publication": "Publication",
+  "person.page.orcid.sync-queue.tooltip.publication": "Publikace",
+
+  // "person.page.orcid.sync-queue.tooltip.project": "Project",
+  "person.page.orcid.sync-queue.tooltip.project": "Projekt",
+
+  // "person.page.orcid.sync-queue.tooltip.affiliation": "Affiliation",
+  "person.page.orcid.sync-queue.tooltip.affiliation": "Afiliace",
+
+  // "person.page.orcid.sync-queue.tooltip.education": "Education",
+  "person.page.orcid.sync-queue.tooltip.education": "Vzdělání",
+
+  // "person.page.orcid.sync-queue.tooltip.qualification": "Qualification",
+  "person.page.orcid.sync-queue.tooltip.qualification": "Kvalifikace",
+
+  // "person.page.orcid.sync-queue.tooltip.other_names": "Other name",
+  "person.page.orcid.sync-queue.tooltip.other_names": "Další jméno",
+
+  // "person.page.orcid.sync-queue.tooltip.country": "Country",
+  "person.page.orcid.sync-queue.tooltip.country": "Země",
+
+  // "person.page.orcid.sync-queue.tooltip.keywords": "Keyword",
+  "person.page.orcid.sync-queue.tooltip.keywords": "Klíčové slovo",
+
+  // "person.page.orcid.sync-queue.tooltip.external_ids": "External identifier",
+  "person.page.orcid.sync-queue.tooltip.external_ids": "Externí identifikátor",
+
+  // "person.page.orcid.sync-queue.tooltip.researcher_urls": "Researcher url",
+  "person.page.orcid.sync-queue.tooltip.researcher_urls": "URL výzkumníka",
+
+  // "person.page.orcid.sync-queue.send": "Synchronize with ORCID registry",
+  "person.page.orcid.sync-queue.send": "Synchronizovat s registrem ORCID",
+
+  // "person.page.orcid.sync-queue.send.unauthorized-error.title": "The submission to ORCID failed for missing authorizations.",
+  "person.page.orcid.sync-queue.send.unauthorized-error.title": "Odeslání do ORCID se nezdařilo z důvodu chybějících oprávnění.",
+
+  // "person.page.orcid.sync-queue.send.unauthorized-error.content": "Click <a href='{{orcid}}'>here</a> to grant again the required permissions. If the problem persists, contact the administrator",
+  "person.page.orcid.sync-queue.send.unauthorized-error.content": "Klikněte <a href='{{orcid}}'>zde</a> a znovu udělte požadovaná oprávnění. Pokud problém přetrvává, kontaktujte správce.",
+
+  // "person.page.orcid.sync-queue.send.bad-request-error": "The submission to ORCID failed because the resource sent to ORCID registry is not valid",
+  "person.page.orcid.sync-queue.send.bad-request-error": "Odeslání do ORCID se nezdařilo, protože zdroj odeslaný do registru ORCID není platný",
+
+  // "person.page.orcid.sync-queue.send.error": "The submission to ORCID failed",
+  "person.page.orcid.sync-queue.send.error": "Odeslání do ORCID se nezdařilo",
+
+  // "person.page.orcid.sync-queue.send.conflict-error": "The submission to ORCID failed because the resource is already present on the ORCID registry",
+  "person.page.orcid.sync-queue.send.conflict-error": "Odeslání do ORCID se nezdařilo, protože zdroj se již nachází v registru ORCID",
+
+  // "person.page.orcid.sync-queue.send.not-found-warning": "The resource does not exists anymore on the ORCID registry.",
+  "person.page.orcid.sync-queue.send.not-found-warning": "Zdroj již v registru ORCID neexistuje.",
+
+  // "person.page.orcid.sync-queue.send.success": "The submission to ORCID was completed successfully",
+  "person.page.orcid.sync-queue.send.success": "Odeslání do ORCID bylo úspěšně dokončeno",
+
+  // "person.page.orcid.sync-queue.send.validation-error": "The data that you want to synchronize with ORCID is not valid",
+  "person.page.orcid.sync-queue.send.validation-error": "Data, která chcete odeslat do ORCID, jsou neplatná",
+
+  // "person.page.orcid.sync-queue.send.validation-error.amount-currency.required": "The amount's currency is required",
+  "person.page.orcid.sync-queue.send.validation-error.amount-currency.required": "Je vyžadováno zadat měnu částky",
+
+  // "person.page.orcid.sync-queue.send.validation-error.external-id.required": "The resource to be sent requires at least one identifier",
+  "person.page.orcid.sync-queue.send.validation-error.external-id.required": "Zdroj, který má být odeslán, vyžaduje alespoň jeden identifikátor",
+
+  // "person.page.orcid.sync-queue.send.validation-error.title.required": "The title is required",
+  "person.page.orcid.sync-queue.send.validation-error.title.required": "Název je vyžadován",
+
+  // "person.page.orcid.sync-queue.send.validation-error.type.required": "The dc.type is required",
+  "person.page.orcid.sync-queue.send.validation-error.type.required": "Je vyžadováno pole dc.type",
+
+  // "person.page.orcid.sync-queue.send.validation-error.start-date.required": "The start date is required",
+  "person.page.orcid.sync-queue.send.validation-error.start-date.required": "Je vyžadováno počáteční datum",
+
+  // "person.page.orcid.sync-queue.send.validation-error.funder.required": "The funder is required",
+  "person.page.orcid.sync-queue.send.validation-error.funder.required": "Je vyžadováno zadání sponzora",
+
+  // "person.page.orcid.sync-queue.send.validation-error.country.invalid": "Invalid 2 digits ISO 3166 country",
+  "person.page.orcid.sync-queue.send.validation-error.country.invalid": "Neplatný dvojmístný kód země podle ISO 3166",
+
+  // "person.page.orcid.sync-queue.send.validation-error.organization.required": "The organization is required",
+  "person.page.orcid.sync-queue.send.validation-error.organization.required": "Organizace je povinná",
+
+  // "person.page.orcid.sync-queue.send.validation-error.organization.name-required": "The organization's name is required",
+  "person.page.orcid.sync-queue.send.validation-error.organization.name-required": "Název organizace je povinný",
+
+  // "person.page.orcid.sync-queue.send.validation-error.publication.date-invalid": "The publication date must be one year after 1900",
+  "person.page.orcid.sync-queue.send.validation-error.publication.date-invalid": "Datum zveřejnění musí být jeden rok po roce 1900",
+
+  // "person.page.orcid.sync-queue.send.validation-error.organization.address-required": "The organization to be sent requires an address",
+  "person.page.orcid.sync-queue.send.validation-error.organization.address-required": "Organizace, která má být odeslána, vyžaduje adresu",
+
+  // "person.page.orcid.sync-queue.send.validation-error.organization.city-required": "The address of the organization to be sent requires a city",
+  "person.page.orcid.sync-queue.send.validation-error.organization.city-required": "Adresa organizace vyžaduje uvedení města",
+
+  // "person.page.orcid.sync-queue.send.validation-error.organization.country-required": "The address of the organization to be sent requires a valid 2 digits ISO 3166 country",
+  "person.page.orcid.sync-queue.send.validation-error.organization.country-required": "Adresa organizace vyžaduje platný dvoumístný kód země podle ISO 3166",
+
+  // "person.page.orcid.sync-queue.send.validation-error.disambiguated-organization.required": "An identifier to disambiguate organizations is required. Supported ids are GRID, Ringgold, Legal Entity identifiers (LEIs) and Crossref Funder Registry identifiers",
+  "person.page.orcid.sync-queue.send.validation-error.disambiguated-organization.required": "Je vyžadován identifikátor pro rozklíčování organizací. Podporovány jsou identifikátory GRID, Ringgold, identifikátory právnických osob (LEI) a identifikátory registru poskytovatelů finančních prostředků Crossref.",
+
+  // "person.page.orcid.sync-queue.send.validation-error.disambiguated-organization.value-required": "The organization's identifiers requires a value",
+  "person.page.orcid.sync-queue.send.validation-error.disambiguated-organization.value-required": "Identifikátory organizace vyžadují hodnotu",
+
+  // "person.page.orcid.sync-queue.send.validation-error.disambiguation-source.required": "The organization's identifiers requires a source",
+  "person.page.orcid.sync-queue.send.validation-error.disambiguation-source.required": "Identifikátory organizace vyžadují zdroj",
+
+  // "person.page.orcid.sync-queue.send.validation-error.disambiguation-source.invalid": "The source of one of the organization identifiers is invalid. Supported sources are RINGGOLD, GRID, LEI and FUNDREF",
+  "person.page.orcid.sync-queue.send.validation-error.disambiguation-source.invalid": "Zdroj jednoho z identifikátorů organizace je neplatný. Podporovanými zdroji jsou RINGGOLD, GRID, LEI a FUNDREF",
+
+  // "person.page.orcid.synchronization-mode": "Synchronization mode",
+  "person.page.orcid.synchronization-mode": "Režim synchronizace",
+
+  // "person.page.orcid.synchronization-mode.batch": "Batch",
+  "person.page.orcid.synchronization-mode.batch": "Dávkově",
+
+  // "person.page.orcid.synchronization-mode.label": "Synchronization mode",
+  "person.page.orcid.synchronization-mode.label": "Synchronizační režim",
+
+  // "person.page.orcid.synchronization-mode-message": "Please select how you would like synchronization to ORCID to occur. The options include \"Manual\" (you must send your data to ORCID manually), or \"Batch\" (the system will send your data to ORCID via a scheduled script).",
+  "person.page.orcid.synchronization-mode-message": "Vyberte prosím, jakým způsobem chcete synchronizaci s ORCID provádět. Mezi možnosti patří \"Ručně\" (musíte odeslat data do ORCID ručně) nebo \"Dávkově\" (systém odešle vaše data do ORCID prostřednictvím naplánovaného skriptu).",
+
+  // "person.page.orcid.synchronization-mode-funding-message": "Select whether to send your linked Project entities to your ORCID record's list of funding information.",
+  "person.page.orcid.synchronization-mode-funding-message": "Zvolte, zda se mají propojené entity projektu odeslat do seznamu informací o financování vašeho profilu ORCID.",
+
+  // "person.page.orcid.synchronization-mode-publication-message": "Select whether to send your linked Publication entities to your ORCID record's list of works.",
+  "person.page.orcid.synchronization-mode-publication-message": "Vyberte, zda se mají vaše propojené entity Publikace posílat do seznamu děl vašeho profilu ORCID.",
+
+  // "person.page.orcid.synchronization-mode-profile-message": "Select whether to send your biographical data or personal identifiers to your ORCID record.",
+  "person.page.orcid.synchronization-mode-profile-message": "Zvolte, zda se mají do vašeho profilu ORCID odesílat vaše biografické údaje nebo osobní identifikátory.",
+
+  // "person.page.orcid.synchronization-settings-update.success": "The synchronization settings have been updated successfully",
+  "person.page.orcid.synchronization-settings-update.success": "Nastavení synchronizace bylo úspěšně aktualizováno",
+
+  // "person.page.orcid.synchronization-settings-update.error": "The update of the synchronization settings failed",
+  "person.page.orcid.synchronization-settings-update.error": "Aktualizace nastavení synchronizace se nezdařila",
+
+  // "person.page.orcid.synchronization-mode.manual": "Manual",
+  "person.page.orcid.synchronization-mode.manual": "Manuálně",
+
+  // "person.page.orcid.scope.authenticate": "Get your ORCID iD",
+  "person.page.orcid.scope.authenticate": "Zřiďte si ORCID iD",
+
+  // "person.page.orcid.scope.read-limited": "Read your information with visibility set to Trusted Parties",
+  "person.page.orcid.scope.read-limited": "Čtěte vaše informace s viditelností nastavenou na důvěryhodné strany.",
+
+  // "person.page.orcid.scope.activities-update": "Add/update your research activities",
+  "person.page.orcid.scope.activities-update": "Přidat/aktualizovat vaše výzkumné aktivity",
+
+  // "person.page.orcid.scope.person-update": "Add/update other information about you",
+  "person.page.orcid.scope.person-update": "Přidat/aktualizovat další informace o vás",
+
+  // "person.page.orcid.unlink.success": "The disconnection between the profile and the ORCID registry was successful",
+  "person.page.orcid.unlink.success": "Odpojení profilu od registru ORCID proběhlo úspěšně",
+
+  // "person.page.orcid.unlink.error": "An error occurred while disconnecting between the profile and the ORCID registry. Try again",
+  "person.page.orcid.unlink.error": "Při odpojování mezi profilem a registrem ORCID došlo k chybě. Zkuste to znovu",
+
+  // "person.orcid.sync.setting": "ORCID Synchronization settings",
+  "person.orcid.sync.setting": "Nastavení synchronizace ORCID",
+
+  // "person.orcid.registry.queue": "ORCID Registry Queue",
+  "person.orcid.registry.queue": "Fronta do registru ORCID",
+
+  // "person.orcid.registry.auth": "ORCID Authorizations",
+  "person.orcid.registry.auth": "ORCID oprávnění",
+
+  // "home.recent-submissions.head": "Recent Submissions",
+  "home.recent-submissions.head": "Nedávné příspěvky",
+
+  // "listable-notification-object.default-message": "This object couldn't be retrieved",
+  "listable-notification-object.default-message": "Tento objekt se nepodařilo načíst",
+
+  // "system-wide-alert-banner.retrieval.error": "Something went wrong retrieving the system-wide alert banner",
+  "system-wide-alert-banner.retrieval.error": "Něco se pokazilo při načítání systémových upozornění",
+
+  // "system-wide-alert-banner.countdown.prefix": "In",
+  "system-wide-alert-banner.countdown.prefix": "V",
+
+  // "system-wide-alert-banner.countdown.days": "{{days}} day(s),",
+  "system-wide-alert-banner.countdown.days": "{{days}} den(dny),",
+
+  // "system-wide-alert-banner.countdown.hours": "{{hours}} hour(s) and",
+  "system-wide-alert-banner.countdown.hours": "{{hours}} hodina(y) a",
+
+  // "system-wide-alert-banner.countdown.minutes": "{{minutes}} minute(s):",
+  "system-wide-alert-banner.countdown.minutes": "{{minutes}} minuta(y):",
+
+  // "menu.section.system-wide-alert": "System-wide Alert",
+  "menu.section.system-wide-alert": "Systémová upozornění",
+
+  // "system-wide-alert.form.header": "System-wide Alert",
+  "system-wide-alert.form.header": "Systémová upozornění",
+
+  // "system-wide-alert-form.retrieval.error": "Something went wrong retrieving the system-wide alert",
+  "system-wide-alert-form.retrieval.error": "Něco se pokazilo při načítání systémových upozornění",
+
+  // "system-wide-alert.form.cancel": "Cancel",
+  "system-wide-alert.form.cancel": "Zrušit",
+
+  // "system-wide-alert.form.save": "Save",
+  "system-wide-alert.form.save": "Uložit",
+
+  // "system-wide-alert.form.label.active": "ACTIVE",
+  "system-wide-alert.form.label.active": "AKTIVNÍ",
+
+  // "system-wide-alert.form.label.inactive": "INACTIVE",
+  "system-wide-alert.form.label.inactive": "NEAKTIVNÍ",
+
+  // "system-wide-alert.form.error.message": "The system wide alert must have a message",
+  "system-wide-alert.form.error.message": "Systémové upozornění musí mít obsah",
+
+  // "system-wide-alert.form.label.message": "Alert message",
+  "system-wide-alert.form.label.message": "Obsah upozornění",
+
+  // "system-wide-alert.form.label.countdownTo.enable": "Enable a countdown timer",
+  "system-wide-alert.form.label.countdownTo.enable": "Povolit odpočet",
+
+  // "system-wide-alert.form.label.countdownTo.hint": "Hint: Set a countdown timer. When enabled, a date can be set in the future and the system-wide alert banner will perform a countdown to the set date. When this timer ends, it will disappear from the alert. The server will NOT be automatically stopped.",
+  "system-wide-alert.form.label.countdownTo.hint": "Nápověda: Nastavte odpočítávací měřič. Je-li to povoleno, lze datum nastavit i v budoucnosti a systémový upozornění bude uvádět odpočítávání do nastaveného data. Ve chvíli, kdy skončí odpočítávání, zmizí i odpočítávač z upozornění. Server NEBUDE automaticky zastaven.",
+
+  // "system-wide-alert-form.select-date-by-calendar": "Select date using calendar",
   // TODO New key - Add a translation
-  "workflow-item.send-back.button.cancel": "Cancel",
+  "system-wide-alert-form.select-date-by-calendar": "Select date using calendar",
 
-  // "workflow-item.send-back.button.confirm": "Send back"
+  // "system-wide-alert.form.label.preview": "System-wide alert preview",
+  "system-wide-alert.form.label.preview": "Náhled systémového upozornění",
+
+  // "system-wide-alert.form.update.success": "The system-wide alert was successfully updated",
+  "system-wide-alert.form.update.success": "Systémové upozornění bylo úspěšně aktualizováno",
+
+  // "system-wide-alert.form.update.error": "Something went wrong when updating the system-wide alert",
+  "system-wide-alert.form.update.error": "Něco se pokazilo při aktualizaci systémového upozornění",
+
+  // "system-wide-alert.form.create.success": "The system-wide alert was successfully created",
+  "system-wide-alert.form.create.success": "Systémové upozornění bylo úspěšně vytvořeno",
+
+  // "system-wide-alert.form.create.error": "Something went wrong when creating the system-wide alert",
+  "system-wide-alert.form.create.error": "Něco se pokazilo při vytváření systémového upozornění",
+
+  // "admin.system-wide-alert.breadcrumbs": "System-wide Alerts",
+  "admin.system-wide-alert.breadcrumbs": "Systémová upozornění",
+
+  // "admin.system-wide-alert.title": "System-wide Alerts",
+  "admin.system-wide-alert.title": "Systémová upozornění",
+
+  // "discover.filters.head": "Discover",
   // TODO New key - Add a translation
-  "workflow-item.send-back.button.confirm": "Send back",
+  "discover.filters.head": "Discover",
 
+  // "item-access-control-title": "This form allows you to perform changes to the access conditions of the item's metadata or its bitstreams.",
+  "item-access-control-title": "Tento formulář umožňuje provést změny typu přístupu k metadatovému záznamu nebo souborům.",
 
+  // "collection-access-control-title": "This form allows you to perform changes to the access conditions of all the items owned by this collection. Changes may be performed to either all Item metadata or all content (bitstreams).",
+  "collection-access-control-title": "Tento formulář umožňuje provést změny typu přístupu u všech záznamů v této kolekci. Změny mohou být uplatněny bud na všechny metadatové záznamy nebo veškerý obsah (soubory).",
+
+  // "community-access-control-title": "This form allows you to perform changes to the access conditions of all the items owned by any collection under this community. Changes may be performed to either all Item metadata or all content (bitstreams).",
+  "community-access-control-title": "Tento formulář umožňuje provést změny typu přístupu u všech záznamů v kolekcích této komunity. Změny mohou být uplatněny bud na všechny metadatové záznamy nebo veškerý obsah (soubory).",
+
+  // "access-control-item-header-toggle": "Item's Metadata",
+  "access-control-item-header-toggle": "Metadata záznamu",
+
+  // "access-control-item-toggle.enable": "Enable option to perform changes on the item's metadata",
+  // TODO New key - Add a translation
+  "access-control-item-toggle.enable": "Enable option to perform changes on the item's metadata",
+
+  // "access-control-item-toggle.disable": "Disable option to perform changes on the item's metadata",
+  // TODO New key - Add a translation
+  "access-control-item-toggle.disable": "Disable option to perform changes on the item's metadata",
+
+  // "access-control-bitstream-header-toggle": "Bitstreams",
+  "access-control-bitstream-header-toggle": "Soubory",
+
+  // "access-control-bitstream-toggle.enable": "Enable option to perform changes on the bitstreams",
+  // TODO New key - Add a translation
+  "access-control-bitstream-toggle.enable": "Enable option to perform changes on the bitstreams",
+
+  // "access-control-bitstream-toggle.disable": "Disable option to perform changes on the bitstreams",
+  // TODO New key - Add a translation
+  "access-control-bitstream-toggle.disable": "Disable option to perform changes on the bitstreams",
+
+  // "access-control-mode": "Mode",
+  "access-control-mode": "Mód",
+
+  // "access-control-access-conditions": "Access conditions",
+  "access-control-access-conditions": "Typ přístupu",
+
+  // "access-control-no-access-conditions-warning-message": "Currently, no access conditions are specified below. If executed, this will replace the current access conditions with the default access conditions inherited from the owning collection.",
+  "access-control-no-access-conditions-warning-message": "Momentálně není nastaven typ přístupu. Pokud provedete tuto akci, typ přístupu bude přenastaven podle nastavení typu přístupu na kolekci.",
+
+  // "access-control-replace-all": "Replace access conditions",
+  "access-control-replace-all": "Nahradit typ přístupu",
+
+  // "access-control-add-to-existing": "Add to existing ones",
+  "access-control-add-to-existing": "Přidat k existujícím",
+
+  // "access-control-limit-to-specific": "Limit the changes to specific bitstreams",
+  "access-control-limit-to-specific": "Uplatnit změny pouze na specifikované soubory",
+
+  // "access-control-process-all-bitstreams": "Update all the bitstreams in the item",
+  "access-control-process-all-bitstreams": "Aktualozivat všechny soubory u daného záznamu",
+
+  // "access-control-bitstreams-selected": "bitstreams selected",
+  "access-control-bitstreams-selected": "vybrány soubory",
+
+  // "access-control-bitstreams-select": "Select bitstreams",
+  // TODO New key - Add a translation
+  "access-control-bitstreams-select": "Select bitstreams",
+
+  // "access-control-cancel": "Cancel",
+  "access-control-cancel": "Zrušit",
+
+  // "access-control-execute": "Execute",
+  "access-control-execute": "Provést",
+
+  // "access-control-add-more": "Add more",
+  "access-control-add-more": "Přidat další",
+
+  // "access-control-remove": "Remove access condition",
+  // TODO New key - Add a translation
+  "access-control-remove": "Remove access condition",
+
+  // "access-control-select-bitstreams-modal.title": "Select bitstreams",
+  "access-control-select-bitstreams-modal.title": "Vybrat soubory",
+
+  // "access-control-select-bitstreams-modal.no-items": "No items to show.",
+  "access-control-select-bitstreams-modal.no-items": "Žádné záznamy k zobrazení.",
+
+  // "access-control-select-bitstreams-modal.close": "Close",
+  "access-control-select-bitstreams-modal.close": "Zavřít",
+
+  // "access-control-option-label": "Access condition type",
+  "access-control-option-label": "Typ přístupu",
+
+  // "access-control-option-note": "Choose an access condition to apply to selected objects.",
+  "access-control-option-note": "Vybrat typ přístupu k vybraným objektům.",
+
+  // "access-control-option-start-date": "Grant access from",
+  "access-control-option-start-date": "Povolit přístup od",
+
+  // "access-control-option-start-date-note": "Select the date from which the related access condition is applied",
+  "access-control-option-start-date-note": "Vyberte datum, od kterého má být typ přístupu aktivován",
+
+  // "access-control-option-end-date": "Grant access until",
+  "access-control-option-end-date": "Povolit přístup do",
+
+  // "access-control-option-end-date-note": "Select the date until which the related access condition is applied",
+  "access-control-option-end-date-note": "Vyberte datum, do kterého má být typ přístupu aktivován",
+
+  // "vocabulary-treeview.search.form.add": "Add",
+  // TODO New key - Add a translation
+  "vocabulary-treeview.search.form.add": "Přidat",
+
+  // "admin.notifications.publicationclaim.breadcrumbs": "Publication Claim",
+  // TODO New key - Add a translation
+  "admin.notifications.publicationclaim.breadcrumbs": "Publication Claim",
+
+  // "admin.notifications.publicationclaim.page.title": "Publication Claim",
+  // TODO New key - Add a translation
+  "admin.notifications.publicationclaim.page.title": "Publication Claim",
+
+  // "coar-notify-support.title": "COAR Notify Protocol",
+  // TODO New key - Add a translation
+  "coar-notify-support.title": "COAR Notify Protocol",
+
+  // "coar-notify-support-title.content": "Here, we fully support the COAR Notify protocol, which is designed to enhance the communication between repositories. To learn more about the COAR Notify protocol, visit the <a href=\\\"https://notify.coar-repositories.org/\\\">COAR Notify website</a>.",
+  // TODO New key - Add a translation
+  "coar-notify-support-title.content": "Here, we fully support the COAR Notify protocol, which is designed to enhance the communication between repositories. To learn more about the COAR Notify protocol, visit the <a href=\\\"https://notify.coar-repositories.org/\\\">COAR Notify website</a>.",
+
+  // "coar-notify-support.ldn-inbox.title": "LDN InBox",
+  // TODO New key - Add a translation
+  "coar-notify-support.ldn-inbox.title": "LDN InBox",
+
+  // "coar-notify-support.ldn-inbox.content": "For your convenience, our LDN (Linked Data Notifications) InBox is easily accessible at {ldnInboxUrl}. The LDN InBox enables seamless communication and data exchange, ensuring efficient and effective collaboration.",
+  // TODO New key - Add a translation
+  "coar-notify-support.ldn-inbox.content": "For your convenience, our LDN (Linked Data Notifications) InBox is easily accessible at {ldnInboxUrl}. The LDN InBox enables seamless communication and data exchange, ensuring efficient and effective collaboration.",
+
+  // "coar-notify-support.message-moderation.title": "Message Moderation",
+  // TODO New key - Add a translation
+  "coar-notify-support.message-moderation.title": "Message Moderation",
+
+  // "coar-notify-support.message-moderation.content": "To ensure a secure and productive environment, all incoming LDN messages are moderated. If you are planning to exchange information with us, kindly reach out via our dedicated",
+  // TODO New key - Add a translation
+  "coar-notify-support.message-moderation.content": "To ensure a secure and productive environment, all incoming LDN messages are moderated. If you are planning to exchange information with us, kindly reach out via our dedicated",
+
+  // "coar-notify-support.message-moderation.feedback-form": " Feedback form.",
+  // TODO New key - Add a translation
+  "coar-notify-support.message-moderation.feedback-form": " Feedback form.",
+
+  // "service.overview.delete.header": "Delete Service",
+  // TODO New key - Add a translation
+  "service.overview.delete.header": "Delete Service",
+
+  // "ldn-registered-services.title": "Registered Services",
+  // TODO New key - Add a translation
+  "ldn-registered-services.title": "Registered Services",
+  // "ldn-registered-services.table.name": "Name",
+  // TODO New key - Add a translation
+  "ldn-registered-services.table.name": "Name",
+  // "ldn-registered-services.table.description": "Description",
+  // TODO New key - Add a translation
+  "ldn-registered-services.table.description": "Description",
+  // "ldn-registered-services.table.status": "Status",
+  // TODO New key - Add a translation
+  "ldn-registered-services.table.status": "Status",
+  // "ldn-registered-services.table.action": "Action",
+  // TODO New key - Add a translation
+  "ldn-registered-services.table.action": "Action",
+  // "ldn-registered-services.new": "NEW",
+  // TODO New key - Add a translation
+  "ldn-registered-services.new": "NEW",
+  // "ldn-registered-services.new.breadcrumbs": "Registered Services",
+  // TODO New key - Add a translation
+  "ldn-registered-services.new.breadcrumbs": "Registered Services",
+
+  // "ldn-service.overview.table.enabled": "Enabled",
+  // TODO New key - Add a translation
+  "ldn-service.overview.table.enabled": "Enabled",
+  // "ldn-service.overview.table.disabled": "Disabled",
+  // TODO New key - Add a translation
+  "ldn-service.overview.table.disabled": "Disabled",
+  // "ldn-service.overview.table.clickToEnable": "Click to enable",
+  // TODO New key - Add a translation
+  "ldn-service.overview.table.clickToEnable": "Click to enable",
+  // "ldn-service.overview.table.clickToDisable": "Click to disable",
+  // TODO New key - Add a translation
+  "ldn-service.overview.table.clickToDisable": "Click to disable",
+
+  // "ldn-edit-registered-service.title": "Edit Service",
+  // TODO New key - Add a translation
+  "ldn-edit-registered-service.title": "Edit Service",
+  // "ldn-create-service.title": "Create service",
+  // TODO New key - Add a translation
+  "ldn-create-service.title": "Create service",
+  // "service.overview.create.modal": "Create Service",
+  // TODO New key - Add a translation
+  "service.overview.create.modal": "Create Service",
+  // "service.overview.create.body": "Please confirm the creation of this service.",
+  // TODO New key - Add a translation
+  "service.overview.create.body": "Please confirm the creation of this service.",
+  // "ldn-service-status": "Status",
+  // TODO New key - Add a translation
+  "ldn-service-status": "Status",
+  // "service.confirm.create": "Create",
+  // TODO New key - Add a translation
+  "service.confirm.create": "Create",
+  // "service.refuse.create": "Cancel",
+  // TODO New key - Add a translation
+  "service.refuse.create": "Cancel",
+  // "ldn-register-new-service.title": "Register a new service",
+  // TODO New key - Add a translation
+  "ldn-register-new-service.title": "Register a new service",
+  // "ldn-new-service.form.label.submit": "Save",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.label.submit": "Save",
+  // "ldn-new-service.form.label.name": "Name",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.label.name": "Name",
+  // "ldn-new-service.form.label.description": "Description",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.label.description": "Description",
+  // "ldn-new-service.form.label.url": "Service URL",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.label.url": "Service URL",
+  // "ldn-new-service.form.label.ip-range": "Service IP range",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.label.ip-range": "Service IP range",
+  // "ldn-new-service.form.label.score": "Level of trust",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.label.score": "Level of trust",
+  // "ldn-new-service.form.label.ldnUrl": "LDN Inbox URL",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.label.ldnUrl": "LDN Inbox URL",
+  // "ldn-new-service.form.placeholder.name": "Please provide service name",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.placeholder.name": "Please provide service name",
+  // "ldn-new-service.form.placeholder.description": "Please provide a description regarding your service",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.placeholder.description": "Please provide a description regarding your service",
+  // "ldn-new-service.form.placeholder.url": "Please input the URL for users to check out more information about the service",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.placeholder.url": "Please input the URL for users to check out more information about the service",
+  // "ldn-new-service.form.placeholder.lowerIp": "IPv4 range lower bound",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.placeholder.lowerIp": "IPv4 range lower bound",
+  // "ldn-new-service.form.placeholder.upperIp": "IPv4 range upper bound",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.placeholder.upperIp": "IPv4 range upper bound",
+  // "ldn-new-service.form.placeholder.ldnUrl": "Please specify the URL of the LDN Inbox",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.placeholder.ldnUrl": "Please specify the URL of the LDN Inbox",
+  // "ldn-new-service.form.placeholder.score": "Please enter a value between 0 and 1. Use the “.” as decimal separator",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.placeholder.score": "Please enter a value between 0 and 1. Use the “.” as decimal separator",
+  // "ldn-service.form.label.placeholder.default-select": "Select a pattern",
+  // TODO New key - Add a translation
+  "ldn-service.form.label.placeholder.default-select": "Select a pattern",
+
+  // "ldn-service.form.pattern.ack-accept.label": "Acknowledge and Accept",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.ack-accept.label": "Acknowledge and Accept",
+  // "ldn-service.form.pattern.ack-accept.description": "This pattern is used to acknowledge and accept a request (offer). It implies an intention to act on the request.",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.ack-accept.description": "This pattern is used to acknowledge and accept a request (offer). It implies an intention to act on the request.",
+  // "ldn-service.form.pattern.ack-accept.category": "Acknowledgements",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.ack-accept.category": "Acknowledgements",
+
+  // "ldn-service.form.pattern.ack-reject.label": "Acknowledge and Reject",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.ack-reject.label": "Acknowledge and Reject",
+  // "ldn-service.form.pattern.ack-reject.description": "This pattern is used to acknowledge and reject a request (offer). It signifies no further action regarding the request.",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.ack-reject.description": "This pattern is used to acknowledge and reject a request (offer). It signifies no further action regarding the request.",
+  // "ldn-service.form.pattern.ack-reject.category": "Acknowledgements",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.ack-reject.category": "Acknowledgements",
+
+  // "ldn-service.form.pattern.ack-tentative-accept.label": "Acknowledge and Tentatively Accept",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.ack-tentative-accept.label": "Acknowledge and Tentatively Accept",
+  // "ldn-service.form.pattern.ack-tentative-accept.description": "This pattern is used to acknowledge and tentatively accept a request (offer). It implies an intention to act, which may change.",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.ack-tentative-accept.description": "This pattern is used to acknowledge and tentatively accept a request (offer). It implies an intention to act, which may change.",
+  // "ldn-service.form.pattern.ack-tentative-accept.category": "Acknowledgements",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.ack-tentative-accept.category": "Acknowledgements",
+
+  // "ldn-service.form.pattern.ack-tentative-reject.label": "Acknowledge and Tentatively Reject",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.ack-tentative-reject.label": "Acknowledge and Tentatively Reject",
+  // "ldn-service.form.pattern.ack-tentative-reject.description": "This pattern is used to acknowledge and tentatively reject a request (offer). It signifies no further action, subject to change.",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.ack-tentative-reject.description": "This pattern is used to acknowledge and tentatively reject a request (offer). It signifies no further action, subject to change.",
+  // "ldn-service.form.pattern.ack-tentative-reject.category": "Acknowledgements",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.ack-tentative-reject.category": "Acknowledgements",
+
+  // "ldn-service.form.pattern.announce-endorsement.label": "Announce Endorsement",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.announce-endorsement.label": "Announce Endorsement",
+  // "ldn-service.form.pattern.announce-endorsement.description": "This pattern is used to announce the existence of an endorsement, referencing the endorsed resource.",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.announce-endorsement.description": "This pattern is used to announce the existence of an endorsement, referencing the endorsed resource.",
+  // "ldn-service.form.pattern.announce-endorsement.category": "Announcements",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.announce-endorsement.category": "Announcements",
+
+  // "ldn-service.form.pattern.announce-ingest.label": "Announce Ingest",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.announce-ingest.label": "Announce Ingest",
+  // "ldn-service.form.pattern.announce-ingest.description": "This pattern is used to announce that a resource has been ingested.",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.announce-ingest.description": "This pattern is used to announce that a resource has been ingested.",
+  // "ldn-service.form.pattern.announce-ingest.category": "Announcements",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.announce-ingest.category": "Announcements",
+
+  // "ldn-service.form.pattern.announce-relationship.label": "Announce Relationship",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.announce-relationship.label": "Announce Relationship",
+  // "ldn-service.form.pattern.announce-relationship.description": "This pattern is used to announce a relationship between two resources.",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.announce-relationship.description": "This pattern is used to announce a relationship between two resources.",
+  // "ldn-service.form.pattern.announce-relationship.category": "Announcements",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.announce-relationship.category": "Announcements",
+
+  // "ldn-service.form.pattern.announce-review.label": "Announce Review",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.announce-review.label": "Announce Review",
+  // "ldn-service.form.pattern.announce-review.description": "This pattern is used to announce the existence of a review, referencing the reviewed resource.",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.announce-review.description": "This pattern is used to announce the existence of a review, referencing the reviewed resource.",
+  // "ldn-service.form.pattern.announce-review.category": "Announcements",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.announce-review.category": "Announcements",
+
+  // "ldn-service.form.pattern.announce-service-result.label": "Announce Service Result",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.announce-service-result.label": "Announce Service Result",
+  // "ldn-service.form.pattern.announce-service-result.description": "This pattern is used to announce the existence of a 'service result', referencing the relevant resource.",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.announce-service-result.description": "This pattern is used to announce the existence of a 'service result', referencing the relevant resource.",
+  // "ldn-service.form.pattern.announce-service-result.category": "Announcements",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.announce-service-result.category": "Announcements",
+
+  // "ldn-service.form.pattern.request-endorsement.label": "Request Endorsement",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.request-endorsement.label": "Request Endorsement",
+  // "ldn-service.form.pattern.request-endorsement.description": "This pattern is used to request endorsement of a resource owned by the origin system.",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.request-endorsement.description": "This pattern is used to request endorsement of a resource owned by the origin system.",
+  // "ldn-service.form.pattern.request-endorsement.category": "Requests",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.request-endorsement.category": "Requests",
+
+  // "ldn-service.form.pattern.request-ingest.label": "Request Ingest",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.request-ingest.label": "Request Ingest",
+  // "ldn-service.form.pattern.request-ingest.description": "This pattern is used to request that the target system ingest a resource.",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.request-ingest.description": "This pattern is used to request that the target system ingest a resource.",
+  // "ldn-service.form.pattern.request-ingest.category": "Requests",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.request-ingest.category": "Requests",
+
+  // "ldn-service.form.pattern.request-review.label": "Request Review",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.request-review.label": "Request Review",
+  // "ldn-service.form.pattern.request-review.description": "This pattern is used to request a review of a resource owned by the origin system.",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.request-review.description": "This pattern is used to request a review of a resource owned by the origin system.",
+  // "ldn-service.form.pattern.request-review.category": "Requests",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.request-review.category": "Requests",
+
+  // "ldn-service.form.pattern.undo-offer.label": "Undo Offer",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.undo-offer.label": "Undo Offer",
+  // "ldn-service.form.pattern.undo-offer.description": "This pattern is used to undo (retract) an offer previously made.",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.undo-offer.description": "This pattern is used to undo (retract) an offer previously made.",
+  // "ldn-service.form.pattern.undo-offer.category": "Undo",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.undo-offer.category": "Undo",
+
+  // "ldn-new-service.form.label.placeholder.selectedItemFilter": "No Item Filter Selected",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.label.placeholder.selectedItemFilter": "No Item Filter Selected",
+  // "ldn-new-service.form.label.ItemFilter": "Item Filter",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.label.ItemFilter": "Item Filter",
+  // "ldn-new-service.form.label.automatic": "Automatic",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.label.automatic": "Automatic",
+  // "ldn-new-service.form.error.name": "Name is required",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.error.name": "Name is required",
+  // "ldn-new-service.form.error.url": "URL is required",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.error.url": "URL is required",
+  // "ldn-new-service.form.error.ipRange": "Please enter a valid IP range",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.error.ipRange": "Please enter a valid IP range",
+  // "ldn-new-service.form.hint.ipRange": "Please enter a valid IpV4 in both range bounds (note: for single IP, please enter the same value in both fields)",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.hint.ipRange": "Please enter a valid IpV4 in both range bounds (note: for single IP, please enter the same value in both fields)",
+  // "ldn-new-service.form.error.ldnurl": "LDN URL is required",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.error.ldnurl": "LDN URL is required",
+  // "ldn-new-service.form.error.patterns": "At least a pattern is required",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.error.patterns": "At least a pattern is required",
+  // "ldn-new-service.form.error.score": "Please enter a valid score (between 0 and 1). Use the “.” as decimal separator",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.error.score": "Please enter a valid score (between 0 and 1). Use the “.” as decimal separator",
+
+  // "ldn-new-service.form.label.inboundPattern": "Inbound Pattern",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.label.inboundPattern": "Inbound Pattern",
+  // "ldn-new-service.form.label.addPattern": "+ Add more",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.label.addPattern": "+ Add more",
+  // "ldn-new-service.form.label.removeItemFilter": "Remove",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.label.removeItemFilter": "Remove",
+  // "ldn-register-new-service.breadcrumbs": "New Service",
+  // TODO New key - Add a translation
+  "ldn-register-new-service.breadcrumbs": "New Service",
+  // "service.overview.delete.body": "Are you sure you want to delete this service?",
+  // TODO New key - Add a translation
+  "service.overview.delete.body": "Are you sure you want to delete this service?",
+  // "service.overview.edit.body": "Do you confirm the changes?",
+  // TODO New key - Add a translation
+  "service.overview.edit.body": "Do you confirm the changes?",
+  // "service.overview.edit.modal": "Edit Service",
+  // TODO New key - Add a translation
+  "service.overview.edit.modal": "Edit Service",
+  // "service.detail.update": "Confirm",
+  // TODO New key - Add a translation
+  "service.detail.update": "Confirm",
+  // "service.detail.return": "Cancel",
+  // TODO New key - Add a translation
+  "service.detail.return": "Cancel",
+  // "service.overview.reset-form.body": "Are you sure you want to discard the changes and leave?",
+  // TODO New key - Add a translation
+  "service.overview.reset-form.body": "Are you sure you want to discard the changes and leave?",
+  // "service.overview.reset-form.modal": "Discard Changes",
+  // TODO New key - Add a translation
+  "service.overview.reset-form.modal": "Discard Changes",
+  // "service.overview.reset-form.reset-confirm": "Discard",
+  // TODO New key - Add a translation
+  "service.overview.reset-form.reset-confirm": "Discard",
+  // "admin.registries.services-formats.modify.success.head": "Successful Edit",
+  // TODO New key - Add a translation
+  "admin.registries.services-formats.modify.success.head": "Successful Edit",
+  // "admin.registries.services-formats.modify.success.content": "The service has been edited",
+  // TODO New key - Add a translation
+  "admin.registries.services-formats.modify.success.content": "The service has been edited",
+  // "admin.registries.services-formats.modify.failure.head": "Failed Edit",
+  // TODO New key - Add a translation
+  "admin.registries.services-formats.modify.failure.head": "Failed Edit",
+  // "admin.registries.services-formats.modify.failure.content": "The service has not been edited",
+  // TODO New key - Add a translation
+  "admin.registries.services-formats.modify.failure.content": "The service has not been edited",
+  // "ldn-service-notification.created.success.title": "Successful Create",
+  // TODO New key - Add a translation
+  "ldn-service-notification.created.success.title": "Successful Create",
+  // "ldn-service-notification.created.success.body": "The service has been created",
+  // TODO New key - Add a translation
+  "ldn-service-notification.created.success.body": "The service has been created",
+  // "ldn-service-notification.created.failure.title": "Failed Create",
+  // TODO New key - Add a translation
+  "ldn-service-notification.created.failure.title": "Failed Create",
+  // "ldn-service-notification.created.failure.body": "The service has not been created",
+  // TODO New key - Add a translation
+  "ldn-service-notification.created.failure.body": "The service has not been created",
+  // "ldn-service-notification.created.warning.title": "Please select at least one Inbound Pattern",
+  // TODO New key - Add a translation
+  "ldn-service-notification.created.warning.title": "Please select at least one Inbound Pattern",
+  // "ldn-enable-service.notification.success.title": "Successful status updated",
+  // TODO New key - Add a translation
+  "ldn-enable-service.notification.success.title": "Successful status updated",
+  // "ldn-enable-service.notification.success.content": "The service status has been updated",
+  // TODO New key - Add a translation
+  "ldn-enable-service.notification.success.content": "The service status has been updated",
+  // "ldn-service-delete.notification.success.title": "Successful Deletion",
+  // TODO New key - Add a translation
+  "ldn-service-delete.notification.success.title": "Successful Deletion",
+  // "ldn-service-delete.notification.success.content": "The service has been deleted",
+  // TODO New key - Add a translation
+  "ldn-service-delete.notification.success.content": "The service has been deleted",
+  // "ldn-service-delete.notification.error.title": "Failed Deletion",
+  // TODO New key - Add a translation
+  "ldn-service-delete.notification.error.title": "Failed Deletion",
+  // "ldn-service-delete.notification.error.content": "The service has not been deleted",
+  // TODO New key - Add a translation
+  "ldn-service-delete.notification.error.content": "The service has not been deleted",
+  // "service.overview.reset-form.reset-return": "Cancel",
+  // TODO New key - Add a translation
+  "service.overview.reset-form.reset-return": "Cancel",
+  // "service.overview.delete": "Delete service",
+  // TODO New key - Add a translation
+  "service.overview.delete": "Delete service",
+  // "ldn-edit-service.title": "Edit service",
+  // TODO New key - Add a translation
+  "ldn-edit-service.title": "Edit service",
+  // "ldn-edit-service.form.label.name": "Name",
+  // TODO New key - Add a translation
+  "ldn-edit-service.form.label.name": "Name",
+  // "ldn-edit-service.form.label.description": "Description",
+  // TODO New key - Add a translation
+  "ldn-edit-service.form.label.description": "Description",
+  // "ldn-edit-service.form.label.url": "Service URL",
+  // TODO New key - Add a translation
+  "ldn-edit-service.form.label.url": "Service URL",
+  // "ldn-edit-service.form.label.ldnUrl": "LDN Inbox URL",
+  // TODO New key - Add a translation
+  "ldn-edit-service.form.label.ldnUrl": "LDN Inbox URL",
+  // "ldn-edit-service.form.label.inboundPattern": "Inbound Pattern",
+  // TODO New key - Add a translation
+  "ldn-edit-service.form.label.inboundPattern": "Inbound Pattern",
+  // "ldn-edit-service.form.label.noInboundPatternSelected": "No Inbound Pattern",
+  // TODO New key - Add a translation
+  "ldn-edit-service.form.label.noInboundPatternSelected": "No Inbound Pattern",
+  // "ldn-edit-service.form.label.selectedItemFilter": "Selected Item Filter",
+  // TODO New key - Add a translation
+  "ldn-edit-service.form.label.selectedItemFilter": "Selected Item Filter",
+  // "ldn-edit-service.form.label.selectItemFilter": "No Item Filter",
+  // TODO New key - Add a translation
+  "ldn-edit-service.form.label.selectItemFilter": "No Item Filter",
+  // "ldn-edit-service.form.label.automatic": "Automatic",
+  // TODO New key - Add a translation
+  "ldn-edit-service.form.label.automatic": "Automatic",
+  // "ldn-edit-service.form.label.addInboundPattern": "+ Add more",
+  // TODO New key - Add a translation
+  "ldn-edit-service.form.label.addInboundPattern": "+ Add more",
+  // "ldn-edit-service.form.label.submit": "Save",
+  // TODO New key - Add a translation
+  "ldn-edit-service.form.label.submit": "Save",
+  // "ldn-edit-service.breadcrumbs": "Edit Service",
+  // TODO New key - Add a translation
+  "ldn-edit-service.breadcrumbs": "Edit Service",
+  // "ldn-service.control-constaint-select-none": "Select none",
+  // TODO New key - Add a translation
+  "ldn-service.control-constaint-select-none": "Select none",
+
+  // "ldn-register-new-service.notification.error.title": "Error",
+  // TODO New key - Add a translation
+  "ldn-register-new-service.notification.error.title": "Error",
+  // "ldn-register-new-service.notification.error.content": "An error occurred while creating this process",
+  // TODO New key - Add a translation
+  "ldn-register-new-service.notification.error.content": "An error occurred while creating this process",
+  // "ldn-register-new-service.notification.success.title": "Success",
+  // TODO New key - Add a translation
+  "ldn-register-new-service.notification.success.title": "Success",
+  // "ldn-register-new-service.notification.success.content": "The process was successfully created",
+  // TODO New key - Add a translation
+  "ldn-register-new-service.notification.success.content": "The process was successfully created",
+
+  // "submission.sections.notify.info": "The selected service is compatible with the item according to its current status. {{ service.name }}: {{ service.description }}",
+  // TODO New key - Add a translation
+  "submission.sections.notify.info": "The selected service is compatible with the item according to its current status. {{ service.name }}: {{ service.description }}",
+
+  // "item.page.endorsement": "Endorsement",
+  // TODO New key - Add a translation
+  "item.page.endorsement": "Endorsement",
+
+  // "item.page.review": "Review",
+  // TODO New key - Add a translation
+  "item.page.review": "Review",
+
+  // "item.page.dataset": "Dataset",
+  // TODO New key - Add a translation
+  "item.page.dataset": "Dataset",
+  // "menu.section.icon.ldn_services": "LDN Services overview",
+  // TODO New key - Add a translation
+  "menu.section.icon.ldn_services": "LDN Services overview",
+  // "menu.section.services": "LDN Services",
+  // TODO New key - Add a translation
+  "menu.section.services": "LDN Services",
+
+  // "menu.section.services_new": "LDN Service",
+  // TODO New key - Add a translation
+  "menu.section.services_new": "LDN Service",
+
+  // "quality-assurance.topics.description-with-target": "Below you can see all the topics received from the subscriptions to {{source}} in regards to the",
+  // TODO New key - Add a translation
+  "quality-assurance.topics.description-with-target": "Below you can see all the topics received from the subscriptions to {{source}} in regards to the",
+  // "quality-assurance.events.description": "Below the list of all the suggestions for the selected topic <b>{{topic}}</b>, related to <b>{{source}}</b>.",
+  // TODO New key - Add a translation
+  "quality-assurance.events.description": "Below the list of all the suggestions for the selected topic <b>{{topic}}</b>, related to <b>{{source}}</b>.",
+
+  // "quality-assurance.events.description-with-topic-and-target": "Below the list of all the suggestions for the selected topic <b>{{topic}}</b>, related to <b>{{source}}</b> and ",
+  // TODO New key - Add a translation
+  "quality-assurance.events.description-with-topic-and-target": "Below the list of all the suggestions for the selected topic <b>{{topic}}</b>, related to <b>{{source}}</b> and ",
+
+  // "quality-assurance.event.table.event.message.serviceUrl": "Service URL:",
+  // TODO New key - Add a translation
+  "quality-assurance.event.table.event.message.serviceUrl": "Service URL:",
+
+  // "quality-assurance.event.table.event.message.link": "Link:",
+  // TODO New key - Add a translation
+  "quality-assurance.event.table.event.message.link": "Link:",
+
+  // "service.detail.delete.cancel": "Cancel",
+  // TODO New key - Add a translation
+  "service.detail.delete.cancel": "Cancel",
+
+  // "service.detail.delete.button": "Delete service",
+  // TODO New key - Add a translation
+  "service.detail.delete.button": "Delete service",
+
+  // "service.detail.delete.header": "Delete service",
+  // TODO New key - Add a translation
+  "service.detail.delete.header": "Delete service",
+
+  // "service.detail.delete.body": "Are you sure you want to delete the current service?",
+  // TODO New key - Add a translation
+  "service.detail.delete.body": "Are you sure you want to delete the current service?",
+
+  // "service.detail.delete.confirm": "Delete service",
+  // TODO New key - Add a translation
+  "service.detail.delete.confirm": "Delete service",
+
+  // "service.detail.delete.success": "The service was successfully deleted.",
+  // TODO New key - Add a translation
+  "service.detail.delete.success": "The service was successfully deleted.",
+
+  // "service.detail.delete.error": "Something went wrong when deleting the service",
+  // TODO New key - Add a translation
+  "service.detail.delete.error": "Something went wrong when deleting the service",
+
+  // "service.overview.table.id": "Services ID",
+  // TODO New key - Add a translation
+  "service.overview.table.id": "Services ID",
+
+  // "service.overview.table.name": "Name",
+  // TODO New key - Add a translation
+  "service.overview.table.name": "Name",
+
+  // "service.overview.table.start": "Start time (UTC)",
+  // TODO New key - Add a translation
+  "service.overview.table.start": "Start time (UTC)",
+
+  // "service.overview.table.status": "Status",
+  // TODO New key - Add a translation
+  "service.overview.table.status": "Status",
+
+  // "service.overview.table.user": "User",
+  // TODO New key - Add a translation
+  "service.overview.table.user": "User",
+
+  // "service.overview.title": "Services Overview",
+  // TODO New key - Add a translation
+  "service.overview.title": "Services Overview",
+
+  // "service.overview.breadcrumbs": "Services Overview",
+  // TODO New key - Add a translation
+  "service.overview.breadcrumbs": "Services Overview",
+
+  // "service.overview.table.actions": "Actions",
+  // TODO New key - Add a translation
+  "service.overview.table.actions": "Actions",
+
+  // "service.overview.table.description": "Description",
+  // TODO New key - Add a translation
+  "service.overview.table.description": "Description",
+
+  // "submission.sections.submit.progressbar.coarnotify": "COAR Notify",
+  // TODO New key - Add a translation
+  "submission.sections.submit.progressbar.coarnotify": "COAR Notify",
+
+  // "submission.section.section-coar-notify.control.request-review.label": "You can request a review to one of the following services",
+  // TODO New key - Add a translation
+  "submission.section.section-coar-notify.control.request-review.label": "You can request a review to one of the following services",
+
+  // "submission.section.section-coar-notify.control.request-endorsement.label": "You can request an Endorsement to one of the following overlay journals",
+  // TODO New key - Add a translation
+  "submission.section.section-coar-notify.control.request-endorsement.label": "You can request an Endorsement to one of the following overlay journals",
+
+  // "submission.section.section-coar-notify.control.request-ingest.label": "You can request to ingest a copy of your submission to one of the following services",
+  // TODO New key - Add a translation
+  "submission.section.section-coar-notify.control.request-ingest.label": "You can request to ingest a copy of your submission to one of the following services",
+
+  // "submission.section.section-coar-notify.dropdown.no-data": "No data available",
+  // TODO New key - Add a translation
+  "submission.section.section-coar-notify.dropdown.no-data": "No data available",
+
+  // "submission.section.section-coar-notify.dropdown.select-none": "Select none",
+  // TODO New key - Add a translation
+  "submission.section.section-coar-notify.dropdown.select-none": "Select none",
+
+  // "submission.section.section-coar-notify.small.notification": "Select a service for {{ pattern }} of this item",
+  // TODO New key - Add a translation
+  "submission.section.section-coar-notify.small.notification": "Select a service for {{ pattern }} of this item",
+
+  // "submission.section.section-coar-notify.selection.description": "Selected service's description:",
+  // TODO New key - Add a translation
+  "submission.section.section-coar-notify.selection.description": "Selected service's description:",
+
+  // "submission.section.section-coar-notify.selection.no-description": "No further information is available",
+  // TODO New key - Add a translation
+  "submission.section.section-coar-notify.selection.no-description": "No further information is available",
+
+  // "submission.section.section-coar-notify.notification.error": "The selected service is not suitable for the current item. Please check the description for details about which record can be managed by this service.",
+  // TODO New key - Add a translation
+  "submission.section.section-coar-notify.notification.error": "The selected service is not suitable for the current item. Please check the description for details about which record can be managed by this service.",
+
+  // "submission.section.section-coar-notify.info.no-pattern": "No configurable patterns found.",
+  // TODO New key - Add a translation
+  "submission.section.section-coar-notify.info.no-pattern": "No configurable patterns found.",
+
+  // "error.validation.coarnotify.invalidfilter": "Invalid filter, try to select another service or none.",
+  // TODO New key - Add a translation
+  "error.validation.coarnotify.invalidfilter": "Invalid filter, try to select another service or none.",
+
+  // "request-status-alert-box.accepted": "The requested {{ offerType }} for <a href='{{serviceUrl}}' target='_blank'> {{ serviceName }}  </a> has been taken in charge.",
+  // TODO New key - Add a translation
+  "request-status-alert-box.accepted": "The requested {{ offerType }} for <a href='{{serviceUrl}}' target='_blank'> {{ serviceName }}  </a> has been taken in charge.",
+
+  // "request-status-alert-box.rejected": "The requested {{ offerType }} for <a href='{{serviceUrl}}' target='_blank'> {{ serviceName }}  </a> has been rejected.",
+  // TODO New key - Add a translation
+  "request-status-alert-box.rejected": "The requested {{ offerType }} for <a href='{{serviceUrl}}' target='_blank'> {{ serviceName }}  </a> has been rejected.",
+
+  // "request-status-alert-box.requested": "The requested {{ offerType }} for <a href='{{serviceUrl}}' target='_blank'> {{ serviceName }}  </a> is pending.",
+  // TODO New key - Add a translation
+  "request-status-alert-box.requested": "The requested {{ offerType }} for <a href='{{serviceUrl}}' target='_blank'> {{ serviceName }}  </a> is pending.",
+
+  // "ldn-service-button-mark-inbound-deletion": "Mark inbound pattern for deletion",
+  // TODO New key - Add a translation
+  "ldn-service-button-mark-inbound-deletion": "Mark inbound pattern for deletion",
+
+  // "ldn-service-button-unmark-inbound-deletion": "Unmark inbound pattern for deletion",
+  // TODO New key - Add a translation
+  "ldn-service-button-unmark-inbound-deletion": "Unmark inbound pattern for deletion",
+
+  // "ldn-service-input-inbound-item-filter-dropdown": "Select Item filter for inbound pattern",
+  // TODO New key - Add a translation
+  "ldn-service-input-inbound-item-filter-dropdown": "Select Item filter for inbound pattern",
+
+  // "ldn-service-input-inbound-pattern-dropdown": "Select inbound pattern for service",
+  // TODO New key - Add a translation
+  "ldn-service-input-inbound-pattern-dropdown": "Select inbound pattern for service",
+
+  // "ldn-service-overview-select-delete": "Select service for deletion",
+  // TODO New key - Add a translation
+  "ldn-service-overview-select-delete": "Select service for deletion",
+
+  // "ldn-service-overview-select-edit": "Edit LDN service",
+  // TODO New key - Add a translation
+  "ldn-service-overview-select-edit": "Edit LDN service",
+
+  // "ldn-service-overview-close-modal": "Close modal",
+  // TODO New key - Add a translation
+  "ldn-service-overview-close-modal": "Close modal",
+
+  // "a-common-or_statement.label": "Item type is Journal Article or Dataset",
+  // TODO New key - Add a translation
+  "a-common-or_statement.label": "Item type is Journal Article or Dataset",
+
+  // "always_true_filter.label": "Always true",
+  // TODO New key - Add a translation
+  "always_true_filter.label": "Always true",
+
+  // "automatic_processing_collection_filter_16.label": "Automatic processing",
+  // TODO New key - Add a translation
+  "automatic_processing_collection_filter_16.label": "Automatic processing",
+
+  // "dc-identifier-uri-contains-doi_condition.label": "URI contains DOI",
+  // TODO New key - Add a translation
+  "dc-identifier-uri-contains-doi_condition.label": "URI contains DOI",
+
+  // "doi-filter.label": "DOI filter",
+  // TODO New key - Add a translation
+  "doi-filter.label": "DOI filter",
+
+  // "driver-document-type_condition.label": "Document type equals driver",
+  // TODO New key - Add a translation
+  "driver-document-type_condition.label": "Document type equals driver",
+
+  // "has-at-least-one-bitstream_condition.label": "Has at least one Bitstream",
+  // TODO New key - Add a translation
+  "has-at-least-one-bitstream_condition.label": "Has at least one Bitstream",
+
+  // "has-bitstream_filter.label": "Has Bitstream",
+  // TODO New key - Add a translation
+  "has-bitstream_filter.label": "Has Bitstream",
+
+  // "has-one-bitstream_condition.label": "Has one Bitstream",
+  // TODO New key - Add a translation
+  "has-one-bitstream_condition.label": "Has one Bitstream",
+
+  // "is-archived_condition.label": "Is archived",
+  // TODO New key - Add a translation
+  "is-archived_condition.label": "Is archived",
+
+  // "is-withdrawn_condition.label": "Is withdrawn",
+  // TODO New key - Add a translation
+  "is-withdrawn_condition.label": "Is withdrawn",
+
+  // "item-is-public_condition.label": "Item is public",
+  // TODO New key - Add a translation
+  "item-is-public_condition.label": "Item is public",
+
+  // "journals_ingest_suggestion_collection_filter_18.label": "Journals ingest",
+  // TODO New key - Add a translation
+  "journals_ingest_suggestion_collection_filter_18.label": "Journals ingest",
+
+  // "title-starts-with-pattern_condition.label": "Title starts with pattern",
+  // TODO New key - Add a translation
+  "title-starts-with-pattern_condition.label": "Title starts with pattern",
+
+  // "type-equals-dataset_condition.label": "Type equals Dataset",
+  // TODO New key - Add a translation
+  "type-equals-dataset_condition.label": "Type equals Dataset",
+
+  // "type-equals-journal-article_condition.label": "Type equals Journal Article",
+  // TODO New key - Add a translation
+  "type-equals-journal-article_condition.label": "Type equals Journal Article",
+
+  // "ldn.no-filter.label": "None",
+  // TODO New key - Add a translation
+  "ldn.no-filter.label": "None",
+
+  // "admin.notify.dashboard": "Dashboard",
+  // TODO New key - Add a translation
+  "admin.notify.dashboard": "Dashboard",
+
+  // "menu.section.notify_dashboard": "Dashboard",
+  // TODO New key - Add a translation
+  "menu.section.notify_dashboard": "Dashboard",
+
+  // "menu.section.coar_notify": "COAR Notify",
+  // TODO New key - Add a translation
+  "menu.section.coar_notify": "COAR Notify",
+
+  // "admin-notify-dashboard.title": "Notify Dashboard",
+  // TODO New key - Add a translation
+  "admin-notify-dashboard.title": "Notify Dashboard",
+
+  // "admin-notify-dashboard.description": "The Notify dashboard monitor the general usage of the COAR Notify protocol across the repository. In the “Metrics” tab are statistics about usage of the COAR Notify protocol. In the “Logs/Inbound” and “Logs/Outbound” tabs it’s possible to search and check the individual status of each LDN message, either received or sent.",
+  // TODO New key - Add a translation
+  "admin-notify-dashboard.description": "The Notify dashboard monitor the general usage of the COAR Notify protocol across the repository. In the “Metrics” tab are statistics about usage of the COAR Notify protocol. In the “Logs/Inbound” and “Logs/Outbound” tabs it’s possible to search and check the individual status of each LDN message, either received or sent.",
+
+  // "admin-notify-dashboard.metrics": "Metrics",
+  // TODO New key - Add a translation
+  "admin-notify-dashboard.metrics": "Metrics",
+
+  // "admin-notify-dashboard.received-ldn": "Number of received LDN",
+  // TODO New key - Add a translation
+  "admin-notify-dashboard.received-ldn": "Number of received LDN",
+
+  // "admin-notify-dashboard.generated-ldn": "Number of generated LDN",
+  // TODO New key - Add a translation
+  "admin-notify-dashboard.generated-ldn": "Number of generated LDN",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.accepted": "Accepted",
+  // TODO New key - Add a translation
+  "admin-notify-dashboard.NOTIFY.incoming.accepted": "Accepted",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.accepted.description": "Accepted inbound notifications",
+  // TODO New key - Add a translation
+  "admin-notify-dashboard.NOTIFY.incoming.accepted.description": "Accepted inbound notifications",
+
+  // "admin-notify-logs.NOTIFY.incoming.accepted": "Currently displaying: Accepted notifications",
+  // TODO New key - Add a translation
+  "admin-notify-logs.NOTIFY.incoming.accepted": "Currently displaying: Accepted notifications",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.processed": "Processed LDN",
+  // TODO New key - Add a translation
+  "admin-notify-dashboard.NOTIFY.incoming.processed": "Processed LDN",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.processed.description": "Processed inbound notifications",
+  // TODO New key - Add a translation
+  "admin-notify-dashboard.NOTIFY.incoming.processed.description": "Processed inbound notifications",
+
+  // "admin-notify-logs.NOTIFY.incoming.processed": "Currently displaying: Processed LDN",
+  // TODO New key - Add a translation
+  "admin-notify-logs.NOTIFY.incoming.processed": "Currently displaying: Processed LDN",
+
+  // "admin-notify-logs.NOTIFY.incoming.failure": "Currently displaying: Failed notifications",
+  // TODO New key - Add a translation
+  "admin-notify-logs.NOTIFY.incoming.failure": "Currently displaying: Failed notifications",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.failure": "Failure",
+  // TODO New key - Add a translation
+  "admin-notify-dashboard.NOTIFY.incoming.failure": "Failure",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.failure.description": "Failed inbound notifications",
+  // TODO New key - Add a translation
+  "admin-notify-dashboard.NOTIFY.incoming.failure.description": "Failed inbound notifications",
+
+  // "admin-notify-logs.NOTIFY.outgoing.failure": "Currently displaying: Failed notifications",
+  // TODO New key - Add a translation
+  "admin-notify-logs.NOTIFY.outgoing.failure": "Currently displaying: Failed notifications",
+
+  // "admin-notify-dashboard.NOTIFY.outgoing.failure": "Failure",
+  // TODO New key - Add a translation
+  "admin-notify-dashboard.NOTIFY.outgoing.failure": "Failure",
+
+  // "admin-notify-dashboard.NOTIFY.outgoing.failure.description": "Failed outbound notifications",
+  // TODO New key - Add a translation
+  "admin-notify-dashboard.NOTIFY.outgoing.failure.description": "Failed outbound notifications",
+
+  // "admin-notify-logs.NOTIFY.incoming.untrusted": "Currently displaying: Untrusted notifications",
+  // TODO New key - Add a translation
+  "admin-notify-logs.NOTIFY.incoming.untrusted": "Currently displaying: Untrusted notifications",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.untrusted": "Untrusted",
+  // TODO New key - Add a translation
+  "admin-notify-dashboard.NOTIFY.incoming.untrusted": "Untrusted",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.untrusted.description": "Inbound notifications not trusted",
+  // TODO New key - Add a translation
+  "admin-notify-dashboard.NOTIFY.incoming.untrusted.description": "Inbound notifications not trusted",
+
+  // "admin-notify-logs.NOTIFY.incoming.delivered": "Currently displaying: Delivered notifications",
+  // TODO New key - Add a translation
+  "admin-notify-logs.NOTIFY.incoming.delivered": "Currently displaying: Delivered notifications",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.delivered.description": "Inbound notifications successfully delivered",
+  // TODO New key - Add a translation
+  "admin-notify-dashboard.NOTIFY.incoming.delivered.description": "Inbound notifications successfully delivered",
+
+  // "admin-notify-dashboard.NOTIFY.outgoing.delivered": "Delivered",
+  // TODO New key - Add a translation
+  "admin-notify-dashboard.NOTIFY.outgoing.delivered": "Delivered",
+
+  // "admin-notify-logs.NOTIFY.outgoing.delivered": "Currently displaying: Delivered notifications",
+  // TODO New key - Add a translation
+  "admin-notify-logs.NOTIFY.outgoing.delivered": "Currently displaying: Delivered notifications",
+
+  // "admin-notify-dashboard.NOTIFY.outgoing.delivered.description": "Outbound notifications successfully delivered",
+  // TODO New key - Add a translation
+  "admin-notify-dashboard.NOTIFY.outgoing.delivered.description": "Outbound notifications successfully delivered",
+
+  // "admin-notify-logs.NOTIFY.outgoing.queued": "Currently displaying: Queued notifications",
+  // TODO New key - Add a translation
+  "admin-notify-logs.NOTIFY.outgoing.queued": "Currently displaying: Queued notifications",
+
+  // "admin-notify-dashboard.NOTIFY.outgoing.queued.description": "Notifications currently queued",
+  // TODO New key - Add a translation
+  "admin-notify-dashboard.NOTIFY.outgoing.queued.description": "Notifications currently queued",
+
+  // "admin-notify-dashboard.NOTIFY.outgoing.queued": "Queued",
+  // TODO New key - Add a translation
+  "admin-notify-dashboard.NOTIFY.outgoing.queued": "Queued",
+
+  // "admin-notify-logs.NOTIFY.outgoing.queued_for_retry": "Currently displaying: Queued for retry notifications",
+  // TODO New key - Add a translation
+  "admin-notify-logs.NOTIFY.outgoing.queued_for_retry": "Currently displaying: Queued for retry notifications",
+
+  // "admin-notify-dashboard.NOTIFY.outgoing.queued_for_retry": "Queued for retry",
+  // TODO New key - Add a translation
+  "admin-notify-dashboard.NOTIFY.outgoing.queued_for_retry": "Queued for retry",
+
+  // "admin-notify-dashboard.NOTIFY.outgoing.queued_for_retry.description": "Notifications currently queued for retry",
+  // TODO New key - Add a translation
+  "admin-notify-dashboard.NOTIFY.outgoing.queued_for_retry.description": "Notifications currently queued for retry",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.involvedItems": "Items involved",
+  // TODO New key - Add a translation
+  "admin-notify-dashboard.NOTIFY.incoming.involvedItems": "Items involved",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.involvedItems.description": "Items related to inbound notifications",
+  // TODO New key - Add a translation
+  "admin-notify-dashboard.NOTIFY.incoming.involvedItems.description": "Items related to inbound notifications",
+
+  // "admin-notify-dashboard.NOTIFY.outgoing.involvedItems": "Items involved",
+  // TODO New key - Add a translation
+  "admin-notify-dashboard.NOTIFY.outgoing.involvedItems": "Items involved",
+
+  // "admin-notify-dashboard.NOTIFY.outgoing.involvedItems.description": "Items related to outbound notifications",
+  // TODO New key - Add a translation
+  "admin-notify-dashboard.NOTIFY.outgoing.involvedItems.description": "Items related to outbound notifications",
+
+  // "admin.notify.dashboard.breadcrumbs": "Dashboard",
+  // TODO New key - Add a translation
+  "admin.notify.dashboard.breadcrumbs": "Dashboard",
+
+  // "admin.notify.dashboard.inbound": "Inbound messages",
+  // TODO New key - Add a translation
+  "admin.notify.dashboard.inbound": "Inbound messages",
+
+  // "admin.notify.dashboard.inbound-logs": "Logs/Inbound",
+  // TODO New key - Add a translation
+  "admin.notify.dashboard.inbound-logs": "Logs/Inbound",
+
+  // "admin.notify.dashboard.filter": "Filter: ",
+  // TODO New key - Add a translation
+  "admin.notify.dashboard.filter": "Filter: ",
+
+  // "search.filters.applied.f.relateditem": "Related items",
+  // TODO New key - Add a translation
+  "search.filters.applied.f.relateditem": "Related items",
+
+  // "search.filters.applied.f.ldn_service": "LDN Service",
+  // TODO New key - Add a translation
+  "search.filters.applied.f.ldn_service": "LDN Service",
+
+  // "search.filters.applied.f.notifyReview": "Notify Review",
+  // TODO New key - Add a translation
+  "search.filters.applied.f.notifyReview": "Notify Review",
+
+  // "search.filters.applied.f.notifyEndorsement": "Notify Endorsement",
+  // TODO New key - Add a translation
+  "search.filters.applied.f.notifyEndorsement": "Notify Endorsement",
+
+  // "search.filters.applied.f.notifyRelation": "Notify Relation",
+  // TODO New key - Add a translation
+  "search.filters.applied.f.notifyRelation": "Notify Relation",
+
+  // "search.filters.filter.queue_last_start_time.head": "Last processing time ",
+  // TODO New key - Add a translation
+  "search.filters.filter.queue_last_start_time.head": "Last processing time ",
+
+  // "search.filters.filter.queue_last_start_time.min.label": "Min range",
+  // TODO New key - Add a translation
+  "search.filters.filter.queue_last_start_time.min.label": "Min range",
+
+  // "search.filters.filter.queue_last_start_time.max.label": "Max range",
+  // TODO New key - Add a translation
+  "search.filters.filter.queue_last_start_time.max.label": "Max range",
+
+  // "search.filters.applied.f.queue_last_start_time.min": "Min range",
+  // TODO New key - Add a translation
+  "search.filters.applied.f.queue_last_start_time.min": "Min range",
+
+  // "search.filters.applied.f.queue_last_start_time.max": "Max range",
+  // TODO New key - Add a translation
+  "search.filters.applied.f.queue_last_start_time.max": "Max range",
+
+  // "admin.notify.dashboard.outbound": "Outbound messages",
+  // TODO New key - Add a translation
+  "admin.notify.dashboard.outbound": "Outbound messages",
+
+  // "admin.notify.dashboard.outbound-logs": "Logs/Outbound",
+  // TODO New key - Add a translation
+  "admin.notify.dashboard.outbound-logs": "Logs/Outbound",
+
+  // "NOTIFY.incoming.search.results.head": "Incoming",
+  // TODO New key - Add a translation
+  "NOTIFY.incoming.search.results.head": "Incoming",
+
+  // "search.filters.filter.relateditem.head": "Related item",
+  // TODO New key - Add a translation
+  "search.filters.filter.relateditem.head": "Related item",
+
+  // "search.filters.filter.origin.head": "Origin",
+  // TODO New key - Add a translation
+  "search.filters.filter.origin.head": "Origin",
+
+  // "search.filters.filter.ldn_service.head": "LDN Service",
+  // TODO New key - Add a translation
+  "search.filters.filter.ldn_service.head": "LDN Service",
+
+  // "search.filters.filter.target.head": "Target",
+  // TODO New key - Add a translation
+  "search.filters.filter.target.head": "Target",
+
+  // "search.filters.filter.queue_status.head": "Queue status",
+  // TODO New key - Add a translation
+  "search.filters.filter.queue_status.head": "Queue status",
+
+  // "search.filters.filter.activity_stream_type.head": "Activity stream type",
+  // TODO New key - Add a translation
+  "search.filters.filter.activity_stream_type.head": "Activity stream type",
+
+  // "search.filters.filter.coar_notify_type.head": "COAR Notify type",
+  // TODO New key - Add a translation
+  "search.filters.filter.coar_notify_type.head": "COAR Notify type",
+
+  // "search.filters.filter.notification_type.head": "Notification type",
+  // TODO New key - Add a translation
+  "search.filters.filter.notification_type.head": "Notification type",
+
+  // "search.filters.filter.relateditem.label": "Search related items",
+  // TODO New key - Add a translation
+  "search.filters.filter.relateditem.label": "Search related items",
+
+  // "search.filters.filter.queue_status.label": "Search queue status",
+  // TODO New key - Add a translation
+  "search.filters.filter.queue_status.label": "Search queue status",
+
+  // "search.filters.filter.target.label": "Search target",
+  // TODO New key - Add a translation
+  "search.filters.filter.target.label": "Search target",
+
+  // "search.filters.filter.activity_stream_type.label": "Search activity stream type",
+  // TODO New key - Add a translation
+  "search.filters.filter.activity_stream_type.label": "Search activity stream type",
+
+  // "search.filters.applied.f.queue_status": "Queue Status",
+  // TODO New key - Add a translation
+  "search.filters.applied.f.queue_status": "Queue Status",
+
+  // "search.filters.queue_status.0,authority": "Untrusted Ip",
+  // TODO New key - Add a translation
+  "search.filters.queue_status.0,authority": "Untrusted Ip",
+
+  // "search.filters.queue_status.1,authority": "Queued",
+  // TODO New key - Add a translation
+  "search.filters.queue_status.1,authority": "Queued",
+
+  // "search.filters.queue_status.2,authority": "Processing",
+  // TODO New key - Add a translation
+  "search.filters.queue_status.2,authority": "Processing",
+
+  // "search.filters.queue_status.3,authority": "Processed",
+  // TODO New key - Add a translation
+  "search.filters.queue_status.3,authority": "Processed",
+
+  // "search.filters.queue_status.4,authority": "Failed",
+  // TODO New key - Add a translation
+  "search.filters.queue_status.4,authority": "Failed",
+
+  // "search.filters.queue_status.5,authority": "Untrusted",
+  // TODO New key - Add a translation
+  "search.filters.queue_status.5,authority": "Untrusted",
+
+  // "search.filters.queue_status.6,authority": "Unmapped Action",
+  // TODO New key - Add a translation
+  "search.filters.queue_status.6,authority": "Unmapped Action",
+
+  // "search.filters.queue_status.7,authority": "Queued for retry",
+  // TODO New key - Add a translation
+  "search.filters.queue_status.7,authority": "Queued for retry",
+
+  // "search.filters.applied.f.activity_stream_type": "Activity stream type",
+  // TODO New key - Add a translation
+  "search.filters.applied.f.activity_stream_type": "Activity stream type",
+
+  // "search.filters.applied.f.coar_notify_type": "COAR Notify type",
+  // TODO New key - Add a translation
+  "search.filters.applied.f.coar_notify_type": "COAR Notify type",
+
+  // "search.filters.applied.f.notification_type": "Notification type",
+  // TODO New key - Add a translation
+  "search.filters.applied.f.notification_type": "Notification type",
+
+  // "search.filters.filter.coar_notify_type.label": "Search COAR Notify type",
+  // TODO New key - Add a translation
+  "search.filters.filter.coar_notify_type.label": "Search COAR Notify type",
+
+  // "search.filters.filter.notification_type.label": "Search notification type",
+  // TODO New key - Add a translation
+  "search.filters.filter.notification_type.label": "Search notification type",
+
+  // "search.filters.filter.relateditem.placeholder": "Related items",
+  // TODO New key - Add a translation
+  "search.filters.filter.relateditem.placeholder": "Related items",
+
+  // "search.filters.filter.target.placeholder": "Target",
+  // TODO New key - Add a translation
+  "search.filters.filter.target.placeholder": "Target",
+
+  // "search.filters.filter.origin.label": "Search source",
+  // TODO New key - Add a translation
+  "search.filters.filter.origin.label": "Search source",
+
+  // "search.filters.filter.origin.placeholder": "Source",
+  // TODO New key - Add a translation
+  "search.filters.filter.origin.placeholder": "Source",
+
+  // "search.filters.filter.ldn_service.label": "Search LDN Service",
+  // TODO New key - Add a translation
+  "search.filters.filter.ldn_service.label": "Search LDN Service",
+
+  // "search.filters.filter.ldn_service.placeholder": "LDN Service",
+  // TODO New key - Add a translation
+  "search.filters.filter.ldn_service.placeholder": "LDN Service",
+
+  // "search.filters.filter.queue_status.placeholder": "Queue status",
+  // TODO New key - Add a translation
+  "search.filters.filter.queue_status.placeholder": "Queue status",
+
+  // "search.filters.filter.activity_stream_type.placeholder": "Activity stream type",
+  // TODO New key - Add a translation
+  "search.filters.filter.activity_stream_type.placeholder": "Activity stream type",
+
+  // "search.filters.filter.coar_notify_type.placeholder": "COAR Notify type",
+  // TODO New key - Add a translation
+  "search.filters.filter.coar_notify_type.placeholder": "COAR Notify type",
+
+  // "search.filters.filter.notification_type.placeholder": "Notification",
+  // TODO New key - Add a translation
+  "search.filters.filter.notification_type.placeholder": "Notification",
+
+  // "search.filters.filter.notifyRelation.head": "Notify Relation",
+  // TODO New key - Add a translation
+  "search.filters.filter.notifyRelation.head": "Notify Relation",
+
+  // "search.filters.filter.notifyRelation.label": "Search Notify Relation",
+  // TODO New key - Add a translation
+  "search.filters.filter.notifyRelation.label": "Search Notify Relation",
+
+  // "search.filters.filter.notifyRelation.placeholder": "Notify Relation",
+  // TODO New key - Add a translation
+  "search.filters.filter.notifyRelation.placeholder": "Notify Relation",
+
+  // "search.filters.filter.notifyReview.head": "Notify Review",
+  // TODO New key - Add a translation
+  "search.filters.filter.notifyReview.head": "Notify Review",
+
+  // "search.filters.filter.notifyReview.label": "Search Notify Review",
+  // TODO New key - Add a translation
+  "search.filters.filter.notifyReview.label": "Search Notify Review",
+
+  // "search.filters.filter.notifyReview.placeholder": "Notify Review",
+  // TODO New key - Add a translation
+  "search.filters.filter.notifyReview.placeholder": "Notify Review",
+
+  // "search.filters.coar_notify_type.coar-notify:ReviewAction": "Review action",
+  // TODO New key - Add a translation
+  "search.filters.coar_notify_type.coar-notify:ReviewAction": "Review action",
+
+  // "search.filters.coar_notify_type.coar-notify:ReviewAction,authority": "Review action",
+  // TODO New key - Add a translation
+  "search.filters.coar_notify_type.coar-notify:ReviewAction,authority": "Review action",
+
+  // "notify-detail-modal.coar-notify:ReviewAction": "Review action",
+  // TODO New key - Add a translation
+  "notify-detail-modal.coar-notify:ReviewAction": "Review action",
+
+  // "search.filters.coar_notify_type.coar-notify:EndorsementAction": "Endorsement action",
+  // TODO New key - Add a translation
+  "search.filters.coar_notify_type.coar-notify:EndorsementAction": "Endorsement action",
+
+  // "search.filters.coar_notify_type.coar-notify:EndorsementAction,authority": "Endorsement action",
+  // TODO New key - Add a translation
+  "search.filters.coar_notify_type.coar-notify:EndorsementAction,authority": "Endorsement action",
+
+  // "notify-detail-modal.coar-notify:EndorsementAction": "Endorsement action",
+  // TODO New key - Add a translation
+  "notify-detail-modal.coar-notify:EndorsementAction": "Endorsement action",
+
+  // "search.filters.coar_notify_type.coar-notify:IngestAction": "Ingest action",
+  // TODO New key - Add a translation
+  "search.filters.coar_notify_type.coar-notify:IngestAction": "Ingest action",
+
+  // "search.filters.coar_notify_type.coar-notify:IngestAction,authority": "Ingest action",
+  // TODO New key - Add a translation
+  "search.filters.coar_notify_type.coar-notify:IngestAction,authority": "Ingest action",
+
+  // "notify-detail-modal.coar-notify:IngestAction": "Ingest action",
+  // TODO New key - Add a translation
+  "notify-detail-modal.coar-notify:IngestAction": "Ingest action",
+
+  // "search.filters.coar_notify_type.coar-notify:RelationshipAction": "Relationship action",
+  // TODO New key - Add a translation
+  "search.filters.coar_notify_type.coar-notify:RelationshipAction": "Relationship action",
+
+  // "search.filters.coar_notify_type.coar-notify:RelationshipAction,authority": "Relationship action",
+  // TODO New key - Add a translation
+  "search.filters.coar_notify_type.coar-notify:RelationshipAction,authority": "Relationship action",
+
+  // "notify-detail-modal.coar-notify:RelationshipAction": "Relationship action",
+  // TODO New key - Add a translation
+  "notify-detail-modal.coar-notify:RelationshipAction": "Relationship action",
+
+  // "search.filters.queue_status.QUEUE_STATUS_QUEUED": "Queued",
+  // TODO New key - Add a translation
+  "search.filters.queue_status.QUEUE_STATUS_QUEUED": "Queued",
+
+  // "notify-detail-modal.QUEUE_STATUS_QUEUED": "Queued",
+  // TODO New key - Add a translation
+  "notify-detail-modal.QUEUE_STATUS_QUEUED": "Queued",
+
+  // "search.filters.queue_status.QUEUE_STATUS_QUEUED_FOR_RETRY": "Queued for retry",
+  // TODO New key - Add a translation
+  "search.filters.queue_status.QUEUE_STATUS_QUEUED_FOR_RETRY": "Queued for retry",
+
+  // "notify-detail-modal.QUEUE_STATUS_QUEUED_FOR_RETRY": "Queued for retry",
+  // TODO New key - Add a translation
+  "notify-detail-modal.QUEUE_STATUS_QUEUED_FOR_RETRY": "Queued for retry",
+
+  // "search.filters.queue_status.QUEUE_STATUS_PROCESSING": "Processing",
+  // TODO New key - Add a translation
+  "search.filters.queue_status.QUEUE_STATUS_PROCESSING": "Processing",
+
+  // "notify-detail-modal.QUEUE_STATUS_PROCESSING": "Processing",
+  // TODO New key - Add a translation
+  "notify-detail-modal.QUEUE_STATUS_PROCESSING": "Processing",
+
+  // "search.filters.queue_status.QUEUE_STATUS_PROCESSED": "Processed",
+  // TODO New key - Add a translation
+  "search.filters.queue_status.QUEUE_STATUS_PROCESSED": "Processed",
+
+  // "notify-detail-modal.QUEUE_STATUS_PROCESSED": "Processed",
+  // TODO New key - Add a translation
+  "notify-detail-modal.QUEUE_STATUS_PROCESSED": "Processed",
+
+  // "search.filters.queue_status.QUEUE_STATUS_FAILED": "Failed",
+  // TODO New key - Add a translation
+  "search.filters.queue_status.QUEUE_STATUS_FAILED": "Failed",
+
+  // "notify-detail-modal.QUEUE_STATUS_FAILED": "Failed",
+  // TODO New key - Add a translation
+  "notify-detail-modal.QUEUE_STATUS_FAILED": "Failed",
+
+  // "search.filters.queue_status.QUEUE_STATUS_UNTRUSTED": "Untrusted",
+  // TODO New key - Add a translation
+  "search.filters.queue_status.QUEUE_STATUS_UNTRUSTED": "Untrusted",
+
+  // "search.filters.queue_status.QUEUE_STATUS_UNTRUSTED_IP": "Untrusted Ip",
+  // TODO New key - Add a translation
+  "search.filters.queue_status.QUEUE_STATUS_UNTRUSTED_IP": "Untrusted Ip",
+
+  // "notify-detail-modal.QUEUE_STATUS_UNTRUSTED": "Untrusted",
+  // TODO New key - Add a translation
+  "notify-detail-modal.QUEUE_STATUS_UNTRUSTED": "Untrusted",
+
+  // "notify-detail-modal.QUEUE_STATUS_UNTRUSTED_IP": "Untrusted Ip",
+  // TODO New key - Add a translation
+  "notify-detail-modal.QUEUE_STATUS_UNTRUSTED_IP": "Untrusted Ip",
+
+  // "search.filters.queue_status.QUEUE_STATUS_UNMAPPED_ACTION": "Unmapped Action",
+  // TODO New key - Add a translation
+  "search.filters.queue_status.QUEUE_STATUS_UNMAPPED_ACTION": "Unmapped Action",
+
+  // "notify-detail-modal.QUEUE_STATUS_UNMAPPED_ACTION": "Unmapped Action",
+  // TODO New key - Add a translation
+  "notify-detail-modal.QUEUE_STATUS_UNMAPPED_ACTION": "Unmapped Action",
+
+  // "sorting.queue_last_start_time.DESC": "Last started queue Descending",
+  // TODO New key - Add a translation
+  "sorting.queue_last_start_time.DESC": "Last started queue Descending",
+
+  // "sorting.queue_last_start_time.ASC": "Last started queue Ascending",
+  // TODO New key - Add a translation
+  "sorting.queue_last_start_time.ASC": "Last started queue Ascending",
+
+  // "sorting.queue_attempts.DESC": "Queue attempted Descending",
+  // TODO New key - Add a translation
+  "sorting.queue_attempts.DESC": "Queue attempted Descending",
+
+  // "sorting.queue_attempts.ASC": "Queue attempted Ascending",
+  // TODO New key - Add a translation
+  "sorting.queue_attempts.ASC": "Queue attempted Ascending",
+
+  // "NOTIFY.incoming.involvedItems.search.results.head": "Items involved in incoming LDN",
+  // TODO New key - Add a translation
+  "NOTIFY.incoming.involvedItems.search.results.head": "Items involved in incoming LDN",
+
+  // "NOTIFY.outgoing.involvedItems.search.results.head": "Items involved in outgoing LDN",
+  // TODO New key - Add a translation
+  "NOTIFY.outgoing.involvedItems.search.results.head": "Items involved in outgoing LDN",
+
+  // "type.notify-detail-modal": "Type",
+  // TODO New key - Add a translation
+  "type.notify-detail-modal": "Type",
+
+  // "id.notify-detail-modal": "Id",
+  // TODO New key - Add a translation
+  "id.notify-detail-modal": "Id",
+
+  // "coarNotifyType.notify-detail-modal": "COAR Notify type",
+  // TODO New key - Add a translation
+  "coarNotifyType.notify-detail-modal": "COAR Notify type",
+
+  // "activityStreamType.notify-detail-modal": "Activity stream type",
+  // TODO New key - Add a translation
+  "activityStreamType.notify-detail-modal": "Activity stream type",
+
+  // "inReplyTo.notify-detail-modal": "In reply to",
+  // TODO New key - Add a translation
+  "inReplyTo.notify-detail-modal": "In reply to",
+
+  // "object.notify-detail-modal": "Repository Item",
+  // TODO New key - Add a translation
+  "object.notify-detail-modal": "Repository Item",
+
+  // "context.notify-detail-modal": "Repository Item",
+  // TODO New key - Add a translation
+  "context.notify-detail-modal": "Repository Item",
+
+  // "queueAttempts.notify-detail-modal": "Queue attempts",
+  // TODO New key - Add a translation
+  "queueAttempts.notify-detail-modal": "Queue attempts",
+
+  // "queueLastStartTime.notify-detail-modal": "Queue last started",
+  // TODO New key - Add a translation
+  "queueLastStartTime.notify-detail-modal": "Queue last started",
+
+  // "origin.notify-detail-modal": "LDN Service",
+  // TODO New key - Add a translation
+  "origin.notify-detail-modal": "LDN Service",
+
+  // "target.notify-detail-modal": "LDN Service",
+  // TODO New key - Add a translation
+  "target.notify-detail-modal": "LDN Service",
+
+  // "queueStatusLabel.notify-detail-modal": "Queue status",
+  // TODO New key - Add a translation
+  "queueStatusLabel.notify-detail-modal": "Queue status",
+
+  // "queueTimeout.notify-detail-modal": "Queue timeout",
+  // TODO New key - Add a translation
+  "queueTimeout.notify-detail-modal": "Queue timeout",
+
+  // "notify-message-modal.title": "Message Detail",
+  // TODO New key - Add a translation
+  "notify-message-modal.title": "Message Detail",
+
+  // "notify-message-modal.show-message": "Show message",
+  // TODO New key - Add a translation
+  "notify-message-modal.show-message": "Show message",
+
+  // "notify-message-result.timestamp": "Timestamp",
+  // TODO New key - Add a translation
+  "notify-message-result.timestamp": "Timestamp",
+
+  // "notify-message-result.repositoryItem": "Repository Item",
+  // TODO New key - Add a translation
+  "notify-message-result.repositoryItem": "Repository Item",
+
+  // "notify-message-result.ldnService": "LDN Service",
+  // TODO New key - Add a translation
+  "notify-message-result.ldnService": "LDN Service",
+
+  // "notify-message-result.type": "Type",
+  // TODO New key - Add a translation
+  "notify-message-result.type": "Type",
+
+  // "notify-message-result.status": "Status",
+  // TODO New key - Add a translation
+  "notify-message-result.status": "Status",
+
+  // "notify-message-result.action": "Action",
+  // TODO New key - Add a translation
+  "notify-message-result.action": "Action",
+
+  // "notify-message-result.detail": "Detail",
+  // TODO New key - Add a translation
+  "notify-message-result.detail": "Detail",
+
+  // "notify-message-result.reprocess": "Reprocess",
+  // TODO New key - Add a translation
+  "notify-message-result.reprocess": "Reprocess",
+
+  // "notify-queue-status.processed": "Processed",
+  // TODO New key - Add a translation
+  "notify-queue-status.processed": "Processed",
+
+  // "notify-queue-status.failed": "Failed",
+  // TODO New key - Add a translation
+  "notify-queue-status.failed": "Failed",
+
+  // "notify-queue-status.queue_retry": "Queued for retry",
+  // TODO New key - Add a translation
+  "notify-queue-status.queue_retry": "Queued for retry",
+
+  // "notify-queue-status.unmapped_action": "Unmapped action",
+  // TODO New key - Add a translation
+  "notify-queue-status.unmapped_action": "Unmapped action",
+
+  // "notify-queue-status.processing": "Processing",
+  // TODO New key - Add a translation
+  "notify-queue-status.processing": "Processing",
+
+  // "notify-queue-status.queued": "Queued",
+  // TODO New key - Add a translation
+  "notify-queue-status.queued": "Queued",
+
+  // "notify-queue-status.untrusted": "Untrusted",
+  // TODO New key - Add a translation
+  "notify-queue-status.untrusted": "Untrusted",
+
+  // "ldnService.notify-detail-modal": "LDN Service",
+  // TODO New key - Add a translation
+  "ldnService.notify-detail-modal": "LDN Service",
+
+  // "relatedItem.notify-detail-modal": "Related Item",
+  // TODO New key - Add a translation
+  "relatedItem.notify-detail-modal": "Related Item",
+
+  // "search.filters.filter.notifyEndorsement.head": "Notify Endorsement",
+  // TODO New key - Add a translation
+  "search.filters.filter.notifyEndorsement.head": "Notify Endorsement",
+
+  // "search.filters.filter.notifyEndorsement.placeholder": "Notify Endorsement",
+  // TODO New key - Add a translation
+  "search.filters.filter.notifyEndorsement.placeholder": "Notify Endorsement",
+
+  // "search.filters.filter.notifyEndorsement.label": "Search Notify Endorsement",
+  // TODO New key - Add a translation
+  "search.filters.filter.notifyEndorsement.label": "Search Notify Endorsement",
+
+  // "item.page.cc.license.title": "Creative Commons license",
+  // TODO New key - Add a translation
+  "item.page.cc.license.title": "Creative Commons license",
+
+  // "item.page.cc.license.disclaimer": "Except where otherwised noted, this item's license is described as",
+  // TODO New key - Add a translation
+  "item.page.cc.license.disclaimer": "Except where otherwised noted, this item's license is described as",
 }
diff --git a/src/assets/i18n/de.json5 b/src/assets/i18n/de.json5
index b03dc21e5a..5e48b3d7e8 100644
--- a/src/assets/i18n/de.json5
+++ b/src/assets/i18n/de.json5
@@ -9,8 +9,6 @@
   // "401.unauthorized": "unauthorized",
   "401.unauthorized": "unautorisiert",
 
-
-
   // "403.help": "You don't have permission to access this page. You can use the button below to get back to the home page.",
   "403.help": "Sie sind nicht berechtigt, auf diese Seite zuzugreifen. Über den Button unten auf der Seite gelangen Sie zurück zur Startseite.",
 
@@ -20,8 +18,6 @@
   // "403.forbidden": "forbidden",
   "403.forbidden": "verboten",
 
-
-
   // "404.help": "We can't find the page you're looking for. The page may have been moved or deleted. You can use the button below to get back to the home page. ",
   "404.help": "Die Seite konnte nicht gefunden werden. Eventuell wurde sie verschoben oder gelöscht. Über den Button unten auf der Seite gelangen Sie zurück zur Startseite.",
 
@@ -31,6 +27,16 @@
   // "404.page-not-found": "page not found",
   "404.page-not-found": "Seite nicht gefunden",
 
+  // "500.page-internal-server-error": "Service unavailable",
+  "500.page-internal-server-error": "Dienst nicht verfügbar",
+
+  // "500.help": "The server is temporarily unable to service your request due to maintenance downtime or capacity problems. Please try again later.",
+  "500.help": "Der Dienst steht momentan nicht zur Verfügung. Bitte versuchen Sie es später noch einmal.",
+
+  // "500.link.home-page": "Take me to the home page",
+  "500.link.home-page": "Zur Startseite",
+
+
   // "admin.access-control.epeople.breadcrumbs": "EPeople",
   "admin.access-control.epeople.breadcrumbs": "Personen suchen",
 
@@ -731,9 +737,6 @@
   // "admin.workflow.title": "Administer Workflow",
   "admin.workflow.title": "Workflows verwalten",
 
-  // "admin.workflow.item.workflow": "Workflow",
-  "admin.workflow.item.workflow": "Workflows",
-
   // "admin.workflow.item.delete": "Delete",
   "admin.workflow.item.delete": "Löschen",
 
@@ -1382,7 +1385,7 @@
 
 
   // "community.create.head": "Create a Community",
-  "community.create.head": "Sammlung anlegen",
+  "community.create.head": "Bereich anlegen",
 
   // "community.create.notifications.success": "Successfully created the Community",
   "community.create.notifications.success": "Bereich erfolgreich angelegt",
@@ -1712,7 +1715,8 @@
   // "curation-task.task.vscan.label": "Virus Scan",
   "curation-task.task.vscan.label": "Virenscan",
 
-
+  // "curation-task.task.registerdoi.label": "Register DOI",
+  "curation-task.task.registerdoi.label": "DOI registrieren",
 
   // "curation.form.task-select.label": "Task:",
   "curation.form.task-select.label": "Aufgabe:",
@@ -2192,6 +2196,44 @@
   // "info.privacy.title": "Privacy Statement",
   "info.privacy.title": "Datenschutzerklärung",
 
+  // "info.feedback.breadcrumbs": "Feedback",
+  "info.feedback.breadcrumbs": "Feedback",
+
+  // "info.feedback.head": "Feedback",
+  "info.feedback.head": "Feedback",
+
+  // "info.feedback.title": "Feedback",
+  "info.feedback.title": "Feedback",
+
+  // "info.feedback.info": "Thanks for sharing your feedback about the DSpace system. Your comments are appreciated!",
+  "info.feedback.info": "Wir freuen uns auf Ihr Feedback. Sofern Sie eine Rückmeldung wünschen, werden wir uns in Kürze bei Ihnen melden.",
+
+  // "info.feedback.email_help": "This address will be used to follow up on your feedback.",
+  "info.feedback.email_help": "Sollten wir Rückfragen zu Ihrem Feedback haben, dann kontaktieren wir Sie unter dieser E-Mailadresse.",
+
+  // "info.feedback.send": "Send Feedback",
+  "info.feedback.send": "Feedback senden",
+
+  // "info.feedback.comments": "Comments",
+  "info.feedback.comments": "Ihr Kommentar",
+
+  // "info.feedback.email-label": "Your Email",
+  "info.feedback.email-label": "Ihre E-Mailadresse",
+
+  // "info.feedback.create.success": "Feedback Sent Successfully!",
+  "info.feedback.create.success": "Vielen Dank für Ihr Feedback! Ihr Feedback wurde erfolgreich versendet.",
+
+  // "info.feedback.error.email.required": "A valid email address is required",
+  "info.feedback.error.email.required": "Bitte geben Sie eine gültige E-Mailadresse ein!",
+
+  // "info.feedback.error.message.required": "A comment is required",
+  "info.feedback.error.message.required": "Bitte geben Sie einen Kommentar ein!",
+
+  // "info.feedback.page-label": "Page",
+  "info.feedback.page-label": "URL der Seite",
+
+  // "info.feedback.page_help": "The page related to your feedback",
+  "info.feedback.page_help": "Dies ist die URL der Seite, auf die sich Ihr Feedback bezieht.",
 
 
   // "item.alerts.private": "This item is private",
@@ -3013,7 +3055,7 @@
   "journalissue.listelement.badge": "Zeitschriftenheft",
 
   // "journalissue.page.description": "Description",
-  "journalissue.page.description": "Beschreibeung",
+  "journalissue.page.description": "Beschreibung",
 
   // "journalissue.page.edit": "Edit this item",
   "journalissue.page.edit": "Dieses Item bearbeiten",
@@ -3484,20 +3526,20 @@
   // "mydspace.show.workspace": "Your Submissions",
   "mydspace.show.workspace": "Ihre Veröffentlichungen",
 
-  // "mydspace.status.archived": "Archived",
-  "mydspace.status.archived": "Archiviert",
+  // "mydspace.status.mydspaceArchived": "Archived",
+  "mydspace.status.mydspaceArchived": "Archiviert",
 
-  // "mydspace.status.validation": "Validation",
-  "mydspace.status.validation": "Validierung",
+  // "mydspace.status.mydspaceValidation": "Validation",
+  "mydspace.status.mydspaceValidation": "Validierung",
 
-  // "mydspace.status.waiting-for-controller": "Waiting for controller",
-  "mydspace.status.waiting-for-controller": "Warten auf die Überprüfung",
+  // "mydspace.status.mydspaceWaitingController": "Waiting for reviewer",
+  "mydspace.status.mydspaceWaitingController": "Warten auf die Überprüfung",
 
-  // "mydspace.status.workflow": "Workflow",
-  "mydspace.status.workflow": "Geschäftsgang",
+  // "mydspace.status.mydspaceWorkflow": "Workflow",
+  "mydspace.status.mydspaceWorkflow": "Geschäftsgang",
 
-  // "mydspace.status.workspace": "Workspace",
-  "mydspace.status.workspace": "Arbeitsbereich",
+  // "mydspace.status.mydspaceWorkspace": "Workspace",
+  "mydspace.status.mydspaceWorkspace": "Arbeitsbereich",
 
   // "mydspace.title": "MyDSpace",
   "mydspace.title": "Mein DSpace",
@@ -4202,6 +4244,9 @@
   // "resource-policies.form.name.label": "Name",
   "resource-policies.form.name.label": "Name",
 
+  //"resource-policies.form.name.hint": "Max 30 characters",
+  "resource-policies.form.name.hint": "Maximal 30 Zeichen",
+
   // "resource-policies.form.policy-type.label": "Select the policy type",
   "resource-policies.form.policy-type.label": "Wählen Sie den Richtlinientyp",
 
@@ -4487,6 +4532,21 @@
   // "search.filters.discoverable.false": "Yes",
   "search.filters.discoverable.false": "Ja",
 
+  // "search.filters.namedresourcetype.Archived": "Archived",
+  "search.filters.namedresourcetype.Archived": "Archiviert",
+
+  // "search.filters.namedresourcetype.Validation": "Validation",
+  "search.filters.namedresourcetype.Validation": "Validierung",
+
+  // "search.filters.namedresourcetype.Waiting for Controller": "Waiting for Controller",
+  "search.filters.namedresourcetype.Waiting for Controller": "Warten auf die Überprüfung",
+
+  // "search.filters.namedresourcetype.Workflow": "Workflow",
+  "search.filters.namedresourcetype.Workflow": "Geschäftsgang",
+
+  // "search.filters.namedresourcetype.Workspace": "Workspace",
+  "search.filters.namedresourcetype.Workspace": "Arbeitsbereich",
+
   // "search.filters.withdrawn.true": "Yes",
   "search.filters.withdrawn.true": "Ja",
 
@@ -4755,6 +4815,12 @@
   // "submission.sections.describe.relationship-lookup.external-source.import-button-title.Journal Volume": "Import remote journal volume",
   "submission.sections.describe.relationship-lookup.external-source.import-button-title.Journal Volume": "Zeitschriftenband importieren",
 
+  // "submission.sections.describe.relationship-lookup.external-source.import-button-title.none": "Import remote item",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.none": "Item importieren",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-button-title.Publication": "Import remote publication",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Publication": "Metadaten der Publikation importieren",
+
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.isAuthorOfPublication.title": "Import Remote Author",
   "submission.sections.describe.relationship-lookup.external-source.import-modal.isAuthorOfPublication.title": "Importiere Autor:innen-Metadaten",
 
@@ -5089,10 +5155,10 @@
   "submission.sections.general.deposit_error_notice": "Beim Einreichen des Items ist ein Fehler aufgetreten. Bitte versuchen Sie es später noch einmal.",
 
   // "submission.sections.general.deposit_success_notice": "Submission deposited successfully.",
-  "submission.sections.general.deposit_success_notice": "Veröffentlichung erfolgreich eingereicht",
+  "submission.sections.general.deposit_success_notice": "Veröffentlichung erfolgreich eingereicht.",
 
   // "submission.sections.general.discard_error_notice": "There was an issue when discarding the item, please try again later.",
-  "submission.sections.general.discard_error_notice": "Beim Verwerfen der Einreichung ist ein Fehler aufgetreten. Bitte versuchen Sie es später noch einmal",
+  "submission.sections.general.discard_error_notice": "Beim Verwerfen der Einreichung ist ein Fehler aufgetreten. Bitte versuchen Sie es später noch einmal.",
 
   // "submission.sections.general.discard_success_notice": "Submission discarded successfully.",
   "submission.sections.general.discard_success_notice": "Einreichung erfolgreich verworfen.",
@@ -5410,7 +5476,7 @@
   "workflow-item.delete.notification.success.title": "Gelöscht",
 
   // "workflow-item.delete.notification.success.content": "This workflow item was successfully deleted",
-  "workflow-item.delete.notification.success.content": "Dieses Workflow-Item wurde gelöscht.",
+  "workflow-item.delete.notification.success.content": "Dieses Workflow-Item wurde erfolgreich gelöscht.",
 
   // "workflow-item.delete.notification.error.title": "Something went wrong",
   "workflow-item.delete.notification.error.title": "Das hat leider nicht funktioniert.",
@@ -5455,4 +5521,46 @@
   // "workflow-item.send-back.button.confirm": "Send back"
   "workflow-item.send-back.button.confirm": "Zurücksenden",
 
+  // "workflow-item.view.breadcrumbs": "Workflow View",
+  "workflow-item.view.breadcrumbs": "Workflow-Ansicht",
+
+  // "workspace-item.view.breadcrumbs": "Workspace View",
+  "workspace-item.view.breadcrumbs": "Workspace-Ansicht",
+
+  // "workspace-item.view.title": "Workspace View",
+  "workspace-item.view.title": "Workspace-Ansicht",
+
+  // "workspace-item.delete.breadcrumbs": "Workspace Delete",
+  "workspace-item.delete.breadcrumbs": "Workspace-Item löschen",
+
+  // "workspace-item.delete.header": "Delete workspace item",
+  "workspace-item.delete.header": "Workspace-Item löschen",
+
+  // "workspace-item.delete.button.confirm": "Delete",
+  "workspace-item.delete.button.confirm": "Löschen",
+
+  // "workspace-item.delete.button.cancel": "Cancel",
+  "workspace-item.delete.button.cancel": "Abbrechen",
+
+  // "workspace-item.delete.notification.success.title": "Deleted",
+  "workspace-item.delete.notification.success.title": "Gelöscht",
+
+  // "workspace-item.delete.title": "This workspace item was successfully deleted",
+  "workspace-item.delete.title": "Dieses Workspace-Item wurde erfolgreich gelöscht.",
+
+  // "workspace-item.delete.notification.error.title": "Something went wrong",
+  "workspace-item.delete.notification.error.title": "Das hat leider nicht funktioniert.",
+
+  // "workspace-item.delete.notification.error.content": "The workspace item could not be deleted",
+  "workspace-item.delete.notification.error.content": "Das Workspace-Item konnte nicht gelöscht werden.",
+
+
+  // "form.date-picker.placeholder.year": "Year",
+  "form.date-picker.placeholder.year": "Jahr",
+
+  // "form.date-picker.placeholder.month": "Month",
+  "form.date-picker.placeholder.month": "Monat",
+
+  // "form.date-picker.placeholder.day": "Day",
+  "form.date-picker.placeholder.day": "Tag",
 }
diff --git a/src/assets/i18n/el.json5 b/src/assets/i18n/el.json5
index af8a4fce49..8bb7388296 100644
--- a/src/assets/i18n/el.json5
+++ b/src/assets/i18n/el.json5
@@ -1315,11 +1315,11 @@
   "mydspace.search-form.placeholder": "Αναζήτηση στο mydspace...",
   "mydspace.show.workflow": "Εργασίες ροής εργασιών",
   "mydspace.show.workspace": "Οι Υποβολές σας",
-  "mydspace.status.archived": "Αρχειοθετημένα",
-  "mydspace.status.validation": "Επικύρωση",
-  "mydspace.status.waiting-for-controller": "Αναμονή για τον ελεγκτή",
-  "mydspace.status.workflow": "Ροή εργασιών",
-  "mydspace.status.workspace": "Χώρος εργασίας",
+  "mydspace.status.mydspaceArchived": "Αρχειοθετημένα",
+  "mydspace.status.mydspaceValidation": "Επικύρωση",
+  "mydspace.status.mydspaceWaitingController": "Αναμονή για τον ελεγκτή",
+  "mydspace.status.mydspaceWorkflow": "Ροή εργασιών",
+  "mydspace.status.mydspaceWorkspace": "Χώρος εργασίας",
   "mydspace.title": "MyDSpace",
   "mydspace.upload.upload-failed": "Σφάλμα κατά τη δημιουργία νέου χώρου εργασίας. Επαληθεύστε το περιεχόμενο που ανεβάσατε πριν δοκιμάσετε ξανά.",
   "mydspace.upload.upload-failed-manyentries": "Μη επεξεργάσιμο αρχείο. Εντοπίστηκαν πάρα πολλές καταχωρίσεις, αλλά επιτρέπεται μόνο μία για αρχείο.",
@@ -1687,6 +1687,9 @@
   "resource-policies.form.eperson-group-list.table.headers.id": "ID",
   "resource-policies.form.eperson-group-list.table.headers.name": "Ονομα",
   "resource-policies.form.name.label": "Ονομα",
+  //"resource-policies.form.name.hint": "Max 30 characters",
+  // TODO New key - Add a translation
+  "resource-policies.form.name.hint": "Max 30 characters",
   "resource-policies.form.policy-type.label": "Επιλέξτε τον τύπο πολιτικής",
   "resource-policies.form.policy-type.required": "Πρέπει να επιλέξετε τον τύπο πολιτικής πόρων.",
   "resource-policies.table.headers.action": "Δράση",
@@ -1882,7 +1885,7 @@
   "submission.import-external.source.ads": "NASA/ADS",
   "submission.import-external.source.arxiv": "arXiv",
   "submission.import-external.source.cinii": "CiNii",
-  "submission.import-external.source.crossref": "CrossRef",
+  "submission.import-external.source.crossref": "Crossref",
   "submission.import-external.source.epo": "Ευρωπαϊκό Γραφείο Διπλωμάτων Ευρεσιτεχνίας (EPO)",
   "submission.import-external.source.lcname": "Βιβλιοθήκη Ονομάτων του Κογκρέσου (Library of Congress Names)",
   "submission.import-external.source.loading": "Φόρτωση ...",
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index 6c91bae4c1..5a75de6a66 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -1,18 +1,17 @@
 {
-
   "401.help": "You're not authorized to access this page. You can use the button below to get back to the home page.",
 
   "401.link.home-page": "Take me to the home page",
 
-  "401.unauthorized": "unauthorized",
+  "401.unauthorized": "Unauthorized",
 
   "403.help": "You don't have permission to access this page. You can use the button below to get back to the home page.",
 
   "403.link.home-page": "Take me to the home page",
 
-  "403.forbidden": "forbidden",
+  "403.forbidden": "Forbidden",
 
-  "500.page-internal-server-error": "Service Unavailable",
+  "500.page-internal-server-error": "Service unavailable",
 
   "500.help": "The server is temporarily unable to service your request due to maintenance downtime or capacity problems. Please try again later.",
 
@@ -22,15 +21,15 @@
 
   "404.link.home-page": "Take me to the home page",
 
-  "404.page-not-found": "page not found",
+  "404.page-not-found": "Page not found",
 
-  "error-page.description.401": "unauthorized",
+  "error-page.description.401": "Unauthorized",
 
-  "error-page.description.403": "forbidden",
+  "error-page.description.403": "Forbidden",
 
-  "error-page.description.500": "Service Unavailable",
+  "error-page.description.500": "Service unavailable",
 
-  "error-page.description.404": "page not found",
+  "error-page.description.404": "Page not found",
 
   "error-page.orcid.generic-error": "An error occurred during login via ORCID. Make sure you have shared your ORCID account email address with DSpace. If the error persists, contact the administrator",
 
@@ -58,7 +57,7 @@
 
   "admin.registries.bitstream-formats.create.failure.head": "Failure",
 
-  "admin.registries.bitstream-formats.create.head": "Create Bitstream format",
+  "admin.registries.bitstream-formats.create.head": "Create bitstream format",
 
   "admin.registries.bitstream-formats.create.new": "Add a new bitstream format",
 
@@ -128,6 +127,8 @@
 
   "admin.registries.bitstream-formats.table.name": "Name",
 
+  "admin.registries.bitstream-formats.table.selected": "Selected bitstream formats",
+
   "admin.registries.bitstream-formats.table.id": "ID",
 
   "admin.registries.bitstream-formats.table.return": "Back",
@@ -142,6 +143,10 @@
 
   "admin.registries.bitstream-formats.title": "Bitstream Format Registry",
 
+  "admin.registries.bitstream-formats.select": "Select",
+
+  "admin.registries.bitstream-formats.deselect": "Deselect",
+
   "admin.registries.metadata.breadcrumbs": "Metadata registry",
 
   "admin.registries.metadata.description": "The metadata registry maintains a list of all metadata fields available in the repository. These fields may be divided amongst multiple schemas. However, DSpace requires the qualified Dublin Core schema.",
@@ -158,8 +163,14 @@
 
   "admin.registries.metadata.schemas.no-items": "No metadata schemas to show.",
 
+  "admin.registries.metadata.schemas.select": "Select",
+
+  "admin.registries.metadata.schemas.deselect": "Deselect",
+
   "admin.registries.metadata.schemas.table.delete": "Delete selected",
 
+  "admin.registries.metadata.schemas.table.selected": "Selected schemas",
+
   "admin.registries.metadata.schemas.table.id": "ID",
 
   "admin.registries.metadata.schemas.table.name": "Name",
@@ -172,6 +183,10 @@
 
   "admin.registries.schema.description": "This is the metadata schema for \"{{namespace}}\".",
 
+  "admin.registries.schema.fields.select": "Select",
+
+  "admin.registries.schema.fields.deselect": "Deselect",
+
   "admin.registries.schema.fields.head": "Schema metadata fields",
 
   "admin.registries.schema.fields.no-items": "No metadata fields to show.",
@@ -180,6 +195,8 @@
 
   "admin.registries.schema.fields.table.field": "Field",
 
+  "admin.registries.schema.fields.table.selected": "Selected metadata fields",
+
   "admin.registries.schema.fields.table.id": "ID",
 
   "admin.registries.schema.fields.table.scopenote": "Scope Note",
@@ -248,6 +265,14 @@
 
   "admin.access-control.epeople.title": "EPeople",
 
+  "admin.access-control.epeople.edit.breadcrumbs": "New EPerson",
+
+  "admin.access-control.epeople.edit.title": "New EPerson",
+
+  "admin.access-control.epeople.add.breadcrumbs": "Add EPerson",
+
+  "admin.access-control.epeople.add.title": "Add EPerson",
+
   "admin.access-control.epeople.head": "EPeople",
 
   "admin.access-control.epeople.search.head": "Search",
@@ -256,7 +281,7 @@
 
   "admin.access-control.epeople.search.scope.metadata": "Metadata",
 
-  "admin.access-control.epeople.search.scope.email": "E-mail (exact)",
+  "admin.access-control.epeople.search.scope.email": "Email (exact)",
 
   "admin.access-control.epeople.search.button": "Search",
 
@@ -268,7 +293,7 @@
 
   "admin.access-control.epeople.table.name": "Name",
 
-  "admin.access-control.epeople.table.email": "E-mail (exact)",
+  "admin.access-control.epeople.table.email": "Email (exact)",
 
   "admin.access-control.epeople.table.edit": "Edit",
 
@@ -288,9 +313,9 @@
 
   "admin.access-control.epeople.form.lastName": "Last name",
 
-  "admin.access-control.epeople.form.email": "E-mail",
+  "admin.access-control.epeople.form.email": "Email",
 
-  "admin.access-control.epeople.form.emailHint": "Must be valid e-mail address",
+  "admin.access-control.epeople.form.emailHint": "Must be a valid email address",
 
   "admin.access-control.epeople.form.canLogIn": "Can log in",
 
@@ -326,7 +351,7 @@
 
   "admin.access-control.epeople.form.goToGroups": "Add to groups",
 
-  "admin.access-control.epeople.notification.deleted.failure": "Failed to delete EPerson: \"{{name}}\"",
+  "admin.access-control.epeople.notification.deleted.failure": "Error occurred when trying to delete EPerson with id \"{{id}}\" with code: \"{{statusCode}}\" and message: \"{{restResponse.errorMessage}}\"",
 
   "admin.access-control.epeople.notification.deleted.success": "Successfully deleted EPerson: \"{{name}}\"",
 
@@ -426,10 +451,6 @@
 
   "admin.access-control.groups.form.members-list.headMembers": "Current Members",
 
-  "admin.access-control.groups.form.members-list.search.scope.metadata": "Metadata",
-
-  "admin.access-control.groups.form.members-list.search.scope.email": "E-mail (exact)",
-
   "admin.access-control.groups.form.members-list.search.button": "Search",
 
   "admin.access-control.groups.form.members-list.table.id": "ID",
@@ -486,8 +507,6 @@
 
   "admin.access-control.groups.form.subgroups-list.table.edit.buttons.add": "Add subgroup with name \"{{name}}\"",
 
-  "admin.access-control.groups.form.subgroups-list.table.edit.currentGroup": "Current group",
-
   "admin.access-control.groups.form.subgroups-list.notification.success.addSubgroup": "Successfully added subgroup: \"{{name}}\"",
 
   "admin.access-control.groups.form.subgroups-list.notification.failure.addSubgroup": "Failed to add subgroup: \"{{name}}\"",
@@ -508,9 +527,9 @@
 
   "admin.access-control.groups.form.tooltip.editGroupPage": "On this page, you can modify the properties and members of a group. In the top section, you can edit the group name and description, unless this is an admin group for a collection or community, in which case the group name and description are auto-generated and cannot be edited. In the following sections, you can edit group membership. See [the wiki](https://wiki.lyrasis.org/display/DSDOC7x/Create+or+manage+a+user+group) for more details.",
 
-  "admin.access-control.groups.form.tooltip.editGroup.addEpeople": "To add or remove an EPerson to/from this group, either click the 'Browse All' button or use the search bar below to search for users (use the dropdown to the left of the search bar to choose whether to search by metadata or by email). Then click the plus icon for each user you wish to add in the list below, or the trash can icon for each user you wish to remove. The list below may have several pages: use the page controls below the list to navigate to the next pages. Once you are ready, save your changes by clicking the 'Save' button in the top section.",
+  "admin.access-control.groups.form.tooltip.editGroup.addEpeople": "To add or remove an EPerson to/from this group, either click the 'Browse All' button or use the search bar below to search for users (use the dropdown to the left of the search bar to choose whether to search by metadata or by email). Then click the plus icon for each user you wish to add in the list below, or the trash can icon for each user you wish to remove. The list below may have several pages: use the page controls below the list to navigate to the next pages.",
 
-  "admin.access-control.groups.form.tooltip.editGroup.addSubgroups": "To add or remove a Subgroup to/from this group, either click the 'Browse All' button or use the search bar below to search for users. Then click the plus icon for each user you wish to add in the list below, or the trash can icon for each user you wish to remove. The list below may have several pages: use the page controls below the list to navigate to the next pages. Once you are ready, save your changes by clicking the 'Save' button in the top section.",
+  "admin.access-control.groups.form.tooltip.editGroup.addSubgroups": "To add or remove a Subgroup to/from this group, either click the 'Browse All' button or use the search bar below to search for groups. Then click the plus icon for each group you wish to add in the list below, or the trash can icon for each group you wish to remove. The list below may have several pages: use the page controls below the list to navigate to the next pages.",
 
   "admin.search.breadcrumbs": "Administrative Search",
 
@@ -586,9 +605,9 @@
 
   "admin.metadata-import.page.error.addFile": "Select file first!",
 
-  "admin.metadata-import.page.error.addFileUrl": "Insert file url first!",
+  "admin.metadata-import.page.error.addFileUrl": "Insert file URL first!",
 
-  "admin.batch-import.page.error.addFile": "Select Zip file first!",
+  "admin.batch-import.page.error.addFile": "Select ZIP file first!",
 
   "admin.metadata-import.page.toggle.upload": "Upload",
 
@@ -624,10 +643,6 @@
 
   "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.headMembers": "Current Members",
 
-  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.scope.metadata": "Metadata",
-
-  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.scope.email": "E-mail (exact)",
-
   "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.button": "Search",
 
   "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.id": "ID",
@@ -750,7 +765,7 @@
 
   "bitstream-request-a-copy.name.error": "The name is required",
 
-  "bitstream-request-a-copy.email.label": "Your e-mail address *",
+  "bitstream-request-a-copy.email.label": "Your email address *",
 
   "bitstream-request-a-copy.email.hint": "This email address is used for sending the file.",
 
@@ -782,6 +797,8 @@
 
   "browse.comcol.by.srsc": "By Subject Category",
 
+  "browse.comcol.by.nsi": "By Norwegian Science Index",
+
   "browse.comcol.by.title": "By Title",
 
   "browse.comcol.head": "Browse",
@@ -804,6 +821,8 @@
 
   "browse.metadata.srsc.breadcrumbs": "Browse by Subject Category",
 
+  "browse.metadata.nsi.breadcrumbs": "Browse by Norwegian Science Index",
+
   "browse.metadata.title.breadcrumbs": "Browse by Title",
 
   "pagination.next.button": "Next",
@@ -812,6 +831,8 @@
 
   "pagination.next.button.disabled.tooltip": "No more pages of results",
 
+  "pagination.page-number-bar": "Control bar for page navigation, relative to element with ID: ",
+
   "browse.startsWith": ", starting with {{ startsWith }}",
 
   "browse.startsWith.choose_start": "(Choose start)",
@@ -860,6 +881,8 @@
 
   "browse.startsWith.input": "Filter",
 
+  "browse.taxonomy_srsc.title": "Browsing by Subject Category",
+
   "browse.taxonomy.button": "Browse",
 
   "browse.title": "Browsing {{ collection }} by {{ field }}{{ startsWith }} {{ value }}",
@@ -876,6 +899,10 @@
 
   "claimed-declined-task-search-result-list-element.title": "Declined, sent back to Review Manager's workflow",
 
+  "collection.create.breadcrumbs": "Create collection",
+
+  "collection.browse.logo": "Browse for a collection logo",
+
   "collection.create.head": "Create a Collection",
 
   "collection.create.notifications.success": "Successfully created the Collection",
@@ -1072,6 +1099,8 @@
 
   "collection.listelement.badge": "Collection",
 
+  "collection.logo": "Collection logo",
+
   "collection.page.browse.recent.head": "Recent Submissions",
 
   "collection.page.browse.recent.empty": "No items to show",
@@ -1088,6 +1117,12 @@
 
   "collection.select.empty": "No collections to show",
 
+  "collection.select.table.selected": "Selected collections",
+
+  "collection.select.table.select": "Select collection",
+
+  "collection.select.table.deselect": "Deselect collection",
+
   "collection.select.table.title": "Title",
 
   "collection.source.controls.head": "Harvest Controls",
@@ -1148,6 +1183,14 @@
 
   "communityList.showMore": "Show More",
 
+  "communityList.expand": "Expand {{ name }}",
+
+  "communityList.collapse": "Collapse {{ name }}",
+
+  "community.browse.logo": "Browse for a community logo",
+
+  "community.create.breadcrumbs": "Create Community",
+
   "community.create.head": "Create a Community",
 
   "community.create.notifications.success": "Successfully created the Community",
@@ -1182,9 +1225,9 @@
 
   "community.edit.logo.label": "Community logo",
 
-  "community.edit.logo.notifications.add.error": "Uploading Community logo failed. Please verify the content before retrying.",
+  "community.edit.logo.notifications.add.error": "Uploading community logo failed. Please verify the content before retrying.",
 
-  "community.edit.logo.notifications.add.success": "Upload Community logo successful.",
+  "community.edit.logo.notifications.add.success": "Upload community logo successful.",
 
   "community.edit.logo.notifications.delete.success.title": "Logo deleted",
 
@@ -1192,13 +1235,13 @@
 
   "community.edit.logo.notifications.delete.error.title": "Error deleting logo",
 
-  "community.edit.logo.upload": "Drop a Community Logo to upload",
+  "community.edit.logo.upload": "Drop a community logo to upload",
 
   "community.edit.notifications.success": "Successfully edited the Community",
 
   "community.edit.notifications.unauthorized": "You do not have privileges to make this change",
 
-  "community.edit.notifications.error": "An error occured while editing the Community",
+  "community.edit.notifications.error": "An error occurred while editing the community",
 
   "community.edit.return": "Back",
 
@@ -1224,6 +1267,8 @@
 
   "community.listelement.badge": "Community",
 
+  "community.logo": "Community logo",
+
   "comcol-role.edit.no-group": "None",
 
   "comcol-role.edit.create": "Create",
@@ -1256,7 +1301,7 @@
 
   "comcol-role.edit.bitstream_read.name": "Default bitstream read access",
 
-  "comcol-role.edit.bitstream_read.description": "Community administrators can create sub-communities or collections, and manage or assign management for those sub-communities or collections. In addition, they decide who can submit items to any sub-collections, edit item metadata (after submission), and add (map) existing items from other collections (subject to authorization).",
+  "comcol-role.edit.bitstream_read.description": "E-People and Groups that can read new bitstreams submitted to this collection. Changes to this role are not retroactive. Existing bitstreams in the system will still be viewable by those who had read access at the time of their addition.",
 
   "comcol-role.edit.bitstream_read.anonymous-group": "Default read for incoming bitstreams is currently set to Anonymous.",
 
@@ -1392,7 +1437,7 @@
 
   "curation-task.task.vscan.label": "Virus Scan",
 
-  "curation-task.task.register-doi.label": "Register DOI",
+  "curation-task.task.registerdoi.label": "Register DOI",
 
   "curation.form.task-select.label": "Task:",
 
@@ -1404,7 +1449,7 @@
 
   "curation.form.submit.error.head": "Running the curation task failed",
 
-  "curation.form.submit.error.content": "An error occured when trying to start the curation task.",
+  "curation.form.submit.error.content": "An error occurred when trying to start the curation task.",
 
   "curation.form.submit.error.invalid-handle": "Couldn't determine the handle for this object",
 
@@ -1424,6 +1469,12 @@
 
   "deny-request-copy.success": "Successfully denied item request",
 
+  "dynamic-list.load-more": "Load more",
+
+  "dropdown.clear": "Clear selection",
+
+  "dropdown.clear.tooltip": "Clear the selected option",
+
   "dso.name.untitled": "Untitled",
 
   "dso.name.unnamed": "Unnamed",
@@ -1572,6 +1623,8 @@
 
   "error.recent-submissions": "Error fetching recent submissions",
 
+  "error.profile-groups": "Error retrieving profile groups",
+
   "error.search-results": "Error fetching search results",
 
   "error.invalid-search-query": "Search query is not valid. Please check <a href=\"https://solr.apache.org/guide/query-syntax-and-parsing.html\" target=\"_blank\">Solr query syntax</a> best practices for further information about this error.",
@@ -1592,9 +1645,9 @@
 
   "error.validation.required": "This field is required",
 
-  "error.validation.NotValidEmail": "This E-mail is not a valid email",
+  "error.validation.NotValidEmail": "This is not a valid email",
 
-  "error.validation.emailTaken": "This E-mail is already taken",
+  "error.validation.emailTaken": "This email is already taken",
 
   "error.validation.groupExists": "This group already exists",
 
@@ -1614,6 +1667,8 @@
 
   "feed.description": "Syndication feed",
 
+  "file-download-link.restricted": "Restricted bitstream",
+
   "file-section.error.header": "Error obtaining files for this item",
 
   "footer.copyright": "copyright © 2002-{{ year }}",
@@ -1650,7 +1705,7 @@
 
   "forgot-email.form.error.head": "Error when trying to reset password",
 
-  "forgot-email.form.error.content": "An error occured when attempting to reset the password for the account associated with the following email address: {{ email }}",
+  "forgot-email.form.error.content": "An error occurred when attempting to reset the password for the account associated with the following email address: {{ email }}",
 
   "forgot-password.title": "Forgot Password",
 
@@ -1668,7 +1723,7 @@
 
   "forgot-password.form.label.passwordrepeat": "Retype to confirm",
 
-  "forgot-password.form.error.empty-password": "Please enter a password in the box below.",
+  "forgot-password.form.error.empty-password": "Please enter a password in the boxes above.",
 
   "forgot-password.form.error.matching-passwords": "The passwords do not match.",
 
@@ -1748,6 +1803,16 @@
 
   "form.repeatable.sort.tip": "Drop the item in the new position",
 
+  "form.number-picker.decrement": "Decrement {{field}}",
+
+  "form.number-picker.increment": "Increment {{field}}",
+
+  "form.date-picker.placeholder.year": "Year",
+
+  "form.date-picker.placeholder.month": "Month",
+
+  "form.date-picker.placeholder.day": "Day",
+
   "grant-deny-request-copy.deny": "Don't send copy",
 
   "grant-deny-request-copy.email.back": "Back",
@@ -1888,7 +1953,7 @@
 
   "info.feedback.page-label": "Page",
 
-  "info.feedback.page_help": "Tha page related to your feedback",
+  "info.feedback.page_help": "The page related to your feedback",
 
   "item.alerts.private": "This item is non-discoverable",
 
@@ -1934,6 +1999,10 @@
 
   "item.edit.bitstreams.bundle.name": "BUNDLE: {{ name }}",
 
+  "item.edit.bitstreams.bundle.table.aria-label": "Bitstreams in the  {{ bundle }} Bundle",
+
+  "item.edit.bitstreams.bundle.tooltip": "You can move a bitstream to a different page by dropping it on the page number.",
+
   "item.edit.bitstreams.discard-button": "Discard",
 
   "item.edit.bitstreams.edit.buttons.download": "Download",
@@ -1946,8 +2015,20 @@
 
   "item.edit.bitstreams.edit.buttons.undo": "Undo changes",
 
+  "item.edit.bitstreams.edit.live.cancel": "{{ bitstream }} was returned to position {{ toIndex }} and is no longer selected.",
+
+  "item.edit.bitstreams.edit.live.clear": "{{ bitstream }} is no longer selected.",
+
+  "item.edit.bitstreams.edit.live.loading": "Waiting for move to complete.",
+
+  "item.edit.bitstreams.edit.live.select": "{{ bitstream }} is selected.",
+
+  "item.edit.bitstreams.edit.live.move": "{{ bitstream }} is now in position {{ toIndex }}.",
+
   "item.edit.bitstreams.empty": "This item doesn't contain any bitstreams. Click the upload button to create one.",
 
+  "item.edit.bitstreams.info-alert": "Bitstreams can be reordered within their bundles by holding the drag handle and moving the mouse. Alternatively, bitstreams can be moved using the keyboard in the following way: Select the bitstream by pressing enter when the bitstream's drag handle is in focus. Move the bitstream up or down using the arrow keys. Press enter again to confirm the current position of the bitstream.",
+
   "item.edit.bitstreams.headers.actions": "Actions",
 
   "item.edit.bitstreams.headers.bundle": "Bundle",
@@ -1984,6 +2065,8 @@
 
   "item.edit.bitstreams.upload-button": "Upload",
 
+  "item.edit.bitstreams.load-more.link": "Load more",
+
   "item.edit.delete.cancel": "Cancel",
 
   "item.edit.delete.confirm": "Delete",
@@ -2088,6 +2171,10 @@
 
   "item.edit.metadata.discard-button": "Discard",
 
+  "item.edit.metadata.edit.language": "Edit language",
+
+  "item.edit.metadata.edit.value": "Edit value",
+
   "item.edit.metadata.edit.buttons.confirm": "Confirm",
 
   "item.edit.metadata.edit.buttons.drag": "Drag to reorder",
@@ -2112,6 +2199,8 @@
 
   "item.edit.metadata.headers.value": "Value",
 
+  "item.edit.metadata.metadatafield": "Edit field",
+
   "item.edit.metadata.metadatafield.error": "An error occurred validating the metadata field",
 
   "item.edit.metadata.metadatafield.invalid": "Please choose a valid metadata field",
@@ -2162,6 +2251,8 @@
 
   "item.edit.move.inheritpolicies.description": "Inherit the default policies of the destination collection",
 
+  "item.edit.move.inheritpolicies.tooltip": "Warning: When enabled, the read access policy for the item and any files associated with the item will be replaced by the default read access policy of the collection. This cannot be undone.",
+
   "item.edit.move.move": "Move",
 
   "item.edit.move.processing": "Moving...",
@@ -2440,7 +2531,7 @@
 
   "item.page.version.create": "Create new version",
 
-  "item.page.version.hasDraft": "A new version cannot be created because there is an inprogress submission in the version history",
+  "item.page.version.hasDraft": "A new version cannot be created because there is an in-progress submission in the version history",
 
   "item.page.claim.button": "Claim",
 
@@ -2468,6 +2559,14 @@
 
   "item.preview.oaire.citation.volume": "Volume",
 
+  "item.preview.dc.relation.hasversion": "Has version",
+
+  "item.preview.dc.relation.ispartofseries": "Is part of series",
+
+  "item.preview.dc.rights": "Rights",
+
+  "item.preview.dc.identifier.other": "Other Identifier",
+
   "item.preview.dc.relation.issn": "ISSN",
 
   "item.preview.dc.identifier.isbn": "ISBN",
@@ -2502,6 +2601,12 @@
 
   "item.select.empty": "No items to show",
 
+  "item.select.table.selected": "Selected items",
+
+  "item.select.table.select": "Select item",
+
+  "item.select.table.deselect": "Deselect item",
+
   "item.select.table.author": "Author",
 
   "item.select.table.collection": "Collection",
@@ -2546,7 +2651,7 @@
 
   "item.version.history.table.action.deleteVersion": "Delete version",
 
-  "item.version.history.table.action.hasDraft": "A new version cannot be created because there is an inprogress submission in the version history",
+  "item.version.history.table.action.hasDraft": "A new version cannot be created because there is an in-progress submission in the version history",
 
   "item.version.notice": "This is not the latest version of this item. The latest version can be found <a href='{{destination}}'>here</a>.",
 
@@ -2576,7 +2681,7 @@
 
   "item.version.create.notification.failure": "New version has not been created",
 
-  "item.version.create.notification.inProgress": "A new version cannot be created because there is an inprogress submission in the version history",
+  "item.version.create.notification.inProgress": "A new version cannot be created because there is an in-progress submission in the version history",
 
   "item.version.delete.modal.header": "Delete version",
 
@@ -2602,6 +2707,10 @@
 
   "itemtemplate.edit.metadata.discard-button": "Discard",
 
+  "itemtemplate.edit.metadata.edit.language": "Edit language",
+
+  "itemtemplate.edit.metadata.edit.value": "Edit value",
+
   "itemtemplate.edit.metadata.edit.buttons.confirm": "Confirm",
 
   "itemtemplate.edit.metadata.edit.buttons.drag": "Drag to reorder",
@@ -2624,6 +2733,8 @@
 
   "itemtemplate.edit.metadata.headers.value": "Value",
 
+  "itemtemplate.edit.metadata.metadatafield": "Edit field",
+
   "itemtemplate.edit.metadata.metadatafield.error": "An error occurred validating the metadata field",
 
   "itemtemplate.edit.metadata.metadatafield.invalid": "Please choose a valid metadata field",
@@ -2768,8 +2879,6 @@
 
   "login.form.new-user": "New user? Click here to register.",
 
-  "login.form.or-divider": "or",
-
   "login.form.oidc": "Log in with OIDC",
 
   "login.form.orcid": "Log in with ORCID",
@@ -2790,6 +2899,8 @@
 
   "logout.title": "Logout",
 
+  "menu.header.nav.description": "Admin navigation bar",
+
   "menu.header.admin": "Management",
 
   "menu.header.image.logo": "Repository logo",
@@ -2826,6 +2937,8 @@
 
   "menu.section.browse_global_by_srsc": "By Subject Category",
 
+  "menu.section.browse_global_by_nsi": "By Norwegian Science Index",
+
   "menu.section.browse_global_by_title": "By Title",
 
   "menu.section.browse_global_communities_and_collections": "Communities & Collections",
@@ -3002,13 +3115,13 @@
 
   "mydspace.results.no-title": "No title",
 
-  "mydspace.results.no-uri": "No Uri",
+  "mydspace.results.no-uri": "No URI",
 
-  "mydspace.search-form.placeholder": "Search in mydspace...",
+  "mydspace.search-form.placeholder": "Search in MyDSpace...",
 
   "mydspace.show.workflow": "Workflow tasks",
 
-  "mydspace.show.workspace": "Your Submissions",
+  "mydspace.show.workspace": "Your submissions",
 
   "mydspace.show.supervisedWorkspace": "Supervised items",
 
@@ -3016,7 +3129,7 @@
 
   "mydspace.status.mydspaceValidation": "Validation",
 
-  "mydspace.status.mydspaceWaitingController": "Waiting for controller",
+  "mydspace.status.mydspaceWaitingController": "Waiting for reviewer",
 
   "mydspace.status.mydspaceWorkflow": "Workflow",
 
@@ -3034,6 +3147,8 @@
 
   "mydspace.view-btn": "View",
 
+  "nav.expandable-navbar-section-suffix": "(submenu)",
+
   "nav.browse.header": "All of DSpace",
 
   "nav.community-browse.header": "By Community",
@@ -3044,7 +3159,7 @@
 
   "nav.login": "Log In",
 
-  "nav.user-profile-menu-and-logout": "User profile menu and Log Out",
+  "nav.user-profile-menu-and-logout": "User profile menu and log out",
 
   "nav.logout": "Log Out",
 
@@ -3088,6 +3203,8 @@
 
   "orgunit.page.titleprefix": "Organizational Unit: ",
 
+  "orgunit.search.results.head": "Organizational Unit Search Results",
+
   "pagination.options.description": "Pagination options",
 
   "pagination.results-per-page": "Results Per Page",
@@ -3132,6 +3249,14 @@
 
   "process.new.select-parameters": "Parameters",
 
+  "process.new.select-parameter": "Select parameter",
+
+  "process.new.add-parameter": "Add a parameter...",
+
+  "process.new.delete-parameter": "Delete parameter",
+
+  "process.new.parameter.label": "Parameter value",
+
   "process.new.cancel": "Cancel",
 
   "process.new.submit": "Save",
@@ -3238,6 +3363,8 @@
 
   "process.overview.delete": "Delete {{count}} processes",
 
+  "process.overview.delete-process": "Delete process",
+
   "process.overview.delete.clear": "Clear delete selection",
 
   "process.overview.delete.processing": "{{count}} process(es) are being deleted. Please wait for the deletion to fully complete. Note that this can take a while.",
@@ -3264,8 +3391,6 @@
 
   "profile.special.groups.head": "Authorization special groups you belong to",
 
-  "profile.head": "Update Profile",
-
   "profile.metadata.form.error.firstname.required": "First Name is required",
 
   "profile.metadata.form.error.lastname.required": "Last Name is required",
@@ -3430,7 +3555,7 @@
 
   "register-page.registration.error.head": "Error when trying to register email",
 
-  "register-page.registration.error.content": "An error occured when registering the following email address: {{ email }}",
+  "register-page.registration.error.content": "An error occurred when registering the following email address: {{ email }}",
 
   "register-page.registration.error.recaptcha": "Error when trying to authenticate with recaptcha",
 
@@ -3574,6 +3699,8 @@
 
   "resource-policies.form.name.label": "Name",
 
+  "resource-policies.form.name.hint": "Max 30 characters",
+
   "resource-policies.form.policy-type.label": "Select the policy type",
 
   "resource-policies.form.policy-type.required": "You must select the resource policy type.",
@@ -3594,6 +3721,14 @@
 
   "resource-policies.table.headers.group": "Group",
 
+  "resource-policies.table.headers.select-all": "Select all",
+
+  "resource-policies.table.headers.deselect-all": "Deselect all",
+
+  "resource-policies.table.headers.select": "Select",
+
+  "resource-policies.table.headers.deselect": "Deselect",
+
   "resource-policies.table.headers.id": "ID",
 
   "resource-policies.table.headers.name": "Name",
@@ -3610,6 +3745,8 @@
 
   "resource-policies.table.headers.title.for.collection": "Policies for Collection",
 
+  "root.skip-to-content": "Skip to main content",
+
   "search.description": "",
 
   "search.switch-configuration.title": "Show",
@@ -3620,6 +3757,8 @@
 
   "search.search-form.placeholder": "Search the repository ...",
 
+  "search.filters.remove": "Remove filter of type {{ type }} with value {{ value }}",
+
   "search.filters.applied.f.author": "Author",
 
   "search.filters.applied.f.dateIssued.max": "End date",
@@ -3672,6 +3811,10 @@
 
   "search.filters.filter.creativeDatePublished.label": "Search date published",
 
+  "search.filters.filter.creativeDatePublished.min.label": "Start",
+
+  "search.filters.filter.creativeDatePublished.max.label": "End",
+
   "search.filters.filter.creativeWorkEditor.head": "Editor",
 
   "search.filters.filter.creativeWorkEditor.placeholder": "Editor",
@@ -3812,6 +3955,16 @@
 
   "search.filters.discoverable.false": "Yes",
 
+  "search.filters.namedresourcetype.Archived": "Archived",
+
+  "search.filters.namedresourcetype.Validation": "Validation",
+
+  "search.filters.namedresourcetype.Waiting for Controller": "Waiting for reviewer",
+
+  "search.filters.namedresourcetype.Workflow": "Workflow",
+
+  "search.filters.namedresourcetype.Workspace": "Workspace",
+
   "search.filters.withdrawn.true": "Yes",
 
   "search.filters.withdrawn.false": "No",
@@ -3864,6 +4017,10 @@
 
   "search.view-switch.show-list": "Show as list",
 
+  "selectable-list-item-control.deselect": "Deselect item",
+
+  "selectable-list-item-control.select": "Select item",
+
   "sorting.ASC": "Ascending",
 
   "sorting.DESC": "Descending",
@@ -3888,6 +4045,18 @@
 
   "sorting.lastModified.DESC": "Last modified Descending",
 
+  "sorting.person.familyName.ASC": "Surname Ascending",
+
+  "sorting.person.familyName.DESC": "Surname Descending",
+
+  "sorting.person.givenName.ASC": "Name Ascending",
+
+  "sorting.person.givenName.DESC": "Name Descending",
+
+  "sorting.person.birthDate.ASC": "Birth Date Ascending",
+
+  "sorting.person.birthDate.DESC": "Birth Date Descending",
+
   "statistics.title": "Statistics",
 
   "statistics.header": "Statistics for {{ scope }}",
@@ -3978,7 +4147,7 @@
 
   "submission.import-external.source.cinii": "CiNii",
 
-  "submission.import-external.source.crossref": "CrossRef",
+  "submission.import-external.source.crossref": "Crossref",
 
   "submission.import-external.source.datacite": "DataCite",
 
@@ -4166,6 +4335,8 @@
 
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.JournalIssue": "Local Journal Issues ({{ count }})",
 
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalVolumeOfIssue": "Local Journal Volumes ({{ count }})",
+
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalVolumeOfPublication": "Local Journal Volumes ({{ count }})",
 
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.JournalVolume": "Local Journal Volumes ({{ count }})",
@@ -4212,6 +4383,8 @@
 
   "submission.sections.describe.relationship-lookup.title.JournalIssue": "Journal Issues",
 
+  "submission.sections.describe.relationship-lookup.title.isJournalVolumeOfIssue": "Journal Volumes",
+
   "submission.sections.describe.relationship-lookup.title.isJournalVolumeOfPublication": "Journal Volumes",
 
   "submission.sections.describe.relationship-lookup.title.JournalVolume": "Journal Volumes",
@@ -4252,6 +4425,8 @@
 
   "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalOfPublication": "Selected Journals",
 
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalVolumeOfIssue": "Selected Journal Volume",
+
   "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalVolumeOfPublication": "Selected Journal Volume",
 
   "submission.sections.describe.relationship-lookup.selection-tab.title.Project": "Selected Projects",
@@ -4346,6 +4521,8 @@
 
   "submission.sections.general.no-collection": "No collection found",
 
+  "submission.sections.general.no-entity": "No entity types found",
+
   "submission.sections.general.no-sections": "No options available",
 
   "submission.sections.general.save_error_notice": "There was an issue when saving the item, please try again later.",
@@ -4660,6 +4837,8 @@
 
   "subscriptions.tooltip": "Subscribe",
 
+  "subscriptions.unsubscribe": "Unsubscribe",
+
   "subscriptions.modal.title": "Subscriptions",
 
   "subscriptions.modal.type-frequency": "Type and frequency",
@@ -4736,6 +4915,8 @@
 
   "vocabulary-treeview.search.form.search": "Search",
 
+  "vocabulary-treeview.search.form.search-placeholder": "Filter results by typing the first few letters",
+
   "vocabulary-treeview.search.no-result": "There were no items to show",
 
   "vocabulary-treeview.tree.description.nsi": "The Norwegian Science Index",
@@ -5116,6 +5297,10 @@
 
   "person.orcid.registry.auth": "ORCID Authorizations",
 
+  "person.orcid-tooltip.authenticated": "{{orcid}}",
+
+  "person.orcid-tooltip.not-authenticated": "{{orcid}} (unconfirmed)",
+
   "home.recent-submissions.head": "Recent Submissions",
 
   "listable-notification-object.default-message": "This object couldn't be retrieved",
@@ -5152,6 +5337,8 @@
 
   "system-wide-alert.form.label.countdownTo.hint": "Hint: Set a countdown timer. When enabled, a date can be set in the future and the system-wide alert banner will perform a countdown to the set date. When this timer ends, it will disappear from the alert. The server will NOT be automatically stopped.",
 
+  "system-wide-alert-form.select-date-by-calendar": "Select date using calendar",
+
   "system-wide-alert.form.label.preview": "System-wide alert preview",
 
   "system-wide-alert.form.update.success": "The system-wide alert was successfully updated",
@@ -5174,8 +5361,16 @@
 
   "access-control-item-header-toggle": "Item's Metadata",
 
+  "access-control-item-toggle.enable": "Enable option to perform changes on the item's metadata",
+
+  "access-control-item-toggle.disable": "Disable option to perform changes on the item's metadata",
+
   "access-control-bitstream-header-toggle": "Bitstreams",
 
+  "access-control-bitstream-toggle.enable": "Enable option to perform changes on the bitstreams",
+
+  "access-control-bitstream-toggle.disable": "Disable option to perform changes on the bitstreams",
+
   "access-control-mode": "Mode",
 
   "access-control-access-conditions": "Access conditions",
@@ -5192,12 +5387,16 @@
 
   "access-control-bitstreams-selected": "bitstreams selected",
 
+  "access-control-bitstreams-select": "Select bitstreams",
+
   "access-control-cancel": "Cancel",
 
   "access-control-execute": "Execute",
 
   "access-control-add-more": "Add more",
 
+  "access-control-remove": "Remove access condition",
+
   "access-control-select-bitstreams-modal.title": "Select bitstreams",
 
   "access-control-select-bitstreams-modal.no-items": "No items to show.",
@@ -5216,4 +5415,27 @@
 
   "access-control-option-end-date-note": "Select the date until which the related access condition is applied",
 
+  "vocabulary-treeview.search.form.add": "Add",
+
+  "process.overview.unknown.user": "Unknown",
+
+  "browse.search-form.placeholder": "Search the repository",
+
+  "file-download-link.download": "Download ",
+
+  "register-page.registration.aria.label": "Enter your e-mail address",
+
+  "forgot-email.form.aria.label": "Enter your e-mail address",
+
+  "search-facet-option.update.announcement": "The page will be reloaded. Filter {{ filter }} is selected.",
+
+  "live-region.ordering.instructions": "Press spacebar to reorder {{ itemName }}.",
+
+  "live-region.ordering.status": "{{ itemName }}, grabbed. Current position in list: {{ index }} of  {{ length }}. Press up and down arrow keys to change position, SpaceBar to drop, Escape to cancel.",
+
+  "live-region.ordering.moved": "{{ itemName }}, moved to position {{ index }} of {{ length }}. Press up and down arrow keys to change position, SpaceBar to drop, Escape to cancel.",
+
+  "live-region.ordering.dropped": "{{ itemName }}, dropped at position {{ index }} of {{ length }}.",
+
+  "dynamic-form-array.sortable-list.label": "Sortable list",
 }
diff --git a/src/assets/i18n/es.json5 b/src/assets/i18n/es.json5
index 7a2f2fa3db..d3d1467fde 100644
--- a/src/assets/i18n/es.json5
+++ b/src/assets/i18n/es.json5
@@ -9,8 +9,6 @@
   // "401.unauthorized": "unauthorized",
   "401.unauthorized": "no autorizado",
 
-
-
   // "403.help": "You don't have permission to access this page. You can use the button below to get back to the home page.",
   "403.help": "No tiene permisos para acceder a esta página. Puede utilizar el botón de abajo para volver a la página de inicio.",
 
@@ -29,7 +27,6 @@
   // "500.link.home-page": "Take me to the home page",
   "500.link.home-page": "Llévame a la página de inicio",
 
-
   // "404.help": "We can't find the page you're looking for. The page may have been moved or deleted. You can use the button below to get back to the home page. ",
   "404.help": "No podemos encontrar la página que busca. La página puede haber sido movida o eliminada. Puede utilizar el botón de abajo para volver a la página de inicio. ",
 
@@ -52,7 +49,7 @@
   "error-page.description.404": "página no encontrada",
 
   // "error-page.orcid.generic-error": "An error occurred during login via ORCID. Make sure you have shared your ORCID account email address with DSpace. If the error persists, contact the administrator",
-  "error-page.orcid.generic-error": "Hubo un error en el login via ORCID. Asegúrese que ha compartido el correo electrónico de su cuenta ORCID con Dspace. Si continuase el error, contacte con el administrador",
+  "error-page.orcid.generic-error": "Hubo un error en el login vía ORCID. Asegúrese que ha compartido el correo electrónico de su cuenta ORCID con Dspace. Si continuase el error, contacte con el administrador",
 
   // "access-status.embargo.listelement.badge": "Embargo",
   "access-status.embargo.listelement.badge": "Embargo",
@@ -194,7 +191,8 @@
 
   // "admin.registries.bitstream-formats.table.name": "Name",
   "admin.registries.bitstream-formats.table.name": "Nombre",
-  // "admin.registries.bitstream-formats.table.id" : "ID",
+
+  // "admin.registries.bitstream-formats.table.id": "ID",
   "admin.registries.bitstream-formats.table.id": "ID",
 
   // "admin.registries.bitstream-formats.table.return": "Back",
@@ -215,8 +213,6 @@
   // "admin.registries.bitstream-formats.title": "Bitstream Format Registry",
   "admin.registries.bitstream-formats.title": "Registro de formato Archivo",
 
-
-
   // "admin.registries.metadata.breadcrumbs": "Metadata registry",
   "admin.registries.metadata.breadcrumbs": "Registro de metadatos",
 
@@ -256,8 +252,6 @@
   // "admin.registries.metadata.title": "Metadata Registry",
   "admin.registries.metadata.title": "Registro de metadatos",
 
-
-
   // "admin.registries.schema.breadcrumbs": "Metadata schema",
   "admin.registries.schema.breadcrumbs": "Esquema de metadatos",
 
@@ -275,7 +269,8 @@
 
   // "admin.registries.schema.fields.table.field": "Field",
   "admin.registries.schema.fields.table.field": "Campo",
-  // "admin.registries.schema.fields.table.id" : "ID",
+
+  // "admin.registries.schema.fields.table.id": "ID",
   "admin.registries.schema.fields.table.id": "ID",
 
   // "admin.registries.schema.fields.table.scopenote": "Scope Note",
@@ -335,7 +330,29 @@
   // "admin.registries.schema.title": "Metadata Schema Registry",
   "admin.registries.schema.title": "Registro de esquemas de metadatos",
 
+  // "admin.access-control.bulk-access.breadcrumbs": "Bulk Access Management",
+  "admin.access-control.bulk-access.breadcrumbs": "Gestión de Acceso Masivo",
 
+  // "administrativeBulkAccess.search.results.head": "Search Results",
+  "administrativeBulkAccess.search.results.head": "Resultados de la búsqueda",
+
+  // "admin.access-control.bulk-access": "Bulk Access Management",
+  "admin.access-control.bulk-access": "Gestión de Acceso Masivo",
+
+  // "admin.access-control.bulk-access.title": "Bulk Access Management",
+  "admin.access-control.bulk-access.title": "Gestión de Acceso Masivo",
+
+  // "admin.access-control.bulk-access-browse.header": "Step 1: Select Objects",
+  "admin.access-control.bulk-access-browse.header": "Paso 1: Seleccione Objetos",
+
+  // "admin.access-control.bulk-access-browse.search.header": "Search",
+  "admin.access-control.bulk-access-browse.search.header": "Buscar",
+
+  // "admin.access-control.bulk-access-browse.selected.header": "Current selection({{number}})",
+  "admin.access-control.bulk-access-browse.selected.header": "Selección actual({{number}})",
+
+  // "admin.access-control.bulk-access-settings.header": "Step 2: Operation to Perform",
+  "admin.access-control.bulk-access-settings.header": "Paso 2: Operación a realizar",
 
   // "admin.access-control.epeople.actions.delete": "Delete EPerson",
   "admin.access-control.epeople.actions.delete": "Eliminar usuario",
@@ -347,7 +364,7 @@
   "admin.access-control.epeople.actions.reset": "Restablecer la contraseña",
 
   // "admin.access-control.epeople.actions.stop-impersonating": "Stop impersonating EPerson",
-  "admin.access-control.epeople.actions.stop-impersonating": "Deja de hacerse pasar por usuario",
+  "admin.access-control.epeople.actions.stop-impersonating": "Dejar de hacerse pasar por usuario",
 
   // "admin.access-control.epeople.breadcrumbs": "EPeople",
   "admin.access-control.epeople.breadcrumbs": "Usuarios",
@@ -478,8 +495,6 @@
   // "admin.access-control.epeople.notification.deleted.success": "Successfully deleted EPerson: \"{{name}}\"",
   "admin.access-control.epeople.notification.deleted.success": "Usuario eliminado correctamente: \"{{ name }}\"",
 
-
-
   // "admin.access-control.groups.title": "Groups",
   "admin.access-control.groups.title": "Grupos",
 
@@ -549,8 +564,6 @@
   // "admin.access-control.groups.notification.deleted.failure.content": "Cause: \"{{cause}}\"",
   "admin.access-control.groups.notification.deleted.failure.content": "Causa: \"{{ cause }}\"",
 
-
-
   // "admin.access-control.groups.form.alert.permanent": "This group is permanent, so it can't be edited or deleted. You can still add and remove group members using this page.",
   "admin.access-control.groups.form.alert.permanent": "Este grupo es permanente, por lo que no se puede editar ni eliminar. Sin embargo, puedes añadir y eliminar miembros del grupo utilizando esta página.",
 
@@ -791,9 +804,6 @@
   // "administrativeView.search.results.head": "Administrative Search",
   "administrativeView.search.results.head": "Búsqueda administrativa",
 
-
-
-
   // "admin.workflow.breadcrumbs": "Administer Workflow",
   "admin.workflow.breadcrumbs": "Administrar flujo de trabajo",
 
@@ -818,8 +828,6 @@
   // "admin.workflow.item.supervision": "Supervision",
   "admin.workflow.item.supervision": "Supervisión",
 
-
-
   // "admin.metadata-import.breadcrumbs": "Import Metadata",
   "admin.metadata-import.breadcrumbs": "Importar metadatos",
 
@@ -844,6 +852,9 @@
   // "admin.batch-import.page.help": "Select the Collection to import into. Then, drop or browse to a Simple Archive Format (SAF) zip file that includes the Items to import",
   "admin.batch-import.page.help": "Seleccione la Colección a la que importar. Luego, suelte o busque el archivo zip en formato Simple Archive Format (SAF) que incluye los ítems a importar",
 
+  // "admin.batch-import.page.toggle.help": "It is possible to perform import either with file upload or via URL, use above toggle to set the input source",
+  "admin.batch-import.page.toggle.help": "Es posible realizar una importación tanto mediante una subida de fichero como a través de una URL. Use el selector de arriba para especificar la fuente de entrada.",
+
   // "admin.metadata-import.page.dropMsg": "Drop a metadata CSV to import",
   "admin.metadata-import.page.dropMsg": "Suelta un CSV de metadatos para importar",
 
@@ -863,14 +874,26 @@
   "admin.metadata-import.page.button.proceed": "Continuar",
 
   // "admin.metadata-import.page.button.select-collection": "Select Collection",
-  "admin.metadata-import.page.button.select-collection": "Selecciona la Colleción",
+  "admin.metadata-import.page.button.select-collection": "Selecciona la Colección",
 
   // "admin.metadata-import.page.error.addFile": "Select file first!",
   "admin.metadata-import.page.error.addFile": "¡Seleccione el archivo primero!",
 
+  // "admin.metadata-import.page.error.addFileUrl": "Insert file url first!",
+  "admin.metadata-import.page.error.addFileUrl": "¡Seleccione primero la URL del archivo!",
+
   // "admin.batch-import.page.error.addFile": "Select Zip file first!",
   "admin.batch-import.page.error.addFile": "¡Seleccione el archivo ZIP primero!",
 
+  // "admin.metadata-import.page.toggle.upload": "Upload",
+  "admin.metadata-import.page.toggle.upload": "Subir",
+
+  // "admin.metadata-import.page.toggle.url": "URL",
+  "admin.metadata-import.page.toggle.url": "URL",
+
+  // "admin.metadata-import.page.urlMsg": "Insert the batch ZIP url to import",
+  "admin.metadata-import.page.urlMsg": "¡Seleccione primero la URL del archivo ZIP!",
+
   // "admin.metadata-import.page.validateOnly": "Validate Only",
   "admin.metadata-import.page.validateOnly": "Solo Validar",
 
@@ -895,14 +918,12 @@
   // "advanced-workflow-action.rating.description-requiredDescription": "Please select a rating below and also add a review",
   "advanced-workflow-action.rating.description-requiredDescription": "Por favor, seleccione una evaluación y también agregue una revisión",
 
-
   // "advanced-workflow-action.select-reviewer.description-single": "Please select a single reviewer below before submitting",
   "advanced-workflow-action.select-reviewer.description-single": "Por favor, seleccione un revisor antes de realizar el envío",
 
   // "advanced-workflow-action.select-reviewer.description-multiple": "Please select one or more reviewers below before submitting",
   "advanced-workflow-action.select-reviewer.description-multiple": "Por favor, seleccione uno o mas revisores antes de realizar el envío",
 
-
   // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.head": "EPeople",
   "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.head": "Usuario",
 
@@ -987,15 +1008,12 @@
   // "auth.messages.token-refresh-failed": "Refreshing your session token failed. Please log in again.",
   "auth.messages.token-refresh-failed": "No se pudo actualizar el token de la sesión. Inicie sesión de nuevo.",
 
-
-
-  // "bitstream.download.page": "Now downloading {{bitstream}}..." ,
+  // "bitstream.download.page": "Now downloading {{bitstream}}...",
   "bitstream.download.page": "Descargando {{ bitstream }}...",
 
-  // "bitstream.download.page.back": "Back" ,
+  // "bitstream.download.page.back": "Back",
   "bitstream.download.page.back": "Atrás" ,
 
-
   // "bitstream.edit.authorizations.link": "Edit bitstream's Policies",
   "bitstream.edit.authorizations.link": "Editar las políticas del archivo",
 
@@ -1047,6 +1065,9 @@
   // "bitstream.edit.notifications.error.format.title": "An error occurred saving the bitstream's format",
   "bitstream.edit.notifications.error.format.title": "Se produjo un error al guardar el formato del archivo.",
 
+  // "bitstream.edit.notifications.error.primaryBitstream.title": "An error occurred saving the primary bitstream",
+  "bitstream.edit.notifications.error.primaryBitstream.title": "Se produjo un error al guardar el archivo primario",
+
   // "bitstream.edit.form.iiifLabel.label": "IIIF Label",
   "bitstream.edit.form.iiifLabel.label": "Etiqueta IIIF",
 
@@ -1071,7 +1092,6 @@
   // "bitstream.edit.form.iiifHeight.hint": "The canvas height should usually match the image height.",
   "bitstream.edit.form.iiifHeight.hint": "La altura del marco normalmente debería coincidir con la altura de la imagen",
 
-
   // "bitstream.edit.notifications.saved.content": "Your changes to this bitstream were saved.",
   "bitstream.edit.notifications.saved.content": "Se guardaron sus cambios en este archivo.",
 
@@ -1095,6 +1115,7 @@
 
   // "bitstream-request-a-copy.intro.bitstream.one": "Requesting the following file: ",
   "bitstream-request-a-copy.intro.bitstream.one": "Solicitando el siguiente fichero: ",
+
   // "bitstream-request-a-copy.intro.bitstream.all": "Requesting all files. ",
   "bitstream-request-a-copy.intro.bitstream.all": "Solicitando todos los ficheros. ",
 
@@ -1137,8 +1158,6 @@
   // "bitstream-request-a-copy.submit.error": "Something went wrong with submitting the item request.",
   "bitstream-request-a-copy.submit.error": "Hubo un fallo en el envío de la solicitud de ítem.",
 
-
-
   // "browse.back.all-results": "All browse results",
   "browse.back.all-results": "Todos los resultados de la búsqueda",
 
@@ -1151,8 +1170,11 @@
   // "browse.comcol.by.subject": "By Subject",
   "browse.comcol.by.subject": "Por materia",
 
+  // "browse.comcol.by.srsc": "By Subject Category",
+  "browse.comcol.by.srsc": "Por categoría",
+
   // "browse.comcol.by.title": "By Title",
-  "browse.comcol.by.title": "Por titulo",
+  "browse.comcol.by.title": "Por título",
 
   // "browse.comcol.head": "Browse",
   "browse.comcol.head": "Examinar",
@@ -1181,6 +1203,9 @@
   // "browse.metadata.subject.breadcrumbs": "Browse by Subject",
   "browse.metadata.subject.breadcrumbs": "Examinar por materia",
 
+  // "browse.metadata.srsc.breadcrumbs": "Browse by Subject Category",
+  "browse.metadata.srsc.breadcrumbs": "Examinar por categoría",
+
   // "browse.metadata.title.breadcrumbs": "Browse by Title",
   "browse.metadata.title.breadcrumbs": "Examinar por título",
 
@@ -1262,21 +1287,24 @@
   // "browse.startsWith.type_text": "Filter results by typing the first few letters",
   "browse.startsWith.type_text": "Seleccione resultados tecleando las primeras letras",
 
+  // "browse.startsWith.input": "Filter",
+  "browse.startsWith.input": "Filtrar",
+
+  // "browse.taxonomy.button": "Browse",
+  "browse.taxonomy.button": "Examinar",
+
   // "browse.title": "Browsing {{ collection }} by {{ field }}{{ startsWith }} {{ value }}",
   "browse.title": "Examinando {{ collection }} por {{ field }} {{ value }}",
 
   // "browse.title.page": "Browsing {{ collection }} by {{ field }} {{ value }}",
   "browse.title.page": "Examinando {{ collection }} por {{ field }} {{ value }}",
 
-
   // "search.browse.item-back": "Back to Results",
   "search.browse.item-back": "Volver a los resultados",
 
-
   // "chips.remove": "Remove chip",
   "chips.remove": "Quitar chip",
 
-
   // "claimed-approved-search-result-list-element.title": "Approved",
   "claimed-approved-search-result-list-element.title": "Aprobado",
 
@@ -1286,7 +1314,6 @@
   // "claimed-declined-task-search-result-list-element.title": "Declined, sent back to Review Manager's workflow",
   "claimed-declined-task-search-result-list-element.title": "Declinado, enviar de vuelta al Administrador de Revisión del flujo de trabajo",
 
-
   // "collection.create.head": "Create a Collection",
   "collection.create.head": "Crear una colección",
 
@@ -1320,8 +1347,6 @@
   // "collection.delete.text": "Are you sure you want to delete collection \"{{ dso }}\"",
   "collection.delete.text": "¿Estás seguro de que quieres eliminar la colección \"{{ dso }}\"?",
 
-
-
   // "collection.edit.delete": "Delete this collection",
   "collection.edit.delete": "Eliminar esta colección",
 
@@ -1331,8 +1356,6 @@
   // "collection.edit.breadcrumbs": "Edit Collection",
   "collection.edit.breadcrumbs": "Editar colección",
 
-
-
   // "collection.edit.tabs.mapper.head": "Item Mapper",
   "collection.edit.tabs.mapper.head": "Mapeo de ítems",
 
@@ -1393,7 +1416,6 @@
   // "collection.edit.item-mapper.tabs.map": "Map new items",
   "collection.edit.item-mapper.tabs.map": "Asignar nuevos ítems",
 
-
   // "collection.edit.logo.delete.title": "Delete logo",
   "collection.edit.logo.delete.title": "Eliminar logo",
 
@@ -1421,21 +1443,23 @@
   // "collection.edit.logo.upload": "Drop a Collection Logo to upload",
   "collection.edit.logo.upload": "Suelta un logotipo de colección para cargarlo",
 
-
-
   // "collection.edit.notifications.success": "Successfully edited the Collection",
   "collection.edit.notifications.success": "Editó con éxito la colección",
 
   // "collection.edit.return": "Back",
   "collection.edit.return": "Atrás",
 
+  // "collection.edit.tabs.access-control.head": "Access Control",
+  "collection.edit.tabs.access-control.head": "Control de acceso",
 
+  // "collection.edit.tabs.access-control.title": "Collection Edit - Access Control",
+  "collection.edit.tabs.access-control.title": "Edición de colección: Control de acceso",
 
   // "collection.edit.tabs.curate.head": "Curate",
   "collection.edit.tabs.curate.head": "Curar",
 
   // "collection.edit.tabs.curate.title": "Collection Edit - Curate",
-  "collection.edit.tabs.curate.title": "Edición de colección - Curar",
+  "collection.edit.tabs.curate.title": "Edición de colección: Curar",
 
   // "collection.edit.tabs.authorizations.head": "Authorizations",
   "collection.edit.tabs.authorizations.head": "Autorizaciones",
@@ -1518,8 +1542,6 @@
   // "collection.edit.tabs.source.title": "Collection Edit - Content Source",
   "collection.edit.tabs.source.title": "Edición de colección: fuente de contenido",
 
-
-
   // "collection.edit.template.add-button": "Add",
   "collection.edit.template.add-button": "Agregar",
 
@@ -1556,8 +1578,6 @@
   // "collection.edit.template.title": "Edit Template Item",
   "collection.edit.template.title": "Editar plantilla de ítem",
 
-
-
   // "collection.form.abstract": "Short Description",
   "collection.form.abstract": "Breve descripción",
 
@@ -1585,13 +1605,9 @@
   // "collection.form.entityType": "Entity Type",
   "collection.form.entityType": "Tipo de entidad",
 
-
-
   // "collection.listelement.badge": "Collection",
   "collection.listelement.badge": "Colección",
 
-
-
   // "collection.page.browse.recent.head": "Recent Submissions",
   "collection.page.browse.recent.head": "Envíos recientes",
 
@@ -1610,8 +1626,6 @@
   // "collection.page.news": "News",
   "collection.page.news": "Noticias",
 
-
-
   // "collection.select.confirm": "Confirm selected",
   "collection.select.confirm": "Confirmar seleccionado",
 
@@ -1621,63 +1635,81 @@
   // "collection.select.table.title": "Title",
   "collection.select.table.title": "Título",
 
-
   // "collection.source.controls.head": "Harvest Controls",
   "collection.source.controls.head": "Controles de recolección",
+
   // "collection.source.controls.test.submit.error": "Something went wrong with initiating the testing of the settings",
   "collection.source.controls.test.submit.error": "Hubo fallos al realizar las pruebas de comprobación de los ajustes",
+
   // "collection.source.controls.test.failed": "The script to test the settings has failed",
   "collection.source.controls.test.failed": "La prueba de los ajustes ha fallado",
+
   // "collection.source.controls.test.completed": "The script to test the settings has successfully finished",
   "collection.source.controls.test.completed": "El script de prueba de los ajustes ha terminado correctamente",
+
   // "collection.source.controls.test.submit": "Test configuration",
   "collection.source.controls.test.submit": "Probar la configuración",
+
   // "collection.source.controls.test.running": "Testing configuration...",
   "collection.source.controls.test.running": "Probando la configuración...",
+
   // "collection.source.controls.import.submit.success": "The import has been successfully initiated",
   "collection.source.controls.import.submit.success": "La importación ha comenzado correctamente",
+
   // "collection.source.controls.import.submit.error": "Something went wrong with initiating the import",
   "collection.source.controls.import.submit.error": "Hubo algún fallo al iniciar la importación",
+
   // "collection.source.controls.import.submit": "Import now",
   "collection.source.controls.import.submit": "Importar ahora",
+
   // "collection.source.controls.import.running": "Importing...",
   "collection.source.controls.import.running": "Importando...",
+
   // "collection.source.controls.import.failed": "An error occurred during the import",
   "collection.source.controls.import.failed": "Ha ocurrido un error durante la importación",
+
   // "collection.source.controls.import.completed": "The import completed",
   "collection.source.controls.import.completed": "La importación finalizó",
+
   // "collection.source.controls.reset.submit.success": "The reset and reimport has been successfully initiated",
   "collection.source.controls.reset.submit.success": "La restauración y reimportación ha comenzado correctamente",
+
   // "collection.source.controls.reset.submit.error": "Something went wrong with initiating the reset and reimport",
   "collection.source.controls.reset.submit.error": "Ha ocurrido un error al iniciar la restauración y reimportación",
+
   // "collection.source.controls.reset.failed": "An error occurred during the reset and reimport",
   "collection.source.controls.reset.failed": "Ha ocurrido un error en la restauración y reimportación",
+
   // "collection.source.controls.reset.completed": "The reset and reimport completed",
   "collection.source.controls.reset.completed": "Restauración y reimportación finalizadas",
+
   // "collection.source.controls.reset.submit": "Reset and reimport",
   "collection.source.controls.reset.submit": "Restauración y reimportación",
+
   // "collection.source.controls.reset.running": "Resetting and reimporting...",
   "collection.source.controls.reset.running": "Restaurando y reimportando...",
+
   // "collection.source.controls.harvest.status": "Harvest status:",
   "collection.source.controls.harvest.status": "Estado de la Recolección:",
+
   // "collection.source.controls.harvest.start": "Harvest start time:",
   "collection.source.controls.harvest.start": "Comienzo de la recolección:",
+
   // "collection.source.controls.harvest.last": "Last time harvested:",
   "collection.source.controls.harvest.last": "Fecha de la última recolección:",
+
   // "collection.source.controls.harvest.message": "Harvest info:",
   "collection.source.controls.harvest.message": "Información de recolección:",
+
   // "collection.source.controls.harvest.no-information": "N/A",
   "collection.source.controls.harvest.no-information": "N/A",
 
-
   // "collection.source.update.notifications.error.content": "The provided settings have been tested and didn't work.",
   "collection.source.update.notifications.error.content": "La configuración proporcionada se ha probado y no funcionó.",
 
   // "collection.source.update.notifications.error.title": "Server Error",
   "collection.source.update.notifications.error.title": "Error del Servidor",
 
-
-
   // "communityList.breadcrumbs": "Community List",
   "communityList.breadcrumbs": "Lista de comunidades",
 
@@ -1690,8 +1722,6 @@
   // "communityList.showMore": "Show More",
   "communityList.showMore": "Mostrar más",
 
-
-
   // "community.create.head": "Create a Community",
   "community.create.head": "Crear una comunidad",
 
@@ -1734,7 +1764,6 @@
   // "community.edit.breadcrumbs": "Edit Community",
   "community.edit.breadcrumbs": "Editar comunidad",
 
-
   // "community.edit.logo.delete.title": "Delete logo",
   "community.edit.logo.delete.title": "Eliminar logo",
 
@@ -1762,8 +1791,6 @@
   // "community.edit.logo.upload": "Drop a Community Logo to upload",
   "community.edit.logo.upload": "Suelta un logotipo de la comunidad para cargar",
 
-
-
   // "community.edit.notifications.success": "Successfully edited the Community",
   "community.edit.notifications.success": "Editó con éxito la comunidad",
 
@@ -1776,14 +1803,18 @@
   // "community.edit.return": "Back",
   "community.edit.return": "Atrás",
 
-
-
   // "community.edit.tabs.curate.head": "Curate",
   "community.edit.tabs.curate.head": "Curar",
 
   // "community.edit.tabs.curate.title": "Community Edit - Curate",
   "community.edit.tabs.curate.title": "Edición de la comunidad - Curar",
 
+  // "community.edit.tabs.access-control.head": "Access Control",
+  "community.edit.tabs.access-control.head": "Control de acceso",
+
+  // "community.edit.tabs.access-control.title": "Community Edit - Access Control",
+  "community.edit.tabs.access-control.title": "Edición de la comunidad: Control de acceso",
+
   // "community.edit.tabs.metadata.head": "Edit Metadata",
   "community.edit.tabs.metadata.head": "Editar metadatos",
 
@@ -1802,13 +1833,9 @@
   // "community.edit.tabs.authorizations.title": "Community Edit - Authorizations",
   "community.edit.tabs.authorizations.title": "Edición de la comunidad: autorizaciones",
 
-
-
   // "community.listelement.badge": "Community",
   "community.listelement.badge": "Comunidad",
 
-
-
   // "comcol-role.edit.no-group": "None",
   "comcol-role.edit.no-group": "Ninguno",
 
@@ -1827,28 +1854,24 @@
   // "comcol-role.edit.delete.error.title": "Failed to delete the '{{ role }}' role's group",
   "comcol-role.edit.delete.error.title": "Error al borrar el grupo del rol '{{ role }}'",
 
-
   // "comcol-role.edit.community-admin.name": "Administrators",
   "comcol-role.edit.community-admin.name": "Administradores",
 
   // "comcol-role.edit.collection-admin.name": "Administrators",
   "comcol-role.edit.collection-admin.name": "Administradores",
 
-
   // "comcol-role.edit.community-admin.description": "Community administrators can create sub-communities or collections, and manage or assign management for those sub-communities or collections. In addition, they decide who can submit items to any sub-collections, edit item metadata (after submission), and add (map) existing items from other collections (subject to authorization).",
   "comcol-role.edit.community-admin.description": "Los administradores de la comunidad pueden crear subcomunidades o colecciones y gestionar o asignar la gestión para esas subcomunidades o colecciones. Además, deciden quién puede enviar ítems a las subcolecciones, editar los metadatos del ítem (después del envío) y agregar (mapear) ítems existentes de otras colecciones (sujeto a autorización).",
 
   // "comcol-role.edit.collection-admin.description": "Collection administrators decide who can submit items to the collection, edit item metadata (after submission), and add (map) existing items from other collections to this collection (subject to authorization for that collection).",
   "comcol-role.edit.collection-admin.description": "Los administradores de la colección deciden quién puede enviar ítems a la colección, editar los metadatos del ítem (después del envío) y agregar (mapear) ítems existentes de otras colecciones a esta colección (sujeto a autorización para esa colección).",
 
-
   // "comcol-role.edit.submitters.name": "Submitters",
   "comcol-role.edit.submitters.name": "Remitentes",
 
   // "comcol-role.edit.submitters.description": "The E-People and Groups that have permission to submit new items to this collection.",
   "comcol-role.edit.submitters.description": "Los Usuarios y Grupos que tienen permiso para enviar nuevos ítems a esta colección.",
 
-
   // "comcol-role.edit.item_read.name": "Default item read access",
   "comcol-role.edit.item_read.name": "Acceso de lectura predeterminado del ítem",
 
@@ -1858,7 +1881,6 @@
   // "comcol-role.edit.item_read.anonymous-group": "Default read for incoming items is currently set to Anonymous.",
   "comcol-role.edit.item_read.anonymous-group": "La lectura predeterminada para los ítems entrantes está configurada actualmente como Anónimo.",
 
-
   // "comcol-role.edit.bitstream_read.name": "Default bitstream read access",
   "comcol-role.edit.bitstream_read.name": "Acceso de lectura predeterminado de archivos",
 
@@ -1868,28 +1890,24 @@
   // "comcol-role.edit.bitstream_read.anonymous-group": "Default read for incoming bitstreams is currently set to Anonymous.",
   "comcol-role.edit.bitstream_read.anonymous-group": "La lectura predeterminada para los archivos entrantes se establece actualmente en Anónimo.",
 
-
   // "comcol-role.edit.editor.name": "Editors",
   "comcol-role.edit.editor.name": "Editores",
 
   // "comcol-role.edit.editor.description": "Editors are able to edit the metadata of incoming submissions, and then accept or reject them.",
   "comcol-role.edit.editor.description": "Los editores pueden editar los metadatos de los envíos entrantes y luego aceptarlos o rechazarlos.",
 
-
   // "comcol-role.edit.finaleditor.name": "Final editors",
   "comcol-role.edit.finaleditor.name": "Editores finales",
 
   // "comcol-role.edit.finaleditor.description": "Final editors are able to edit the metadata of incoming submissions, but will not be able to reject them.",
   "comcol-role.edit.finaleditor.description": "Los editores finales pueden editar los metadatos de los envíos entrantes, pero no podrán rechazarlos.",
 
-
   // "comcol-role.edit.reviewer.name": "Reviewers",
   "comcol-role.edit.reviewer.name": "Revisores",
 
   // "comcol-role.edit.reviewer.description": "Reviewers are able to accept or reject incoming submissions. However, they are not able to edit the submission's metadata.",
   "comcol-role.edit.reviewer.description": "Los revisores pueden aceptar o rechazar envíos entrantes. Sin embargo, no pueden editar los metadatos del envío.",
 
-
   // "comcol-role.edit.scorereviewers.name": "Score Reviewers",
   "comcol-role.edit.scorereviewers.name": "Revisores de puntuación",
 
@@ -1929,14 +1947,12 @@
   // "community.all-lists.head": "Subcommunities and Collections",
   "community.all-lists.head": "Subcomunidades y colecciones",
 
-  // "community.sub-collection-list.head": "Collections of this Community",
+  // "community.sub-collection-list.head": "Collections in this Community",
   "community.sub-collection-list.head": "Colecciones de esta comunidad",
 
-  // "community.sub-community-list.head": "Communities of this Community",
+  // "community.sub-community-list.head": "Communities in this Community",
   "community.sub-community-list.head": "Comunidades de esta comunidad",
 
-
-
   // "cookies.consent.accept-all": "Accept all",
   "cookies.consent.accept-all": "Aceptar todo",
 
@@ -2015,38 +2031,30 @@
   // "cookies.consent.app.description.authentication": "Required for signing you in",
   "cookies.consent.app.description.authentication": "Requerido para iniciar sesión",
 
-
   // "cookies.consent.app.title.preferences": "Preferences",
   "cookies.consent.app.title.preferences": "Preferencias",
 
   // "cookies.consent.app.description.preferences": "Required for saving your preferences",
   "cookies.consent.app.description.preferences": "Requerido para guardar sus preferencias",
 
-
-
   // "cookies.consent.app.title.acknowledgement": "Acknowledgement",
   "cookies.consent.app.title.acknowledgement": "Reconocimiento",
 
   // "cookies.consent.app.description.acknowledgement": "Required for saving your acknowledgements and consents",
   "cookies.consent.app.description.acknowledgement": "Requerido para guardar sus reconocimientos y consentimientos",
 
-
-
   // "cookies.consent.app.title.google-analytics": "Google Analytics",
   "cookies.consent.app.title.google-analytics": "Google Analytics",
 
   // "cookies.consent.app.description.google-analytics": "Allows us to track statistical data",
   "cookies.consent.app.description.google-analytics": "Nos permite rastrear datos estadísticos",
 
-
-
   // "cookies.consent.app.title.google-recaptcha": "Google reCaptcha",
   "cookies.consent.app.title.google-recaptcha": "Google reCaptcha",
 
   // "cookies.consent.app.description.google-recaptcha": "We use google reCAPTCHA service during registration and password recovery",
   "cookies.consent.app.description.google-recaptcha": "Utilizamos el servicio google reCAPTCHA durante el registro y la recuperación de contraseña",
 
-
   // "cookies.consent.purpose.functional": "Functional",
   "cookies.consent.purpose.functional": "Funcional",
 
@@ -2059,10 +2067,10 @@
   // "cookies.consent.purpose.sharing": "Sharing",
   "cookies.consent.purpose.sharing": "Compartición",
 
-  // "curation-task.task.citationpage.label":  "Generate Citation Page",
+  // "curation-task.task.citationpage.label": "Generate Citation Page",
   "curation-task.task.citationpage.label": "Generar página de cita",
 
-  // "curation-task.task.checklinks.label":  "Check Links in Metadata",
+  // "curation-task.task.checklinks.label": "Check Links in Metadata",
   "curation-task.task.checklinks.label": "Comprobar enlaces en metadatos",
 
   // "curation-task.task.noop.label": "NOOP",
@@ -2080,10 +2088,8 @@
   // "curation-task.task.vscan.label": "Virus Scan",
   "curation-task.task.vscan.label": "Búsqueda de virus",
 
-  // "curation-task.task.register-doi.label": "Register DOI",
-  "curation-task.task.register-doi.label": "Registro DOI",
-
-
+  // "curation-task.task.registerdoi.label": "Register DOI",
+  "curation-task.task.registerdoi.label": "Registro DOI",
 
   // "curation.form.task-select.label": "Task:",
   "curation.form.task-select.label": "Tarea:",
@@ -2112,10 +2118,8 @@
   // "curation.form.handle.hint": "Hint: Enter [your-handle-prefix]/0 to run a task across entire site (not all tasks may support this capability)",
   "curation.form.handle.hint": "Sugerencia: Introduzca [su-prefijo-handle]/0 para ejecutar una tarea en toda su instalación (no todas las tareas permiten esta opción)",
 
-
-
   // "deny-request-copy.email.message": "Dear {{ recipientName }},\nIn response to your request I regret to inform you that it's not possible to send you a copy of the file(s) you have requested, concerning the document: \"{{ itemUrl }}\" ({{ itemName }}), of which I am an author.\n\nBest regards,\n{{ authorName }} <{{ authorEmail }}>",
-  "deny-request-copy.email.message": "Estimado {{ recipientName }},\nEn respuesta a su solicitud, lamento informarle que no es posible enviarle una copia de los archivos que ha solicitado, en relación con el documento: \"{{ itemUrl }}\" ({{ itemName }}), del cual soy autor.\n\nSaludos cordiales,\n{{ authorName }} <{{ authorEmail }}>",
+  "deny-request-copy.email.message": "Estimado {{ recipientName }},\nEn respuesta a su solicitud, lamento informarle de que no es posible enviarle una copia de los archivos que ha solicitado, en relación con el documento: \"{{ itemUrl }}\" ({{ itemName }}), del cual soy autor.\n\nSaludos cordiales,\n{{ authorName }} <{{ authorEmail }}>",
 
   // "deny-request-copy.email.subject": "Request copy of document",
   "deny-request-copy.email.subject": "Solicitar una copia del documento",
@@ -2127,17 +2131,16 @@
   "deny-request-copy.header": "Denegar copia del documento",
 
   // "deny-request-copy.intro": "This message will be sent to the applicant of the request",
-  "deny-request-copy.intro": "Éste es el texto que será enviado al solicitante.",
+  "deny-request-copy.intro": "Éste es el texto que será enviado al solicitante",
 
   // "deny-request-copy.success": "Successfully denied item request",
   "deny-request-copy.success": "Solicitud de copia de documento denegada",
 
-
-
   // "dso.name.untitled": "Untitled",
   "dso.name.untitled": "Sin título",
 
-
+  // "dso.name.unnamed": "Unnamed",
+  "dso.name.unnamed": "Sin nombre",
 
   // "dso-selector.create.collection.head": "New collection",
   "dso-selector.create.collection.head": "Nueva colección",
@@ -2259,7 +2262,7 @@
   // "supervision-group-selector.notification.create.failure.title": "Error",
   "supervision-group-selector.notification.create.failure.title": "Error",
 
-  // "supervision-group-selector.notification.create.already-existing" : "A supervision order already exists on this item for selected group",
+  // "supervision-group-selector.notification.create.already-existing": "A supervision order already exists on this item for selected group",
   "supervision-group-selector.notification.create.already-existing": "Ya existe una orden de supervisión para este ítem en el grupo selecionado",
 
   // "confirmation-modal.export-metadata.header": "Export metadata for {{ dsoName }}",
@@ -2374,7 +2377,7 @@
   "error.top-level-communities": "Error al recuperar las comunidades de primer nivel",
 
   // "error.validation.license.notgranted": "You must grant this license to complete your submission. If you are unable to grant this license at this time you may save your work and return later or remove the submission.",
-  "error.validation.license.notgranted": "Debe conceda esta licencia de depósito para completar el envío. Si no puede conceder esta licencia en este momento, puede guardar su trabajo y regresar más tarde o bien eliminar el envío.",
+  "error.validation.license.notgranted": "Debe conceder esta licencia de depósito para completar el envío. Si no puede conceder esta licencia en este momento, puede guardar su trabajo y regresar más tarde o bien eliminar el envío.",
 
   // "error.validation.pattern": "This input is restricted by the current pattern: {{ pattern }}.",
   "error.validation.pattern": "Esta entrada está restringida por este patrón: {{ pattern }}.",
@@ -2394,16 +2397,33 @@
   // "error.validation.groupExists": "This group already exists",
   "error.validation.groupExists": "Este grupo ya existe",
 
+  // "error.validation.metadata.name.invalid-pattern": "This field cannot contain dots, commas or spaces. Please use the Element & Qualifier fields instead",
+  "error.validation.metadata.name.invalid-pattern": "Este campo no puede contener puntos, comas o espacios. Use preferiblemente los campos Elemento y Cualificador",
+
+  // "error.validation.metadata.name.max-length": "This field may not contain more than 32 characters",
+  "error.validation.metadata.name.max-length": "Este campo no puede contener mas de 32 caracteres",
+
+  // "error.validation.metadata.namespace.max-length": "This field may not contain more than 256 characters",
+  "error.validation.metadata.namespace.max-length": "Este campo no puede contener mas de 256 caracteres",
+
+  // "error.validation.metadata.element.invalid-pattern": "This field cannot contain dots, commas or spaces. Please use the Qualifier field instead",
+  "error.validation.metadata.element.invalid-pattern": "Este campo no puede contener puntos, comas o espacios. Use preferiblemente el campo Cualificador",
+
+  // "error.validation.metadata.element.max-length": "This field may not contain more than 64 characters",
+  "error.validation.metadata.element.max-length": "Este campo no puede contener mas de 64 caracteres",
+
+  // "error.validation.metadata.qualifier.invalid-pattern": "This field cannot contain dots, commas or spaces",
+  "error.validation.metadata.qualifier.invalid-pattern": "This field cannot contain dots, commas or spaces",
+
+  // "error.validation.metadata.qualifier.max-length": "This field may not contain more than 64 characters",
+  "error.validation.metadata.qualifier.max-length": "Este campo no puede contener mas de 64 caracteres",
 
   // "feed.description": "Syndication feed",
   "feed.description": "Hilo de sindicación",
 
-
   // "file-section.error.header": "Error obtaining files for this item",
   "file-section.error.header": "Error al obtener archivos para este ítem",
 
-
-
   // "footer.copyright": "copyright © 2002-{{ year }}",
   "footer.copyright": "copyright © 2002-{{ year }}",
 
@@ -2419,14 +2439,12 @@
   // "footer.link.privacy-policy": "Privacy policy",
   "footer.link.privacy-policy": "Política de privacidad",
 
-  // "footer.link.end-user-agreement":"End User Agreement",
+  // "footer.link.end-user-agreement": "End User Agreement",
   "footer.link.end-user-agreement": "Acuerdo de usuario final",
 
-  // "footer.link.feedback":"Send Feedback",
+  // "footer.link.feedback": "Send Feedback",
   "footer.link.feedback": "Enviar Sugerencias",
 
-
-
   // "forgot-email.form.header": "Forgot Password",
   "forgot-email.form.header": "Olvido de contraseña",
 
@@ -2460,8 +2478,6 @@
   // "forgot-email.form.error.content": "An error occured when attempting to reset the password for the account associated with the following email address: {{ email }}",
   "forgot-email.form.error.content": "Ha ocurrido una error intentando restablecer la contraseña para la cuenta asociada al correo electrónico: {{ email }}",
 
-
-
   // "forgot-password.title": "Forgot Password",
   "forgot-password.title": "Olvido de contraseña",
 
@@ -2504,7 +2520,6 @@
   // "forgot-password.form.submit": "Submit password",
   "forgot-password.form.submit": "Enviar contraseña",
 
-
   // "form.add": "Add more",
   "form.add": "Añadir más",
 
@@ -2565,6 +2580,24 @@
   // "form.no-value": "No value entered",
   "form.no-value": "No se introdujo ningún valor",
 
+  // "form.other-information.email": "Email",
+  "form.other-information.email": "Correo electrónico",
+
+  // "form.other-information.first-name": "First Name",
+  "form.other-information.first-name": "Nombre",
+
+  // "form.other-information.insolr": "In Solr Index",
+  "form.other-information.insolr": "en el índice Solr",
+
+  // "form.other-information.institution": "Institution",
+  "form.other-information.institution": "Institución",
+
+  // "form.other-information.last-name": "Last Name",
+  "form.other-information.last-name": "Apellido",
+
+  // "form.other-information.orcid": "ORCID",
+  "form.other-information.orcid": "ORCID",
+
   // "form.remove": "Remove",
   "form.remove": "Eliminar",
 
@@ -2589,16 +2622,14 @@
   // "form.repeatable.sort.tip": "Drop the item in the new position",
   "form.repeatable.sort.tip": "Suelte el ítem en la nueva posición",
 
-
-
   // "grant-deny-request-copy.deny": "Don't send copy",
   "grant-deny-request-copy.deny": "No envíe copia",
 
   // "grant-deny-request-copy.email.back": "Back",
   "grant-deny-request-copy.email.back": "Atrás",
 
-  // "grant-deny-request-copy.email.message": "Message",
-  "grant-deny-request-copy.email.message": "Mensaje",
+  // "grant-deny-request-copy.email.message": "Optional additional message",
+  "grant-deny-request-copy.email.message": "Mensaje adicional (opcional)",
 
   // "grant-deny-request-copy.email.message.empty": "Please enter a message",
   "grant-deny-request-copy.email.message.empty": "Por favor, introduzca un mensaje",
@@ -2636,11 +2667,6 @@
   // "grant-deny-request-copy.processed": "This request has already been processed. You can use the button below to get back to the home page.",
   "grant-deny-request-copy.processed": "Esta solicitud ya fue procesada. Puede usar los botones inferiores para regresas a la página de inicio",
 
-
-
-  // "grant-request-copy.email.message": "Dear {{ recipientName }},\nIn response to your request I have the pleasure to send you in attachment a copy of the file(s) concerning the document: \"{{ itemUrl }}\" ({{ itemName }}), of which I am an author.\n\nBest regards,\n{{ authorName }} <{{ authorEmail }}>",
-  "grant-request-copy.email.message": "Estimado {{ recipientName }},\nRespondiendo a su solicitud, le envío anexada una copia del fichero correspondiente al documento: \"{{ itemUrl }}\" ({{ itemName }}), del que soy autor.\n\nUn cordial saludo,\n{{ authorName }} <{{ authorEmail }}>",
-
   // "grant-request-copy.email.subject": "Request copy of document",
   "grant-request-copy.email.subject": "Solicitar copia de documento",
 
@@ -2650,23 +2676,22 @@
   // "grant-request-copy.header": "Grant document copy request",
   "grant-request-copy.header": "Conceder solicitud de copia de documento",
 
-  // "grant-request-copy.intro": "This message will be sent to the applicant of the request. The requested document(s) will be attached.",
+  // "grant-request-copy.intro": "A message will be sent to the applicant of the request. The requested document(s) will be attached.",
   "grant-request-copy.intro": "Este mensaje se enviará al solicitante de la copia. Se le anexará una copia del documento.",
 
   // "grant-request-copy.success": "Successfully granted item request",
   "grant-request-copy.success": "Solicitud de ítem concedida exitosamente",
 
-
   // "health.breadcrumbs": "Health",
   "health.breadcrumbs": "Chequeos",
 
-  // "health-page.heading" : "Health",
+  // "health-page.heading": "Health",
   "health-page.heading": "Chequeos",
 
-  // "health-page.info-tab" : "Info",
+  // "health-page.info-tab": "Info",
   "health-page.info-tab": "Información",
 
-  // "health-page.status-tab" : "Status",
+  // "health-page.status-tab": "Status",
   "health-page.status-tab": "Estado",
 
   // "health-page.error.msg": "The health check service is temporarily unavailable",
@@ -2717,7 +2742,6 @@
   // "health-page.section.no-issues": "No issues detected",
   "health-page.section.no-issues": "No se detectaron problemas",
 
-
   // "home.description": "",
   "home.description": "",
 
@@ -2736,8 +2760,6 @@
   // "home.top-level-communities.help": "Select a community to browse its collections.",
   "home.top-level-communities.help": "Seleccione una comunidad para explorar sus colecciones.",
 
-
-
   // "info.end-user-agreement.accept": "I have read and I agree to the End User Agreement",
   "info.end-user-agreement.accept": "He leído y acepto el Acuerdo de usuario final.",
 
@@ -2762,6 +2784,9 @@
   // "info.end-user-agreement.title": "End User Agreement",
   "info.end-user-agreement.title": "Acuerdo de usuario final",
 
+  // "info.end-user-agreement.hosting-country": "the United States",
+  "info.end-user-agreement.hosting-country": "los Estados Unidos de América",
+
   // "info.privacy.breadcrumbs": "Privacy Statement",
   "info.privacy.breadcrumbs": "Declaracion de privacidad",
 
@@ -2795,47 +2820,39 @@
   // "info.feedback.email-label": "Your Email",
   "info.feedback.email-label": "Su correo electrónico",
 
-  // "info.feedback.create.success" : "Feedback Sent Successfully!",
+  // "info.feedback.create.success": "Feedback Sent Successfully!",
   "info.feedback.create.success": "Envío exitoso de sugerencia",
 
-  // "info.feedback.error.email.required" : "A valid email address is required",
+  // "info.feedback.error.email.required": "A valid email address is required",
   "info.feedback.error.email.required": "se requiere una dirección válida de correo electrónico",
 
-  // "info.feedback.error.message.required" : "A comment is required",
+  // "info.feedback.error.message.required": "A comment is required",
   "info.feedback.error.message.required": "Se requiere un comentario",
 
-  // "info.feedback.page-label" : "Page",
+  // "info.feedback.page-label": "Page",
   "info.feedback.page-label": "Página",
 
-  // "info.feedback.page_help" : "Tha page related to your feedback",
+  // "info.feedback.page_help": "Tha page related to your feedback",
   "info.feedback.page_help": "La página relacionada con su sugerencia",
 
-
-
   // "item.alerts.private": "This item is non-discoverable",
   "item.alerts.private": "Este ítem es privado",
 
   // "item.alerts.withdrawn": "This item has been withdrawn",
   "item.alerts.withdrawn": "Este ítem ha sido retirado",
 
-
-
   // "item.edit.authorizations.heading": "With this editor you can view and alter the policies of an item, plus alter policies of individual item components: bundles and bitstreams. Briefly, an item is a container of bundles, and bundles are containers of bitstreams. Containers usually have ADD/REMOVE/READ/WRITE policies, while bitstreams only have READ/WRITE policies.",
   "item.edit.authorizations.heading": "Con este editor puede ver y modificar las políticas de un ítem, además de modificar las políticas de los componentes individuales del ítem: paquetes y archivos. Brevemente, un ítem es un contenedor de paquetes y los paquetes son contenedores de archivos. Los contenedores suelen tener políticas AGREGAR/ELIMINAR/LEER/ESCRIBIR, mientras que los archivos solo tienen políticas LEER/ESCRIBIR.",
 
   // "item.edit.authorizations.title": "Edit item's Policies",
   "item.edit.authorizations.title": "Editar las políticas del ítem",
 
-
-
   // "item.badge.private": "Non-discoverable",
   "item.badge.private": "Privado",
 
   // "item.badge.withdrawn": "Withdrawn",
   "item.badge.withdrawn": "Retirado",
 
-
-
   // "item.bitstreams.upload.bundle": "Bundle",
   "item.bitstreams.upload.bundle": "Bloque",
 
@@ -2869,8 +2886,6 @@
   // "item.bitstreams.upload.title": "Upload bitstream",
   "item.bitstreams.upload.title": "Subir archivo",
 
-
-
   // "item.edit.bitstreams.bundle.edit.buttons.upload": "Upload",
   "item.edit.bitstreams.bundle.edit.buttons.upload": "Subir",
 
@@ -2961,8 +2976,6 @@
   // "item.edit.bitstreams.upload-button": "Upload",
   "item.edit.bitstreams.upload-button": "Subir",
 
-
-
   // "item.edit.delete.cancel": "Cancel",
   "item.edit.delete.cancel": "Cancelar",
 
@@ -2990,7 +3003,6 @@
   // "item.edit.tabs.disabled.tooltip": "You're not authorized to access this tab",
   "item.edit.tabs.disabled.tooltip": "No tienes autorización para acceder a esta pestaña",
 
-
   // "item.edit.tabs.mapper.head": "Collection Mapper",
   "item.edit.tabs.mapper.head": "Mapeador de colecciones",
 
@@ -3114,8 +3126,6 @@
   // "item.edit.item-mapper.tabs.map": "Map new collections",
   "item.edit.item-mapper.tabs.map": "Mapear nuevas colecciones",
 
-
-
   // "item.edit.metadata.add-button": "Add",
   "item.edit.metadata.add-button": "Agregar",
 
@@ -3200,8 +3210,6 @@
   // "item.edit.metadata.save-button": "Save",
   "item.edit.metadata.save-button": "Guardar",
 
-
-
   // "item.edit.modify.overview.field": "Field",
   "item.edit.modify.overview.field": "Campo",
 
@@ -3211,8 +3219,6 @@
   // "item.edit.modify.overview.value": "Value",
   "item.edit.modify.overview.value": "Valor",
 
-
-
   // "item.edit.move.cancel": "Back",
   "item.edit.move.cancel": "Atrás",
 
@@ -3252,8 +3258,6 @@
   // "item.edit.move.title": "Move item",
   "item.edit.move.title": "Mover ítem",
 
-
-
   // "item.edit.private.cancel": "Cancel",
   "item.edit.private.cancel": "Cancelar",
 
@@ -3272,8 +3276,6 @@
   // "item.edit.private.success": "The item is now non-discoverable",
   "item.edit.private.success": "El ítem ahora es privado",
 
-
-
   // "item.edit.public.cancel": "Cancel",
   "item.edit.public.cancel": "Cancelar",
 
@@ -3292,8 +3294,6 @@
   // "item.edit.public.success": "The item is now discoverable",
   "item.edit.public.success": "El ítem ahora es público",
 
-
-
   // "item.edit.reinstate.cancel": "Cancel",
   "item.edit.reinstate.cancel": "Cancelar",
 
@@ -3312,8 +3312,6 @@
   // "item.edit.reinstate.success": "The item was reinstated successfully",
   "item.edit.reinstate.success": "El ítem se reintegró correctamente",
 
-
-
   // "item.edit.relationships.discard-button": "Discard",
   "item.edit.relationships.discard-button": "Descartar",
 
@@ -3359,11 +3357,9 @@
   // "item.edit.relationships.no-entity-type": "Add 'dspace.entity.type' metadata to enable relationships for this item",
   "item.edit.relationships.no-entity-type": "Agregue metadatos 'dspace.entity.type' para habilitar las relaciones para este ítem",
 
-
   // "item.edit.return": "Back",
   "item.edit.return": "Atrás",
 
-
   // "item.edit.tabs.bitstreams.head": "Bitstreams",
   "item.edit.tabs.bitstreams.head": "Archivos",
 
@@ -3376,6 +3372,15 @@
   // "item.edit.tabs.curate.title": "Item Edit - Curate",
   "item.edit.tabs.curate.title": "Edición de ítem: Curar",
 
+  // "item.edit.curate.title": "Curate Item: {{item}}",
+  "item.edit.curate.title": "Curar ítem: {{item}}",
+
+  // "item.edit.tabs.access-control.head": "Access Control",
+  "item.edit.tabs.access-control.head": "Control de acceso",
+
+  // "item.edit.tabs.access-control.title": "Item Edit - Access Control",
+  "item.edit.tabs.access-control.title": "Edición de ítem: Control de acceso",
+
   // "item.edit.tabs.metadata.head": "Metadata",
   "item.edit.tabs.metadata.head": "Metadatos",
 
@@ -3407,7 +3412,7 @@
   "item.edit.tabs.status.buttons.mappedCollections.label": "Administrar colecciones mapeadas",
 
   // "item.edit.tabs.status.buttons.move.button": "Move this Item to a different Collection",
-  "item.edit.tabs.status.buttons.move.button": "Mover éste ítem a una colección diferente",
+  "item.edit.tabs.status.buttons.move.button": "Mover este ítem a una colección diferente",
 
   // "item.edit.tabs.status.buttons.move.label": "Move item to another collection",
   "item.edit.tabs.status.buttons.move.label": "Mover ítem a otra colección",
@@ -3434,7 +3439,7 @@
   "item.edit.tabs.status.buttons.unauthorized": "No estás autorizado para realizar esta acción.",
 
   // "item.edit.tabs.status.buttons.withdraw.button": "Withdraw this item",
-  "item.edit.tabs.status.buttons.withdraw.button": "Retirar éste ítem",
+  "item.edit.tabs.status.buttons.withdraw.button": "Retirar este ítem",
 
   // "item.edit.tabs.status.buttons.withdraw.label": "Withdraw item from the repository",
   "item.edit.tabs.status.buttons.withdraw.label": "Retirar ítem del repositorio",
@@ -3475,8 +3480,6 @@
   // "item.edit.tabs.view.title": "Item Edit -  View",
   "item.edit.tabs.view.title": "Edición de ítem - Ver",
 
-
-
   // "item.edit.withdraw.cancel": "Cancel",
   "item.edit.withdraw.cancel": "Cancelar",
 
@@ -3498,7 +3501,6 @@
   // "item.orcid.return": "Back",
   "item.orcid.return": "Atrás",
 
-
   // "item.listelement.badge": "Item",
   "item.listelement.badge": "Ítem",
 
@@ -3556,8 +3558,6 @@
   // "workflow-item.search.result.list.element.supervised.remove-tooltip": "Remove supervision group",
   "workflow-item.search.result.list.element.supervised.remove-tooltip": "Borrar grupo de supervisión",
 
-
-
   // "item.page.abstract": "Abstract",
   "item.page.abstract": "Resumen",
 
@@ -3648,10 +3648,10 @@
   // "item.page.bitstreams.collapse": "Collapse",
   "item.page.bitstreams.collapse": "Contraer",
 
-  // "item.page.filesection.original.bundle" : "Original bundle",
+  // "item.page.filesection.original.bundle": "Original bundle",
   "item.page.filesection.original.bundle": "Bloque original",
 
-  // "item.page.filesection.license.bundle" : "License bundle",
+  // "item.page.filesection.license.bundle": "License bundle",
   "item.page.filesection.license.bundle": "Bloque de licencias",
 
   // "item.page.return": "Back",
@@ -3660,7 +3660,7 @@
   // "item.page.version.create": "Create new version",
   "item.page.version.create": "Crear una nueva version",
 
-  // "item.page.version.hasDraft": "A new version cannot be created because there is an inprogress submission in the version history",
+  // "item.page.version.hasDraft": "A new version cannot be created because there is an in-progress submission in the version history",
   "item.page.version.hasDraft": "No se puede crear una nueva versión porque en el historial de versiones hay un envío en curso",
 
   // "item.page.claim.button": "Claim",
@@ -3696,27 +3696,30 @@
   // "item.preview.dc.type": "Type:",
   "item.preview.dc.type": "Tipo:",
 
-  // "item.preview.oaire.citation.issue" : "Issue",
+  // "item.preview.oaire.citation.issue": "Issue",
   "item.preview.oaire.citation.issue": "Número",
 
-  // "item.preview.oaire.citation.volume" : "Volume",
+  // "item.preview.oaire.citation.volume": "Volume",
   "item.preview.oaire.citation.volume": "Volumen",
 
-  // "item.preview.dc.relation.issn" : "ISSN",
+  // "item.preview.dc.relation.issn": "ISSN",
   "item.preview.dc.relation.issn": "ISSN",
 
-  // "item.preview.dc.identifier.isbn" : "ISBN",
+  // "item.preview.dc.identifier.isbn": "ISBN",
   "item.preview.dc.identifier.isbn": "ISBN",
 
   // "item.preview.dc.identifier": "Identifier:",
   "item.preview.dc.identifier": "Identificador:",
 
-  // "item.preview.dc.relation.ispartof" : "Journal or Serie",
+  // "item.preview.dc.relation.ispartof": "Journal or Series",
   "item.preview.dc.relation.ispartof": "Revista o Serie",
 
-  // "item.preview.dc.identifier.doi" : "DOI",
+  // "item.preview.dc.identifier.doi": "DOI",
   "item.preview.dc.identifier.doi": "DOI",
 
+  // "item.preview.dc.publisher": "Publisher:",
+  "item.preview.dc.publisher": "Editor:",
+
   // "item.preview.person.familyName": "Surname:",
   "item.preview.person.familyName": "Apellido:",
 
@@ -3744,8 +3747,6 @@
   // "item.preview.oaire.fundingStream": "Funding Stream:",
   "item.preview.oaire.fundingStream": "Línea de financiación:",
 
-
-
   // "item.select.confirm": "Confirm selected",
   "item.select.confirm": "Confirmar seleccionado",
 
@@ -3761,7 +3762,6 @@
   // "item.select.table.title": "Title",
   "item.select.table.title": "Título",
 
-
   // "item.version.history.empty": "There are no other versions for this item yet.",
   "item.version.history.empty": "Aún no hay otras versiones para este ítem.",
 
@@ -3819,14 +3819,12 @@
   // "item.version.history.table.action.deleteVersion": "Delete version",
   "item.version.history.table.action.deleteVersion": "Borrar versión",
 
-  // "item.version.history.table.action.hasDraft": "A new version cannot be created because there is an inprogress submission in the version history",
+  // "item.version.history.table.action.hasDraft": "A new version cannot be created because there is an in-progress submission in the version history",
   "item.version.history.table.action.hasDraft": "No es posible crear una nueva versión puesto que existe en el historial de versiones un envío pendiente",
 
-
   // "item.version.notice": "This is not the latest version of this item. The latest version can be found <a href='{{destination}}'>here</a>.",
   "item.version.notice": "Esta no es la última versión de este ítem. La última versión se puede encontrar <a href='{{ destination }}'>aquí</a>.",
 
-
   // "item.version.create.modal.header": "New version",
   "item.version.create.modal.header": "Nueva versión",
 
@@ -3860,21 +3858,20 @@
   // "item.version.create.modal.submitted.text": "The new version is being created. This may take some time if the item has a lot of relationships.",
   "item.version.create.modal.submitted.text": "Se está creando la nueva versión. Si el ítem tiene muchas relaciones, este proceso podría tardar.",
 
-  // "item.version.create.notification.success" : "New version has been created with version number {{version}}",
+  // "item.version.create.notification.success": "New version has been created with version number {{version}}",
   "item.version.create.notification.success": "Se ha creado una nueva versión con número {{version}}",
 
-  // "item.version.create.notification.failure" : "New version has not been created",
+  // "item.version.create.notification.failure": "New version has not been created",
   "item.version.create.notification.failure": "No se ha creado una nueva versión",
 
-  // "item.version.create.notification.inProgress" : "A new version cannot be created because there is an inprogress submission in the version history",
+  // "item.version.create.notification.inProgress": "A new version cannot be created because there is an in-progress submission in the version history",
   "item.version.create.notification.inProgress": "No es posible crear una nueva versión puesto que existe en el historial de versiones un envío pendiente",
 
-
   // "item.version.delete.modal.header": "Delete version",
   "item.version.delete.modal.header": "Borrar versión",
 
   // "item.version.delete.modal.text": "Do you want to delete version {{version}}?",
-  "item.version.delete.modal.text": "Quiere borrar la versión {{version}}?",
+  "item.version.delete.modal.text": "¿Quiere borrar la versión {{version}}?",
 
   // "item.version.delete.modal.button.confirm": "Delete",
   "item.version.delete.modal.button.confirm": "Borrar",
@@ -3888,21 +3885,18 @@
   // "item.version.delete.modal.button.cancel.tooltip": "Do not delete this version",
   "item.version.delete.modal.button.cancel.tooltip": "No borrar esta versión",
 
-  // "item.version.delete.notification.success" : "Version number {{version}} has been deleted",
+  // "item.version.delete.notification.success": "Version number {{version}} has been deleted",
   "item.version.delete.notification.success": "Se ha borrado la versión número {{version}}",
 
-  // "item.version.delete.notification.failure" : "Version number {{version}} has not been deleted",
+  // "item.version.delete.notification.failure": "Version number {{version}} has not been deleted",
   "item.version.delete.notification.failure": "No se ha borrado la versión número {{version}}",
 
+  // "item.version.edit.notification.success": "The summary of version number {{version}} has been changed",
+  "item.version.edit.notification.success": "Se ha cambiado el resumen de la versión número {{version}}",
 
-  // "item.version.edit.notification.success" : "The summary of version number {{version}} has been changed",
-  "item.version.edit.notification.success": "Ha cambiado el resumen de la versión número {{version}}",
-
-  // "item.version.edit.notification.failure" : "The summary of version number {{version}} has not been changed",
+  // "item.version.edit.notification.failure": "The summary of version number {{version}} has not been changed",
   "item.version.edit.notification.failure": "No ha cambiado el resumen de la versión número {{version}}",
 
-
-
   // "itemtemplate.edit.metadata.add-button": "Add",
   "itemtemplate.edit.metadata.add-button": "Agregar",
 
@@ -3984,8 +3978,6 @@
   // "itemtemplate.edit.metadata.save-button": "Save",
   "itemtemplate.edit.metadata.save-button": "Guardar",
 
-
-
   // "journal.listelement.badge": "Journal",
   "journal.listelement.badge": "Revista",
 
@@ -4016,8 +4008,6 @@
   // "journal.search.title": "Journal Search",
   "journal.search.title": "Búsqueda de revistas",
 
-
-
   // "journalissue.listelement.badge": "Journal Issue",
   "journalissue.listelement.badge": "Número de la revista",
 
@@ -4045,8 +4035,6 @@
   // "journalissue.page.titleprefix": "Journal Issue: ",
   "journalissue.page.titleprefix": "Número de la revista: ",
 
-
-
   // "journalvolume.listelement.badge": "Journal Volume",
   "journalvolume.listelement.badge": "Volumen de la revista",
 
@@ -4065,7 +4053,6 @@
   // "journalvolume.page.volume": "Volume",
   "journalvolume.page.volume": "Volumen",
 
-
   // "iiifsearchable.listelement.badge": "Document Media",
   "iiifsearchable.listelement.badge": "Soporte (media) del documento",
 
@@ -4099,7 +4086,6 @@
   // "iiif.page.description": "Description: ",
   "iiif.page.description": "Descripción: ",
 
-
   // "loading.bitstream": "Loading bitstream...",
   "loading.bitstream": "Cargando archivo...",
 
@@ -4154,8 +4140,6 @@
   // "loading.top-level-communities": "Loading top-level communities...",
   "loading.top-level-communities": "Cargando comunidades de primer nivel...",
 
-
-
   // "login.form.email": "Email address",
   "login.form.email": "Correo electrónico",
 
@@ -4192,8 +4176,6 @@
   // "login.breadcrumbs": "Login",
   "login.breadcrumbs": "Acceso",
 
-
-
   // "logout.form.header": "Log out from DSpace",
   "logout.form.header": "Cerrar sesión en DSpace",
 
@@ -4203,8 +4185,6 @@
   // "logout.title": "Logout",
   "logout.title": "Cerrar sesión",
 
-
-
   // "menu.header.admin": "Management",
   "menu.header.admin": "Gestión",
 
@@ -4214,27 +4194,24 @@
   // "menu.header.admin.description": "Management menu",
   "menu.header.admin.description": "Menú de gestión",
 
-
-
   // "menu.section.access_control": "Access Control",
   "menu.section.access_control": "Control de acceso",
 
   // "menu.section.access_control_authorizations": "Authorizations",
   "menu.section.access_control_authorizations": "Autorizaciones",
 
+  // "menu.section.access_control_bulk": "Bulk Access Management",
+  "menu.section.access_control_bulk": "Gestión de Acceso Masivo",
+
   // "menu.section.access_control_groups": "Groups",
   "menu.section.access_control_groups": "Grupos",
 
   // "menu.section.access_control_people": "People",
   "menu.section.access_control_people": "Usuarios",
 
-
-
   // "menu.section.admin_search": "Admin Search",
   "menu.section.admin_search": "Búsqueda de administrador",
 
-
-
   // "menu.section.browse_community": "This Community",
   "menu.section.browse_community": "Esta comunidad",
 
@@ -4259,22 +4236,21 @@
   // "menu.section.browse_global_by_subject": "By Subject",
   "menu.section.browse_global_by_subject": "Por tema",
 
+  // "menu.section.browse_global_by_srsc": "By Subject Category",
+  "menu.section.browse_global_by_srsc": "Por categoría",
+
   // "menu.section.browse_global_by_title": "By Title",
   "menu.section.browse_global_by_title": "Por titulo",
 
   // "menu.section.browse_global_communities_and_collections": "Communities & Collections",
   "menu.section.browse_global_communities_and_collections": "Comunidades",
 
-
-
   // "menu.section.control_panel": "Control Panel",
   "menu.section.control_panel": "Panel de control",
 
   // "menu.section.curation_task": "Curation Task",
   "menu.section.curation_task": "Tareas de curación",
 
-
-
   // "menu.section.edit": "Edit",
   "menu.section.edit": "Editar",
 
@@ -4287,8 +4263,6 @@
   // "menu.section.edit_item": "Item",
   "menu.section.edit_item": "Ítem",
 
-
-
   // "menu.section.export": "Export",
   "menu.section.export": "Exportar",
 
@@ -4307,7 +4281,6 @@
   // "menu.section.export_batch": "Batch Export (ZIP)",
   "menu.section.export_batch": "Exportación por lotes (ZIP)",
 
-
   // "menu.section.icon.access_control": "Access Control menu section",
   "menu.section.icon.access_control": "Sección del menú de control de acceso",
 
@@ -4356,8 +4329,6 @@
   // "menu.section.icon.unpin": "Unpin sidebar",
   "menu.section.icon.unpin": "Desanclar la barra lateral",
 
-
-
   // "menu.section.import": "Import",
   "menu.section.import": "Importar",
 
@@ -4367,8 +4338,6 @@
   // "menu.section.import_metadata": "Metadata",
   "menu.section.import_metadata": "Metadatos",
 
-
-
   // "menu.section.new": "New",
   "menu.section.new": "Nuevo",
 
@@ -4387,24 +4356,18 @@
   // "menu.section.new_process": "Process",
   "menu.section.new_process": "Proceso",
 
-
-
   // "menu.section.pin": "Pin sidebar",
   "menu.section.pin": "Anclar barra lateral",
 
   // "menu.section.unpin": "Unpin sidebar",
   "menu.section.unpin": "Desanclar la barra lateral",
 
-
-
   // "menu.section.processes": "Processes",
   "menu.section.processes": "Procesos",
 
   // "menu.section.health": "Health",
   "menu.section.health": "Chequeo",
 
-
-
   // "menu.section.registries": "Registries",
   "menu.section.registries": "Registros",
 
@@ -4414,16 +4377,12 @@
   // "menu.section.registries_metadata": "Metadata",
   "menu.section.registries_metadata": "Metadatos",
 
-
-
   // "menu.section.statistics": "Statistics",
   "menu.section.statistics": "Estadísticas",
 
   // "menu.section.statistics_task": "Statistics Task",
   "menu.section.statistics_task": "Tarea de estadísticas",
 
-
-
   // "menu.section.toggle.access_control": "Toggle Access Control section",
   "menu.section.toggle.access_control": "Alternar sección de control de acceso",
 
@@ -4454,19 +4413,18 @@
   // "menu.section.toggle.statistics_task": "Toggle Statistics Task section",
   "menu.section.toggle.statistics_task": "Alternar sección de Tarea de estadísticas",
 
-
   // "menu.section.workflow": "Administer Workflow",
   "menu.section.workflow": "Administrar flujo de trabajo",
 
-
   // "metadata-export-search.tooltip": "Export search results as CSV",
   "metadata-export-search.tooltip": "Exportar los resultados de búsqueda a CSV",
+
   // "metadata-export-search.submit.success": "The export was started successfully",
   "metadata-export-search.submit.success": "La exportación ha comenzado satisfactoriamente",
+
   // "metadata-export-search.submit.error": "Starting the export has failed",
   "metadata-export-search.submit.error": "Ha fallado el comienzo de la exportación",
 
-
   // "mydspace.breadcrumbs": "MyDSpace",
   "mydspace.breadcrumbs": "Mi DSpace",
 
@@ -4560,20 +4518,20 @@
   // "mydspace.show.supervisedWorkspace": "Supervised items",
   "mydspace.show.supervisedWorkspace": "Ítems supervisados",
 
-  // "mydspace.status.archived": "Archived",
-  "mydspace.status.archived": "Archivado",
+  // "mydspace.status.mydspaceArchived": "Archived",
+  "mydspace.status.mydspaceArchived": "Archivado",
 
-  // "mydspace.status.validation": "Validation",
-  "mydspace.status.validation": "Validación",
+  // "mydspace.status.mydspaceValidation": "Validation",
+  "mydspace.status.mydspaceValidation": "Validación",
 
-  // "mydspace.status.waiting-for-controller": "Waiting for controller",
-  "mydspace.status.waiting-for-controller": "Esperando al controlador",
+  // "mydspace.status.mydspaceWaitingController": "Waiting for reviewer",
+  "mydspace.status.mydspaceWaitingController": "Esperando al controlador",
 
-  // "mydspace.status.workflow": "Workflow",
-  "mydspace.status.workflow": "Flujo de trabajo",
+  // "mydspace.status.mydspaceWorkflow": "Workflow",
+  "mydspace.status.mydspaceWorkflow": "Flujo de trabajo",
 
-  // "mydspace.status.workspace": "Workspace",
-  "mydspace.status.workspace": "Espacio de trabajo",
+  // "mydspace.status.mydspaceWorkspace": "Workspace",
+  "mydspace.status.mydspaceWorkspace": "Espacio de trabajo",
 
   // "mydspace.title": "MyDSpace",
   "mydspace.title": "Mi DSpace",
@@ -4593,8 +4551,6 @@
   // "mydspace.view-btn": "View",
   "mydspace.view-btn": "Ver",
 
-
-
   // "nav.browse.header": "All of DSpace",
   "nav.browse.header": "Todo DSpace",
 
@@ -4628,25 +4584,27 @@
   // "nav.search": "Search",
   "nav.search": "Buscar",
 
+  // "nav.search.button": "Submit search",
+  "nav.search.button": "Buscar",
+
   // "nav.statistics.header": "Statistics",
   "nav.statistics.header": "Estadísticas",
 
   // "nav.stop-impersonating": "Stop impersonating EPerson",
-  "nav.stop-impersonating": "Dejar de hacerse pasar por usuario",
+  "nav.stop-impersonating": "Dejar de impersonar al usuario",
 
-  // "nav.subscriptions" : "Subscriptions",
+  // "nav.subscriptions": "Subscriptions",
   "nav.subscriptions": "Suscripciones",
 
-  // "nav.toggle" : "Toggle navigation",
+  // "nav.toggle": "Toggle navigation",
   "nav.toggle": "Alternar navegación",
 
-  // "nav.user.description" : "User profile bar",
+  // "nav.user.description": "User profile bar",
   "nav.user.description": "Barra de perfil de usuario",
 
   // "none.listelement.badge": "Item",
   "none.listelement.badge": "Ítem",
 
-
   // "orgunit.listelement.badge": "Organizational Unit",
   "orgunit.listelement.badge": "Unidad organizativa",
 
@@ -4674,8 +4632,6 @@
   // "orgunit.page.titleprefix": "Organizational Unit: ",
   "orgunit.page.titleprefix": "Unidad organizativa: ",
 
-
-
   // "pagination.options.description": "Pagination options",
   "pagination.options.description": "Opciones de paginación",
 
@@ -4691,8 +4647,6 @@
   // "pagination.sort-direction": "Sort Options",
   "pagination.sort-direction": "Opciones de ordenación",
 
-
-
   // "person.listelement.badge": "Person",
   "person.listelement.badge": "Persona",
 
@@ -4741,8 +4695,6 @@
   // "person.search.title": "Person Search",
   "person.search.title": "Búsqueda de personas",
 
-
-
   // "process.new.select-parameters": "Parameters",
   "process.new.select-parameters": "Parámetros",
 
@@ -4791,6 +4743,9 @@
   // "process.new.notification.error.content": "An error occurred while creating this process",
   "process.new.notification.error.content": "Se produjo un error al crear este proceso.",
 
+  // "process.new.notification.error.max-upload.content": "The file exceeds the maximum upload size",
+  "process.new.notification.error.max-upload.content": "El fichero sobrepasa el límte máximo de subida",
+
   // "process.new.header": "Create a new process",
   "process.new.header": "Crea un nuevo proceso",
 
@@ -4800,18 +4755,16 @@
   // "process.new.breadcrumbs": "Create a new process",
   "process.new.breadcrumbs": "Crea un nuevo proceso",
 
-
-
-  // "process.detail.arguments" : "Arguments",
+  // "process.detail.arguments": "Arguments",
   "process.detail.arguments": "Argumentos",
 
-  // "process.detail.arguments.empty" : "This process doesn't contain any arguments",
+  // "process.detail.arguments.empty": "This process doesn't contain any arguments",
   "process.detail.arguments.empty": "Este proceso no contiene ningún argumento",
 
-  // "process.detail.back" : "Back",
+  // "process.detail.back": "Back",
   "process.detail.back": "Atrás",
 
-  // "process.detail.output" : "Process Output",
+  // "process.detail.output": "Process Output",
   "process.detail.output": "Salida del proceso",
 
   // "process.detail.logs.button": "Retrieve process output",
@@ -4823,28 +4776,29 @@
   // "process.detail.logs.none": "This process has no output",
   "process.detail.logs.none": "Este proceso no tiene salida",
 
-  // "process.detail.output-files" : "Output Files",
+  // "process.detail.output-files": "Output Files",
   "process.detail.output-files": "Archivos de salida",
 
-  // "process.detail.output-files.empty" : "This process doesn't contain any output files",
+  // "process.detail.output-files.empty": "This process doesn't contain any output files",
   "process.detail.output-files.empty": "Este proceso no contiene ningún archivo de salida",
 
-  // "process.detail.script" : "Script",
+  // "process.detail.script": "Script",
   "process.detail.script": "Secuencia de comandos",
 
-  // "process.detail.title" : "Process: {{ id }} - {{ name }}",
+  // "process.detail.title": "Process: {{ id }} - {{ name }}",
+
   "process.detail.title": "Proceso: {{ id }} - {{ name }}",
 
-  // "process.detail.start-time" : "Start time",
+  // "process.detail.start-time": "Start time",
   "process.detail.start-time": "Hora de inicio",
 
-  // "process.detail.end-time" : "Finish time",
+  // "process.detail.end-time": "Finish time",
   "process.detail.end-time": "Hora de finalización",
 
-  // "process.detail.status" : "Status",
+  // "process.detail.status": "Status",
   "process.detail.status": "Estado",
 
-  // "process.detail.create" : "Create similar process",
+  // "process.detail.create": "Create similar process",
   "process.detail.create": "Crear un proceso similar",
 
   // "process.detail.actions": "Actions",
@@ -4871,24 +4825,22 @@
   // "process.detail.delete.error": "Something went wrong when deleting the process",
   "process.detail.delete.error": "Algo falló eliminando el proceso",
 
-
-
-  // "process.overview.table.finish" : "Finish time (UTC)",
+  // "process.overview.table.finish": "Finish time (UTC)",
   "process.overview.table.finish": "Hora de finalización (UTC)",
 
-  // "process.overview.table.id" : "Process ID",
+  // "process.overview.table.id": "Process ID",
   "process.overview.table.id": "ID de proceso",
 
-  // "process.overview.table.name" : "Name",
+  // "process.overview.table.name": "Name",
   "process.overview.table.name": "Nombre",
 
-  // "process.overview.table.start" : "Start time (UTC)",
+  // "process.overview.table.start": "Start time (UTC)",
   "process.overview.table.start": "Hora de inicio (UTC)",
 
-  // "process.overview.table.status" : "Status",
+  // "process.overview.table.status": "Status",
   "process.overview.table.status": "Estado",
 
-  // "process.overview.table.user" : "User",
+  // "process.overview.table.user": "User",
   "process.overview.table.user": "Usuario",
 
   // "process.overview.title": "Processes Overview",
@@ -4927,8 +4879,6 @@
   // "process.bulk.delete.success": "{{count}} process(es) have been succesfully deleted",
   "process.bulk.delete.success": "{{count}} proceso(s) se han eliminado correctamente",
 
-
-
   // "profile.breadcrumbs": "Update Profile",
   "profile.breadcrumbs": "Actualización del perfil",
 
@@ -5058,8 +5008,6 @@
   // "project-relationships.search.results.head": "Project Search Results",
   "project-relationships.search.results.head": "Resultados de búsqueda de proyectos",
 
-
-
   // "publication.listelement.badge": "Publication",
   "publication.listelement.badge": "Publicación",
 
@@ -5093,7 +5041,6 @@
   // "publication.search.title": "Publication Search",
   "publication.search.title": "Búsqueda de publicaciones",
 
-
   // "media-viewer.next": "Next",
   "media-viewer.next": "Siguiente",
 
@@ -5103,7 +5050,6 @@
   // "media-viewer.playlist": "Playlist",
   "media-viewer.playlist": "Lista de reproducción",
 
-
   // "register-email.title": "New user registration",
   "register-email.title": "Registro de nuevo usuario",
 
@@ -5167,7 +5113,6 @@
   // "register-page.create-profile.submit.success.head": "Registration completed",
   "register-page.create-profile.submit.success.head": "Registro completado",
 
-
   // "register-page.registration.header": "New user registration",
   "register-page.registration.header": "Registro de nuevo usuario",
 
@@ -5209,6 +5154,7 @@
 
   // "register-page.registration.google-recaptcha.must-accept-cookies": "In order to register you must accept the <b>Registration and Password recovery</b> (Google reCaptcha) cookies.",
   "register-page.registration.google-recaptcha.must-accept-cookies": "Para registrarse debe aceptar las cookies de <b>Registro y recuperación de contraseña</b> (Google reCaptcha).",
+
   // "register-page.registration.error.maildomain": "This email address is not on the list of domains who can register. Allowed domains are {{ domains }}",
   "register-page.registration.error.maildomain": "Este correo electrónico no esta en la lista de dominios que pueden registrarse. Los dominios permitidos son {{ domains }}",
 
@@ -5223,6 +5169,7 @@
 
   // "register-page.registration.google-recaptcha.notification.message.expired": "Verification expired. Please verify again.",
   "register-page.registration.google-recaptcha.notification.message.expired": "Verificación caducada. Verifique de nuevo.",
+
   // "register-page.registration.info.maildomain": "Accounts can be registered for mail addresses of the domains",
   "register-page.registration.info.maildomain": "Las cuentas pueden registrarse para las direcciones de correo de los dominios",
 
@@ -5289,16 +5236,14 @@
   // "relationships.isFundingAgencyOf.OrgUnit": "Funder",
   "relationships.isFundingAgencyOf.OrgUnit": "Financiador",
 
-
   // "repository.image.logo": "Repository logo",
   "repository.image.logo": "Logotipo del repositorio",
 
-  // "repository.title.prefix": "DSpace Angular :: ",
-  "repository.title.prefix": "DSpace Angular :: ",
-
-  // "repository.title.prefixDSpace": "DSpace Angular ::",
-  "repository.title.prefixDSpace": "DSpace Angular ::",
+  // "repository.title": "DSpace Repository",
+  "repository.title": "Repositorio DSpace",
 
+  // "repository.title.prefix": "DSpace Repository :: ",
+  "repository.title.prefix": "Repositorio DSpace :: ",
 
   // "resource-policies.add.button": "Add",
   "resource-policies.add.button": "Agregar",
@@ -5417,6 +5362,9 @@
   // "resource-policies.form.name.label": "Name",
   "resource-policies.form.name.label": "Nombre",
 
+  //"resource-policies.form.name.hint": "Max 30 characters",
+  "resource-policies.form.name.hint": "Máximo 30 caracteres",
+
   // "resource-policies.form.policy-type.label": "Select the policy type",
   "resource-policies.form.policy-type.label": "Seleccione el tipo de política",
 
@@ -5471,8 +5419,6 @@
   // "resource-policies.table.headers.title.for.collection": "Policies for Collection",
   "resource-policies.table.headers.title.for.collection": "Políticas para la colección",
 
-
-
   // "search.description": "",
   "search.description": "",
 
@@ -5488,7 +5434,6 @@
   // "search.search-form.placeholder": "Search the repository ...",
   "search.search-form.placeholder": "Buscar en el repositorio ...",
 
-
   // "search.filters.applied.f.author": "Author",
   "search.filters.applied.f.author": "Autor",
 
@@ -5537,8 +5482,6 @@
   // "search.filters.applied.f.withdrawn": "Withdrawn",
   "search.filters.applied.f.withdrawn": "Retirado",
 
-
-
   // "search.filters.filter.author.head": "Author",
   "search.filters.filter.author.head": "Autor",
 
@@ -5758,8 +5701,6 @@
   // "search.filters.filter.supervisedBy.label": "Search Supervised By",
   "search.filters.filter.supervisedBy.label": "Búsqueda Supervisada Por",
 
-
-
   // "search.filters.entityType.JournalIssue": "Journal Issue",
   "search.filters.entityType.JournalIssue": "Número de la revista",
 
@@ -5787,7 +5728,6 @@
   // "search.filters.withdrawn.false": "No",
   "search.filters.withdrawn.false": "No",
 
-
   // "search.filters.head": "Filters",
   "search.filters.head": "Filtros",
 
@@ -5797,8 +5737,6 @@
   // "search.filters.search.submit": "Submit",
   "search.filters.search.submit": "Enviar",
 
-
-
   // "search.form.search": "Search",
   "search.form.search": "Buscar",
 
@@ -5808,8 +5746,6 @@
   // "search.form.scope.all": "All of DSpace",
   "search.form.scope.all": "Todo DSpace",
 
-
-
   // "search.results.head": "Search Results",
   "search.results.head": "Resultados de la búsqueda",
 
@@ -5834,7 +5770,6 @@
   // "default-relationships.search.results.head": "Search Results",
   "default-relationships.search.results.head": "Resultados de la búsqueda",
 
-
   // "search.sidebar.close": "Back to results",
   "search.sidebar.close": "Volver a resultados",
 
@@ -5856,8 +5791,6 @@
   // "search.sidebar.settings.title": "Settings",
   "search.sidebar.settings.title": "Ajustes",
 
-
-
   // "search.view-switch.show-detail": "Show detail",
   "search.view-switch.show-detail": "Mostrar detalle",
 
@@ -5867,8 +5800,6 @@
   // "search.view-switch.show-list": "Show as list",
   "search.view-switch.show-list": "Mostrar como lista",
 
-
-
   // "sorting.ASC": "Ascending",
   "sorting.ASC": "Ascendente",
 
@@ -5905,7 +5836,6 @@
   // "sorting.lastModified.DESC": "Last modified Descending",
   "sorting.lastModified.DESC": "Última modificación Descendente",
 
-
   // "statistics.title": "Statistics",
   "statistics.title": "Estadísticas",
 
@@ -5942,7 +5872,6 @@
   // "statistics.table.no-name": "(object name could not be loaded)",
   "statistics.table.no-name": "(el nombre del objeto no pudo ser cargado)",
 
-
   // "submission.edit.breadcrumbs": "Edit Submission",
   "submission.edit.breadcrumbs": "Editar envío",
 
@@ -5952,7 +5881,7 @@
   // "submission.general.cancel": "Cancel",
   "submission.general.cancel": "Cancelar",
 
-  // "submission.general.cannot_submit": "You have not the privilege to make a new submission.",
+  // "submission.general.cannot_submit": "You don't have permission to make a new submission.",
   "submission.general.cannot_submit": "No tiene los permisos para realizar un nuevo envío.",
 
   // "submission.general.deposit": "Deposit",
@@ -5985,7 +5914,6 @@
   // "submission.general.save-later": "Save for later",
   "submission.general.save-later": "Guardar para más adelante",
 
-
   // "submission.import-external.page.title": "Import metadata from an external source",
   "submission.import-external.page.title": "Importar metadatos desde una fuente externa",
 
@@ -6043,8 +5971,8 @@
   // "submission.import-external.source.cinii": "CiNii",
   "submission.import-external.source.cinii": "CiNii",
 
-  // "submission.import-external.source.crossref": "CrossRef",
-  "submission.import-external.source.crossref": "CrossRef",
+  // "submission.import-external.source.crossref": "Crossref",
+  "submission.import-external.source.crossref": "Crossref",
 
   // "submission.import-external.source.datacite": "DataCite",
   "submission.import-external.source.datacite": "DataCite",
@@ -6297,6 +6225,7 @@
 
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalOfPublication": "Local Journals ({{ count }})",
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalOfPublication": "Revistas locales ({{ count }})",
+
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.Project": "Local Projects ({{ count }})",
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.Project": "Proyectos locales ({{ count }})",
 
@@ -6320,16 +6249,18 @@
 
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalIssueOfPublication": "Local Journal Issues ({{ count }})",
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalIssueOfPublication": "Números de revista locales ({{ count }})",
+
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.JournalIssue": "Local Journal Issues ({{ count }})",
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.JournalIssue": "Números de revista locales  ({{ count }})",
 
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalVolumeOfPublication": "Local Journal Volumes ({{ count }})",
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalVolumeOfPublication": "Volúmenes de revista locales ({{ count }})",
+
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.JournalVolume": "Local Journal Volumes ({{ count }})",
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.JournalVolume": "Volúmenes de revista locales ({{ count }})",
 
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaJournal": "Sherpa Journals ({{ count }})",
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaJournal": "Revistas Sherpa  ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaJournal": "Revistas Sherpa ({{ count }})",
 
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaPublisher": "Sherpa Publishers ({{ count }})",
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaPublisher": "Editores Sherpa ({{ count }})",
@@ -6379,9 +6310,6 @@
   // "submission.sections.describe.relationship-lookup.title.isFundingAgencyOfProject": "Funder of the Project",
   "submission.sections.describe.relationship-lookup.title.isFundingAgencyOfProject": "Financiador del Proyecto",
 
-
-
-
   // "submission.sections.describe.relationship-lookup.selection-tab.search-form.placeholder": "Search...",
   "submission.sections.describe.relationship-lookup.selection-tab.search-form.placeholder": "Buscar...",
 
@@ -6390,11 +6318,13 @@
 
   // "submission.sections.describe.relationship-lookup.title.isJournalIssueOfPublication": "Journal Issues",
   "submission.sections.describe.relationship-lookup.title.isJournalIssueOfPublication": "Números de revista",
+
   // "submission.sections.describe.relationship-lookup.title.JournalIssue": "Journal Issues",
   "submission.sections.describe.relationship-lookup.title.JournalIssue": "Números de revista",
 
   // "submission.sections.describe.relationship-lookup.title.isJournalVolumeOfPublication": "Journal Volumes",
   "submission.sections.describe.relationship-lookup.title.isJournalVolumeOfPublication": "Volúmenes de la revista",
+
   // "submission.sections.describe.relationship-lookup.title.JournalVolume": "Journal Volumes",
   "submission.sections.describe.relationship-lookup.title.JournalVolume": "Volúmenes de la revista",
 
@@ -6406,6 +6336,7 @@
 
   // "submission.sections.describe.relationship-lookup.title.isFundingAgencyOfPublication": "Funding Agency",
   "submission.sections.describe.relationship-lookup.title.isFundingAgencyOfPublication": "Agencia financiadora",
+
   // "submission.sections.describe.relationship-lookup.title.Project": "Projects",
   "submission.sections.describe.relationship-lookup.title.Project": "Proyectos",
 
@@ -6453,6 +6384,7 @@
 
   // "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalVolumeOfPublication": "Selected Journal Volume",
   "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalVolumeOfPublication": "Volumen de revista seleccionada",
+
   // "submission.sections.describe.relationship-lookup.selection-tab.title.Project": "Selected Projects",
   "submission.sections.describe.relationship-lookup.selection-tab.title.Project": "Proyectos seleccionados",
 
@@ -6476,6 +6408,7 @@
 
   // "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalIssueOfPublication": "Selected Issue",
   "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalIssueOfPublication": "Número de revista seleccionados",
+
   // "submission.sections.describe.relationship-lookup.selection-tab.title.JournalVolume": "Selected Journal Volume",
   "submission.sections.describe.relationship-lookup.selection-tab.title.JournalVolume": "Volúmenes de revista seleccionados",
 
@@ -6484,6 +6417,7 @@
 
   // "submission.sections.describe.relationship-lookup.selection-tab.title.isFundingOfPublication": "Selected Funding",
   "submission.sections.describe.relationship-lookup.selection-tab.title.isFundingOfPublication": "Financiamientos seleccionados",
+
   // "submission.sections.describe.relationship-lookup.selection-tab.title.JournalIssue": "Selected Issue",
   "submission.sections.describe.relationship-lookup.selection-tab.title.JournalIssue": "Número seleccionado",
 
@@ -6658,7 +6592,6 @@
   // "submission.sections.submit.progressbar.sherpaPolicies": "Publisher open access policy information",
   "submission.sections.submit.progressbar.sherpaPolicies": "Información sobre políticas editoriales de acceso abierto",
 
-
   // "submission.sections.sherpa-policy.title-empty": "No publisher policy information available. If your work has an associated ISSN, please enter it above to see any related publisher open access policies.",
   "submission.sections.sherpa-policy.title-empty": "No se encuentra disponible la información sobre política editorial. Si tiene un ISSN asociado, introdúzcalo arriba para ver información sobre políticas editoriales de acceso abierto.",
 
@@ -6839,10 +6772,9 @@
   // "submission.sections.license.required": "You must accept the license",
   "submission.sections.license.required": "Debe aceptar la licencia",
 
-  // "submission.sections.license.notgranted":  "You must accept the license",
+  // "submission.sections.license.notgranted": "You must accept the license",
   "submission.sections.license.notgranted": "Debe aceptar la licencia",
 
-
   // "submission.sections.sherpa.publication.information": "Publication information",
   "submission.sections.sherpa.publication.information": "Información de la Publicación",
 
@@ -6868,7 +6800,7 @@
   "submission.sections.sherpa.publisher.policy": "Política editorial",
 
   // "submission.sections.sherpa.publisher.policy.description": "The below information was found via Sherpa Romeo. Based on the policies of your publisher, it provides advice regarding whether an embargo may be necessary and/or which files you are allowed to upload. If you have questions, please contact your site administrator via the feedback form in the footer.",
-  "submission.sections.sherpa.publisher.policy.description": "La siguiente informacióm se encontró via Sherpa Romeo. En base a esas políticas, se proporcionan consejos sobre las necesidad de un embargo y de aquellos ficheros que puede utilizar.  Si tiene dudas, por favor, contacte con el administrador del repositorio mediante el formulario de sugerencias.",
+  "submission.sections.sherpa.publisher.policy.description": "La siguiente informacióm se encontró vía Sherpa Romeo. En base a esas políticas, se proporcionan consejos sobre las necesidad de un embargo y de aquellos ficheros que puede utilizar. Si tiene dudas, por favor, contacte con el administrador del repositorio mediante el formulario de sugerencias.",
 
   // "submission.sections.sherpa.publisher.policy.openaccess": "Open Access pathways permitted by this journal's policy are listed below by article version. Click on a pathway for a more detailed view",
   "submission.sections.sherpa.publisher.policy.openaccess": "Los caminos hacia el Acceso Abierto que esta revista permite se relacionan, por versión de artículo, abajo. Pulse en un camino para una visión mas detallada",
@@ -6921,16 +6853,12 @@
   // "submission.sections.sherpa.error.message": "There was an error retrieving sherpa informations",
   "submission.sections.sherpa.error.message": "Hubo un error recuperando la información de Sherpa",
 
-
-
   // "submission.submit.breadcrumbs": "New submission",
   "submission.submit.breadcrumbs": "Nuevo envío",
 
   // "submission.submit.title": "New submission",
   "submission.submit.title": "Nuevo envío",
 
-
-
   // "submission.workflow.generic.delete": "Delete",
   "submission.workflow.generic.delete": "Eliminar",
 
@@ -6949,21 +6877,18 @@
   // "submission.workflow.generic.view-help": "Select this option to view the item's metadata.",
   "submission.workflow.generic.view-help": "Seleccione esta opción para ver los metadatos del ítem.",
 
-
   // "submission.workflow.generic.submit_select_reviewer": "Select Reviewer",
   "submission.workflow.generic.submit_select_reviewer": "Seleccionar revisor",
 
   // "submission.workflow.generic.submit_select_reviewer-help": "",
   "submission.workflow.generic.submit_select_reviewer-help": "",
 
-
   // "submission.workflow.generic.submit_score": "Rate",
   "submission.workflow.generic.submit_score": "Evaluar",
 
   // "submission.workflow.generic.submit_score-help": "",
   "submission.workflow.generic.submit_score-help": "",
 
-
   // "submission.workflow.tasks.claimed.approve": "Approve",
   "submission.workflow.tasks.claimed.approve": "Aprobar",
 
@@ -7006,8 +6931,6 @@
   // "submission.workflow.tasks.claimed.return_help": "Return the task to the pool so that another user may perform the task.",
   "submission.workflow.tasks.claimed.return_help": "Devuelva la tarea al pool para que otro usuario pueda realizarla.",
 
-
-
   // "submission.workflow.tasks.generic.error": "Error occurred during operation...",
   "submission.workflow.tasks.generic.error": "Ocurrió un error durante la operación...",
 
@@ -7020,8 +6943,6 @@
   // "submission.workflow.tasks.generic.success": "Operation successful",
   "submission.workflow.tasks.generic.success": "Operación exitosa",
 
-
-
   // "submission.workflow.tasks.pool.claim": "Claim",
   "submission.workflow.tasks.pool.claim": "Asumir tarea",
 
@@ -7034,13 +6955,14 @@
   // "submission.workflow.tasks.pool.show-detail": "Show detail",
   "submission.workflow.tasks.pool.show-detail": "Mostrar detalle",
 
-
   // "submission.workspace.generic.view": "View",
   "submission.workspace.generic.view": "Ver",
 
   // "submission.workspace.generic.view-help": "Select this option to view the item's metadata.",
   "submission.workspace.generic.view-help": "Seleccione esta opción para ver los metadatos del ítem.",
 
+  // "submitter.empty": "N/A",
+  "submitter.empty": "N/A",
 
   // "subscriptions.title": "Subscriptions",
   "subscriptions.title": "Suscripciones",
@@ -7147,7 +7069,6 @@
   // "subscriptions.table.empty.message": "You do not have any subscriptions at this time. To subscribe to email updates for a Community or Collection, use the subscription button on the object's page.",
   "subscriptions.table.empty.message": "Usted no tiene suscripciones. Para subscribirse a las actualizaciones por correo electrónico de una Comunidad o Colección, utilice el botón de suscripción en la página del objeto.",
 
-
   // "thumbnail.default.alt": "Thumbnail Image",
   "thumbnail.default.alt": "Miniatura",
 
@@ -7172,13 +7093,9 @@
   // "thumbnail.person.placeholder": "No Profile Picture Available",
   "thumbnail.person.placeholder": "No hay imagen de perfil disponible",
 
-
-
   // "title": "DSpace",
   "title": "DSpace",
 
-
-
   // "vocabulary-treeview.header": "Hierarchical tree view",
   "vocabulary-treeview.header": "Vista de árbol jerárquico",
 
@@ -7230,8 +7147,6 @@
   // "virtual-metadata.delete-relationship.modal-head": "Select the items for which you want to save the virtual metadata as real metadata",
   "virtual-metadata.delete-relationship.modal-head": "Seleccione los ítems para los que desea guardar los metadatos virtuales como metadatos reales",
 
-
-
   // "supervisedWorkspace.search.results.head": "Supervised Items",
   "supervisedWorkspace.search.results.head": "Ítems supervisados",
 
@@ -7247,8 +7162,6 @@
   // "supervision.search.results.head": "Workflow and Workspace tasks",
   "supervision.search.results.head": "Tareas del flujo de trabajo y del espacio de trabajo",
 
-
-
   // "workflow-item.edit.breadcrumbs": "Edit workflowitem",
   "workflow-item.edit.breadcrumbs": "Editar ítem del flujo de trabajo",
 
@@ -7279,7 +7192,6 @@
   // "workflow-item.delete.button.confirm": "Delete",
   "workflow-item.delete.button.confirm": "Borrar",
 
-
   // "workflow-item.send-back.notification.success.title": "Sent back to submitter",
   "workflow-item.send-back.notification.success.title": "Devolver al remitente",
 
@@ -7313,11 +7225,33 @@
   // "workspace-item.view.title": "Workspace View",
   "workspace-item.view.title": "Vista del flujo de trabajo",
 
+  // "workspace-item.delete.breadcrumbs": "Workspace Delete",
+  "workspace-item.delete.breadcrumbs": "Borrar espacio de trabajo",
+
+  // "workspace-item.delete.header": "Delete workspace item",
+  "workspace-item.delete.header": "Borrar ítem del espacio de trabajo",
+
+  // "workspace-item.delete.button.confirm": "Delete",
+  "workspace-item.delete.button.confirm": "Borrar",
+
+  // "workspace-item.delete.button.cancel": "Cancel",
+  "workspace-item.delete.button.cancel": "Cancelar",
+
+  // "workspace-item.delete.notification.success.title": "Deleted",
+  "workspace-item.delete.notification.success.title": "Borrado",
+
+  // "workspace-item.delete.title": "This workspace item was successfully deleted",
+  "workspace-item.delete.title": "Este ítem del espacio de trabajo se eliminó correctamente",
+
+  // "workspace-item.delete.notification.error.title": "Something went wrong",
+  "workspace-item.delete.notification.error.title": "Algo salió mal",
+
+  // "workspace-item.delete.notification.error.content": "The workspace item could not be deleted",
+  "workspace-item.delete.notification.error.content": "Este ítem del espacio de trabajo no pudo borrarse",
 
   // "workflow-item.advanced.title": "Advanced workflow",
   "workflow-item.advanced.title": "Flujo de trabajo avanzado",
 
-
   // "workflow-item.selectrevieweraction.notification.success.title": "Selected reviewer",
   "workflow-item.selectrevieweraction.notification.success.title": "Revisor seleccionado",
 
@@ -7342,7 +7276,6 @@
   // "workflow-item.selectrevieweraction.button.confirm": "Confirm",
   "workflow-item.selectrevieweraction.button.confirm": "Confirmar",
 
-
   // "workflow-item.scorereviewaction.notification.success.title": "Rating review",
   "workflow-item.scorereviewaction.notification.success.title": "Revisión de evaluación",
 
@@ -7379,7 +7312,7 @@
   // "idle-modal.extend-session": "Extend session",
   "idle-modal.extend-session": "Prolongar la sesión",
 
-  // "researcher.profile.action.processing" : "Processing...",
+  // "researcher.profile.action.processing": "Processing...",
   "researcher.profile.action.processing": "Procesando...",
 
   // "researcher.profile.associated": "Researcher profile associated",
@@ -7412,10 +7345,10 @@
   // "researcher.profile.view": "View",
   "researcher.profile.view": "Ver",
 
-  // "researcher.profile.private.visibility" : "PRIVATE",
+  // "researcher.profile.private.visibility": "PRIVATE",
   "researcher.profile.private.visibility": "PRIVADO",
 
-  // "researcher.profile.public.visibility" : "PUBLIC",
+  // "researcher.profile.public.visibility": "PUBLIC",
   "researcher.profile.public.visibility": "PÚBLICO",
 
   // "researcher.profile.status": "Status:",
@@ -7424,16 +7357,16 @@
   // "researcherprofile.claim.not-authorized": "You are not authorized to claim this item. For more details contact the administrator(s).",
   "researcherprofile.claim.not-authorized": "No está autorizado pare reclamar este ítem. Contacte con el administrador para mas detalles.",
 
-  // "researcherprofile.error.claim.body" : "An error occurred while claiming the profile, please try again later",
+  // "researcherprofile.error.claim.body": "An error occurred while claiming the profile, please try again later",
   "researcherprofile.error.claim.body": "Hubo un error reclamando el perfil, por favor, inténtelo mas tarde",
 
-  // "researcherprofile.error.claim.title" : "Error",
+  // "researcherprofile.error.claim.title": "Error",
   "researcherprofile.error.claim.title": "Error",
 
-  // "researcherprofile.success.claim.body" : "Profile claimed with success",
+  // "researcherprofile.success.claim.body": "Profile claimed with success",
   "researcherprofile.success.claim.body": "Perfil reclamado con éxito",
 
-  // "researcherprofile.success.claim.title" : "Success",
+  // "researcherprofile.success.claim.title": "Success",
   "researcherprofile.success.claim.title": "Éxito",
 
   // "person.page.orcid.create": "Create an ORCID ID",
@@ -7442,7 +7375,7 @@
   // "person.page.orcid.granted-authorizations": "Granted authorizations",
   "person.page.orcid.granted-authorizations": "Autorizaciones concedidas",
 
-  // "person.page.orcid.grant-authorizations" : "Grant authorizations",
+  // "person.page.orcid.grant-authorizations": "Grant authorizations",
   "person.page.orcid.grant-authorizations": "Conceder autorizaciones",
 
   // "person.page.orcid.link": "Connect to ORCID ID",
@@ -7458,7 +7391,7 @@
   "person.page.orcid.orcid-not-linked-message": "El ORCID iD de este perfil ({{ orcid }}) no se ha conectado aún con una cuenta en el registro ORCID o la conexión caducó.",
 
   // "person.page.orcid.unlink": "Disconnect from ORCID",
-  "person.page.orcid.unlink": "Desconectar de  ORCID",
+  "person.page.orcid.unlink": "Desconectar de ORCID",
 
   // "person.page.orcid.unlink.processing": "Processing...",
   "person.page.orcid.unlink.processing": "Procesando...",
@@ -7490,44 +7423,44 @@
   // "person.page.orcid.save.preference.changes": "Update settings",
   "person.page.orcid.save.preference.changes": "Actualizar configuración",
 
-  // "person.page.orcid.sync-profile.affiliation" : "Affiliation",
+  // "person.page.orcid.sync-profile.affiliation": "Affiliation",
   "person.page.orcid.sync-profile.affiliation": "Afiliación",
 
-  // "person.page.orcid.sync-profile.biographical" : "Biographical data",
+  // "person.page.orcid.sync-profile.biographical": "Biographical data",
   "person.page.orcid.sync-profile.biographical": "Biografía",
 
-  // "person.page.orcid.sync-profile.education" : "Education",
+  // "person.page.orcid.sync-profile.education": "Education",
   "person.page.orcid.sync-profile.education": "Grados",
 
-  // "person.page.orcid.sync-profile.identifiers" : "Identifiers",
+  // "person.page.orcid.sync-profile.identifiers": "Identifiers",
   "person.page.orcid.sync-profile.identifiers": "Identificadores",
 
-  // "person.page.orcid.sync-fundings.all" : "All fundings",
+  // "person.page.orcid.sync-fundings.all": "All fundings",
   "person.page.orcid.sync-fundings.all": "Todas las financiaciones",
 
-  // "person.page.orcid.sync-fundings.mine" : "My fundings",
+  // "person.page.orcid.sync-fundings.mine": "My fundings",
   "person.page.orcid.sync-fundings.mine": "Mi financiación",
 
-  // "person.page.orcid.sync-fundings.my_selected" : "Selected fundings",
+  // "person.page.orcid.sync-fundings.my_selected": "Selected fundings",
   "person.page.orcid.sync-fundings.my_selected": "Financiaciones seleccionadas",
 
-  // "person.page.orcid.sync-fundings.disabled" : "Disabled",
+  // "person.page.orcid.sync-fundings.disabled": "Disabled",
   "person.page.orcid.sync-fundings.disabled": "Deshabilitado",
 
-  // "person.page.orcid.sync-publications.all" : "All publications",
+  // "person.page.orcid.sync-publications.all": "All publications",
   "person.page.orcid.sync-publications.all": "Todas las publicaciones",
 
-  // "person.page.orcid.sync-publications.mine" : "My publications",
+  // "person.page.orcid.sync-publications.mine": "My publications",
   "person.page.orcid.sync-publications.mine": "Mis publicaciones",
 
-  // "person.page.orcid.sync-publications.my_selected" : "Selected publications",
+  // "person.page.orcid.sync-publications.my_selected": "Selected publications",
   "person.page.orcid.sync-publications.my_selected": "Publicaciones seleccionadas",
 
-  // "person.page.orcid.sync-publications.disabled" : "Disabled",
+  // "person.page.orcid.sync-publications.disabled": "Disabled",
   "person.page.orcid.sync-publications.disabled": "Deshabilitado",
 
-  // "person.page.orcid.sync-queue.discard" : "Discard the change and do not synchronize with the ORCID registry",
-  "person.page.orcid.sync-queue.discard": "Deshechar el cambio y no sincronizar con ORCID",
+  // "person.page.orcid.sync-queue.discard": "Discard the change and do not synchronize with the ORCID registry",
+  "person.page.orcid.sync-queue.discard": "Deshechar el cambio y no sincronizar con el registro ORCID",
 
   // "person.page.orcid.sync-queue.discard.error": "The discarding of the ORCID queue record failed",
   "person.page.orcid.sync-queue.discard.error": "Falló el borrado del registro ORCID en la cola",
@@ -7538,13 +7471,13 @@
   // "person.page.orcid.sync-queue.empty-message": "The ORCID queue registry is empty",
   "person.page.orcid.sync-queue.empty-message": "La cola del registro de ORCID está vacía",
 
-  // "person.page.orcid.sync-queue.table.header.type" : "Type",
+  // "person.page.orcid.sync-queue.table.header.type": "Type",
   "person.page.orcid.sync-queue.table.header.type": "Tipo",
 
-  // "person.page.orcid.sync-queue.table.header.description" : "Description",
+  // "person.page.orcid.sync-queue.table.header.description": "Description",
   "person.page.orcid.sync-queue.table.header.description": "Descripción",
 
-  // "person.page.orcid.sync-queue.table.header.action" : "Action",
+  // "person.page.orcid.sync-queue.table.header.action": "Action",
   "person.page.orcid.sync-queue.table.header.action": "Acción",
 
   // "person.page.orcid.sync-queue.description.affiliation": "Affiliations",
@@ -7610,7 +7543,7 @@
   // "person.page.orcid.sync-queue.tooltip.researcher_urls": "Researcher url",
   "person.page.orcid.sync-queue.tooltip.researcher_urls": "URL del investigador",
 
-  // "person.page.orcid.sync-queue.send" : "Synchronize with ORCID registry",
+  // "person.page.orcid.sync-queue.send": "Synchronize with ORCID registry",
   "person.page.orcid.sync-queue.send": "Sincronizar con el registro ORCID",
 
   // "person.page.orcid.sync-queue.send.unauthorized-error.title": "The submission to ORCID failed for missing authorizations.",
@@ -7620,13 +7553,13 @@
   "person.page.orcid.sync-queue.send.unauthorized-error.content": "Pulse <a href='{{orcid}}'>aquí</a> para conceder de nuevo los permisos requeridos. Si el problema continuase, contacte con el administrador",
 
   // "person.page.orcid.sync-queue.send.bad-request-error": "The submission to ORCID failed because the resource sent to ORCID registry is not valid",
-  "person.page.orcid.sync-queue.send.bad-request-error": "El envío a  ORCID falló debido a que el recurso que se envión no era válido",
+  "person.page.orcid.sync-queue.send.bad-request-error": "El envío a ORCID falló debido a que el recurso que se envión no era válido",
 
   // "person.page.orcid.sync-queue.send.error": "The submission to ORCID failed",
   "person.page.orcid.sync-queue.send.error": "Falló el envío a ORCID",
 
   // "person.page.orcid.sync-queue.send.conflict-error": "The submission to ORCID failed because the resource is already present on the ORCID registry",
-  "person.page.orcid.sync-queue.send.conflict-error": "El envío a  ORCID falló debido a que el recurso ya existía en el registro ORCID",
+  "person.page.orcid.sync-queue.send.conflict-error": "El envío a ORCID falló debido a que el recurso ya existía en el registro ORCID",
 
   // "person.page.orcid.sync-queue.send.not-found-warning": "The resource does not exists anymore on the ORCID registry.",
   "person.page.orcid.sync-queue.send.not-found-warning": "El recurso no existe ya en el registro ORCID.",
@@ -7664,8 +7597,8 @@
   // "person.page.orcid.sync-queue.send.validation-error.organization.name-required": "The organization's name is required",
   "person.page.orcid.sync-queue.send.validation-error.organization.name-required": "Se requiere el nombre de la organización",
 
-  // "person.page.orcid.sync-queue.send.validation-error.publication.date-invalid" : "The publication date must be one year after 1900",
-  "person.page.orcid.sync-queue.send.validation-error.publication.date-invalid": "la fecha de la publicación debe ser posterior a 1900",
+  // "person.page.orcid.sync-queue.send.validation-error.publication.date-invalid": "The publication date must be one year after 1900",
+  "person.page.orcid.sync-queue.send.validation-error.publication.date-invalid": "La fecha de publicación debe ser posterior a 1900",
 
   // "person.page.orcid.sync-queue.send.validation-error.organization.address-required": "The organization to be sent requires an address",
   "person.page.orcid.sync-queue.send.validation-error.organization.address-required": "Se requiere la dirección de la organización",
@@ -7698,7 +7631,7 @@
   "person.page.orcid.synchronization-mode.label": "Modo sincronización",
 
   // "person.page.orcid.synchronization-mode-message": "Please select how you would like synchronization to ORCID to occur. The options include \"Manual\" (you must send your data to ORCID manually), or \"Batch\" (the system will send your data to ORCID via a scheduled script).",
-  "person.page.orcid.synchronization-mode-message": "Seleccione cómo prefiere realizar la sincronización con ORCID. Puede escoger \"Manual\" (usted envía los datos a ORCID manualmente), o \"Batch\" (el sistema enviará sus datos a ORCID via un programa planificado).",
+  "person.page.orcid.synchronization-mode-message": "Seleccione cómo prefiere realizar la sincronización con ORCID. Puede escoger \"Manual\" (usted envía los datos a ORCID manualmente), o \"Batch\" (el sistema enviará sus datos a ORCID vía un programa planificado).",
 
   // "person.page.orcid.synchronization-mode-funding-message": "Select whether to send your linked Project entities to your ORCID record's list of funding information.",
   "person.page.orcid.synchronization-mode-funding-message": "Seleccione si enviará información de sus entidades conectadas de tipo Proyecto a la información de financiación de ORCID.",
@@ -7744,13 +7677,13 @@
 
   // "person.orcid.registry.auth": "ORCID Authorizations",
   "person.orcid.registry.auth": "Autorizaciones ORCID",
+
   // "home.recent-submissions.head": "Recent Submissions",
   "home.recent-submissions.head": "Envíos recientes",
 
   // "listable-notification-object.default-message": "This object couldn't be retrieved",
   "listable-notification-object.default-message": "Este objeto no se pudo recuperar",
 
-
   // "system-wide-alert-banner.retrieval.error": "Something went wrong retrieving the system-wide alert banner",
   "system-wide-alert-banner.retrieval.error": "Algo salió mal al recuperar el banner de alerta del sistema",
 
@@ -7766,8 +7699,6 @@
   // "system-wide-alert-banner.countdown.minutes": "{{minutes}} minute(s):",
   "system-wide-alert-banner.countdown.minutes": "{{minutes}} minuto(s):",
 
-
-
   // "menu.section.system-wide-alert": "System-wide Alert",
   "menu.section.system-wide-alert": "Alerta del Sistema",
 
@@ -7822,5 +7753,93 @@
   // "admin.system-wide-alert.title": "System-wide Alerts",
   "admin.system-wide-alert.title": "Alertas del sistema",
 
+  // "item-access-control-title": "This form allows you to perform changes to the access conditions of the item's metadata or its bitstreams.",
+  "item-access-control-title": "Esta pantalla le permite realizar cambios en las condiciones de acceso a los metadatos o a los archivos del ítem.",
 
+  // "collection-access-control-title": "This form allows you to perform changes to the access conditions of all the items owned by this collection. Changes may be performed to either all Item metadata or all content (bitstreams).",
+  "collection-access-control-title": "Esta pantalla le permite realizar cambios en las condiciones de acceso de todos los ítems de la colección. Puede realizar los cambios a los metadatos o a los archivos de todos los ítems.",
+
+  // "community-access-control-title": "This form allows you to perform changes to the access conditions of all the items owned by any collection under this community. Changes may be performed to either all Item metadata or all content (bitstreams).",
+  "community-access-control-title": "Esta pantalla le permite realizar cambios en las condiciones de acceso de todos los ítems de todas las colecciones de esta comunidad. Puede realizar los cambios a los metadatos o a los archivos de todos los ítems.",
+
+  // "access-control-item-header-toggle": "Item's Metadata",
+  "access-control-item-header-toggle": "Metadatos del ítem",
+
+  // "access-control-bitstream-header-toggle": "Bitstreams",
+  "access-control-bitstream-header-toggle": "Archivos",
+
+  // "access-control-mode": "Mode",
+  "access-control-mode": "Modo",
+
+  // "access-control-access-conditions": "Access conditions",
+  "access-control-access-conditions": "Condiciones de accceso",
+
+  // "access-control-no-access-conditions-warning-message": "Currently, no access conditions are specified below. If executed, this will replace the current access conditions with the default access conditions inherited from the owning collection.",
+  "access-control-no-access-conditions-warning-message": "No ha especificado condiciones de acceso. Si lo ejecuta, se sustituirán las condiciones actuales con las condiones heredadas de la colección de pertenencia.",
+
+  // "access-control-replace-all": "Replace access conditions",
+  "access-control-replace-all": "Sustituir condiciones de accceso",
+
+  // "access-control-add-to-existing": "Add to existing ones",
+  "access-control-add-to-existing": "Añadir a las existentes",
+
+  // "access-control-limit-to-specific": "Limit the changes to specific bitstreams",
+  "access-control-limit-to-specific": "Limitar los cambios a ficheros específicos",
+
+  // "access-control-process-all-bitstreams": "Update all the bitstreams in the item",
+  "access-control-process-all-bitstreams": "Actualizar todos los archivos del ítem",
+
+  // "access-control-bitstreams-selected": "bitstreams selected",
+  "access-control-bitstreams-selected": "archivos seleccionados",
+
+  // "access-control-cancel": "Cancel",
+  "access-control-cancel": "Cancelar",
+
+  // "access-control-execute": "Execute",
+  "access-control-execute": "Ejecutar",
+
+  // "access-control-add-more": "Add more",
+  "access-control-add-more": "Añadir mas",
+
+  // "access-control-select-bitstreams-modal.title": "Select bitstreams",
+  "access-control-select-bitstreams-modal.title": "Seleccionar archivos",
+
+  // "access-control-select-bitstreams-modal.no-items": "No items to show.",
+  "access-control-select-bitstreams-modal.no-items": "No hay ítems para mostrar.",
+
+  // "access-control-select-bitstreams-modal.close": "Close",
+  "access-control-select-bitstreams-modal.close": "Cerrar",
+
+  // "access-control-option-label": "Access condition type",
+  "access-control-option-label": "Tipo de condición de acceso",
+
+  // "access-control-option-note": "Choose an access condition to apply to selected objects.",
+  "access-control-option-note": "Seleccione una condición de acceso para aplicar a los objetos seleccionados.",
+
+  // "access-control-option-start-date": "Grant access from",
+  "access-control-option-start-date": "Establecer acceso desde",
+
+  // "access-control-option-start-date-note": "Select the date from which the related access condition is applied",
+  "access-control-option-start-date-note": "Escoja la fecha desde la cuál se aplicarán las condiciones de acceso especificadas",
+
+  // "access-control-option-end-date": "Grant access until",
+  "access-control-option-end-date": "Establecer acceso hasta",
+
+  // "access-control-option-end-date-note": "Select the date until which the related access condition is applied",
+  "access-control-option-end-date-note": "Escoja la fecha hasta la cuál se aplicarán las condiciones de acceso especificadas",
+
+  //"browse.search-form.placeholder": "Search the repository",
+  "browse.search-form.placeholder": "Buscar en el repositorio",
+
+  // "file-download-link.download": "Download ",
+  "file-download-link.download": "Descargar ",
+
+  // "register-page.registration.aria.label": "Enter your e-mail address",
+  "register-page.registration.aria.label": "Introduzca su dirección de correo electrónico",
+
+  // "forgot-email.form.aria.label": "Enter your e-mail address",
+  "forgot-email.form.aria.label": "Introduzca su dirección de correo electrónico",
+
+  // "search-facet-option.update.announcement": "The page will be reloaded. Filter {{ filter }} is selected.",
+  "search-facet-option.update.announcement": "La página será recargada. Filtro {{ filter }} seleccionado.",
 }
diff --git a/src/assets/i18n/fi.json5 b/src/assets/i18n/fi.json5
index 62e7e6bffe..a87cdada70 100644
--- a/src/assets/i18n/fi.json5
+++ b/src/assets/i18n/fi.json5
@@ -9,8 +9,6 @@
   // "401.unauthorized": "unauthorized",
   "401.unauthorized": "valtuuttamaton",
 
-
-
   // "403.help": "You don't have permission to access this page. You can use the button below to get back to the home page.",
   "403.help": "Sinulla ei ole oikeutta nähdä sivua. Voit palata etusivulle alla olevalla painikkeella.",
 
@@ -20,10 +18,17 @@
   // "403.forbidden": "forbidden",
   "403.forbidden": "kielletty",
 
+  // "500.page-internal-server-error": "Service Unavailable",
+  "500.page-internal-server-error": "Palvelu ei ole saatavilla",
 
+  // "500.help": "The server is temporarily unable to service your request due to maintenance downtime or capacity problems. Please try again later.",
+  "500.help": "Palvelin ei tilapäisesti pysty käsittelemään pyyntöäsi huoltokatkon tai kapasiteettiongelmien vuoksi. Yritä myöhemmin uudelleen.",
+
+  // "500.link.home-page": "Take me to the home page",
+  "500.link.home-page": "Palaa etusivulle",
 
   // "404.help": "We can't find the page you're looking for. The page may have been moved or deleted. You can use the button below to get back to the home page. ",
-  "404.help": "Hakemaasi sivua ei löytynyt. Sivu on voitu siirtää tai poistaa. Painamalla alapuolella olevaa nappia palaat etusivulle. ",
+  "404.help": "Hakemaasi sivua ei löytynyt. Sivu on voitu siirtää tai poistaa. Painamalla alapuolella olevaa painiketta palaat etusivulle. ",
 
   // "404.link.home-page": "Take me to the home page",
   "404.link.home-page": "Palaa etusivulle",
@@ -31,6 +36,36 @@
   // "404.page-not-found": "page not found",
   "404.page-not-found": "sivua ei löytynyt",
 
+  // "error-page.description.401": "unauthorized",
+  "error-page.description.401": "valtuuttamaton",
+
+  // "error-page.description.403": "forbidden",
+  "error-page.description.403": "kielletty",
+
+  // "error-page.description.500": "Service Unavailable",
+  "error-page.description.500": "Palvelu ei ole saatavilla",
+
+  // "error-page.description.404": "page not found",
+  "error-page.description.404": "sivua ei löytynyt",
+
+  // "error-page.orcid.generic-error": "An error occurred during login via ORCID. Make sure you have shared your ORCID account email address with DSpace. If the error persists, contact the administrator",
+  "error-page.orcid.generic-error": "Virhe ORCID-kirjautumisessa. Varmista, että olet tuonut ORCID-tilisi sähköpostiosoitteen DSpaceen. Jos virhe jatkuu, ota yhteyttä ylläpitäjään.",
+
+  // "access-status.embargo.listelement.badge": "Embargo",
+  "access-status.embargo.listelement.badge": "Embargo",
+
+  // "access-status.metadata.only.listelement.badge": "Metadata only",
+  "access-status.metadata.only.listelement.badge": "Vain metadata",
+
+  // "access-status.open.access.listelement.badge": "Open Access",
+  "access-status.open.access.listelement.badge": "Open Access",
+
+  // "access-status.restricted.listelement.badge": "Restricted",
+  "access-status.restricted.listelement.badge": "Rajattu",
+
+  // "access-status.unknown.listelement.badge": "Unknown",
+  "access-status.unknown.listelement.badge": "Tuntematon",
+
   // "admin.curation-tasks.breadcrumbs": "System curation tasks",
   "admin.curation-tasks.breadcrumbs": "Järjestelmän kuratointitehtävät",
 
@@ -157,11 +192,11 @@
   // "admin.registries.bitstream-formats.table.name": "Name",
   "admin.registries.bitstream-formats.table.name": "Nimi",
 
-  // "admin.registries.bitstream-formats.table.id" : "ID",
+  // "admin.registries.bitstream-formats.table.id": "ID",
   "admin.registries.bitstream-formats.table.id": "ID",
 
-  // "admin.registries.bitstream-formats.table.return": "Return",
-  "admin.registries.bitstream-formats.table.return": "Palaa",
+  // "admin.registries.bitstream-formats.table.return": "Back",
+  "admin.registries.bitstream-formats.table.return": "Paluu",
 
   // "admin.registries.bitstream-formats.table.supportLevel.KNOWN": "Known",
   "admin.registries.bitstream-formats.table.supportLevel.KNOWN": "Tunnettu",
@@ -175,10 +210,8 @@
   // "admin.registries.bitstream-formats.table.supportLevel.head": "Support Level",
   "admin.registries.bitstream-formats.table.supportLevel.head": "Tukitaso",
 
-  // "admin.registries.bitstream-formats.title": "DSpace Angular :: Bitstream Format Registry",
-  "admin.registries.bitstream-formats.title": "DSpace Angular :: Tiedostoformaattirekisteri",
-
-
+  // "admin.registries.bitstream-formats.title": "Bitstream Format Registry",
+  "admin.registries.bitstream-formats.title": "Tiedostoformaattirekisteri",
 
   // "admin.registries.metadata.breadcrumbs": "Metadata registry",
   "admin.registries.metadata.breadcrumbs": "Metadatarekisteri",
@@ -216,10 +249,8 @@
   // "admin.registries.metadata.schemas.table.namespace": "Namespace",
   "admin.registries.metadata.schemas.table.namespace": "Nimiavaruus",
 
-  // "admin.registries.metadata.title": "DSpace Angular :: Metadata Registry",
-  "admin.registries.metadata.title": "DSpace Angular :: Metadatarekisteri",
-
-
+  // "admin.registries.metadata.title": "Metadata Registry",
+  "admin.registries.metadata.title": "Metadatarekisteri",
 
   // "admin.registries.schema.breadcrumbs": "Metadata schema",
   "admin.registries.schema.breadcrumbs": "Metadataskeema",
@@ -293,13 +324,11 @@
   // "admin.registries.schema.notification.success": "Success",
   "admin.registries.schema.notification.success": "Valmis",
 
-  // "admin.registries.schema.return": "Return",
-  "admin.registries.schema.return": "Palaa",
-
-  // "admin.registries.schema.title": "DSpace Angular :: Metadata Schema Registry",
-  "admin.registries.schema.title": "DSpace Angular :: Metadataskeemarekisteri",
-
+  // "admin.registries.schema.return": "Back",
+  "admin.registries.schema.return": "Paluu",
 
+  // "admin.registries.schema.title": "Metadata Schema Registry",
+  "admin.registries.schema.title": "Metadataskeemarekisteri",
 
   // "admin.access-control.epeople.actions.delete": "Delete EPerson",
   "admin.access-control.epeople.actions.delete": "Poista käyttäjä",
@@ -313,7 +342,10 @@
   // "admin.access-control.epeople.actions.stop-impersonating": "Stop impersonating EPerson",
   "admin.access-control.epeople.actions.stop-impersonating": "Lopeta käyttäjänä esiintyminen",
 
-  // "admin.access-control.epeople.title": "DSpace Angular :: EPeople",
+  // "admin.access-control.epeople.breadcrumbs": "EPeople",
+  "admin.access-control.epeople.breadcrumbs": "Käyttäjät",
+
+  // "admin.access-control.epeople.title": "EPeople",
   "admin.access-control.epeople.title": "DSpace Angular :: Käyttäjät",
 
   // "admin.access-control.epeople.head": "EPeople",
@@ -334,6 +366,9 @@
   // "admin.access-control.epeople.search.button": "Search",
   "admin.access-control.epeople.search.button": "Hae",
 
+  // "admin.access-control.epeople.search.placeholder": "Search people...",
+  "admin.access-control.epeople.search.placeholder": "Hae käyttäjiä...",
+
   // "admin.access-control.epeople.button.add": "Add EPerson",
   "admin.access-control.epeople.button.add": "Lisää käyttäjä",
 
@@ -352,6 +387,9 @@
   // "admin.access-control.epeople.table.edit.buttons.edit": "Edit \"{{name}}\"",
   "admin.access-control.epeople.table.edit.buttons.edit": "Muokkaa \"{{name}}\"",
 
+  // "admin.access-control.epeople.table.edit.buttons.edit-disabled": "You are not authorized to edit this group",
+  "admin.access-control.epeople.table.edit.buttons.edit-disabled": "Sinulla ei ole valtuuksia muokata tätä ryhmää",
+
   // "admin.access-control.epeople.table.edit.buttons.remove": "Delete \"{{name}}\"",
   "admin.access-control.epeople.table.edit.buttons.remove": "Poista \"{{name}}\"",
 
@@ -382,6 +420,9 @@
   // "admin.access-control.epeople.form.requireCertificate": "Requires certificate",
   "admin.access-control.epeople.form.requireCertificate": "Vaatii sertifikaatin",
 
+  // "admin.access-control.epeople.form.return": "Back",
+  "admin.access-control.epeople.form.return": "Paluu",
+
   // "admin.access-control.epeople.form.notification.created.success": "Successfully created EPerson \"{{name}}\"",
   "admin.access-control.epeople.form.notification.created.success": "Käyttäjä \"{{name}}\" luotu",
 
@@ -415,6 +456,9 @@
   // "admin.access-control.epeople.form.table.name": "Name",
   "admin.access-control.epeople.form.table.name": "Nimi",
 
+  // "admin.access-control.epeople.form.table.collectionOrCommunity": "Collection/Community",
+  "admin.access-control.epeople.form.table.collectionOrCommunity": "Kokoelma/Yhteisö",
+
   // "admin.access-control.epeople.form.memberOfNoGroups": "This EPerson is not a member of any groups",
   "admin.access-control.epeople.form.memberOfNoGroups": "Tämä käyttäjä ei kuulu mihinkään ryhmään",
 
@@ -427,16 +471,23 @@
   // "admin.access-control.epeople.notification.deleted.success": "Successfully deleted EPerson: \"{{name}}\"",
   "admin.access-control.epeople.notification.deleted.success": "Käyttäjä poistettu: \"{{name}}\"",
 
+  // "admin.access-control.groups.title": "Groups",
+  "admin.access-control.groups.title": "Ryhmät",
 
+  // "admin.access-control.groups.breadcrumbs": "Groups",
+  "admin.access-control.groups.breadcrumbs": "Ryhmät",
 
-  // "admin.access-control.groups.title": "DSpace Angular :: Groups",
-  "admin.access-control.groups.title": "DSpace Angular :: Ryhmät",
+  // "admin.access-control.groups.singleGroup.breadcrumbs": "Edit Group",
+  // "admin.access-control.groups.singleGroup.breadcrumbs": "Ryhmän muokkaus",
 
-  // "admin.access-control.groups.title.singleGroup": "DSpace Angular :: Edit Group",
-  "admin.access-control.groups.title.singleGroup": "DSpace Angular :: Ryhmän muokkaus",
+  // "admin.access-control.groups.title.singleGroup": "Edit Group",
+  "admin.access-control.groups.title.singleGroup": "Ryhmän muokkaus",
 
-  // "admin.access-control.groups.title.addGroup": "DSpace Angular :: New Group",
-  "admin.access-control.groups.title.addGroup": "DSpace Angular :: Uusi ryhmä",
+  // "admin.access-control.groups.title.addGroup": "New Group",
+  "admin.access-control.groups.title.addGroup": "Uusi ryhmä",
+
+  // "admin.access-control.groups.addGroup.breadcrumbs": "New Group",
+  "admin.access-control.groups.addGroup.breadcrumbs": "uusi ryhmä",
 
   // "admin.access-control.groups.head": "Groups",
   "admin.access-control.groups.head": "Ryhmät",
@@ -453,12 +504,18 @@
   // "admin.access-control.groups.search.button": "Search",
   "admin.access-control.groups.search.button": "Hae",
 
+  // "admin.access-control.groups.search.placeholder": "Search groups...",
+  "admin.access-control.groups.search.placeholder": "Hae ryhmiä...",
+
   // "admin.access-control.groups.table.id": "ID",
   "admin.access-control.groups.table.id": "ID",
 
   // "admin.access-control.groups.table.name": "Name",
   "admin.access-control.groups.table.name": "Nimi",
 
+  // "admin.access-control.groups.table.collectionOrCommunity": "Collection/Community",
+  "admin.access-control.groups.table.collectionOrCommunity": "Kokoelma/Yhteisö",
+
   // "admin.access-control.groups.table.members": "Members",
   "admin.access-control.groups.table.members": "Jäsenet",
 
@@ -483,8 +540,6 @@
   // "admin.access-control.groups.notification.deleted.failure.content": "Cause: \"{{cause}}\"",
   "admin.access-control.groups.notification.deleted.failure.content": "Syy: \"{{cause}}\"",
 
-
-
   // "admin.access-control.groups.form.alert.permanent": "This group is permanent, so it can't be edited or deleted. You can still add and remove group members using this page.",
   "admin.access-control.groups.form.alert.permanent": "Tämä ryhmä on pysyvä, eikä sitä voi muokata tai poistaa. Ryhmään voi kuitenkin lisätä ja poistaa jäseniä tällä sivulla.",
 
@@ -500,6 +555,9 @@
   // "admin.access-control.groups.form.groupName": "Group name",
   "admin.access-control.groups.form.groupName": "Ryhmän nimi",
 
+  // "admin.access-control.groups.form.groupCommunity": "Community or Collection",
+  "admin.access-control.groups.form.groupCommunity": "Yhteisö tai kokoelma",
+
   // "admin.access-control.groups.form.groupDescription": "Description",
   "admin.access-control.groups.form.groupDescription": "Kuvaus",
 
@@ -572,6 +630,15 @@
   // "admin.access-control.groups.form.members-list.table.name": "Name",
   "admin.access-control.groups.form.members-list.table.name": "Nimi",
 
+  // "admin.access-control.groups.form.members-list.table.identity": "Identity",
+  "admin.access-control.groups.form.members-list.table.identity": "Identiteetti",
+
+  // "admin.access-control.groups.form.members-list.table.email": "Email",
+  "admin.access-control.groups.form.members-list.table.email": "Sähköpostiosoite",
+
+  // "admin.access-control.groups.form.members-list.table.netid": "NetID",
+  "admin.access-control.groups.form.members-list.table.netid": "Käyttäjätunnus",
+
   // "admin.access-control.groups.form.members-list.table.edit": "Remove / Add",
   "admin.access-control.groups.form.members-list.table.edit": "Poista / Lisää",
 
@@ -626,6 +693,9 @@
   // "admin.access-control.groups.form.subgroups-list.table.name": "Name",
   "admin.access-control.groups.form.subgroups-list.table.name": "Nimi",
 
+  // "admin.access-control.groups.form.subgroups-list.table.collectionOrCommunity": "Collection/Community",
+  "admin.access-control.groups.form.subgroups-list.table.collectionOrCommunity": "Kokoelma/Yhteisö",
+
   // "admin.access-control.groups.form.subgroups-list.table.edit": "Remove / Add",
   "admin.access-control.groups.form.subgroups-list.table.edit": "Poista / Lisää",
 
@@ -662,10 +732,17 @@
   // "admin.access-control.groups.form.subgroups-list.no-subgroups-yet": "No subgroups in group yet.",
   "admin.access-control.groups.form.subgroups-list.no-subgroups-yet": "Ryhmällä ei ole alaryhmiä.",
 
-  // "admin.access-control.groups.form.return": "Return to groups",
-  "admin.access-control.groups.form.return": "Palaa ryhmiin",
+  // "admin.access-control.groups.form.return": "Back",
+  "admin.access-control.groups.form.return": "Paluu",
 
+  // "admin.access-control.groups.form.tooltip.editGroupPage": "On this page, you can modify the properties and members of a group. In the top section, you can edit the group name and description, unless this is an admin group for a collection or community, in which case the group name and description are auto-generated and cannot be edited. In the following sections, you can edit group membership. See [the wiki](https://wiki.lyrasis.org/display/DSDOC7x/Create+or+manage+a+user+group) for more details.",
+  "admin.access-control.groups.form.tooltip.editGroupPage": "Tällä sivulla voit muokata ryhmän ominaisuuksia ja jäseniä. Yläosassa voit muokata ryhmän nimeä ja kuvausta, paitsi jos kyseessä on kokoelman tai yhteisön ylläpitäjäryhmä, jolloin ryhmän nimi ja kuvaus luodaan automaattisesti, eikä niitä voi muokata. Muissa osioissa voit muokata ryhmän jäsenyyttä. Katso lisätietoja wiki-sivulta (https://wiki.lyrasis.org/display/DSDOC7x/Create+or+manage+a+user+group).",
 
+  // "admin.access-control.groups.form.tooltip.editGroup.addEpeople": "To add or remove an EPerson to/from this group, either click the 'Browse All' button or use the search bar below to search for users (use the dropdown to the left of the search bar to choose whether to search by metadata or by email). Then click the plus icon for each user you wish to add in the list below, or the trash can icon for each user you wish to remove. The list below may have several pages: use the page controls below the list to navigate to the next pages. Once you are ready, save your changes by clicking the 'Save' button in the top section.",
+  "admin.access-control.groups.form.tooltip.editGroup.addEpeople": "Voit lisätä tai poistaa ryhmän käyttäjän joko napsauttamalla 'Selaa kaikkia' -painiketta tai käyttämällä alla olevaa hakupalkkia käyttäjien etsimiseen (käytä hakupalkin vasemmalla puolella olevaa pudotusvalikkoa valitaksesi, haetaanko metatietojen vai sähköpostin perusteella). Napsauta sitten plus-kuvaketta jokaisen käyttäjän kohdalla, jonka haluat lisätä alla olevaan luetteloon, tai roskakorikuvaketta jokaisen käyttäjän kohdalla, jonka haluat poistaa. Alla olevassa luettelossa voi olla useita sivuja: voit siirtyä seuraaville sivuille luettelon alapuolella olevilla sivunohjaimilla. Kun olet valmis, tallenna muutokset napsauttamalla yläosassa olevaa Tallenna-painiketta.",
+
+  // "admin.access-control.groups.form.tooltip.editGroup.addSubgroups": "To add or remove a Subgroup to/from this group, either click the 'Browse All' button or use the search bar below to search for users. Then click the plus icon for each user you wish to add in the list below, or the trash can icon for each user you wish to remove. The list below may have several pages: use the page controls below the list to navigate to the next pages. Once you are ready, save your changes by clicking the 'Save' button in the top section.",
+  "admin.access-control.groups.form.tooltip.editGroup.addSubgroups": "Jos haluat lisätä tai poistaa alaryhmän tähän ryhmään tai tästä ryhmästä, napsauta joko 'Selaa kaikkia' -painiketta tai käytä alla olevaa hakupalkkia ryhmien etsimiseen. Napsauta sitten luettelossa plus-kuvaketta jokaisen ryhmän kohdalla, jonka haluat lisätä, tai roskakorikuvaketta jokaisen ryhmän kohdalla, jonka haluat poistaa. Luettelossa voi olla useita sivuja: voit siirtyä seuraaville sivuille luettelon alapuolella olevilla sivunohjaimilla. Kun olet valmis, tallenna muutokset napsauttamalla yläosassa olevaa Tallenna-painiketta.",
 
   // "admin.search.breadcrumbs": "Administrative Search",
   "admin.search.breadcrumbs": "Ylläpitäjän haku",
@@ -682,17 +759,17 @@
   // "admin.search.item.edit": "Edit",
   "admin.search.item.edit": "Muokkaa",
 
-  // "admin.search.item.make-private": "Make Private",
+  // "admin.search.item.make-private": "Make non-discoverable",
   "admin.search.item.make-private": "Tee yksityiseksi",
 
-  // "admin.search.item.make-public": "Make Public",
+  // "admin.search.item.make-public": "Make discoverable",
   "admin.search.item.make-public": "Tee julkiseksi",
 
   // "admin.search.item.move": "Move",
   "admin.search.item.move": "Siirrä",
 
   // "admin.search.item.reinstate": "Reinstate",
-  "admin.search.item.reinstate": "Palauta käyttöön",
+  "admin.search.item.reinstate": "Palauta",
 
   // "admin.search.item.withdraw": "Withdraw",
   "admin.search.item.withdraw": "Poista käytöstä",
@@ -703,9 +780,6 @@
   // "administrativeView.search.results.head": "Administrative Search",
   "administrativeView.search.results.head": "Ylläpitäjän haku",
 
-
-
-
   // "admin.workflow.breadcrumbs": "Administer Workflow",
   "admin.workflow.breadcrumbs": "Hallinnoi työnkulkua",
 
@@ -715,43 +789,191 @@
   // "admin.workflow.item.workflow": "Workflow",
   "admin.workflow.item.workflow": "Työnkulku",
 
+  // "admin.workflow.item.workspace": "Workspace",
+  "admin.workflow.item.workspace": "Työtila",
+
   // "admin.workflow.item.delete": "Delete",
   "admin.workflow.item.delete": "Poista",
 
   // "admin.workflow.item.send-back": "Send back",
   "admin.workflow.item.send-back": "Lähetä takaisin",
 
+  // "admin.workflow.item.policies": "Policies",
+  "admin.workflow.item.policies": "Käytännöt",
 
+  // "admin.workflow.item.supervision": "Supervision",
+  "admin.workflow.item.supervision": "Valvonta",
 
   // "admin.metadata-import.breadcrumbs": "Import Metadata",
   "admin.metadata-import.breadcrumbs": "Importoi metadata",
 
+  // "admin.batch-import.breadcrumbs": "Import Batch",
+  "admin.batch-import.breadcrumbs": "Importoi erä",
+
   // "admin.metadata-import.title": "Import Metadata",
   "admin.metadata-import.title": "Importoi metadata",
 
+  // "admin.batch-import.title": "Import Batch",
+  "admin.batch-import.title": "Importoi erä",
+
   // "admin.metadata-import.page.header": "Import Metadata",
   "admin.metadata-import.page.header": "Importoi metadata",
 
+  // "admin.batch-import.page.header": "Import Batch",
+  "admin.batch-import.page.header": "Importoi erä",
+
   // "admin.metadata-import.page.help": "You can drop or browse CSV files that contain batch metadata operations on files here",
   "admin.metadata-import.page.help": "Voit pudottaa tähän tai selata CSV-tiedostoja, joilla voit tehdä metadatatoimintoja usealle tietueelle",
 
+  // "admin.batch-import.page.help": "Select the Collection to import into. Then, drop or browse to a Simple Archive Format (SAF) zip file that includes the Items to import",
+  "admin.batch-import.page.help": "Valitse kokoelma, johon tietueet importoidaan. Sen jälkeen pudota tai selaa esiin importoitavat tietueet sisältävä Simple Archive Format (SAF) -ZIP-tiedosto.",
+
+  // "admin.batch-import.page.toggle.help": "It is possible to perform import either with file upload or via URL, use above toggle to set the input source",
+  "admin.batch-import.page.toggle.help": "Importoinnin voi tehdä joko lataamalla tiedoston tai URL-osoitteen kautta. Käytä yllä olevaa kytkintä valitaksesi syöttötavan.",
+
   // "admin.metadata-import.page.dropMsg": "Drop a metadata CSV to import",
   "admin.metadata-import.page.dropMsg": "Pudota CSV-metadata importoimista varten",
 
+  // "admin.batch-import.page.dropMsg": "Drop a batch ZIP to import",
+  "admin.batch-import.page.dropMsg": "Pudota erän ZIP-tiedosto importoimista varten",
+
   // "admin.metadata-import.page.dropMsgReplace": "Drop to replace the metadata CSV to import",
   "admin.metadata-import.page.dropMsgReplace": "Pudota korvataksesi importoitava CSV-metadata",
 
-  // "admin.metadata-import.page.button.return": "Return",
+  // "admin.batch-import.page.dropMsgReplace": "Drop to replace the batch ZIP to import",
+  "admin.batch-import.page.dropMsgReplace": "Pudota korvataksesi importoitava erän ZIP-tiedosto",
+
+  // "admin.metadata-import.page.button.return": "Back",
   "admin.metadata-import.page.button.return": "Paluu",
 
   // "admin.metadata-import.page.button.proceed": "Proceed",
   "admin.metadata-import.page.button.proceed": "Jatka",
 
+  // "admin.metadata-import.page.button.select-collection": "Select Collection",
+  "admin.metadata-import.page.button.select-collection": "Valitse kokoelma",
+
   // "admin.metadata-import.page.error.addFile": "Select file first!",
   "admin.metadata-import.page.error.addFile": "Valitse ensin tiedosto!",
 
+  // "admin.metadata-import.page.error.addFileUrl": "Insert file url first!",
+  "admin.metadata-import.page.error.addFileUrl": "Syötä tiedoston URL ensin!",
 
+  // "admin.batch-import.page.error.addFile": "Select Zip file first!",
+  "admin.batch-import.page.error.addFile": "Valitse ZIP-tiedosto ensin!",
 
+  // "admin.metadata-import.page.toggle.upload": "Upload",
+  "admin.metadata-import.page.toggle.upload": "Lataa",
+
+  // "admin.metadata-import.page.toggle.url": "URL",
+  "admin.metadata-import.page.toggle.url": "URL",
+
+  // "admin.metadata-import.page.urlMsg": "Insert the batch ZIP url to import",
+  "admin.metadata-import.page.urlMsg": "Syötä erän ZIP-URL importoitavaksi",
+
+  // "admin.metadata-import.page.validateOnly": "Validate Only",
+  "admin.metadata-import.page.validateOnly": "Pelkkä validointi",
+
+  // "admin.metadata-import.page.validateOnly.hint": "When selected, the uploaded CSV will be validated. You will receive a report of detected changes, but no changes will be saved.",
+  "admin.metadata-import.page.validateOnly.hint": "Kun tämä valitaan, ladattu CSV-tiedosto validoidaan. Saat raportin havaituista muutoksista, mutta muutoksia ei tallenneta.",
+
+  // "advanced-workflow-action.rating.form.rating.label": "Rating",
+  "advanced-workflow-action.rating.form.rating.label": "Arviointi",
+
+  // "advanced-workflow-action.rating.form.rating.error": "You must rate the item",
+  "advanced-workflow-action.rating.form.rating.error": "Sinun on arvioitava tietua",
+
+  // "advanced-workflow-action.rating.form.review.label": "Review",
+  "advanced-workflow-action.rating.form.review.label": "Tarkasta",
+
+  // "advanced-workflow-action.rating.form.review.error": "You must enter a review to submit this rating",
+  "advanced-workflow-action.rating.form.review.error": "Sinun on annettava arvostelu lähettääksesi tämän arvioinnin",
+
+  // "advanced-workflow-action.rating.description": "Please select a rating below",
+  "advanced-workflow-action.rating.description": "Valitse arviointi alapuolelta",
+
+  // "advanced-workflow-action.rating.description-requiredDescription": "Please select a rating below and also add a review",
+  "advanced-workflow-action.rating.description-requiredDescription": "Valitse arviointi alapuolelta. Lisää myös arvostelu",
+
+  // "advanced-workflow-action.select-reviewer.description-single": "Please select a single reviewer below before submitting",
+  "advanced-workflow-action.select-reviewer.description-single": "Valitse yksi tarkastaja alapuolelta ennen lähettämistä",
+
+  // "advanced-workflow-action.select-reviewer.description-multiple": "Please select one or more reviewers below before submitting",
+  "advanced-workflow-action.select-reviewer.description-multiple": "Valitse yksi tai useampi tarkastaja alapuolelta ennen lähettämistä",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.head": "EPeople",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.head": "Käyttäjät",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.head": "Add EPeople",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.head": "Lisää käyttäjiä",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.button.see-all": "Browse All",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.button.see-all": "Selaa kaikkia",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.headMembers": "Current Members",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.headMembers": "Nykyiset jäsenet",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.scope.metadata": "Metadata",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.scope.metadata": "Metadata",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.scope.email": "E-mail (exact)",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.scope.email": "Sähköpostiosoite (oikea)",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.button": "Search",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.button": "Hae",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.id": "ID",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.id": "ID",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.name": "Name",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.name": "Nimi",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.identity": "Identity",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.identity": "Identiteetti",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.email": "Email",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.email": "Sähköpostiosoite",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.netid": "NetID",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.netid": "Käyttäjätunnus",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.edit": "Remove / Add",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.edit": "Poista / Lisää",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.edit.buttons.remove": "Remove member with name \"{{name}}\"",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.edit.buttons.remove": "Poista jäsen nimellä \"{{name}}\"",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.success.addMember": "Successfully added member: \"{{name}}\"",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.success.addMember": "Jäsen lisätty: \"{{name}}\"",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.failure.addMember": "Failed to add member: \"{{name}}\"",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.failure.addMember": "Jäsenen lisäys epäonnistui: \"{{name}}\"",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.success.deleteMember": "Successfully deleted member: \"{{name}}\"",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.success.deleteMember": "Jäsen poistettu: \"{{name}}\"",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.failure.deleteMember": "Failed to delete member: \"{{name}}\"",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.failure.deleteMember": "Jäsenen poisto epäonnistui: \"{{name}}\"",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.edit.buttons.add": "Add member with name \"{{name}}\"",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.edit.buttons.add": "Lisää jäsen nimellä \"{{name}}\"",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.failure.noActiveGroup": "No current active group, submit a name first.",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.failure.noActiveGroup": "Ei aktiivista ryhmää, syötä ensin nimi",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.no-members-yet": "No members in group yet, search and add.",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.no-members-yet": "Ryhmässä ei ole vielä jäseniä, hae ja lisää.",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.no-items": "No EPeople found in that search",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.no-items": "Haku ei palauttanut käyttäjiä",
+
+  // "advanced-workflow-action.select-reviewer.no-reviewer-selected.error": "No reviewer selected.",
+  "advanced-workflow-action.select-reviewer.no-reviewer-selected.error": "Ei valittua tarkastajaa.",
+
+  // "admin.batch-import.page.validateOnly.hint": "When selected, the uploaded ZIP will be validated. You will receive a report of detected changes, but no changes will be saved.",
+  "admin.batch-import.page.validateOnly.hint": "Kun tämä valitaan, ladattu ZIP-tiedosto validoidaan.  the uploaded ZIP will be validated. Saat raportin havaituista muutoksista, mutta muutoksia ei tallenneta.",
+
+  // "admin.batch-import.page.remove": "remove",
+  "admin.batch-import.page.remove": "poista",
 
   // "auth.errors.invalid-user": "Invalid email address or password.",
   "auth.errors.invalid-user": "Virheellinen sähköpostiosoite tai salasana.",
@@ -759,7 +981,23 @@
   // "auth.messages.expired": "Your session has expired. Please log in again.",
   "auth.messages.expired": "Istuntosi on vanhentunut. Kirjaudu uudelleen.",
 
+  // "auth.messages.token-refresh-failed": "Refreshing your session token failed. Please log in again.",
+  "auth.messages.token-refresh-failed": "Istuntotunnisteen päivittäminen epäonnistui. Kirjaudu uudelleen.",
 
+  // "bitstream.download.page": "Now downloading {{bitstream}}...",
+  "bitstream.download.page": "Nyt ladataan {{bitstream}}...",
+
+  // "bitstream.download.page.back": "Back",
+  "bitstream.download.page.back": "Paluu",
+
+  // "bitstream.edit.authorizations.link": "Edit bitstream's Policies",
+  "bitstream.edit.authorizations.link": "Muokkaa tiedostokäytäntöjä",
+
+  // "bitstream.edit.authorizations.title": "Edit bitstream's Policies",
+  "bitstream.edit.authorizations.title": "Muokkaa tiedostokäytäntöjä",
+
+  // "bitstream.edit.return": "Back",
+  "bitstream.edit.return": "Paluu",
 
   // "bitstream.edit.bitstream": "Bitstream: ",
   "bitstream.edit.bitstream": "Tiedosto: ",
@@ -803,6 +1041,33 @@
   // "bitstream.edit.notifications.error.format.title": "An error occurred saving the bitstream's format",
   "bitstream.edit.notifications.error.format.title": "Virhe tallennettaessa tiedoston formaattia",
 
+  // "bitstream.edit.notifications.error.primaryBitstream.title": "An error occurred saving the primary bitstream",
+  "bitstream.edit.notifications.error.primaryBitstream.title": "Virhe tallennettaessa päätiedostoa",
+
+  // "bitstream.edit.form.iiifLabel.label": "IIIF Label",
+  "bitstream.edit.form.iiifLabel.label": "IIIF-nimike",
+
+  // "bitstream.edit.form.iiifLabel.hint": "Canvas label for this image. If not provided default label will be used.",
+  "bitstream.edit.form.iiifLabel.hint": "Kuvan canvasin nimike. Ellei nimikettä anneta, käytetään oletusnimikettä.",
+
+  // "bitstream.edit.form.iiifToc.label": "IIIF Table of Contents",
+  "bitstream.edit.form.iiifToc.label": "IIIF-sisällysluettelo",
+
+  // "bitstream.edit.form.iiifToc.hint": "Adding text here makes this the start of a new table of contents range.",
+  "bitstream.edit.form.iiifToc.hint": "Jos tekstiä lisätään tähän, tästä alkaa uusi sisällysluetteloaihe.",
+
+  // "bitstream.edit.form.iiifWidth.label": "IIIF Canvas Width",
+  "bitstream.edit.form.iiifWidth.label": "IIIF-canvasin leveys",
+
+  // "bitstream.edit.form.iiifWidth.hint": "The canvas width should usually match the image width.",
+  "bitstream.edit.form.iiifWidth.hint": "Canvasin leveyden tulee vastata kuvan leveyttä.",
+
+  // "bitstream.edit.form.iiifHeight.label": "IIIF Canvas Height",
+  "bitstream.edit.form.iiifHeight.label": "IIIF-canvasin korkeus",
+
+  // "bitstream.edit.form.iiifHeight.hint": "The canvas height should usually match the image height.",
+  "bitstream.edit.form.iiifHeight.hint": "Canvasin korkeuden tulee vastata kuvan korkeutta.",
+
   // "bitstream.edit.notifications.saved.content": "Your changes to this bitstream were saved.",
   "bitstream.edit.notifications.saved.content": "Muutokset tiedostoon on tallennettu.",
 
@@ -812,7 +1077,65 @@
   // "bitstream.edit.title": "Edit bitstream",
   "bitstream.edit.title": "Muokkaa tiedostoa",
 
+  // "bitstream-request-a-copy.alert.canDownload1": "You already have access to this file. If you want to download the file, click ",
+  "bitstream-request-a-copy.alert.canDownload1": "Sinulla on jo pääsy tähän tiedostoon. Jos haluat ladata tiedoston, napsauta ",
 
+  // "bitstream-request-a-copy.alert.canDownload2": "here",
+  "bitstream-request-a-copy.alert.canDownload2": "tässä",
+
+  // "bitstream-request-a-copy.header": "Request a copy of the file",
+  "bitstream-request-a-copy.header": "Pyydä tiedostokopiota",
+
+  // "bitstream-request-a-copy.intro": "Enter the following information to request a copy for the following item: ",
+  "bitstream-request-a-copy.intro": "Syötä seuraavat tiedot pyytääksesi kopiota tietueesta: ",
+
+  // "bitstream-request-a-copy.intro.bitstream.one": "Requesting the following file: ",
+  "bitstream-request-a-copy.intro.bitstream.one": "Pyydetään seuraavaa tiedostoa: ",
+
+  // "bitstream-request-a-copy.intro.bitstream.all": "Requesting all files. ",
+  "bitstream-request-a-copy.intro.bitstream.all": "Pyydetään kaikkia tiedostoja. ",
+
+  // "bitstream-request-a-copy.name.label": "Name *",
+  "bitstream-request-a-copy.name.label": "Nimi *",
+
+  // "bitstream-request-a-copy.name.error": "The name is required",
+  "bitstream-request-a-copy.name.error": "Nimi on pakollinen tieto",
+
+  // "bitstream-request-a-copy.email.label": "Your e-mail address *",
+  "bitstream-request-a-copy.email.label": "Sähköpostiosoite *",
+
+  // "bitstream-request-a-copy.email.hint": "This email address is used for sending the file.",
+  "bitstream-request-a-copy.email.hint": "Tätä sähköpostiosoitetta käytetään tiedostoa lähetettäessä.",
+
+  // "bitstream-request-a-copy.email.error": "Please enter a valid email address.",
+  "bitstream-request-a-copy.email.error": "Syötä toimiva sähköpostiosoite.",
+
+  // "bitstream-request-a-copy.allfiles.label": "Files",
+  "bitstream-request-a-copy.allfiles.label": "Tiedostot",
+
+  // "bitstream-request-a-copy.files-all-false.label": "Only the requested file",
+  "bitstream-request-a-copy.files-all-false.label": "Vain pyydetty tiedosto",
+
+  // "bitstream-request-a-copy.files-all-true.label": "All files (of this item) in restricted access",
+  "bitstream-request-a-copy.files-all-true.label": "Kaikilla (tämän tietueen) tiedostoilla on rajattu käyttöoikeus",
+
+  // "bitstream-request-a-copy.message.label": "Message",
+  "bitstream-request-a-copy.message.label": "Viesti",
+
+  // "bitstream-request-a-copy.return": "Back",
+  "bitstream-request-a-copy.return": "Paluu",
+
+  // "bitstream-request-a-copy.submit": "Request copy",
+  "bitstream-request-a-copy.submit": "Pyydä kopio",
+
+  // "bitstream-request-a-copy.submit.success": "The item request was submitted successfully.",
+  "bitstream-request-a-copy.submit.success": "Tietuepyyntö on lähetetty.",
+
+  // "bitstream-request-a-copy.submit.error": "Something went wrong with submitting the item request.",
+  "bitstream-request-a-copy.submit.error": "Tapahtui virhe lähetettäessä tietuepyyntöä",
+
+  // "browse.back.all-results": "All browse results",
+  "browse.back.all-results": "Kaikki selaustulokset",
 
   // "browse.comcol.by.author": "By Author",
   "browse.comcol.by.author": "Tekijän mukaan",
@@ -823,6 +1146,9 @@
   // "browse.comcol.by.subject": "By Subject",
   "browse.comcol.by.subject": "Asiasanan mukaan",
 
+  // "browse.comcol.by.srsc": "By Subject Category",
+  "browse.comcol.by.srsc": "Aihekategorian mukaan",
+
   // "browse.comcol.by.title": "By Title",
   "browse.comcol.by.title": "Nimekkeen mukaan",
 
@@ -853,17 +1179,35 @@
   // "browse.metadata.subject.breadcrumbs": "Browse by Subject",
   "browse.metadata.subject.breadcrumbs": "Selaa asiasanan mukaan",
 
+  // "browse.metadata.srsc.breadcrumbs": "Browse by Subject Category",
+  "browse.metadata.srsc.breadcrumbs": "Selaa aihekategorian luokan mukaan",
+
   // "browse.metadata.title.breadcrumbs": "Browse by Title",
   "browse.metadata.title.breadcrumbs": "Selaa nimekkeen mukaan",
 
+  // "pagination.next.button": "Next",
+  "pagination.next.button": "Seuraava",
+
+  // "pagination.previous.button": "Previous",
+  "pagination.previous.button": "Edellinen",
+
+  // "pagination.next.button.disabled.tooltip": "No more pages of results",
+  "pagination.next.button.disabled.tooltip": "Ei enempää tulossivuja",
+
+  // "browse.startsWith": ", starting with {{ startsWith }}",
+  "browse.startsWith": ", alkaa kirjaimella {{ startsWith }}",
+
   // "browse.startsWith.choose_start": "(Choose start)",
   "browse.startsWith.choose_start": "(Valitse alku)",
 
   // "browse.startsWith.choose_year": "(Choose year)",
   "browse.startsWith.choose_year": "(Valitse vuosi)",
 
-  // "browse.startsWith.jump": "Jump to a point in the index:",
-  "browse.startsWith.jump": "Hyppää indeksin kohtaan:",
+  // "browse.startsWith.choose_year.label": "Choose the issue year",
+  "browse.startsWith.choose_year.label": "Valitse julkaisuvuosi",
+
+  // "browse.startsWith.jump": "Filter results by year or month",
+  "browse.startsWith.jump": "Suodata tulokset vuoden tai kuukauden mukaan",
 
   // "browse.startsWith.months.april": "April",
   "browse.startsWith.months.april": "Huhtikuu",
@@ -895,6 +1239,9 @@
   // "browse.startsWith.months.none": "(Choose month)",
   "browse.startsWith.months.none": "(Valitse kuukausi)",
 
+  // "browse.startsWith.months.none.label": "Choose the issue month",
+  "browse.startsWith.months.none.label": "Valitse julkaisukuukausi",
+
   // "browse.startsWith.months.november": "November",
   "browse.startsWith.months.november": "Marraskuu",
 
@@ -904,23 +1251,44 @@
   // "browse.startsWith.months.september": "September",
   "browse.startsWith.months.september": "Syyskuu",
 
-  // "browse.startsWith.submit": "Go",
-  "browse.startsWith.submit": "Ok",
+  // "browse.startsWith.submit": "Browse",
+  "browse.startsWith.submit": "Selaa",
 
-  // "browse.startsWith.type_date": "Or type in a date (year-month):",
-  "browse.startsWith.type_date": "Tai anna päiväys (vuosi-kuukausi):",
+  // "browse.startsWith.type_date": "Filter results by date",
+  "browse.startsWith.type_date": "Suodata tulokset päivämäärän mukaan",
 
-  // "browse.startsWith.type_text": "Or enter first few letters:",
-  "browse.startsWith.type_text": "Tai anna muutama alkukirjain:",
+  // "browse.startsWith.type_date.label": "Or type in a date (year-month) and click on the Browse button",
+  "browse.startsWith.type_date.label": "Tai syötä päiväys (vuosi-kuukausi) ja napsauta Selaa-painiketta",
 
-  // "browse.title": "Browsing {{ collection }} by {{ field }} {{ value }}",
-  "browse.title": "Selataan {{ collection }}-kokoelmaa {{ field }}-kentän arvolla {{ value }}",
+  // "browse.startsWith.type_text": "Filter results by typing the first few letters",
+  "browse.startsWith.type_text": "Suodata tuloksia antamalla muutama alkukirjain",
 
+  // "browse.startsWith.input": "Filter",
+  "browse.startsWith.input": "Suodata",
+
+  // "browse.taxonomy.button": "Browse",
+  "browse.taxonomy.button": "Selaa",
+
+  // "browse.title": "Browsing {{ collection }} by {{ field }}{{ startsWith }} {{ value }}",
+  "browse.title": "Selataan {{ collection }}-kokoelmaa {{ field }}{{ startsWith }}-kentän arvolla {{ value }}",
+
+  // "browse.title.page": "Browsing {{ collection }} by {{ field }} {{ value }}",
+  "browse.title.page": "Selataan {{ collection }}-kokoelmaa {{ field }}-kentän arvolla {{ value }}",
+
+  // "search.browse.item-back": "Back to Results",
+  "search.browse.item-back": "Paluu tuloksiin",
 
   // "chips.remove": "Remove chip",
   "chips.remove": "Poista chip",
 
+  // "claimed-approved-search-result-list-element.title": "Approved",
+  "claimed-approved-search-result-list-element.title": "Hyväksytty",
 
+  // "claimed-declined-search-result-list-element.title": "Rejected, sent back to submitter",
+  "claimed-declined-search-result-list-element.title": "Hylätty, lähetetty takaisin tallentajalle",
+
+  // "claimed-declined-task-search-result-list-element.title": "Declined, sent back to Review Manager's workflow",
+  "claimed-declined-task-search-result-list-element.title": "Kieltäydytty, lähetetty takaisin päätarkastajan työnkulkuun",
 
   // "collection.create.head": "Create a Collection",
   "collection.create.head": "Luo kokoelma",
@@ -940,6 +1308,9 @@
   // "collection.delete.confirm": "Confirm",
   "collection.delete.confirm": "Vahvista",
 
+  // "collection.delete.processing": "Deleting",
+  "collection.delete.processing": "Poistetaan",
+
   // "collection.delete.head": "Delete Collection",
   "collection.delete.head": "Poista kokoelma",
 
@@ -952,8 +1323,6 @@
   // "collection.delete.text": "Are you sure you want to delete collection \"{{ dso }}\"",
   "collection.delete.text": "Haluatko varmasti poistaa kokoelman \"{{ dso }}\"",
 
-
-
   // "collection.edit.delete": "Delete this collection",
   "collection.edit.delete": "Poista kokoelma",
 
@@ -963,8 +1332,6 @@
   // "collection.edit.breadcrumbs": "Edit Collection",
   "collection.edit.breadcrumbs": "Muokkaa kokoelmaa",
 
-
-
   // "collection.edit.tabs.mapper.head": "Item Mapper",
   "collection.edit.tabs.mapper.head": "Tietueliitosväline",
 
@@ -1016,13 +1383,20 @@
   // "collection.edit.item-mapper.remove": "Remove selected item mappings",
   "collection.edit.item-mapper.remove": "Poista valitut tietueliitokset",
 
+  // "collection.edit.item-mapper.search-form.placeholder": "Search items...",
+  "collection.edit.item-mapper.search-form.placeholder": "Hae tietueita...",
+
   // "collection.edit.item-mapper.tabs.browse": "Browse mapped items",
   "collection.edit.item-mapper.tabs.browse": "Selaa liitettyjä tietueita",
 
   // "collection.edit.item-mapper.tabs.map": "Map new items",
   "collection.edit.item-mapper.tabs.map": "Liitä uusia tietueita",
 
+  // "collection.edit.logo.delete.title": "Delete logo",
+  "collection.edit.logo.delete.title": "Poista logo",
 
+  // "collection.edit.logo.delete-undo.title": "Undo delete",
+  "collection.edit.logo.delete-undo.title": "Kumoa poisto",
 
   // "collection.edit.logo.label": "Collection logo",
   "collection.edit.logo.label": "Kokoelman logo",
@@ -1045,15 +1419,11 @@
   // "collection.edit.logo.upload": "Drop a Collection Logo to upload",
   "collection.edit.logo.upload": "Pudota kokoelman logo ladattavaksi",
 
-
-
   // "collection.edit.notifications.success": "Successfully edited the Collection",
   "collection.edit.notifications.success": "Kokoelman muokkaus onnistui",
 
-  // "collection.edit.return": "Return",
-  "collection.edit.return": "Palaa",
-
-
+  // "collection.edit.return": "Back",
+  "collection.edit.return": "Paluu",
 
   // "collection.edit.tabs.curate.head": "Curate",
   "collection.edit.tabs.curate.head": "Kuratoi",
@@ -1067,6 +1437,15 @@
   // "collection.edit.tabs.authorizations.title": "Collection Edit - Authorizations",
   "collection.edit.tabs.authorizations.title": "Kokoelman muokkaus - Käyttöoikeudet",
 
+  // "collection.edit.item.authorizations.load-bundle-button": "Load more bundles",
+  "collection.edit.item.authorizations.load-bundle-button": "Lataa lisää nippuja",
+
+  // "collection.edit.item.authorizations.load-more-button": "Load more",
+  "collection.edit.item.authorizations.load-more-button": "Lataa lisää",
+
+  // "collection.edit.item.authorizations.show-bitstreams-button": "Show bitstream policies for bundle",
+  "collection.edit.item.authorizations.show-bitstreams-button": "Näytä nipun tiedostokäytännöt",
+
   // "collection.edit.tabs.metadata.head": "Edit Metadata",
   "collection.edit.tabs.metadata.head": "Muokkaa metadataa",
 
@@ -1115,7 +1494,7 @@
   // "collection.edit.tabs.source.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button",
   "collection.edit.tabs.source.notifications.discarded.content": "Muutokset hylätty. Valitse 'Kumoa' palauttaaksesi muutokset",
 
-  // "collection.edit.tabs.source.notifications.discarded.title": "Changed discarded",
+  // "collection.edit.tabs.source.notifications.discarded.title": "Changes discarded",
   "collection.edit.tabs.source.notifications.discarded.title": "Muutokset hylätty",
 
   // "collection.edit.tabs.source.notifications.invalid.content": "Your changes were not saved. Please make sure all fields are valid before you save.",
@@ -1133,8 +1512,6 @@
   // "collection.edit.tabs.source.title": "Collection Edit - Content Source",
   "collection.edit.tabs.source.title": "Kokoelman muokkaus - Sisältölähde",
 
-
-
   // "collection.edit.template.add-button": "Add",
   "collection.edit.template.add-button": "Lisää",
 
@@ -1150,12 +1527,18 @@
   // "collection.edit.template.edit-button": "Edit",
   "collection.edit.template.edit-button": "Muokkaa",
 
+  // "collection.edit.template.error": "An error occurred retrieving the template item",
+  "collection.edit.template.error": "Virhe noudettaessa mallitietuetta",
+
   // "collection.edit.template.head": "Edit Template Item for Collection \"{{ collection }}\"",
   "collection.edit.template.head": "Muokkaa kokoelman \"{{ collection }}\" mallitietuetta",
 
   // "collection.edit.template.label": "Template item",
   "collection.edit.template.label": "Mallitietue",
 
+  // "collection.edit.template.loading": "Loading template item...",
+  "collection.edit.template.loading": "Ladataan mallitietuetta...",
+
   // "collection.edit.template.notifications.delete.error": "Failed to delete the item template",
   "collection.edit.template.notifications.delete.error": "Tietueen mallipohjan poisto epäonnistui",
 
@@ -1165,8 +1548,6 @@
   // "collection.edit.template.title": "Edit Template Item",
   "collection.edit.template.title": "Muokkaa mallitietuetta",
 
-
-
   // "collection.form.abstract": "Short Description",
   "collection.form.abstract": "Lyhyt kuvaus",
 
@@ -1191,13 +1572,12 @@
   // "collection.form.title": "Name",
   "collection.form.title": "Nimi",
 
-
+  // "collection.form.entityType": "Entity Type",
+  "collection.form.entityType": "Entiteettityyppi",
 
   // "collection.listelement.badge": "Collection",
   "collection.listelement.badge": "Kokoelma",
 
-
-
   // "collection.page.browse.recent.head": "Recent Submissions",
   "collection.page.browse.recent.head": "Viimeksi lisätyt",
 
@@ -1216,8 +1596,6 @@
   // "collection.page.news": "News",
   "collection.page.news": "Uutiset",
 
-
-
   // "collection.select.confirm": "Confirm selected",
   "collection.select.confirm": "Vahvista valinta",
 
@@ -1227,7 +1605,74 @@
   // "collection.select.table.title": "Title",
   "collection.select.table.title": "Nimeke",
 
+  // "collection.source.controls.head": "Harvest Controls",
+  "collection.source.controls.head": "Harvointikontrollit",
 
+  // "collection.source.controls.test.submit.error": "Something went wrong with initiating the testing of the settings",
+  "collection.source.controls.test.submit.error": "Virhe asetusten testaamisen valmistelussa",
+
+  // "collection.source.controls.test.failed": "The script to test the settings has failed",
+  "collection.source.controls.test.failed": "Asetusten testausskripti epäonnistui",
+
+  // "collection.source.controls.test.completed": "The script to test the settings has successfully finished",
+  "collection.source.controls.test.completed": "Asetusten testausskripti suoritettu",
+
+  // "collection.source.controls.test.submit": "Test configuration",
+  "collection.source.controls.test.submit": "Testikonfiguraatio",
+
+  // "collection.source.controls.test.running": "Testing configuration...",
+  "collection.source.controls.test.running": "Testataan konfiguraatiota...",
+
+  // "collection.source.controls.import.submit.success": "The import has been successfully initiated",
+  "collection.source.controls.import.submit.success": "Importointi valmisteltu",
+
+  // "collection.source.controls.import.submit.error": "Something went wrong with initiating the import",
+  "collection.source.controls.import.submit.error": "Virhe importoinnin valmistelussa",
+
+  // "collection.source.controls.import.submit": "Import now",
+  "collection.source.controls.import.submit": "Importoi nyt",
+
+  // "collection.source.controls.import.running": "Importing...",
+  "collection.source.controls.import.running": "Importoidaan...",
+
+  // "collection.source.controls.import.failed": "An error occurred during the import",
+  "collection.source.controls.import.failed": "Virhe importoinnissa",
+
+  // "collection.source.controls.import.completed": "The import completed",
+  "collection.source.controls.import.completed": "Importointi valmis",
+
+  // "collection.source.controls.reset.submit.success": "The reset and reimport has been successfully initiated",
+  "collection.source.controls.reset.submit.success": "Nollaus ja uudelleenimportointi valmisteltu",
+
+  // "collection.source.controls.reset.submit.error": "Something went wrong with initiating the reset and reimport",
+  "collection.source.controls.reset.submit.error": "Virhe nollauksen ja uudelleenimportoinnin valmistelussa",
+
+  // "collection.source.controls.reset.failed": "An error occurred during the reset and reimport",
+  "collection.source.controls.reset.failed": "Virhe nollauksessa ja uudelleenimportoinnissa",
+
+  // "collection.source.controls.reset.completed": "The reset and reimport completed",
+  "collection.source.controls.reset.completed": "Nollaus ja uudelleenimportointi valmis",
+
+  // "collection.source.controls.reset.submit": "Reset and reimport",
+  "collection.source.controls.reset.submit": "Nollaus ja uudelleenimportointi",
+
+  // "collection.source.controls.reset.running": "Resetting and reimporting...",
+  "collection.source.controls.reset.running": "Nollataan ja uudelleenimportoidaan...",
+
+  // "collection.source.controls.harvest.status": "Harvest status:",
+  "collection.source.controls.harvest.status": "Harvestoinnin tila:",
+
+  // "collection.source.controls.harvest.start": "Harvest start time:",
+  "collection.source.controls.harvest.start": "Harvestoinnin aloitusaika:",
+
+  // "collection.source.controls.harvest.last": "Last time harvested:",
+  "collection.source.controls.harvest.last": "Harvestoitu viimeksi::",
+
+  // "collection.source.controls.harvest.message": "Harvest info:",
+  "collection.source.controls.harvest.message": "Harvestointitiedot:",
+
+  // "collection.source.controls.harvest.no-information": "N/A",
+  "collection.source.controls.harvest.no-information": "Ei saatavilla",
 
   // "collection.source.update.notifications.error.content": "The provided settings have been tested and didn't work.",
   "collection.source.update.notifications.error.content": "Annetut asetukset on testattu. Ne eivät toimi.",
@@ -1235,10 +1680,11 @@
   // "collection.source.update.notifications.error.title": "Server Error",
   "collection.source.update.notifications.error.title": "Palvelinvirhe",
 
+  // "communityList.breadcrumbs": "Community List",
+  "communityList.breadcrumbs": "Yhteisöluettelo",
 
-
-  // "communityList.tabTitle": "DSpace - Community List",
-  "communityList.tabTitle": "DSpace - Yhteisöluettelo",
+  // "communityList.tabTitle": "Community List",
+  "communityList.tabTitle": "Yhteisöluettelo",
 
   // "communityList.title": "List of Communities",
   "communityList.title": "Luettelo yhteisöistä",
@@ -1246,8 +1692,6 @@
   // "communityList.showMore": "Show More",
   "communityList.showMore": "Näytä lisää",
 
-
-
   // "community.create.head": "Create a Community",
   "community.create.head": "Luo yhteisö",
 
@@ -1266,6 +1710,9 @@
   // "community.delete.confirm": "Confirm",
   "community.delete.confirm": "Vahvista",
 
+  // "community.delete.processing": "Deleting...",
+  "community.delete.processing": "Poistetaan...",
+
   // "community.delete.head": "Delete Community",
   "community.delete.head": "Poista yhteisö",
 
@@ -1287,6 +1734,11 @@
   // "community.edit.breadcrumbs": "Edit Community",
   "community.edit.breadcrumbs": "Muokkaa yhteisöä",
 
+  // "community.edit.logo.delete.title": "Delete logo",
+  "community.edit.logo.delete.title": "Poista logo",
+
+  // "community.edit.logo.delete-undo.title": "Undo delete",
+  "community.edit.logo.delete-undo.title": "Kumoa poisto",
 
   // "community.edit.logo.label": "Community logo",
   "community.edit.logo.label": "Yhteisön logo",
@@ -1309,8 +1761,6 @@
   // "community.edit.logo.upload": "Drop a Community Logo to upload",
   "community.edit.logo.upload": "Pudota yhteisön logo ladattavaksi",
 
-
-
   // "community.edit.notifications.success": "Successfully edited the Community",
   "community.edit.notifications.success": "Yhteisön muokkaus onnistui",
 
@@ -1320,10 +1770,8 @@
   // "community.edit.notifications.error": "An error occured while editing the Community",
   "community.edit.notifications.error": "Virhe muokattaessa yhteisöä",
 
-  // "community.edit.return": "Return",
-  "community.edit.return": "Palaa",
-
-
+  // "community.edit.return": "Back",
+  "community.edit.return": "Paluu",
 
   // "community.edit.tabs.curate.head": "Curate",
   "community.edit.tabs.curate.head": "Kuratoi",
@@ -1349,25 +1797,26 @@
   // "community.edit.tabs.authorizations.title": "Community Edit - Authorizations",
   "community.edit.tabs.authorizations.title": "Yhteisön muokkaus - Käyttöoikeudet",
 
-
-
   // "community.listelement.badge": "Community",
   "community.listelement.badge": "Yhteisö",
 
-
-
   // "comcol-role.edit.no-group": "None",
   "comcol-role.edit.no-group": "Ei mitään",
 
   // "comcol-role.edit.create": "Create",
   "comcol-role.edit.create": "Luo",
 
+  // "comcol-role.edit.create.error.title": "Failed to create a group for the '{{ role }}' role",
+  "comcol-role.edit.create.error.title": "Ryhmän luonti '{{ role }}'-roolille epäonnistui",
+
   // "comcol-role.edit.restrict": "Restrict",
   "comcol-role.edit.restrict": "Rajoita",
 
   // "comcol-role.edit.delete": "Delete",
   "comcol-role.edit.delete": "Poista",
 
+  // "comcol-role.edit.delete.error.title": "Failed to delete the '{{ role }}' role's group",
+  "comcol-role.edit.delete.error.title": "'{{ role }}'-roolin ryhmän poisto epäonnistui",
 
   // "comcol-role.edit.community-admin.name": "Administrators",
   "comcol-role.edit.community-admin.name": "Ylläpitäjät",
@@ -1375,21 +1824,18 @@
   // "comcol-role.edit.collection-admin.name": "Administrators",
   "comcol-role.edit.collection-admin.name": "Ylläpitäjät",
 
-
   // "comcol-role.edit.community-admin.description": "Community administrators can create sub-communities or collections, and manage or assign management for those sub-communities or collections. In addition, they decide who can submit items to any sub-collections, edit item metadata (after submission), and add (map) existing items from other collections (subject to authorization).",
   "comcol-role.edit.community-admin.description": "Yhteisön ylläpitäjät voivat luoda alayhteisöjä tai kokoelmia ja hallita niitä sekä myöntää niihin hallintaoikeuksia. He päättävät, kuka saa tallentaa tietueita alakokoelmiin, muokata metadataa (tallennuksen jälkeen) ja lisätä (liittää) olemassa olevia tietueita muista kokoelmista (käyttöoikeuksien puitteissa).",
 
   // "comcol-role.edit.collection-admin.description": "Collection administrators decide who can submit items to the collection, edit item metadata (after submission), and add (map) existing items from other collections to this collection (subject to authorization for that collection).",
   "comcol-role.edit.collection-admin.description": "Kokoelman ylläpitäjät päättävät, kuka saa tallentaa tietueita alakokoelmiin, muokata metadataa (tallennuksen jälkeen) ja lisätä (liittää) olemassa olevia tietueita muista kokoelmista (k.o. kokoelman käyttöoikeuksien puitteissa).",
 
-
   // "comcol-role.edit.submitters.name": "Submitters",
   "comcol-role.edit.submitters.name": "Tallentajat",
 
   // "comcol-role.edit.submitters.description": "The E-People and Groups that have permission to submit new items to this collection.",
   "comcol-role.edit.submitters.description": "Käyttäjät ja ryhmät, joilla on oikeus tallentaa uusia tietueita tähän kokoelmaan",
 
-
   // "comcol-role.edit.item_read.name": "Default item read access",
   "comcol-role.edit.item_read.name": "Tietueen oletuslukuoikeus",
 
@@ -1399,7 +1845,6 @@
   // "comcol-role.edit.item_read.anonymous-group": "Default read for incoming items is currently set to Anonymous.",
   "comcol-role.edit.item_read.anonymous-group": "Uusien tietuiden oletuslukuoikeus on tällä hetkellä Anonymous.",
 
-
   // "comcol-role.edit.bitstream_read.name": "Default bitstream read access",
   "comcol-role.edit.bitstream_read.name": "Tiedostojen oletuslukuoikeus",
 
@@ -1409,28 +1854,29 @@
   // "comcol-role.edit.bitstream_read.anonymous-group": "Default read for incoming bitstreams is currently set to Anonymous.",
   "comcol-role.edit.bitstream_read.anonymous-group": "Uusien tiedostojen oletuslukuoikeus on tällä hetkellä Anonymous.",
 
-
   // "comcol-role.edit.editor.name": "Editors",
   "comcol-role.edit.editor.name": "Muokkaajat",
 
   // "comcol-role.edit.editor.description": "Editors are able to edit the metadata of incoming submissions, and then accept or reject them.",
   "comcol-role.edit.editor.description": "Muokkaajat voivat muokata uusien tallennusten metadataa sekä hyväksyä tai hylätä tallennukset.",
 
-
   // "comcol-role.edit.finaleditor.name": "Final editors",
   "comcol-role.edit.finaleditor.name": "Loppumuokkaajat",
 
   // "comcol-role.edit.finaleditor.description": "Final editors are able to edit the metadata of incoming submissions, but will not be able to reject them.",
   "comcol-role.edit.finaleditor.description": "Loppumuokkaajat voivat muokata uusien tallennusten metadataa. He eivät voi hylätä tallennuksia.",
 
-
   // "comcol-role.edit.reviewer.name": "Reviewers",
   "comcol-role.edit.reviewer.name": "Tarkastajat",
 
   // "comcol-role.edit.reviewer.description": "Reviewers are able to accept or reject incoming submissions. However, they are not able to edit the submission's metadata.",
   "comcol-role.edit.reviewer.description": "Tarkastajat voivat hyväksyä tai hylätä uudet tallennukset. He eivät voi muokata tallennusten metadataa.",
 
+  // "comcol-role.edit.scorereviewers.name": "Score Reviewers",
+  "comcol-role.edit.scorereviewers.name": "Arvosanatarkastajat",
 
+  // "comcol-role.edit.scorereviewers.description": "Reviewers are able to give a score to incoming submissions, this will define whether the submission will be rejected or not.",
+  "comcol-role.edit.scorereviewers.description": "Tarkastajat voivat antaa tallennettaville julkaisuille arvosanan, joka määrittää, hylätäänkö vai hyväksytäänkö tallennus.",
 
   // "community.form.abstract": "Short Description",
   "community.form.abstract": "Lyhyt kuvaus",
@@ -1471,8 +1917,6 @@
   // "community.sub-community-list.head": "Communities of this Community",
   "community.sub-community-list.head": "Yhteisön alayhteisöt",
 
-
-
   // "cookies.consent.accept-all": "Accept all",
   "cookies.consent.accept-all": "Hyväksy kaikki",
 
@@ -1494,6 +1938,12 @@
   // "cookies.consent.app.required.title": "(always required)",
   "cookies.consent.app.required.title": "(aina pakollinen)",
 
+  // "cookies.consent.app.disable-all.description": "Use this switch to enable or disable all services.",
+  "cookies.consent.app.disable-all.description": "Tästä kytkimestä voit ottaa kaikki palvelut käyttöön tai poistaa ne käytöstä",
+
+  // "cookies.consent.app.disable-all.title": "Enable or disable all services",
+  "cookies.consent.app.disable-all.title": "Ota käyttöön tai poista käytöstä kaikki palvelut",
+
   // "cookies.consent.update": "There were changes since your last visit, please update your consent.",
   "cookies.consent.update": "Viime käyntisi jälkeen on tehty muutoksia. Ole hyvä ja päivitä suostumuksesi.",
 
@@ -1503,9 +1953,21 @@
   // "cookies.consent.decline": "Decline",
   "cookies.consent.decline": "Kieltäydy",
 
+  // "cookies.consent.ok": "That's ok",
+  "cookies.consent.ok": "OK",
+
+  // "cookies.consent.save": "Save",
+  "cookies.consent.save": "Tallenna",
+
+  // "cookies.consent.content-notice.title": "Cookie Consent",
+  "cookies.consent.content-notice.title": "Evästeiden hyväksyntä",
+
   // "cookies.consent.content-notice.description": "We collect and process your personal information for the following purposes: <strong>Authentication, Preferences, Acknowledgement and Statistics</strong>. <br/> To learn more, please read our {privacyPolicy}.",
   "cookies.consent.content-notice.description": "Keräämme ja käsittelemme tietojasi seuraaviin tarkoituksiin: <strong>todentaminen, asetukset, kuittaus ja tilastot</strong>. <br/> Lisätietoa saat lukemalla tämän: {privacyPolicy}.",
 
+  // "cookies.consent.content-notice.description.no-privacy": "We collect and process your personal information for the following purposes: <strong>Authentication, Preferences, Acknowledgement and Statistics</strong>.",
+  "cookies.consent.content-notice.description.no-privacy": "Keräämme ja käsittelemme tietojasi seuraaviin tarkoituksiin: <strong>todentaminen, asetukset, kuittaus ja tilastot</strong>.",
+
   // "cookies.consent.content-notice.learnMore": "Customize",
   "cookies.consent.content-notice.learnMore": "Räätälöi",
 
@@ -1521,7 +1983,11 @@
   // "cookies.consent.content-modal.title": "Information that we collect",
   "cookies.consent.content-modal.title": "Keräämämme tieto",
 
+  // "cookies.consent.content-modal.services": "services",
+  "cookies.consent.content-modal.services": "palvelut",
 
+  // "cookies.consent.content-modal.service": "service",
+  "cookies.consent.content-modal.service": "palvelu",
 
   // "cookies.consent.app.title.authentication": "Authentication",
   "cookies.consent.app.title.authentication": "Todentaminen",
@@ -1529,30 +1995,29 @@
   // "cookies.consent.app.description.authentication": "Required for signing you in",
   "cookies.consent.app.description.authentication": "Vaadittu kirjautumista varten",
 
-
   // "cookies.consent.app.title.preferences": "Preferences",
   "cookies.consent.app.title.preferences": "Asetukset",
 
   // "cookies.consent.app.description.preferences": "Required for saving your preferences",
   "cookies.consent.app.description.preferences": "Vaadittu asetustesi tallentamista varten",
 
-
-
   // "cookies.consent.app.title.acknowledgement": "Acknowledgement",
   "cookies.consent.app.title.acknowledgement": "Kuittaus",
 
   // "cookies.consent.app.description.acknowledgement": "Required for saving your acknowledgements and consents",
   "cookies.consent.app.description.acknowledgement": "Vaadittu kuittaustesi ja hyväksyntäsi tallentamista varten",
 
-
-
   // "cookies.consent.app.title.google-analytics": "Google Analytics",
   "cookies.consent.app.title.google-analytics": "Google Analytics",
 
   // "cookies.consent.app.description.google-analytics": "Allows us to track statistical data",
   "cookies.consent.app.description.google-analytics": "Sallii tilastollisen datan seurannan",
 
+  // "cookies.consent.app.title.google-recaptcha": "Google reCaptcha",
+  "cookies.consent.app.title.google-recaptcha": "Google reCaptcha",
 
+  // "cookies.consent.app.description.google-recaptcha": "We use google reCAPTCHA service during registration and password recovery",
+  "cookies.consent.app.description.google-recaptcha": "Käytämme Googlen reCAPTCHA-palvelua rekisteröinnin ja salasanan palauttamisen yhteydessä.",
 
   // "cookies.consent.purpose.functional": "Functional",
   "cookies.consent.purpose.functional": "Toiminnallinen",
@@ -1560,8 +2025,16 @@
   // "cookies.consent.purpose.statistical": "Statistical",
   "cookies.consent.purpose.statistical": "Tilastollinen",
 
+  // "cookies.consent.purpose.registration-password-recovery": "Registration and Password recovery",
+  "cookies.consent.purpose.registration-password-recovery": "Rekisteröinti ja salasanan palauttaminen",
 
-  // "curation-task.task.checklinks.label":  "Check Links in Metadata",
+  // "cookies.consent.purpose.sharing": "Sharing",
+  "cookies.consent.purpose.sharing": "Jakaminen",
+
+  // "curation-task.task.citationpage.label": "Generate Citation Page",
+  "curation-task.task.citationpage.label": "Luo viittaussivu",
+
+  // "curation-task.task.checklinks.label": "Check Links in Metadata",
   "curation-task.task.checklinks.label": "Tarkista metadatan linkit",
 
   // "curation-task.task.noop.label": "NOOP",
@@ -1579,7 +2052,8 @@
   // "curation-task.task.vscan.label": "Virus Scan",
   "curation-task.task.vscan.label": "Virusskannaus",
 
-
+  // "curation-task.task.register-doi.label": "Register DOI",
+  "curation-task.task.register-doi.label": "Rekisteröi DOI",
 
   // "curation.form.task-select.label": "Task:",
   "curation.form.task-select.label": "Tehtävä:",
@@ -1599,13 +2073,38 @@
   // "curation.form.submit.error.content": "An error occured when trying to start the curation task.",
   "curation.form.submit.error.content": "Virhe kuratointitehtävää aloitettaessa.",
 
+  // "curation.form.submit.error.invalid-handle": "Couldn't determine the handle for this object",
+  "curation.form.submit.error.invalid-handle": "Kohteen handlea ei voitu määrittää",
+
   // "curation.form.handle.label": "Handle:",
   "curation.form.handle.label": "Handle:",
 
   // "curation.form.handle.hint": "Hint: Enter [your-handle-prefix]/0 to run a task across entire site (not all tasks may support this capability)",
   "curation.form.handle.hint": "Vinkki: Syötä [oma-handle-prefix]/0 suorittaaksesi tehtävän koko sivustolla (kaikki tehtävät eivät tue tätä toimintoa)",
 
+  // "deny-request-copy.email.message": "Dear {{ recipientName }},\nIn response to your request I regret to inform you that it's not possible to send you a copy of the file(s) you have requested, concerning the document: \"{{ itemUrl }}\" ({{ itemName }}), of which I am an author.\n\nBest regards,\n{{ authorName }} <{{ authorEmail }}>",
+  "deny-request-copy.email.message": "Hyvä {{ recipientName }},\nValitettavasti emme voi lähettää kopiota pyytämistänne tiedostoista (dokumentti \"{{ itemUrl }}\" ({{ itemName }})), joiden tekijä olen. Ystävällisin terveisin \n{{ authorName }} <{{ authorEmail }}>",
 
+  // "deny-request-copy.email.subject": "Request copy of document",
+  "deny-request-copy.email.subject": "Dokumenttikopion pyyntö",
+
+  // "deny-request-copy.error": "An error occurred",
+  "deny-request-copy.error": "Tapahtui virhe",
+
+  // "deny-request-copy.header": "Deny document copy request",
+  "deny-request-copy.header": "Epää dokumenttikopion pyyntö",
+
+  // "deny-request-copy.intro": "This message will be sent to the applicant of the request",
+  "deny-request-copy.intro": "Tämä viesti lähetetään pyynnön esittäjälle",
+
+  // "deny-request-copy.success": "Successfully denied item request",
+  "deny-request-copy.success": "Tietuepyyntö evätty",
+
+  // "dso.name.untitled": "Untitled",
+  "dso.name.untitled": "Nimetön",
+
+  // "dso.name.unnamed": "Unnamed",
+  "dso.name.unnamed": "Nimeämätön",
 
   // "dso-selector.create.collection.head": "New collection",
   "dso-selector.create.collection.head": "Uusi kokoelma",
@@ -1616,6 +2115,9 @@
   // "dso-selector.create.community.head": "New community",
   "zxzcommunity.head": "Uusi yhteisö",
 
+  // "dso-selector.create.community.or-divider": "or",
+  "dso-selector.create.community.or-divider": "tai",
+
   // "dso-selector.create.community.sub-level": "Create a new community in",
   "dso-selector.create.community.sub-level": "Luo uusi yhteisö tänne: ",
 
@@ -1640,16 +2142,92 @@
   // "dso-selector.edit.item.head": "Edit item",
   "dso-selector.edit.item.head": "Muokkaa tietuetta",
 
+  // "dso-selector.error.title": "An error occurred searching for a {{ type }}",
+  "dso-selector.error.title": "Virhe etsittäessä tyyppiä {{ type }}",
+
   // "dso-selector.export-metadata.dspaceobject.head": "Export metadata from",
   "dso-selector.export-metadata.dspaceobject.head": "Eksportoi metadata täältä: ",
 
+  // "dso-selector.export-batch.dspaceobject.head": "Export Batch (ZIP) from",
+  "dso-selector.export-batch.dspaceobject.head": "Eksportoi erä (ZIP): ",
+
+  // "dso-selector.import-batch.dspaceobject.head": "Import batch from",
+  "dso-selector.import-batch.dspaceobject.head": "Importoi erä: ",
+
   // "dso-selector.no-results": "No {{ type }} found",
   "dso-selector.no-results": "Ei {{ type }}-tyyppiä.",
 
   // "dso-selector.placeholder": "Search for a {{ type }}",
   "dso-selector.placeholder": "Hae {{ type }}-tyyppiä",
 
+  // "dso-selector.select.collection.head": "Select a collection",
+  "dso-selector.select.collection.head": "Valitse kokoelma",
 
+  // "dso-selector.set-scope.community.head": "Select a search scope",
+  "dso-selector.set-scope.community.head": "Valitse hakualue",
+
+  // "dso-selector.set-scope.community.button": "Search all of DSpace",
+  "dso-selector.set-scope.community.button": "Hae koko julkaisuarkistosta",
+
+  // "dso-selector.set-scope.community.or-divider": "or",
+  "dso-selector.set-scope.community.or-divider": "tai",
+
+  // "dso-selector.set-scope.community.input-header": "Search for a community or collection",
+  "dso-selector.set-scope.community.input-header": "Hae yhteisöä tai kokoelmaa",
+
+  // "dso-selector.claim.item.head": "Profile tips",
+  "dso-selector.claim.item.head": "Profiilivinkkejä",
+
+  // "dso-selector.claim.item.body": "These are existing profiles that may be related to you. If you recognize yourself in one of these profiles, select it and on the detail page, among the options, choose to claim it. Otherwise you can create a new profile from scratch using the button below.",
+  "dso-selector.claim.item.body": "Nämä ovat olemassa olevia profiileja, jotka saattavat liittyä sinuun. Jos tunnistat jonkin näistä profiileista omaksesi, valitse se ja valitse tarkentavan sivun vaihtoehdoista, että otat sen itsellesi. Muussa tapauksessa voit luoda uuden profiilin käyttämällä alla olevaa painiketta.",
+
+  // "dso-selector.claim.item.not-mine-label": "None of these are mine",
+  "dso-selector.claim.item.not-mine-label": "Mikään näistä ei ole minun",
+
+  // "dso-selector.claim.item.create-from-scratch": "Create a new one",
+  "dso-selector.claim.item.create-from-scratch": "Luo uusi",
+
+  // "dso-selector.results-could-not-be-retrieved": "Something went wrong, please refresh again ↻",
+  "dso-selector.results-could-not-be-retrieved": "Tapahtui virhe, päivitä uudelleen ↻",
+
+  // "supervision-group-selector.header": "Supervision Group Selector",
+  "supervision-group-selector.header": "Ohjausryhmän valitsin",
+
+  // "supervision-group-selector.select.type-of-order.label": "Select a type of Order",
+  "supervision-group-selector.select.type-of-order.label": "Valitse tilauksen tyyppi",
+
+  // "supervision-group-selector.select.type-of-order.option.none": "NONE",
+  "supervision-group-selector.select.type-of-order.option.none": "EI MITÄÄN",
+
+  // "supervision-group-selector.select.type-of-order.option.editor": "EDITOR",
+  "supervision-group-selector.select.type-of-order.option.editor": "MUOKKAAJA",
+
+  // "supervision-group-selector.select.type-of-order.option.observer": "OBSERVER",
+  "supervision-group-selector.select.type-of-order.option.observer": "KATSELIJA",
+
+  // "supervision-group-selector.select.group.label": "Select a Group",
+  "supervision-group-selector.select.group.label": "Valitse ryhmä",
+
+  // "supervision-group-selector.button.cancel": "Cancel",
+  "supervision-group-selector.button.cancel": "Peruuta",
+
+  // "supervision-group-selector.button.save": "Save",
+  "supervision-group-selector.button.save": "Tallenna",
+
+  // "supervision-group-selector.select.type-of-order.error": "Please select a type of order",
+  "supervision-group-selector.select.type-of-order.error": "Valitse tilauksen tyyppi",
+
+  // "supervision-group-selector.select.group.error": "Please select a group",
+  "supervision-group-selector.select.group.error": "Valitse ryhmä",
+
+  // "supervision-group-selector.notification.create.success.title": "Successfully created supervision order for group {{ name }}",
+  "supervision-group-selector.notification.create.success.title": "Ohjausmääräys luotu {{ name }}-ryhmälle",
+
+  // "supervision-group-selector.notification.create.failure.title": "Error",
+  "supervision-group-selector.notification.create.failure.title": "Virhe",
+
+  // "supervision-group-selector.notification.create.already-existing": "A supervision order already exists on this item for selected group",
+  "supervision-group-selector.notification.create.already-existing": "Tietueelle on jo ohjausmääräys valitulle ryhmälle",
 
   // "confirmation-modal.export-metadata.header": "Export metadata for {{ dsoName }}",
   "confirmation-modal.export-metadata.header": "Eksportoi {{ dsoName }}:n metadata",
@@ -1663,11 +2241,23 @@
   // "confirmation-modal.export-metadata.confirm": "Export",
   "confirmation-modal.export-metadata.confirm": "Eksportoi",
 
+  // "confirmation-modal.export-batch.header": "Export batch (ZIP) for {{ dsoName }}",
+  "confirmation-modal.export-batch.header": "Exportoi erä (ZIP) {{ dsoName }}",
+
+  // "confirmation-modal.export-batch.info": "Are you sure you want to export batch (ZIP) for {{ dsoName }}",
+  "confirmation-modal.export-batch.info": "Haluatko varmasti eksportoida erän (ZIP)  {{ dsoName }}?",
+
+  // "confirmation-modal.export-batch.cancel": "Cancel",
+  "confirmation-modal.export-batch.cancel": "Peruuta",
+
+  // "confirmation-modal.export-batch.confirm": "Export",
+  "confirmation-modal.export-batch.confirm": "Eksportoi",
+
   // "confirmation-modal.delete-eperson.header": "Delete EPerson \"{{ dsoName }}\"",
   "confirmation-modal.delete-eperson.header": "Poista käyttäjä \"{{ dsoName }}\"",
 
   // "confirmation-modal.delete-eperson.info": "Are you sure you want to delete EPerson \"{{ dsoName }}\"",
-  "confirmation-modal.delete-eperson.info": "Haluatko varmasti poistaa käyttäjän \"{{ dsoName }}\"",
+  "confirmation-modal.delete-eperson.info": "Haluatko varmasti poistaa käyttäjän \"{{ dsoName }}\"?",
 
   // "confirmation-modal.delete-eperson.cancel": "Cancel",
   "confirmation-modal.delete-eperson.cancel": "Peruuta",
@@ -1675,6 +2265,29 @@
   // "confirmation-modal.delete-eperson.confirm": "Delete",
   "confirmation-modal.delete-eperson.confirm": "Poista",
 
+  // "confirmation-modal.delete-profile.header": "Delete Profile",
+  "confirmation-modal.delete-profile.header": "Poista profiili",
+
+  // "confirmation-modal.delete-profile.info": "Are you sure you want to delete your profile",
+  "confirmation-modal.delete-profile.info": "Haluatko varmasti poistaa profiilisi?",
+
+  // "confirmation-modal.delete-profile.cancel": "Cancel",
+  "confirmation-modal.delete-profile.cancel": "Peruuta",
+
+  // "confirmation-modal.delete-profile.confirm": "Delete",
+  "confirmation-modal.delete-profile.confirm": "Poista",
+
+  // "confirmation-modal.delete-subscription.header": "Delete Subscription",
+  "confirmation-modal.delete-subscription.header": "Poista tilaus",
+
+  // "confirmation-modal.delete-subscription.info": "Are you sure you want to delete subscription for \"{{ dsoName }}\"",
+  "confirmation-modal.delete-subscription.info": "Haluatko varmasti poistaa tilauksen: \"{{ dsoName }}\"",
+
+  // "confirmation-modal.delete-subscription.cancel": "Cancel",
+  "confirmation-modal.delete-subscription.cancel": "Peruuta",
+
+  // "confirmation-modal.delete-subscription.confirm": "Delete",
+  "confirmation-modal.delete-subscription.confirm": "Poista",
 
   // "error.bitstream": "Error fetching bitstream",
   "error.bitstream": "Virhe tiedostoa noudettaessa",
@@ -1712,6 +2325,9 @@
   // "error.search-results": "Error fetching search results",
   "error.search-results": "Virhe hakutuloksia noudettaessa",
 
+  // "error.invalid-search-query": "Search query is not valid. Please check <a href=\"https://solr.apache.org/guide/query-syntax-and-parsing.html\" target=\"_blank\">Solr query syntax</a> best practices for further information about this error.",
+  "error.invalid-search-query": "Hakulauseke on virheellinen. Tarkista <a href=\"https://solr.apache.org/guide/query-syntax-and-parsing.html\" target=\"_blank\">Solr-kyselysyntaksi</a> ja sieltä parhaat käytännöt saadaksesi lisätietoja.",
+
   // "error.sub-collections": "Error fetching sub-collections",
   "error.sub-collections": "Virhe alakokoelmia noudettaessa",
 
@@ -1733,13 +2349,45 @@
   // "error.validation.filerequired": "The file upload is mandatory",
   "error.validation.filerequired": "Tiedoston lataus on pakollinen",
 
+  // "error.validation.required": "This field is required",
+  "error.validation.required": "Kenttä on pakollinen",
 
+  // "error.validation.NotValidEmail": "This E-mail is not a valid email",
+  "error.validation.NotValidEmail": "Sähköpostiosoite ei ole toimiva sähköpostiosoite.",
+
+  // "error.validation.emailTaken": "This E-mail is already taken",
+  "error.validation.emailTaken": "Sähköpostiosoite on jo käytössä",
+
+  // "error.validation.groupExists": "This group already exists",
+  "error.validation.groupExists": "Ryhmä on jo olemassa",
+
+  // "error.validation.metadata.name.invalid-pattern": "This field cannot contain dots, commas or spaces. Please use the Element & Qualifier fields instead",
+  "error.validation.metadata.name.invalid-pattern": "Kenttään ei voi syöttää pisteitä, pilkkuja tai välilyöntejä. Käytä tämän kentän sijasta  Elementti- ja Tarkenne-kenttiä.",
+
+  // "error.validation.metadata.name.max-length": "This field may not contain more than 32 characters",
+  "error.validation.metadata.name.max-length": "Kenttään voi laittaa vain 32 merkkiä",
+
+  // "error.validation.metadata.namespace.max-length": "This field may not contain more than 256 characters",
+  "error.validation.metadata.namespace.max-length": "Kenttään voi laittaa vain 256 merkkiä",
+
+  // "error.validation.metadata.element.invalid-pattern": "This field cannot contain dots, commas or spaces. Please use the Qualifier field instead",
+  "error.validation.metadata.element.invalid-pattern": "Kenttään ei voi syöttää pisteitä, pilkkuja tai välilyöntejä. Käytä tämän kentän sijasta Elementti- ja Tarkenne-kenttiä.",
+
+  // "error.validation.metadata.element.max-length": "This field may not contain more than 64 characters",
+  "error.validation.metadata.element.max-length": "Kenttään voi laittaa vain 64 merkkiä",
+
+  // "error.validation.metadata.qualifier.invalid-pattern": "This field cannot contain dots, commas or spaces",
+  "error.validation.metadata.qualifier.invalid-pattern": "Kenttään ei voi syöttää pisteitä, pilkkuja tai välilyöntejä",
+
+  // "error.validation.metadata.qualifier.max-length": "This field may not contain more than 64 characters",
+  "error.validation.metadata.qualifier.max-length": "Kenttään voi laittaa vain 64 merkkiä",
+
+  // "feed.description": "Syndication feed",
+  "feed.description": "Jakelusyöte",
 
   // "file-section.error.header": "Error obtaining files for this item",
   "file-section.error.header": "Virhe tietueen tiedostoja noudettaessa",
 
-
-
   // "footer.copyright": "copyright © 2002-{{ year }}",
   "footer.copyright": "tekijänoikeus © 2002-{{ year }}",
 
@@ -1755,16 +2403,17 @@
   // "footer.link.privacy-policy": "Privacy policy",
   "footer.link.privacy-policy": "Yksilönsuoja",
 
-  // "footer.link.end-user-agreement":"End User Agreement",
-  "footer.link.end-user-agreement": "Käyttöehdot",
-
+  // "footer.link.end-user-agreement": "End User Agreement",
+  "footer.link.end-user-agreement": "Käyttöoikeussopimus",
 
+  // "footer.link.feedback": "Send Feedback",
+  "footer.link.feedback": "Lähetä palautetta",
 
   // "forgot-email.form.header": "Forgot Password",
   "forgot-email.form.header": "Unohtunut salasana",
 
-  // "forgot-email.form.info": "Enter Register an account to subscribe to collections for email updates, and submit new items to DSpace.",
-  "forgot-email.form.info": "Rekisteröi käyttäjätili voidaksesi tilata sähköposti-ilmoituksia kokoelmien päivityksistä ja lisätä uusia tietueita julkaisuarkistoon.",
+  // "forgot-email.form.info": "Enter the email address associated with the account.",
+  "forgot-email.form.info": "Syötä tiliin liittyvä sähköpostiosoite.",
 
   // "forgot-email.form.email": "Email Address *",
   "forgot-email.form.email": "Sähköpostiosoite *",
@@ -1772,28 +2421,26 @@
   // "forgot-email.form.email.error.required": "Please fill in an email address",
   "forgot-email.form.email.error.required": "Anna sähköpostiosoite",
 
-  // "forgot-email.form.email.error.pattern": "Please fill in a valid email address",
-  "forgot-email.form.email.error.pattern": "Anna oikea sähköpostiosoite",
+  // "forgot-email.form.email.error.not-email-form": "Please fill in a valid email address",
+  "forgot-email.form.email.error.not-email-form": "Anna toimiva sähköpostiosoite",
 
-  // "forgot-email.form.email.hint": "This address will be verified and used as your login name.",
-  "forgot-email.form.email.hint": "Osoite varmistetaan, ja se toimii käyttäjätunnuksenasi kirjautumisessa.",
+  // "forgot-email.form.email.hint": "An email will be sent to this address with a further instructions.",
+  "forgot-email.form.email.hint": "Sähköpostiosoitteeseen lähetetään viesti, jossa on lisäohjeita.",
 
-  // "forgot-email.form.submit": "Submit",
-  "forgot-email.form.submit": "Lähetä",
+  // "forgot-email.form.submit": "Reset password",
+  "forgot-email.form.submit": "Nollaa salasana",
 
-  // "forgot-email.form.success.head": "Verification email sent",
-  "forgot-email.form.success.head": "Varmistusviesti lähetetty",
+  // "forgot-email.form.success.head": "Password reset email sent",
+  "forgot-email.form.success.head": "Salasanan nollausviesti lähetetty",
 
   // "forgot-email.form.success.content": "An email has been sent to {{ email }} containing a special URL and further instructions.",
   "forgot-email.form.success.content": "Viesti on lähetetty osoitteeseen {{ email }}. Viestissä on URL-osoite ja lisäohjeita.",
 
-  // "forgot-email.form.error.head": "Error when trying to register email",
-  "forgot-email.form.error.head": "Virhe sähköpostiosoitetta rekisteröitäessä",
-
-  // "forgot-email.form.error.content": "An error occured when registering the following email address: {{ email }}",
-  "forgot-email.form.error.content": "Virhe rekisteröitäessä tätä sähköpostiosoitetta: {{ email }}",
-
+  // "forgot-email.form.error.head": "Error when trying to reset password",
+  "forgot-email.form.error.head": "Virhe salasanaa nollattaessa",
 
+  // "forgot-email.form.error.content": "An error occured when attempting to reset the password for the account associated with the following email address: {{ email }}",
+  "forgot-email.form.error.content": "Virhe nollattaessa tähän sähköpostiosoitteeseen liittyvän tilin salasanaa {{ email }}",
 
   // "forgot-password.title": "Forgot Password",
   "forgot-password.title": "Unohtunut salasana",
@@ -1801,8 +2448,8 @@
   // "forgot-password.form.head": "Forgot Password",
   "forgot-password.form.head": "Unohtunut salasana",
 
-  // "forgot-password.form.info": "Enter a new password in the box below, and confirm it by typing it again into the second box. It should be at least six characters long.",
-  "forgot-password.form.info": "Syötä uusi salasana alla olevaan kenttään ja vahvista se kirjoittamalla salasana uudelleen seuraavaan kenttään. Salasanan on oltava vähintään kuusi merkkiä pitkä.",
+  // "forgot-password.form.info": "Enter a new password in the box below, and confirm it by typing it again into the second box.",
+  "forgot-password.form.info": "Syötä uusi salasana alla olevaan kenttään ja vahvista se kirjoittamalla salasana uudelleen seuraavaan kenttään.",
 
   // "forgot-password.form.card.security": "Security",
   "forgot-password.form.card.security": "Turvallisuus",
@@ -1825,9 +2472,6 @@
   // "forgot-password.form.error.matching-passwords": "The passwords do not match.",
   "forgot-password.form.error.matching-passwords": "Salasanat eivät täsmää.",
 
-  // "forgot-password.form.error.password-length": "The password should be at least 6 characters long.",
-  "forgot-password.form.error.password-length": "Salasanan on oltava vähintään 6 merkkiä pitkä.",
-
   // "forgot-password.form.notification.error.title": "Error when trying to submit new password",
   "forgot-password.form.notification.error.title": "Virhe uutta salasanaa lähetettäessä",
 
@@ -1840,10 +2484,8 @@
   // "forgot-password.form.submit": "Submit password",
   "forgot-password.form.submit": "Lähetä salasana",
 
-
-
-  // "form.add": "Add",
-  "form.add": "Lisää",
+  // "form.add": "Add more",
+  "form.add": "Lisää vielä",
 
   // "form.add-help": "Click here to add the current entry and to add another one",
   "form.add-help": "Valitse lisätäksesi nykyisen kohteen ja toisen kohteen",
@@ -1855,13 +2497,19 @@
   "form.clear": "Tyhjennä",
 
   // "form.clear-help": "Click here to remove the selected value",
-  "form.clear-help": "Napauta tästä poistaaksesi valitun arvon",
+  "form.clear-help": "Napsauta tästä poistaaksesi valitun arvon",
+
+  // "form.discard": "Discard",
+  "form.discard": "Hylkää",
+
+  // "form.drag": "Drag",
+  "form.drag": "Raahaa",
 
   // "form.edit": "Edit",
   "form.edit": "Muokkaa",
 
   // "form.edit-help": "Click here to edit the selected value",
-  "form.edit-help": "Napauta tästä muokataksesi valittua arvoa",
+  "form.edit-help": "Napsauta tästä muokataksesi valittua arvoa",
 
   // "form.first-name": "First name",
   "form.first-name": "Etunimi",
@@ -1896,6 +2544,24 @@
   // "form.no-value": "No value entered",
   "form.no-value": "Ei syötettyä arvoa",
 
+  // "form.other-information.email": "Email",
+  "form.other-information.email": "Sähköpostiosoite",
+
+  // "form.other-information.first-name": "First Name",
+  "form.other-information.first-name": "Etunimi",
+
+  // "form.other-information.insolr": "In Solr Index",
+  "form.other-information.insolr": "Solr-indeksissä",
+
+  // "form.other-information.institution": "Institution",
+  "form.other-information.institution": "Instituutio",
+
+  // "form.other-information.last-name": "Last Name",
+  "form.other-information.last-name": "Sukunimi",
+
+  // "form.other-information.orcid": "ORCID",
+  "form.other-information.orcid": "ORCID-tunniste",
+
   // "form.remove": "Remove",
   "form.remove": "Poista",
 
@@ -1911,10 +2577,134 @@
   // "form.search-help": "Click here to look for an existing correspondence",
   "form.search-help": "Valitse etsiäksesi olemassa olevaa vastaavuutta",
 
-  // "form.submit": "Submit",
-  "form.submit": "Lähetä",
+  // "form.submit": "Save",
+  "form.submit": "Tallenna",
 
+  // "form.create": "Create",
+  "form.create": "Luo",
 
+  // "form.repeatable.sort.tip": "Drop the item in the new position",
+  "form.repeatable.sort.tip": "Pudota tietue uuteen paikkaan",
+
+  // "grant-deny-request-copy.deny": "Don't send copy",
+  "grant-deny-request-copy.deny": "Älä lähetä kopiota",
+
+  // "grant-deny-request-copy.email.back": "Back",
+  "grant-deny-request-copy.email.back": "Paluu",
+
+  // "grant-deny-request-copy.email.message": "Optional additional message",
+  "grant-deny-request-copy.email.message": "Valinnainen lisäviesti",
+
+  // "grant-deny-request-copy.email.message.empty": "Please enter a message",
+  "grant-deny-request-copy.email.message.empty": "Kirjoita viesti",
+
+  // "grant-deny-request-copy.email.permissions.info": "You may use this occasion to reconsider the access restrictions on the document, to avoid having to respond to these requests. If you’d like to ask the repository administrators to remove these restrictions, please check the box below.",
+  "grant-deny-request-copy.email.permissions.info": "Voit harkita uudelleen dokumentin pääsyrajoituksia, jotta sinun ei tarvitse vastata näihin pyyntöihin. Rastita alla oleva ruutu pyytääksesi julkaisuarkiston ylläpitäjää poistamaan rajoitukset.",
+
+  // "grant-deny-request-copy.email.permissions.label": "Change to open access",
+  "grant-deny-request-copy.email.permissions.label": "Valitse Open Access",
+
+  // "grant-deny-request-copy.email.send": "Send",
+  "grant-deny-request-copy.email.send": "Lähetä",
+
+  // "grant-deny-request-copy.email.subject": "Subject",
+  "grant-deny-request-copy.email.subject": "Asiasana",
+
+  // "grant-deny-request-copy.email.subject.empty": "Please enter a subject",
+  "grant-deny-request-copy.email.subject.empty": "Syötä asiasana",
+
+  // "grant-deny-request-copy.grant": "Send copy",
+  "grant-deny-request-copy.grant": "Lähetä kopio",
+
+  // "grant-deny-request-copy.header": "Document copy request",
+  "grant-deny-request-copy.header": "Dokumenttikopion pyyntö",
+
+  // "grant-deny-request-copy.home-page": "Take me to the home page",
+  "grant-deny-request-copy.home-page": "Palaa etusivulle",
+
+  // "grant-deny-request-copy.intro1": "If you are one of the authors of the document <a href='{{ url }}'>{{ name }}</a>, then please use one of the options below to respond to the user's request.",
+  "grant-deny-request-copy.intro1": "Jos olet dokumentin <a href='{{ url }}'>{{ name }}</a> tekijä, vastaa käyttäjän pyyntöön jollakin alla olevista vaihtoehdoista.",
+
+  // "grant-deny-request-copy.intro2": "After choosing an option, you will be presented with a suggested email reply which you may edit.",
+  "grant-deny-request-copy.intro2": "Valittuasi vaihtoehdon näet sähköpostiviestiehdotuksen. Voit muokata ehdotusta halutessasi.",
+
+  // "grant-deny-request-copy.processed": "This request has already been processed. You can use the button below to get back to the home page.",
+  "grant-deny-request-copy.processed": "Pyyntö on käsitelty. Voit käyttää alla olevaa painiketta palataksesi etusivulle.",
+
+  // "grant-request-copy.email.subject": "Request copy of document",
+  "grant-request-copy.email.subject": "Pyydä kopiota dokumentista",
+
+  // "grant-request-copy.error": "An error occurred",
+  "grant-request-copy.error": "Tapahtui virhe",
+
+  // "grant-request-copy.header": "Grant document copy request",
+  "grant-request-copy.header": "Hyväksy dokumenttikopion pyyntö",
+
+  // "grant-request-copy.intro": "A message will be sent to the applicant of the request. The requested document(s) will be attached.",
+  "grant-request-copy.intro": "Viesti lähetetään pyynnön esittäjälle. Pyydetyt dokumentit liitetään viestiin.",
+
+  // "grant-request-copy.success": "Successfully granted item request",
+  "grant-request-copy.success": "Tietuepyyntö hyväksytty",
+
+  // "health.breadcrumbs": "Health",
+  "health.breadcrumbs": "Järjestelmän kunto",
+
+  // "health-page.heading": "Health",
+  "health-page.heading": "Järjestelmän kunto",
+
+  // "health-page.info-tab": "Info",
+  "health-page.info-tab": "Tiedot",
+
+  // "health-page.status-tab": "Status",
+  "health-page.status-tab": "Tila",
+
+  // "health-page.error.msg": "The health check service is temporarily unavailable",
+  "health-page.error.msg": "Järjestelmän kunnon tarkistus on väliaikaisesti poissa käytöstä",
+
+  // "health-page.property.status": "Status code",
+  "health-page.property.status": "Tilakoodi",
+
+  // "health-page.section.db.title": "Database",
+  "health-page.section.db.title": "Tietokanta",
+
+  // "health-page.section.geoIp.title": "GeoIp",
+  "health-page.section.geoIp.title": "GeoIp",
+
+  // "health-page.section.solrAuthorityCore.title": "Solr: authority core",
+  "health-page.section.solrAuthorityCore.title": "Solr: auktoriteettiydin",
+
+  // "health-page.section.solrOaiCore.title": "Solr: oai core",
+  "health-page.section.solrOaiCore.title": "Solr: OAI-ydin",
+
+  // "health-page.section.solrSearchCore.title": "Solr: search core",
+  "health-page.section.solrSearchCore.title": "Solr: hakuydin",
+
+  // "health-page.section.solrStatisticsCore.title": "Solr: statistics core",
+  "health-page.section.solrStatisticsCore.title": "Solr: tilastoydin",
+
+  // "health-page.section-info.app.title": "Application Backend",
+  "health-page.section-info.app.title": "Taustasovellus",
+
+  // "health-page.section-info.java.title": "Java",
+  "health-page.section-info.java.title": "Java",
+
+  // "health-page.status": "Status",
+  "health-page.status": "Tila",
+
+  // "health-page.status.ok.info": "Operational",
+  "health-page.status.ok.info": "Toiminnassa",
+
+  // "health-page.status.error.info": "Problems detected",
+  "health-page.status.error.info": "Ongelmia havaittu",
+
+  // "health-page.status.warning.info": "Possible issues detected",
+  "health-page.status.warning.info": "Mahdollisia ongelmia havaittu",
+
+  // "health-page.title": "Health",
+  "health-page.title": "Järjestelmän kunto",
+
+  // "health-page.section.no-issues": "No issues detected",
+  "health-page.section.no-issues": "Ei havaittuja ongelmia",
 
   // "home.description": "",
   "home.description": "",
@@ -1922,11 +2712,11 @@
   // "home.breadcrumbs": "Home",
   "home.breadcrumbs": "Etusivu",
 
-  //  "home.search-form.placeholder": "Search the repository ...",
+  // "home.search-form.placeholder": "Search the repository ...",
   "home.search-form.placeholder": "Hae julkaisuarkistosta ...",
 
-  // "home.title": "DSpace Angular :: Home",
-  "home.title": "DSpace Angular :: Etusivu",
+  // "home.title": "Home",
+  "home.title": "Etusivu",
 
   // "home.top-level-communities.head": "Communities in DSpace",
   "home.top-level-communities.head": "Julkaisuarkiston yhteisöt",
@@ -1934,19 +2724,17 @@
   // "home.top-level-communities.help": "Select a community to browse its collections.",
   "home.top-level-communities.help": "Valitse yhteisö, jonka kokoelmia haluat selata.",
 
-
-
   // "info.end-user-agreement.accept": "I have read and I agree to the End User Agreement",
-  "info.end-user-agreement.accept": "Olen lukenut ja hyväksyn käyttöehdot",
+  "info.end-user-agreement.accept": "Olen lukenut ja hyväksyn käyttöoikeussopimuksen",
 
   // "info.end-user-agreement.accept.error": "An error occurred accepting the End User Agreement",
-  "info.end-user-agreement.accept.error": "Virhe hyväksyttäessä käyttöehtoja",
+  "info.end-user-agreement.accept.error": "Virhe hyväksyttäessä käyttöoikeussopimusta",
 
   // "info.end-user-agreement.accept.success": "Successfully updated the End User Agreement",
-  "info.end-user-agreement.accept.success": "Käyttöehdot päivitetty",
+  "info.end-user-agreement.accept.success": "Käyttöoikeussopimus päivitetty",
 
   // "info.end-user-agreement.breadcrumbs": "End User Agreement",
-  "info.end-user-agreement.breadcrumbs": "Käyttöehdot",
+  "info.end-user-agreement.breadcrumbs": "Käyttöoikeussopimus",
 
   // "info.end-user-agreement.buttons.cancel": "Cancel",
   "info.end-user-agreement.buttons.cancel": "Peruuta",
@@ -1955,10 +2743,13 @@
   "info.end-user-agreement.buttons.save": "Tallenna",
 
   // "info.end-user-agreement.head": "End User Agreement",
-  "info.end-user-agreement.head": "Käyttöehdot",
+  "info.end-user-agreement.head": "Käyttöoikeussopimus",
 
   // "info.end-user-agreement.title": "End User Agreement",
-  "info.end-user-agreement.title": "Käyttöehdot",
+  "info.end-user-agreement.title": "Käyttöoikeussopimus",
+
+  // "info.end-user-agreement.hosting-country": "the United States",
+  "info.end-user-agreement.hosting-country": "Suomi",
 
   // "info.privacy.breadcrumbs": "Privacy Statement",
   "info.privacy.breadcrumbs": "Tietosuojalauseke",
@@ -1969,39 +2760,68 @@
   // "info.privacy.title": "Privacy Statement",
   "info.privacy.title": "Tietosuojalauseke",
 
+  // "info.feedback.breadcrumbs": "Feedback",
+  "info.feedback.breadcrumbs": "Palaute",
 
+  // "info.feedback.head": "Feedback",
+  "info.feedback.head": "Palaute",
 
-  // "item.alerts.private": "This item is private",
+  // "info.feedback.title": "Feedback",
+  "info.feedback.title": "Palaute",
+
+  // "info.feedback.info": "Thanks for sharing your feedback about the DSpace system. Your comments are appreciated!",
+  "info.feedback.info": "Kiitos antamastasi palautteesta. Havaintosi ovat arvokkaita!",
+
+  // "info.feedback.email_help": "This address will be used to follow up on your feedback.",
+  "info.feedback.email_help": "Tätä osoitetta käytetään palautteesi käsittelyssä.",
+
+  // "info.feedback.send": "Send Feedback",
+  "info.feedback.send": "Lähetä palautetta",
+
+  // "info.feedback.comments": "Comments",
+  "info.feedback.comments": "Kommentit",
+
+  // "info.feedback.email-label": "Your Email",
+  "info.feedback.email-label": "Sähköpostiosoitteesi",
+
+  // "info.feedback.create.success": "Feedback Sent Successfully!",
+  "info.feedback.create.success": "Palaute lähetetty!",
+
+  // "info.feedback.error.email.required": "A valid email address is required",
+  "info.feedback.error.email.required": "Toimiva sähköpostiosoite on pakollinen",
+
+  // "info.feedback.error.message.required": "A comment is required",
+  "info.feedback.error.message.required": "Kommentti on pakollinen",
+
+  // "info.feedback.page-label": "Page",
+  "info.feedback.page-label": "Sivu",
+
+  // "info.feedback.page_help": "Tha page related to your feedback",
+  "info.feedback.page_help": "Sivu, johon palautteesi kohdistuu",
+
+  // "item.alerts.private": "This item is non-discoverable",
   "item.alerts.private": "Tietue on yksityinen",
 
   // "item.alerts.withdrawn": "This item has been withdrawn",
   "item.alerts.withdrawn": "Tietue on poistettu käytöstä",
 
-
-
   // "item.edit.authorizations.heading": "With this editor you can view and alter the policies of an item, plus alter policies of individual item components: bundles and bitstreams. Briefly, an item is a container of bundles, and bundles are containers of bitstreams. Containers usually have ADD/REMOVE/READ/WRITE policies, while bitstreams only have READ/WRITE policies.",
   "item.edit.authorizations.heading": "Tässä voit tarkastella ja muokata tietuekäytäntöjä sekä tietueen yksittäisten komponenttien eli nippujen ja tiedostojen käytäntöjä. Tietue on nippujen säiliö ja niput ovat tiedostojen säiliöitä. Säiliöillä on yleensä LISÄYS/POISTO/LUKU/KIRJOITUS-käytännöt, mutta tiedostoihin sovelletaan vain LUKU/KIRJOITUS-käytäntöjä.",
 
-
-
   // "item.edit.authorizations.title": "Edit item's Policies",
   "item.edit.authorizations.title": "Muokkaa tietuekäytäntöjä",
 
-
-
-  // "item.badge.private": "Private",
+  // "item.badge.private": "Non-discoverable",
   "item.badge.private": "Yksityinen",
 
   // "item.badge.withdrawn": "Withdrawn",
   "item.badge.withdrawn": "Poistettu käytöstä",
 
-
-
   // "item.bitstreams.upload.bundle": "Bundle",
   "item.bitstreams.upload.bundle": "Nippu",
 
-  // "item.bitstreams.upload.bundle.placeholder": "Select a bundle",
-  "item.bitstreams.upload.bundle.placeholder": "Valitse nippu",
+  // "item.bitstreams.upload.bundle.placeholder": "Select a bundle or input new bundle name",
+  "item.bitstreams.upload.bundle.placeholder": "Valitse nippu tai syötä uuden nipun nimi",
 
   // "item.bitstreams.upload.bundle.new": "Create bundle",
   "item.bitstreams.upload.bundle.new": "Luo nippu",
@@ -2030,8 +2850,6 @@
   // "item.bitstreams.upload.title": "Upload bitstream",
   "item.bitstreams.upload.title": "Lataa tiedosto",
 
-
-
   // "item.edit.bitstreams.bundle.edit.buttons.upload": "Upload",
   "item.edit.bitstreams.bundle.edit.buttons.upload": "Lataus",
 
@@ -2063,7 +2881,7 @@
   "item.edit.bitstreams.edit.buttons.remove": "Poista",
 
   // "item.edit.bitstreams.edit.buttons.undo": "Undo changes",
-  "item.edit.bitstreams.edit.buttons.undo": "Peruuta muutokset",
+  "item.edit.bitstreams.edit.buttons.undo": "Kumoa muutokset",
 
   // "item.edit.bitstreams.empty": "This item doesn't contain any bitstreams. Click the upload button to create one.",
   "item.edit.bitstreams.empty": "Tietueeseen ei liity tiedostoja. Valitse latauspainike luodaksesi tiedoston.",
@@ -2122,8 +2940,6 @@
   // "item.edit.bitstreams.upload-button": "Upload",
   "item.edit.bitstreams.upload-button": "Lataa",
 
-
-
   // "item.edit.delete.cancel": "Cancel",
   "item.edit.delete.cancel": "Peruuta",
 
@@ -2148,6 +2964,8 @@
   // "item.edit.breadcrumbs": "Edit Item",
   "item.edit.breadcrumbs": "Muokkaa tietuetta",
 
+  // "item.edit.tabs.disabled.tooltip": "You're not authorized to access this tab",
+  "item.edit.tabs.disabled.tooltip": "Sinulla ei ole valtuuksia tähän välilehteen",
 
   // "item.edit.tabs.mapper.head": "Collection Mapper",
   "item.edit.tabs.mapper.head": "Kokoelmaliitosväline",
@@ -2155,6 +2973,69 @@
   // "item.edit.tabs.item-mapper.title": "Item Edit - Collection Mapper",
   "item.edit.tabs.item-mapper.title": "Tietueen muokkaus - Kokoelmaliitosväline",
 
+  // "item.edit.identifiers.doi.status.UNKNOWN": "Unknown",
+  "item.edit.identifiers.doi.status.UNKNOWN": "Tuntematon",
+
+  // "item.edit.identifiers.doi.status.TO_BE_REGISTERED": "Queued for registration",
+  "item.edit.identifiers.doi.status.TO_BE_REGISTERED": "Rekisteröintijonossa",
+
+  // "item.edit.identifiers.doi.status.TO_BE_RESERVED": "Queued for reservation",
+  "item.edit.identifiers.doi.status.TO_BE_RESERVED": "Varausjonossa",
+
+  // "item.edit.identifiers.doi.status.IS_REGISTERED": "Registered",
+  "item.edit.identifiers.doi.status.IS_REGISTERED": "Rekisteröity",
+
+  // "item.edit.identifiers.doi.status.IS_RESERVED": "Reserved",
+  "item.edit.identifiers.doi.status.IS_RESERVED": "Varattu",
+
+  // "item.edit.identifiers.doi.status.UPDATE_RESERVED": "Reserved (update queued)",
+  "item.edit.identifiers.doi.status.UPDATE_RESERVED": "Varattu (päivitysjonossa)",
+
+  // "item.edit.identifiers.doi.status.UPDATE_REGISTERED": "Registered (update queued)",
+  "item.edit.identifiers.doi.status.UPDATE_REGISTERED": "Rekisteröity (päivitysjonossa)",
+
+  // "item.edit.identifiers.doi.status.UPDATE_BEFORE_REGISTRATION": "Queued for update and registration",
+  "item.edit.identifiers.doi.status.UPDATE_BEFORE_REGISTRATION": "Päivitys- ja rekisteröintijonossa",
+
+  // "item.edit.identifiers.doi.status.TO_BE_DELETED": "Queued for deletion",
+  "item.edit.identifiers.doi.status.TO_BE_DELETED": "Poistojonossa",
+
+  // "item.edit.identifiers.doi.status.DELETED": "Deleted",
+  "item.edit.identifiers.doi.status.DELETED": "Poistettu",
+
+  // "item.edit.identifiers.doi.status.PENDING": "Pending (not registered)",
+  "item.edit.identifiers.doi.status.PENDING": "Vireillä (ei rekisteröity)",
+
+  // "item.edit.identifiers.doi.status.MINTED": "Minted (not registered)",
+  "item.edit.identifiers.doi.status.MINTED": "Luotu (ei rekisteröity)",
+
+  // "item.edit.tabs.status.buttons.register-doi.label": "Register a new or pending DOI",
+  "item.edit.tabs.status.buttons.register-doi.label": "Rekisteröi uusi tai vireillä oleva DOI",
+
+  // "item.edit.tabs.status.buttons.register-doi.button": "Register DOI...",
+  "item.edit.tabs.status.buttons.register-doi.button": "Rekisteröi DOI...",
+
+  // "item.edit.register-doi.header": "Register a new or pending DOI",
+  "item.edit.register-doi.header": "Rekisteröi uusi tai vireillä oleva DOI",
+
+  // "item.edit.register-doi.description": "Review any pending identifiers and item metadata below and click Confirm to proceed with DOI registration, or Cancel to back out",
+  "item.edit.register-doi.description": "Tarkasta vireillä olevat tunnisteet ja tietueitten metadata alapuolella. Napsauta Vahvista jatkaaksesi DOI-tunnuksen rekisteröintiä tai Peruuta peruuttaaksesi.",
+
+  // "item.edit.register-doi.confirm": "Confirm",
+  "item.edit.register-doi.confirm": "Vahvista",
+
+  // "item.edit.register-doi.cancel": "Cancel",
+  "item.edit.register-doi.cancel": "Peruuta",
+
+  // "item.edit.register-doi.success": "DOI queued for registration successfully.",
+  "item.edit.register-doi.success": "DOI lisätty rekisteröintijonoon.",
+
+  // "item.edit.register-doi.error": "Error registering DOI",
+  "item.edit.register-doi.error": "Virhe rekisteröitäessä DOI-tunnusta",
+
+  // "item.edit.register-doi.to-update": "The following DOI has already been minted and will be queued for registration online",
+  "item.edit.register-doi.to-update": "DOI on jo luotu ja lisätään rekisteröintijonoon verkossa",
+
   // "item.edit.item-mapper.buttons.add": "Map item to selected collections",
   "item.edit.item-mapper.buttons.add": "Liitä tietue valittuihin kokoelmiin",
 
@@ -2200,20 +3081,27 @@
   // "item.edit.item-mapper.notifications.remove.success.head": "Removal of mapping completed",
   "item.edit.item-mapper.notifications.remove.success.head": "Liitos poistettu",
 
+  // "item.edit.item-mapper.search-form.placeholder": "Search collections...",
+  "item.edit.item-mapper.search-form.placeholder": "Hae kokoelmia...",
+
   // "item.edit.item-mapper.tabs.browse": "Browse mapped collections",
   "item.edit.item-mapper.tabs.browse": "Selaa liitettyjä kokoelmia",
 
   // "item.edit.item-mapper.tabs.map": "Map new collections",
   "item.edit.item-mapper.tabs.map": "Liitä uusia kokoelmia",
 
-
-
   // "item.edit.metadata.add-button": "Add",
   "item.edit.metadata.add-button": "Lisää",
 
   // "item.edit.metadata.discard-button": "Discard",
   "item.edit.metadata.discard-button": "Hylkää",
 
+  // "item.edit.metadata.edit.buttons.confirm": "Confirm",
+  "item.edit.metadata.edit.buttons.confirm": "Vahvista",
+
+  // "item.edit.metadata.edit.buttons.drag": "Drag to reorder",
+  "item.edit.metadata.edit.buttons.drag": "Raahaa uudelleenjärjestääksesi",
+
   // "item.edit.metadata.edit.buttons.edit": "Edit",
   "item.edit.metadata.edit.buttons.edit": "Muokkaa",
 
@@ -2226,6 +3114,9 @@
   // "item.edit.metadata.edit.buttons.unedit": "Stop editing",
   "item.edit.metadata.edit.buttons.unedit": "Lopeta muokkaus",
 
+  // "item.edit.metadata.edit.buttons.virtual": "This is a virtual metadata value, i.e. a value inherited from a related entity. It can’t be modified directly. Add or remove the corresponding relationship in the \"Relationships\" tab",
+  "item.edit.metadata.edit.buttons.virtual": "Tämä on virtuaalinen metadata-arvo eli arvo, joka on peritty liittyvältä entiteetiltä. Sitä ei voi muokata suoraan. Lisää tai poista yhteys \"Suhteet\"-välilehdellä,",
+
   // "item.edit.metadata.empty": "The item currently doesn't contain any metadata. Click Add to start adding a metadata value.",
   "item.edit.metadata.empty": "Tietueessa ei ole metadataa. Valitse Lisää lisätäksesi metadataa.",
 
@@ -2241,13 +3132,16 @@
   // "item.edit.metadata.headers.value": "Value",
   "item.edit.metadata.headers.value": "Arvo",
 
+  // "item.edit.metadata.metadatafield.error": "An error occurred validating the metadata field",
+  "item.edit.metadata.metadatafield.error": "Virhe validoitaessa metadatakenttää",
+
   // "item.edit.metadata.metadatafield.invalid": "Please choose a valid metadata field",
   "item.edit.metadata.metadatafield.invalid": "Valitse oikea metadatakenttä",
 
   // "item.edit.metadata.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button",
   "item.edit.metadata.notifications.discarded.content": "Muutokset hylätty. Valitse 'Kumoa' palauttaaksesi muutokset",
 
-  // "item.edit.metadata.notifications.discarded.title": "Changed discarded",
+  // "item.edit.metadata.notifications.discarded.title": "Changes discarded",
   "item.edit.metadata.notifications.discarded.title": "Muutokset hylätty",
 
   // "item.edit.metadata.notifications.error.title": "An error occurred",
@@ -2262,7 +3156,7 @@
   // "item.edit.metadata.notifications.outdated.content": "The item you're currently working on has been changed by another user. Your current changes are discarded to prevent conflicts",
   "item.edit.metadata.notifications.outdated.content": "Toinen käyttäjä on muuttanut parhaillaan muokkaamaasi tietuetta. Tekemäsi muutokset on hylätty ristiriitojen estämiseksi",
 
-  // "item.edit.metadata.notifications.outdated.title": "Changed outdated",
+  // "item.edit.metadata.notifications.outdated.title": "Changes outdated",
   "item.edit.metadata.notifications.outdated.title": "Muutokset vanhentuneet",
 
   // "item.edit.metadata.notifications.saved.content": "Your changes to this item's metadata were saved.",
@@ -2272,13 +3166,14 @@
   "item.edit.metadata.notifications.saved.title": "Metadata tallennettu",
 
   // "item.edit.metadata.reinstate-button": "Undo",
-  "item.edit.metadata.reinstate-button": "Peruuta",
+  "item.edit.metadata.reinstate-button": "Kumoa",
+
+  // "item.edit.metadata.reset-order-button": "Undo reorder",
+  "item.edit.metadata.reset-order-button": "Kumoa uudelleenjärjestäminen",
 
   // "item.edit.metadata.save-button": "Save",
   "item.edit.metadata.save-button": "Tallenna",
 
-
-
   // "item.edit.modify.overview.field": "Field",
   "item.edit.modify.overview.field": "Kenttä",
 
@@ -2288,10 +3183,14 @@
   // "item.edit.modify.overview.value": "Value",
   "item.edit.modify.overview.value": "Arvo",
 
+  // "item.edit.move.cancel": "Back",
+  "item.edit.move.cancel": "Paluu",
 
+  // "item.edit.move.save-button": "Save",
+  "item.edit.move.save-button": "Tallenna",
 
-  // "item.edit.move.cancel": "Cancel",
-  "item.edit.move.cancel": "Peruuta",
+  // "item.edit.move.discard-button": "Discard",
+  "item.edit.move.discard-button": "Hylkää",
 
   // "item.edit.move.description": "Select the collection you wish to move this item to. To narrow down the list of displayed collections, you can enter a search query in the box.",
   "item.edit.move.description": "Valitse kokoelma, johon haluat siirtää tietueen. Voit antaa hakulausekkeen kokoelmien määrän pienentämiseksi.",
@@ -2323,48 +3222,42 @@
   // "item.edit.move.title": "Move item",
   "item.edit.move.title": "Siirrä tietue",
 
-
-
   // "item.edit.private.cancel": "Cancel",
   "item.edit.private.cancel": "Peruuta",
 
-  // "item.edit.private.confirm": "Make it Private",
+  // "item.edit.private.confirm": "Make it non-discoverable",
   "item.edit.private.confirm": "Muuta yksityiseksi",
 
-  // "item.edit.private.description": "Are you sure this item should be made private in the archive?",
-  "item.edit.private.description": "Haluatko varmasti muuttaa tietueen yksityiseksi?",
+  // "item.edit.private.description": "Are you sure this item should be made non-discoverable in the archive?",
+  "item.edit.private.description": "Haluatko varmasti muuttaa tietueen yksityiseksi? Yksityinen tietue ei löydy haettaessa.",
 
-  // "item.edit.private.error": "An error occurred while making the item private",
+  // "item.edit.private.error": "An error occurred while making the item non-discoverable",
   "item.edit.private.error": "Virhe muutettaessa tietuetta yksityiseksi",
 
-  // "item.edit.private.header": "Make item private: {{ id }}",
-  "item.edit.private.header": "Muuta yksityiseksi tietue: {{ id }}",
+  // "item.edit.private.header": "Make item non-discoverable: {{ id }}",
+  "item.edit.private.header": "Muuta tietue yksityiseksi: {{ id }}",
 
-  // "item.edit.private.success": "The item is now private",
+  // "item.edit.private.success": "The item is now non-discoverable",
   "item.edit.private.success": "Tietue on yksityinen",
 
-
-
   // "item.edit.public.cancel": "Cancel",
   "item.edit.public.cancel": "Peruuta",
 
-  // "item.edit.public.confirm": "Make it Public",
+  // "item.edit.public.confirm": "Make it discoverable",
   "item.edit.public.confirm": "Muuta julkiseksi",
 
-  // "item.edit.public.description": "Are you sure this item should be made public in the archive?",
-  "item.edit.public.description": "Haluatko varmasti muuttaa tietueen julkiseksi?",
+  // "item.edit.public.description": "Are you sure this item should be made discoverable in the archive?",
+  "item.edit.public.description": "Haluatko varmasti muuttaa tietueen julkiseksi? Julkinen tietue löytyy haettaessa.",
 
-  // "item.edit.public.error": "An error occurred while making the item public",
+  // "item.edit.public.error": "An error occurred while making the item discoverable",
   "item.edit.public.error": "Virhe muutettaessa tietuetta julkiseksi",
 
-  // "item.edit.public.header": "Make item public: {{ id }}",
-  "item.edit.public.header": "Muuta julkiseksi tietue: {{ id }}",
+  // "item.edit.public.header": "Make item discoverable: {{ id }}",
+  "item.edit.public.header": "Muuta tietue julkiseksi: {{ id }}",
 
-  // "item.edit.public.success": "The item is now public",
+  // "item.edit.public.success": "The item is now discoverable",
   "item.edit.public.success": "Tietue on julkinen",
 
-
-
   // "item.edit.reinstate.cancel": "Cancel",
   "item.edit.reinstate.cancel": "Peruuta",
 
@@ -2383,8 +3276,6 @@
   // "item.edit.reinstate.success": "The item was reinstated successfully",
   "item.edit.reinstate.success": "Tietue palautettu käyttöön",
 
-
-
   // "item.edit.relationships.discard-button": "Discard",
   "item.edit.relationships.discard-button": "Hylkää",
 
@@ -2395,13 +3286,13 @@
   "item.edit.relationships.edit.buttons.remove": "Poista",
 
   // "item.edit.relationships.edit.buttons.undo": "Undo changes",
-  "item.edit.relationships.edit.buttons.undo": "Peruuta muutokset",
+  "item.edit.relationships.edit.buttons.undo": "Kumoa muutokset",
 
   // "item.edit.relationships.no-relationships": "No relationships",
   "item.edit.relationships.no-relationships": "Ei yhteyksiä",
 
   // "item.edit.relationships.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button",
-  "item.edit.relationships.notifications.discarded.content": "Muutoksesi hylättiin. Valitse 'Peruuta' palauttaaksesi ne.",
+  "item.edit.relationships.notifications.discarded.content": "Muutoksesi hylättiin. Valitse 'Kumoa' palauttaaksesi ne.",
 
   // "item.edit.relationships.notifications.discarded.title": "Changes discarded",
   "item.edit.relationships.notifications.discarded.title": "Muutokset hylätty",
@@ -2422,7 +3313,7 @@
   "item.edit.relationships.notifications.saved.title": "Yhteydet tallennettu",
 
   // "item.edit.relationships.reinstate-button": "Undo",
-  "item.edit.relationships.reinstate-button": "Peruuta",
+  "item.edit.relationships.reinstate-button": "Kumoa",
 
   // "item.edit.relationships.save-button": "Save",
   "item.edit.relationships.save-button": "Tallenna",
@@ -2430,6 +3321,9 @@
   // "item.edit.relationships.no-entity-type": "Add 'dspace.entity.type' metadata to enable relationships for this item",
   "item.edit.relationships.no-entity-type": "Lisää 'dspace.entity.type' -metadataa aktivoidaksesi yhteydet tietueessa",
 
+  // "item.edit.return": "Back",
+  "item.edit.return": "Paluu",
+
   // "item.edit.tabs.bitstreams.head": "Bitstreams",
   "item.edit.tabs.bitstreams.head": "Tietueen tiedostot",
 
@@ -2442,6 +3336,9 @@
   // "item.edit.tabs.curate.title": "Item Edit - Curate",
   "item.edit.tabs.curate.title": "Tietueen muokkaus - Kuratointi",
 
+  // "item.edit.curate.title": "Curate Item: {{item}}",
+  "item.edit.curate.title": "Kuratoi tietuetta: {{item}}",
+
   // "item.edit.tabs.metadata.head": "Metadata",
   "item.edit.tabs.metadata.head": "Tietueen metadata",
 
@@ -2478,23 +3375,26 @@
   // "item.edit.tabs.status.buttons.move.label": "Move item to another collection",
   "item.edit.tabs.status.buttons.move.label": "Siirrä tietue toiseen kokoelmaan",
 
-  // "item.edit.tabs.status.buttons.private.button": "Make it private...",
+  // "item.edit.tabs.status.buttons.private.button": "Make it non-discoverable...",
   "item.edit.tabs.status.buttons.private.button": "Muuta yksityiseksi...",
 
-  // "item.edit.tabs.status.buttons.private.label": "Make item private",
+  // "item.edit.tabs.status.buttons.private.label": "Make item non-discoverable",
   "item.edit.tabs.status.buttons.private.label": "Muuta tietue yksityiseksi",
 
-  // "item.edit.tabs.status.buttons.public.button": "Make it public...",
+  // "item.edit.tabs.status.buttons.public.button": "Make it discoverable...",
   "item.edit.tabs.status.buttons.public.button": "Muuta julkiseksi...",
 
-  // "item.edit.tabs.status.buttons.public.label": "Make item public",
+  // "item.edit.tabs.status.buttons.public.label": "Make item discoverable",
   "item.edit.tabs.status.buttons.public.label": "Muuta tietue julkiseksi",
 
   // "item.edit.tabs.status.buttons.reinstate.button": "Reinstate...",
   "item.edit.tabs.status.buttons.reinstate.button": "Palauta käyttöön...",
 
   // "item.edit.tabs.status.buttons.reinstate.label": "Reinstate item into the repository",
-  "item.edit.tabs.status.buttons.reinstate.label": "Palauta tietue arkistoon",
+  "item.edit.tabs.status.buttons.reinstate.label": "Palauta tietue julkaisuarkistoon",
+
+  // "item.edit.tabs.status.buttons.unauthorized": "You're not authorized to perform this action",
+  "item.edit.tabs.status.buttons.unauthorized": "Sinulla ei ole valtuuksia suorittaa tätä toimintoa",
 
   // "item.edit.tabs.status.buttons.withdraw.button": "Withdraw this item",
   "item.edit.tabs.status.buttons.withdraw.button": "Poista tämä kohde",
@@ -2509,7 +3409,7 @@
   "item.edit.tabs.status.head": "Tietueen tila",
 
   // "item.edit.tabs.status.labels.handle": "Handle",
-  "item.edit.tabs.status.labels.handle": "Handle-tunnus",
+  "item.edit.tabs.status.labels.handle": "Handle",
 
   // "item.edit.tabs.status.labels.id": "Item Internal ID",
   "item.edit.tabs.status.labels.id": "Tietueen sisäinen ID",
@@ -2538,8 +3438,6 @@
   // "item.edit.tabs.view.title": "Item Edit -  View",
   "item.edit.tabs.view.title": "Tietueen muokkaus -  Näytä",
 
-
-
   // "item.edit.withdraw.cancel": "Cancel",
   "item.edit.withdraw.cancel": "Peruuta",
 
@@ -2558,7 +3456,8 @@
   // "item.edit.withdraw.success": "The item was withdrawn successfully",
   "item.edit.withdraw.success": "Tietue poistettu käytöstä",
 
-
+  // "item.orcid.return": "Back",
+  "item.orcid.return": "Paluu",
 
   // "item.listelement.badge": "Item",
   "item.listelement.badge": "Tietue",
@@ -2584,10 +3483,38 @@
   // "item.search.results.head": "Item Search Results",
   "item.search.results.head": "Tietuehaun tulokset",
 
-  // "item.search.title": "DSpace Angular :: Item Search",
-  "item.search.title": "DSpace Angular :: Tietuehaku",
+  // "item.search.title": "Item Search",
+  "item.search.title": "Tietuehaku",
 
+  // "item.truncatable-part.show-more": "Show more",
+  "item.truncatable-part.show-more": "Näytä lisää",
 
+  // "item.truncatable-part.show-less": "Collapse",
+  "item.truncatable-part.show-less": "Sulje",
+
+  // "workflow-item.search.result.delete-supervision.modal.header": "Delete Supervision Order",
+  "workflow-item.search.result.delete-supervision.modal.header": "Poista ohjausmääräys",
+
+  // "workflow-item.search.result.delete-supervision.modal.info": "Are you sure you want to delete Supervision Order",
+  "workflow-item.search.result.delete-supervision.modal.info": "Haluatko varmasti poistaa ohjausmääräyksen?",
+
+  // "workflow-item.search.result.delete-supervision.modal.cancel": "Cancel",
+  "workflow-item.search.result.delete-supervision.modal.cancel": "Peruuta",
+
+  // "workflow-item.search.result.delete-supervision.modal.confirm": "Delete",
+  "workflow-item.search.result.delete-supervision.modal.confirm": "Poista",
+
+  // "workflow-item.search.result.notification.deleted.success": "Successfully deleted supervision order \"{{name}}\"",
+  "workflow-item.search.result.notification.deleted.success": "Ohjausmääräys poistettu \"{{name}}\"",
+
+  // "workflow-item.search.result.notification.deleted.failure": "Failed to delete supervision order \"{{name}}\"",
+  "workflow-item.search.result.notification.deleted.failure": "Ohjausmääräyksen poisto epäonnistui \"{{name}}\"",
+
+  // "workflow-item.search.result.list.element.supervised-by": "Supervised by:",
+  "workflow-item.search.result.list.element.supervised-by": "Ohjaajana:",
+
+  // "workflow-item.search.result.list.element.supervised.remove-tooltip": "Remove supervision group",
+  "workflow-item.search.result.list.element.supervised.remove-tooltip": "Poista ohjausryhmä",
 
   // "item.page.abstract": "Abstract",
   "item.page.abstract": "Tiivistelmä",
@@ -2601,6 +3528,12 @@
   // "item.page.collections": "Collections",
   "item.page.collections": "Kokoelmat",
 
+  // "item.page.collections.loading": "Loading...",
+  "item.page.collections.loading": "Ladataan...",
+
+  // "item.page.collections.load-more": "Load more",
+  "item.page.collections.load-more": "Lataa lisää",
+
   // "item.page.date": "Date",
   "item.page.date": "Päivämäärä",
 
@@ -2634,6 +3567,12 @@
   // "item.page.link.simple": "Simple item page",
   "item.page.link.simple": "Tietueen suppeat tiedot",
 
+  // "item.page.orcid.title": "ORCID",
+  "item.page.orcid.title": "ORCID-tunniste",
+
+  // "item.page.orcid.tooltip": "Open ORCID setting page",
+  "item.page.orcid.tooltip": "Avaa ORCID-asetusten sivu",
+
   // "item.page.person.search.title": "Articles by this author",
   "item.page.person.search.title": "Tekijän artikkelit",
 
@@ -2667,12 +3606,27 @@
   // "item.page.bitstreams.collapse": "Collapse",
   "item.page.bitstreams.collapse": "Sulje",
 
-  // "item.page.filesection.original.bundle" : "Original bundle",
+  // "item.page.filesection.original.bundle": "Original bundle",
   "item.page.filesection.original.bundle": "Alkuperäinen nippu",
 
-  // "item.page.filesection.license.bundle" : "License bundle",
+  // "item.page.filesection.license.bundle": "License bundle",
   "item.page.filesection.license.bundle": "Lisenssinippu",
 
+  // "item.page.return": "Back",
+  "item.page.return": "Paluu",
+
+  // "item.page.version.create": "Create new version",
+  "item.page.version.create": "Luo uusi versio",
+
+  // "item.page.version.hasDraft": "A new version cannot be created because there is an inprogress submission in the version history",
+  "item.page.version.hasDraft": "Uutta versiota ei voida luoda, koska versiohistoriassa on kesken oleva tallennus.",
+
+  // "item.page.claim.button": "Claim",
+  "item.page.claim.button": "Ota itsellesi",
+
+  // "item.page.claim.tooltip": "Claim this item as profile",
+  "item.page.claim.tooltip": "Ota tämä kohde profiiliksi",
+
   // "item.preview.dc.identifier.uri": "Identifier:",
   "item.preview.dc.identifier.uri": "Tunnus:",
 
@@ -2680,7 +3634,7 @@
   "item.preview.dc.contributor.author": "Tekijät:",
 
   // "item.preview.dc.date.issued": "Published date:",
-  "item.preview.dc.date.issued": "Julkaisuajankohta:",
+  "item.preview.dc.date.issued": "Julkaisuaika:",
 
   // "item.preview.dc.description.abstract": "Abstract:",
   "item.preview.dc.description.abstract": "Tiivistelmä:",
@@ -2697,6 +3651,33 @@
   // "item.preview.dc.title": "Title:",
   "item.preview.dc.title": "Nimeke:",
 
+  // "item.preview.dc.type": "Type:",
+  "item.preview.dc.type": "Tyyppi:",
+
+  // "item.preview.oaire.citation.issue": "Issue",
+  "item.preview.oaire.citation.issue": "Numero",
+
+  // "item.preview.oaire.citation.volume": "Volume",
+  "item.preview.oaire.citation.volume": "Vuosikerta",
+
+  // "item.preview.dc.relation.issn": "ISSN",
+  "item.preview.dc.relation.issn": "ISSN-tunnus",
+
+  // "item.preview.dc.identifier.isbn": "ISBN",
+  "item.preview.dc.identifier.isbn": "ISBN",
+
+  // "item.preview.dc.identifier": "Identifier:",
+  "item.preview.dc.identifier": "Tunnisteet:",
+
+  // "item.preview.dc.relation.ispartof": "Journal or Serie",
+  "item.preview.dc.relation.ispartof": "Kausijulkaisu tai sarja",
+
+  // "item.preview.dc.identifier.doi": "DOI",
+  "item.preview.dc.identifier.doi": "DOI",
+
+  // "item.preview.dc.publisher": "Publisher:",
+  "item.preview.dc.publisher": "Julkaisija:",
+
   // "item.preview.person.familyName": "Surname:",
   "item.preview.person.familyName": "Sukunimi:",
 
@@ -2706,6 +3687,23 @@
   // "item.preview.person.identifier.orcid": "ORCID:",
   "item.preview.person.identifier.orcid": "ORCID-tunniste:",
 
+  // "item.preview.project.funder.name": "Funder:",
+  "item.preview.project.funder.name": "Rahoittaja:",
+
+  // "item.preview.project.funder.identifier": "Funder Identifier:",
+  "item.preview.project.funder.identifier": "Rahoittajan tunniste:",
+
+  // "item.preview.oaire.awardNumber": "Funding ID:",
+  "item.preview.oaire.awardNumber": "Rahoitustunnus:",
+
+  // "item.preview.dc.title.alternative": "Acronym:",
+  "item.preview.dc.title.alternative": "Kirjainlyhemme:",
+
+  // "item.preview.dc.coverage.spatial": "Jurisdiction:",
+  "item.preview.dc.coverage.spatial": "Toimivalta:",
+
+  // "item.preview.oaire.fundingStream": "Funding Stream:",
+  "item.preview.oaire.fundingStream": "Rahoituslähde:",
 
   // "item.select.confirm": "Confirm selected",
   "item.select.confirm": "Vahvista valinta",
@@ -2722,19 +3720,21 @@
   // "item.select.table.title": "Title",
   "item.select.table.title": "Nimeke",
 
-
   // "item.version.history.empty": "There are no other versions for this item yet.",
   "item.version.history.empty": "Tietueesta ei ole muita versioita.",
 
   // "item.version.history.head": "Version History",
   "item.version.history.head": "Versiohistoria",
 
-  // "item.version.history.return": "Return",
-  "item.version.history.return": "Palaa",
+  // "item.version.history.return": "Back",
+  "item.version.history.return": "Paluu",
 
   // "item.version.history.selected": "Selected version",
   "item.version.history.selected": "Valittu versio",
 
+  // "item.version.history.selected.alert": "You are currently viewing version {{version}} of the item.",
+  "item.version.history.selected.alert": "Tarkastelet tietueen versiota {{version}}.",
+
   // "item.version.history.table.version": "Version",
   "item.version.history.table.version": "Versio",
 
@@ -2750,12 +3750,191 @@
   // "item.version.history.table.summary": "Summary",
   "item.version.history.table.summary": "Yhteenveto",
 
+  // "item.version.history.table.workspaceItem": "Workspace item",
+  "item.version.history.table.workspaceItem": "Työtilan tietue",
 
+  // "item.version.history.table.workflowItem": "Workflow item",
+  "item.version.history.table.workflowItem": "Työtilan tietue",
+
+  // "item.version.history.table.actions": "Action",
+  "item.version.history.table.actions": "Toiminto",
+
+  // "item.version.history.table.action.editWorkspaceItem": "Edit workspace item",
+  "item.version.history.table.action.editWorkspaceItem": "Muokkaa työtilan tietuetta",
+
+  // "item.version.history.table.action.editSummary": "Edit summary",
+  "item.version.history.table.action.editSummary": "Muokkaa yhteenvetoa",
+
+  // "item.version.history.table.action.saveSummary": "Save summary edits",
+  "item.version.history.table.action.saveSummary": "Tallenna yhteenvedon muokkaukset",
+
+  // "item.version.history.table.action.discardSummary": "Discard summary edits",
+  "item.version.history.table.action.discardSummary": "Hylkää yhteenvedon muokkaukset",
+
+  // "item.version.history.table.action.newVersion": "Create new version from this one",
+  "item.version.history.table.action.newVersion": "Luo tästä uusi versio",
+
+  // "item.version.history.table.action.deleteVersion": "Delete version",
+  "item.version.history.table.action.deleteVersion": "Poista versio",
+
+  // "item.version.history.table.action.hasDraft": "A new version cannot be created because there is an inprogress submission in the version history",
+  "item.version.history.table.action.hasDraft": "Uutta versiota ei voida luoda, koska versiohistoriassa on kesken oleva tallennus.",
 
   // "item.version.notice": "This is not the latest version of this item. The latest version can be found <a href='{{destination}}'>here</a>.",
   "item.version.notice": "Tämä ei ole tietueen uusin versio. Uusin versio löytyy <a href='{{destination}}'>täältä</a>.",
 
+  // "item.version.create.modal.header": "New version",
+  "item.version.create.modal.header": "uusi versio",
 
+  // "item.version.create.modal.text": "Create a new version for this item",
+  "item.version.create.modal.text": "Luodaan tietueesta uusi versio",
+
+  // "item.version.create.modal.text.startingFrom": "starting from version {{version}}",
+  "item.version.create.modal.text.startingFrom": "alkaen versiosta {{version}}",
+
+  // "item.version.create.modal.button.confirm": "Create",
+  "item.version.create.modal.button.confirm": "Luo",
+
+  // "item.version.create.modal.button.confirm.tooltip": "Create new version",
+  "item.version.create.modal.button.confirm.tooltip": "Luo uusi versio",
+
+  // "item.version.create.modal.button.cancel": "Cancel",
+  "item.version.create.modal.button.cancel": "Peruuta",
+
+  // "item.version.create.modal.button.cancel.tooltip": "Do not create new version",
+  "item.version.create.modal.button.cancel.tooltip": "Älä luo uutta versiota",
+
+  // "item.version.create.modal.form.summary.label": "Summary",
+  "item.version.create.modal.form.summary.label": "Yhteenveto",
+
+  // "item.version.create.modal.form.summary.placeholder": "Insert the summary for the new version",
+  "item.version.create.modal.form.summary.placeholder": "Syötä uuden version yhteenveto",
+
+  // "item.version.create.modal.submitted.header": "Creating new version...",
+  "item.version.create.modal.submitted.header": "Luodaan uutta versiota...",
+
+  // "item.version.create.modal.submitted.text": "The new version is being created. This may take some time if the item has a lot of relationships.",
+  "item.version.create.modal.submitted.text": "Uutta versiota luodaan. Luonti voi kestää, jos tietueella on paljon yhteyksiä.",
+
+  // "item.version.create.notification.success": "New version has been created with version number {{version}}",
+  "item.version.create.notification.success": "Uusi versio on luotu, sen versionumero on  {{version}}",
+
+  // "item.version.create.notification.failure": "New version has not been created",
+  "item.version.create.notification.failure": "Uutta versiota ei luotu",
+
+  // "item.version.create.notification.inProgress": "A new version cannot be created because there is an inprogress submission in the version history",
+  "item.version.create.notification.inProgress": "Uutta versiota ei voida luoda, koska versiohistoriassa on kesken oleva tallennus.",
+
+  // "item.version.delete.modal.header": "Delete version",
+  "item.version.delete.modal.header": "Poista versio",
+
+  // "item.version.delete.modal.text": "Do you want to delete version {{version}}?",
+  "item.version.delete.modal.text": "Haluatko poistaa version {{version}}?",
+
+  // "item.version.delete.modal.button.confirm": "Delete",
+  "item.version.delete.modal.button.confirm": "Poista",
+
+  // "item.version.delete.modal.button.confirm.tooltip": "Delete this version",
+  "item.version.delete.modal.button.confirm.tooltip": "Poista tämä versio",
+
+  // "item.version.delete.modal.button.cancel": "Cancel",
+  "item.version.delete.modal.button.cancel": "Peruuta",
+
+  // "item.version.delete.modal.button.cancel.tooltip": "Do not delete this version",
+  "item.version.delete.modal.button.cancel.tooltip": "Älä poista tätä versiota",
+
+  // "item.version.delete.notification.success": "Version number {{version}} has been deleted",
+  "item.version.delete.notification.success": "Versio versionumerolla {{version}} poistettu",
+
+  // "item.version.delete.notification.failure": "Version number {{version}} has not been deleted",
+  "item.version.delete.notification.failure": "Versiota versionumerolla {{version}} ei poistettu",
+
+  // "item.version.edit.notification.success": "The summary of version number {{version}} has been changed",
+  "item.version.edit.notification.success": "Version versionumerolla {{version}} yhteenveto on muuttunut",
+
+  // "item.version.edit.notification.failure": "The summary of version number {{version}} has not been changed",
+  "item.version.edit.notification.failure": "Version versionumerolla {{version}} yhteenvetoa ei ole muutettu",
+
+  // "itemtemplate.edit.metadata.add-button": "Add",
+  "itemtemplate.edit.metadata.add-button": "Lisää",
+
+  // "itemtemplate.edit.metadata.discard-button": "Discard",
+  "itemtemplate.edit.metadata.discard-button": "Hylkää",
+
+  // "itemtemplate.edit.metadata.edit.buttons.confirm": "Confirm",
+  "itemtemplate.edit.metadata.edit.buttons.confirm": "Vahvista",
+
+  // "itemtemplate.edit.metadata.edit.buttons.drag": "Drag to reorder",
+  "itemtemplate.edit.metadata.edit.buttons.drag": "Raahaa uudelleenjärjestääksesi",
+
+  // "itemtemplate.edit.metadata.edit.buttons.edit": "Edit",
+  "itemtemplate.edit.metadata.edit.buttons.edit": "Muokkaa",
+
+  // "itemtemplate.edit.metadata.edit.buttons.remove": "Remove",
+  "itemtemplate.edit.metadata.edit.buttons.remove": "Poista",
+
+  // "itemtemplate.edit.metadata.edit.buttons.undo": "Undo changes",
+  "itemtemplate.edit.metadata.edit.buttons.undo": "Kumoa muutokset",
+
+  // "itemtemplate.edit.metadata.edit.buttons.unedit": "Stop editing",
+  "itemtemplate.edit.metadata.edit.buttons.unedit": "Lopeta muokkaus",
+
+  // "itemtemplate.edit.metadata.empty": "The item template currently doesn't contain any metadata. Click Add to start adding a metadata value.",
+  "itemtemplate.edit.metadata.empty": "Mallipohjassa ei ole metadataa. Napsauta Lisää lisätäksesi metadata-arvoja.",
+
+  // "itemtemplate.edit.metadata.headers.edit": "Edit",
+  "itemtemplate.edit.metadata.headers.edit": "Muokkaa",
+
+  // "itemtemplate.edit.metadata.headers.field": "Field",
+  "itemtemplate.edit.metadata.headers.field": "Kenttä",
+
+  // "itemtemplate.edit.metadata.headers.language": "Lang",
+  "itemtemplate.edit.metadata.headers.language": "Kieli",
+
+  // "itemtemplate.edit.metadata.headers.value": "Value",
+  "itemtemplate.edit.metadata.headers.value": "Arvo",
+
+  // "itemtemplate.edit.metadata.metadatafield.error": "An error occurred validating the metadata field",
+  "itemtemplate.edit.metadata.metadatafield.error": "Virhe metadatakenttää validoitaessa",
+
+  // "itemtemplate.edit.metadata.metadatafield.invalid": "Please choose a valid metadata field",
+  "itemtemplate.edit.metadata.metadatafield.invalid": "Valitse kelvollinen metadatakenttä ",
+
+  // "itemtemplate.edit.metadata.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button",
+  "itemtemplate.edit.metadata.notifications.discarded.content": "Muutoksesi hylättiin. Palauta muutokset napsauttamalla Kumoa-painiketta",
+
+  // "itemtemplate.edit.metadata.notifications.discarded.title": "Changes discarded",
+  "itemtemplate.edit.metadata.notifications.discarded.title": "Muutokset peruttu",
+
+  // "itemtemplate.edit.metadata.notifications.error.title": "An error occurred",
+  "itemtemplate.edit.metadata.notifications.error.title": "Tapahtui virhe",
+
+  // "itemtemplate.edit.metadata.notifications.invalid.content": "Your changes were not saved. Please make sure all fields are valid before you save.",
+  "itemtemplate.edit.metadata.notifications.invalid.content": "Muutoksia ei tallennettu. Tarkista kaikkien kenttien oikeellisuus ennen tallennusta.",
+
+  // "itemtemplate.edit.metadata.notifications.invalid.title": "Metadata invalid",
+  "itemtemplate.edit.metadata.notifications.invalid.title": "Virheellinen metadata",
+
+  // "itemtemplate.edit.metadata.notifications.outdated.content": "The item template you're currently working on has been changed by another user. Your current changes are discarded to prevent conflicts",
+  "itemtemplate.edit.metadata.notifications.outdated.content": "Toinen käyttäjä on muokannut käsittelemääsi mallipohjaa. Muutoksesi on hylätty konfliktien välttämiseksi.",
+
+  // "itemtemplate.edit.metadata.notifications.outdated.title": "Changes outdated",
+  "itemtemplate.edit.metadata.notifications.outdated.title": "Muutokset vanhentuneet",
+
+  // "itemtemplate.edit.metadata.notifications.saved.content": "Your changes to this item template's metadata were saved.",
+  "itemtemplate.edit.metadata.notifications.saved.content": "Muutokset mallipohjan metadataan on tallennettu.",
+
+  // "itemtemplate.edit.metadata.notifications.saved.title": "Metadata saved",
+  "itemtemplate.edit.metadata.notifications.saved.title": "Metadata tallennettu",
+
+  // "itemtemplate.edit.metadata.reinstate-button": "Undo",
+  "itemtemplate.edit.metadata.reinstate-button": "Kumoa",
+
+  // "itemtemplate.edit.metadata.reset-order-button": "Undo reorder",
+  "itemtemplate.edit.metadata.reset-order-button": "Kumoa uudelleenjärjestäminen",
+
+  // "itemtemplate.edit.metadata.save-button": "Save",
+  "itemtemplate.edit.metadata.save-button": "Tallenna",
 
   // "journal.listelement.badge": "Journal",
   "journal.listelement.badge": "Kausijulkaisu",
@@ -2781,10 +3960,11 @@
   // "journal.search.results.head": "Journal Search Results",
   "journal.search.results.head": "Kausijulkaisuhaun tulokset",
 
-  // "journal.search.title": "DSpace Angular :: Journal Search",
-  "journal.search.title": "DSpace Angular :: Kausijulkaisuhaku",
-
+  // "journal-relationships.search.results.head": "Journal Search Results",
+  "journal-relationships.search.results.head": "Kausijulkaisuhaun tulokset",
 
+  // "journal.search.title": "Journal Search",
+  "journal.search.title": "Kausijulkaisuhaku",
 
   // "journalissue.listelement.badge": "Journal Issue",
   "journalissue.listelement.badge": "Kausijulkaisun numero",
@@ -2813,8 +3993,6 @@
   // "journalissue.page.titleprefix": "Journal Issue: ",
   "journalissue.page.titleprefix": "Kausijulkaisun numero: ",
 
-
-
   // "journalvolume.listelement.badge": "Journal Volume",
   "journalvolume.listelement.badge": "Kausijulkaisun vuosikerta",
 
@@ -2833,7 +4011,38 @@
   // "journalvolume.page.volume": "Volume",
   "journalvolume.page.volume": "Vuosikerta",
 
+  // "iiifsearchable.listelement.badge": "Document Media",
+  "iiifsearchable.listelement.badge": "Dokumenttimedia",
 
+  // "iiifsearchable.page.titleprefix": "Document: ",
+  "iiifsearchable.page.titleprefix": "Dokumentti: ",
+
+  // "iiifsearchable.page.doi": "Permanent Link: ",
+  "iiifsearchable.page.doi": "Pysyvä linkki: ",
+
+  // "iiifsearchable.page.issue": "Issue: ",
+  "iiifsearchable.page.issue": "Numero: ",
+
+  // "iiifsearchable.page.description": "Description: ",
+  "iiifsearchable.page.description": "Kuvaus: ",
+
+  // "iiifviewer.fullscreen.notice": "Use full screen for better viewing.",
+  "iiifviewer.fullscreen.notice": "Käytä koko näytön tilaa nähdäksesi paremmin",
+
+  // "iiif.listelement.badge": "Image Media",
+  "iiif.listelement.badge": "Kuvamedia",
+
+  // "iiif.page.titleprefix": "Image: ",
+  "iiif.page.titleprefix": "Kuva: ",
+
+  // "iiif.page.doi": "Permanent Link: ",
+  "iiif.page.doi": "Pysyvä linkki: ",
+
+  // "iiif.page.issue": "Issue: ",
+  "iiif.page.issue": "Numero: ",
+
+  // "iiif.page.description": "Description: ",
+  "iiif.page.description": "Kuvaus: ",
 
   // "loading.bitstream": "Loading bitstream...",
   "loading.bitstream": "Ladataan tiedostoa...",
@@ -2889,8 +4098,6 @@
   // "loading.top-level-communities": "Loading top-level communities...",
   "loading.top-level-communities": "Ladataan ylätason yhteisöjä...",
 
-
-
   // "login.form.email": "Email address",
   "login.form.email": "Sähköpostiosoite",
 
@@ -2906,6 +4113,12 @@
   // "login.form.or-divider": "or",
   "login.form.or-divider": "tai",
 
+  // "login.form.oidc": "Log in with OIDC",
+  "login.form.oidc": "Kirjaudu OIDC-tunnuksella",
+
+  // "login.form.orcid": "Log in with ORCID",
+  "login.form.orcid": "Kirjaudu ORCID-tunnuksella",
+
   // "login.form.password": "Password",
   "login.form.password": "Salasana",
 
@@ -2921,8 +4134,6 @@
   // "login.breadcrumbs": "Login",
   "login.breadcrumbs": "Sisäänkirjautuminen",
 
-
-
   // "logout.form.header": "Log out from DSpace",
   "logout.form.header": "Kirjaudu ulos",
 
@@ -2932,15 +4143,14 @@
   // "logout.title": "Logout",
   "logout.title": "Uloskirjautuminen",
 
-
-
-  // "menu.header.admin": "Admin",
-  "menu.header.admin": "Ylläpitäjä",
+  // "menu.header.admin": "Management",
+  "menu.header.admin": "Hallinto",
 
   // "menu.header.image.logo": "Repository logo",
   "menu.header.image.logo": "Arkiston logo",
 
-
+  // "menu.header.admin.description": "Management menu",
+  "menu.header.admin.description": "Hallintovalikko",
 
   // "menu.section.access_control": "Access Control",
   "menu.section.access_control": "Pääsyoikeudet",
@@ -2954,13 +4164,9 @@
   // "menu.section.access_control_people": "People",
   "menu.section.access_control_people": "Käyttäjät",
 
-
-
   // "menu.section.admin_search": "Admin Search",
   "menu.section.admin_search": "Ylläpitäjän haku",
 
-
-
   // "menu.section.browse_community": "This Community",
   "menu.section.browse_community": "Tämä yhteisö",
 
@@ -2968,7 +4174,7 @@
   "menu.section.browse_community_by_author": "Tekijän mukaan",
 
   // "menu.section.browse_community_by_issue_date": "By Issue Date",
-  "menu.section.browse_community_by_issue_date": "Julkaisuajankohdan mukaan",
+  "menu.section.browse_community_by_issue_date": "Julkaisuajan mukaan",
 
   // "menu.section.browse_community_by_title": "By Title",
   "menu.section.browse_community_by_title": "Nimekkeen mukaan",
@@ -2980,27 +4186,26 @@
   "menu.section.browse_global_by_author": "Tekijän mukaan",
 
   // "menu.section.browse_global_by_dateissued": "By Issue Date",
-  "menu.section.browse_global_by_dateissued": "Julkaisuajankohdan mukaan",
+  "menu.section.browse_global_by_dateissued": "Julkaisuajan mukaan",
 
   // "menu.section.browse_global_by_subject": "By Subject",
   "menu.section.browse_global_by_subject": "Asiasanan mukaan",
 
+  // "menu.section.browse_global_by_srsc": "By Subject Category",
+  "menu.section.browse_global_by_srsc": "Aihekategorian mukaan",
+
   // "menu.section.browse_global_by_title": "By Title",
   "menu.section.browse_global_by_title": "Nimekkeen mukaan",
 
   // "menu.section.browse_global_communities_and_collections": "Communities & Collections",
   "menu.section.browse_global_communities_and_collections": "Yhteisöt & kokoelmat",
 
-
-
   // "menu.section.control_panel": "Control Panel",
   "menu.section.control_panel": "Hallintapaneeli",
 
   // "menu.section.curation_task": "Curation Task",
   "menu.section.curation_task": "Kuratointitehtävä",
 
-
-
   // "menu.section.edit": "Edit",
   "menu.section.edit": "Muokkaa",
 
@@ -3013,8 +4218,6 @@
   // "menu.section.edit_item": "Item",
   "menu.section.edit_item": "Tietue",
 
-
-
   // "menu.section.export": "Export",
   "menu.section.export": "Eksportoi",
 
@@ -3030,7 +4233,8 @@
   // "menu.section.export_metadata": "Metadata",
   "menu.section.export_metadata": "Metadata",
 
-
+  // "menu.section.export_batch": "Batch Export (ZIP)",
+  "menu.section.export_batch": "Erän eksportointi(ZIP)",
 
   // "menu.section.icon.access_control": "Access Control menu section",
   "menu.section.icon.access_control": "Pääsyoikeudet",
@@ -3041,8 +4245,8 @@
   // "menu.section.icon.control_panel": "Control Panel menu section",
   "menu.section.icon.control_panel": "Hallintapaneeli",
 
-  // "menu.section.icon.curation_task": "Curation Task menu section",
-  "menu.section.icon.curation_task": "Kuratointi",
+  // "menu.section.icon.curation_tasks": "Curation Task menu section",
+  "menu.section.icon.curation_tasks": "Kuratointitehtävä",
 
   // "menu.section.icon.edit": "Edit menu section",
   "menu.section.icon.edit": "Muokkaus",
@@ -3053,6 +4257,9 @@
   // "menu.section.icon.find": "Find menu section",
   "menu.section.icon.find": "Haku",
 
+  // "menu.section.icon.health": "Health check menu section",
+  "menu.section.icon.health": "Järjestelmän kunnon tarkistus",
+
   // "menu.section.icon.import": "Import menu section",
   "menu.section.icon.import": "Importointi",
 
@@ -3062,8 +4269,8 @@
   // "menu.section.icon.pin": "Pin sidebar",
   "menu.section.icon.pin": "Kiinnitä sivupalkki",
 
-  // "menu.section.icon.processes": "Processes menu section",
-  "menu.section.icon.processes": "Prosessit",
+  // "menu.section.icon.processes": "Processes Health",
+  "menu.section.icon.processes": "Prosessien kunto",
 
   // "menu.section.icon.registries": "Registries menu section",
   "menu.section.icon.registries": "Rekisterit",
@@ -3071,11 +4278,12 @@
   // "menu.section.icon.statistics_task": "Statistics Task menu section",
   "menu.section.icon.statistics_task": "Tilastot",
 
+  // "menu.section.icon.workflow": "Administer workflow menu section",
+  "menu.section.icon.workflow": "Työnkulku hallinta",
+
   // "menu.section.icon.unpin": "Unpin sidebar",
   "menu.section.icon.unpin": "Vapauta sivupalkki",
 
-
-
   // "menu.section.import": "Import",
   "menu.section.import": "Importoi",
 
@@ -3085,8 +4293,6 @@
   // "menu.section.import_metadata": "Metadata",
   "menu.section.import_metadata": "Metadata",
 
-
-
   // "menu.section.new": "New",
   "menu.section.new": "Uusi",
 
@@ -3105,20 +4311,17 @@
   // "menu.section.new_process": "Process",
   "menu.section.new_process": "Prosessi",
 
-
-
   // "menu.section.pin": "Pin sidebar",
   "menu.section.pin": "Kiinnitä sivupalkki",
 
   // "menu.section.unpin": "Unpin sidebar",
   "menu.section.unpin": "Vapauta sivupalkki",
 
-
-
   // "menu.section.processes": "Processes",
   "menu.section.processes": "Prosessit",
 
-
+  // "menu.section.health": "Health",
+  "menu.section.health": "Järjestelmän kunto",
 
   // "menu.section.registries": "Registries",
   "menu.section.registries": "Rekisterit",
@@ -3129,57 +4332,60 @@
   // "menu.section.registries_metadata": "Metadata",
   "menu.section.registries_metadata": "Metadata",
 
-
-
   // "menu.section.statistics": "Statistics",
   "menu.section.statistics": "Tilastot",
 
   // "menu.section.statistics_task": "Statistics Task",
   "menu.section.statistics_task": "Tilastointitehtävä",
 
-
-
   // "menu.section.toggle.access_control": "Toggle Access Control section",
-  "menu.section.toggle.access_control": "Vaihda Pääsyoikeudet-osion tilaa",
+  "menu.section.toggle.access_control": "Näytä/piilota Pääsyoikeudet-osio",
 
   // "menu.section.toggle.control_panel": "Toggle Control Panel section",
-  "menu.section.toggle.control_panel": "Vaihda Hallintapaneeli-osion tilaa",
+  "menu.section.toggle.control_panel": "Näytä/piilota Hallintapaneeli-osio",
 
   // "menu.section.toggle.curation_task": "Toggle Curation Task section",
-  "menu.section.toggle.curation_task": "Vaihda Kuratointitehtävä-osion tilaa",
+  "menu.section.toggle.curation_task": "Näytä/piilota Kuratointitehtävä-osio",
 
   // "menu.section.toggle.edit": "Toggle Edit section",
-  "menu.section.toggle.edit": "Vaihda Muokkaus-osion tilaa",
+  "menu.section.toggle.edit": "Näytä/piilota Muokkaus-osio",
 
   // "menu.section.toggle.export": "Toggle Export section",
-  "menu.section.toggle.export": "Vaihda Eksportointi-osion tilaa",
+  "menu.section.toggle.export": "Näytä/piilota Eksportointi-osio",
 
   // "menu.section.toggle.find": "Toggle Find section",
-  "menu.section.toggle.find": "Vaihda Haku-osion tilaa",
+  "menu.section.toggle.find": "Näytä/piilota Haku-osio",
 
   // "menu.section.toggle.import": "Toggle Import section",
-  "menu.section.toggle.import": "Vaihda Importointi-osion tilaa",
+  "menu.section.toggle.import": "Näytä/piilota Importointi-osio",
 
   // "menu.section.toggle.new": "Toggle New section",
-  "menu.section.toggle.new": "Vaihda Uusi-osion tilaa",
+  "menu.section.toggle.new": "Näytä/piilota Uusi-osio",
 
   // "menu.section.toggle.registries": "Toggle Registries section",
-  "menu.section.toggle.registries": "Vaihda Rekisterit-osion tilaa",
+  "menu.section.toggle.registries": "Näytä/piilota Rekisterit-osio",
 
   // "menu.section.toggle.statistics_task": "Toggle Statistics Task section",
-  "menu.section.toggle.statistics_task": "Vaihda Tilastointitehtävä-osion tilaa",
-
+  "menu.section.toggle.statistics_task": "Näytä/piilota Tilastointitehtävä-osio",
 
   // "menu.section.workflow": "Administer Workflow",
   "menu.section.workflow": "Hallinnoi työnkulkua",
 
+  // "metadata-export-search.tooltip": "Export search results as CSV",
+  "metadata-export-search.tooltip": "Eksportoi Hakutulokset CSV-tiedostona",
+
+  // "metadata-export-search.submit.success": "The export was started successfully",
+  "metadata-export-search.submit.success": "Eksportointi aloitettu",
+
+  // "metadata-export-search.submit.error": "Starting the export has failed",
+  "metadata-export-search.submit.error": "Eksportoinnin aloittaminen epäonnistui",
+
+  // "mydspace.breadcrumbs": "MyDSpace",
+  "mydspace.breadcrumbs": "Oma DSpace",
 
   // "mydspace.description": "",
   "mydspace.description": "",
 
-  // "mydspace.general.text-here": "here",
-  "mydspace.general.text-here": "tässä",
-
   // "mydspace.messages.controller-help": "Select this option to send a message to item's submitter.",
   "mydspace.messages.controller-help": "Valitse tämä, jos haluat lähettää viestin tietueen tallentajalle.",
 
@@ -3255,26 +4461,32 @@
   // "mydspace.results.no-uri": "No Uri",
   "mydspace.results.no-uri": "Ei URL-osoitetta",
 
-  // "mydspace.show.workflow": "All tasks",
-  "mydspace.show.workflow": "Kaikki tehtävät",
+  // "mydspace.search-form.placeholder": "Search in mydspace...",
+  "mydspace.search-form.placeholder": "Hae omasta DSpacesta...",
+
+  // "mydspace.show.workflow": "Workflow tasks",
+  "mydspace.show.workflow": "Työnkulun tehtävät",
 
   // "mydspace.show.workspace": "Your Submissions",
   "mydspace.show.workspace": "Tallennuksesi",
 
-  // "mydspace.status.archived": "Archived",
-  "mydspace.status.archived": "Arkistoitu",
+  // "mydspace.show.supervisedWorkspace": "Supervised items",
+  "mydspace.show.supervisedWorkspace": "Valvotut tietueet",
 
-  // "mydspace.status.validation": "Validation",
-  "mydspace.status.validation": "Tarkastaminen",
+  // "mydspace.status.mydspaceArchived": "Archived",
+  "mydspace.status.mydspaceArchived": "Arkistoitu",
 
-  // "mydspace.status.waiting-for-controller": "Waiting for controller",
-  "mydspace.status.waiting-for-controller": "Odotetaan tarkastajaa",
+  // "mydspace.status.mydspaceValidation": "Validation",
+  "mydspace.status.mydspaceValidation": "Validointi",
 
-  // "mydspace.status.workflow": "Workflow",
-  "mydspace.status.workflow": "Työnkulku",
+  // "mydspace.status.mydspaceWaitingController": "Waiting for reviewer",
+  "mydspace.status.mydspaceWaitingController": "Odottaa tarkastajaa",
 
-  // "mydspace.status.workspace": "Workspace",
-  "mydspace.status.workspace": "Työtila",
+  // "mydspace.status.mydspaceWorkflow": "Workflow",
+  "mydspace.status.mydspaceWorkflow": "Työnkulku",
+
+  // "mydspace.status.mydspaceWorkspace": "Workspace",
+  "mydspace.status.mydspaceWorkspace": "Työtila",
 
   // "mydspace.title": "MyDSpace",
   "mydspace.title": "Oma DSpace",
@@ -3291,31 +4503,35 @@
   // "mydspace.upload.upload-multiple-successful": "{{qty}} new workspace items created.",
   "mydspace.upload.upload-multiple-successful": "{{qty}} uutta työtilaa luotu.",
 
-  // "mydspace.upload.upload-successful": "New workspace item created. Click {{here}} for edit it.",
-  "mydspace.upload.upload-successful": "Uusi työtila luotu. Napauta tästä muokataksesi sitä.",
-
   // "mydspace.view-btn": "View",
   "mydspace.view-btn": "Näytä",
 
-
-
   // "nav.browse.header": "All of DSpace",
   "nav.browse.header": "Koko julkaisuarkisto",
 
   // "nav.community-browse.header": "By Community",
   "nav.community-browse.header": "Yhteisön mukaan",
 
+  // "nav.context-help-toggle": "Toggle context help",
+  "nav.context-help-toggle": "Näytä/piilota tilannekohtainen ohje",
+
   // "nav.language": "Language switch",
   "nav.language": "Kielivalinta",
 
   // "nav.login": "Log In",
   "nav.login": "Kirjaudu sisään",
 
+  // "nav.user-profile-menu-and-logout": "User profile menu and Log Out",
+  "nav.user-profile-menu-and-logout": "Käyttäjäprofiilivalikko ja uloskirjautuminen",
+
   // "nav.logout": "Log Out",
   "nav.logout": "Kirjaudu ulos",
 
+  // "nav.main.description": "Main navigation bar",
+  "nav.main.description": "Päänavigointipalkki",
+
   // "nav.mydspace": "MyDSpace",
-  "nav.mydspace": "Omat tiedot",
+  "nav.mydspace": "Oma DSpace",
 
   // "nav.profile": "Profile",
   "nav.profile": "Profiili",
@@ -3323,17 +4539,33 @@
   // "nav.search": "Search",
   "nav.search": "Hae",
 
+  // "nav.search.button": "Submit search",
+  "nav.search.button": "Lähetä haku",
+
   // "nav.statistics.header": "Statistics",
   "nav.statistics.header": "Tilastot",
 
   // "nav.stop-impersonating": "Stop impersonating EPerson",
   "nav.stop-impersonating": "Lopeta käyttäjänä esiintyminen",
 
+  // "nav.subscriptions": "Subscriptions",
+  "nav.subscriptions": "Tilaukset",
 
+  // "nav.toggle": "Toggle navigation",
+  "nav.toggle": "Näytä/piilota navigointi",
+
+  // "nav.user.description": "User profile bar",
+  "nav.user.description": "Käyttäjäprofiilipalkki",
+
+  // "none.listelement.badge": "Item",
+  "none.listelement.badge": "Tietue",
 
   // "orgunit.listelement.badge": "Organizational Unit",
   "orgunit.listelement.badge": "Organisaatioyksikkö",
 
+  // "orgunit.listelement.no-title": "Untitled",
+  "orgunit.listelement.no-title": "Nimetön",
+
   // "orgunit.page.city": "City",
   "orgunit.page.city": "Kaupunki",
 
@@ -3355,7 +4587,8 @@
   // "orgunit.page.titleprefix": "Organizational Unit: ",
   "orgunit.page.titleprefix": "Organisaatioyksikkö: ",
 
-
+  // "pagination.options.description": "Pagination options",
+  "pagination.options.description": "Sivutusvaihtoehdot",
 
   // "pagination.results-per-page": "Results Per Page",
   "pagination.results-per-page": "Tuloksia sivulla",
@@ -3369,8 +4602,6 @@
   // "pagination.sort-direction": "Sort Options",
   "pagination.sort-direction": "Lajitteluvalinnat",
 
-
-
   // "person.listelement.badge": "Person",
   "person.listelement.badge": "Käyttäjä",
 
@@ -3395,6 +4626,9 @@
   // "person.page.lastname": "Last Name",
   "person.page.lastname": "Sukunimi",
 
+  // "person.page.name": "Name",
+  "person.page.name": "Nimi",
+
   // "person.page.link.full": "Show all metadata",
   "person.page.link.full": "Näytä kaikki metadata",
 
@@ -3408,12 +4642,13 @@
   "person.page.titleprefix": "Käyttäjä: ",
 
   // "person.search.results.head": "Person Search Results",
-  "person.search.results.head": "Käyttäjähaun tulokset",
-
-  // "person.search.title": "DSpace Angular :: Person Search",
-  "person.search.title": "DSpace Angular :: Käyttäjähaku",
+  "person.search.results.head": "Henkilöhaun tulokset",
 
+  // "person-relationships.search.results.head": "Person Search Results",
+  "person-relationships.search.results.head": "Henkilöhaun tulokset",
 
+  // "person.search.title": "Person Search",
+  "person.search.title": "Henkilöhaku",
 
   // "process.new.select-parameters": "Parameters",
   "process.new.select-parameters": "Parametrit",
@@ -3421,8 +4656,8 @@
   // "process.new.cancel": "Cancel",
   "process.new.cancel": "Peruuta",
 
-  // "process.new.submit": "Submit",
-  "process.new.submit": "Lähetä",
+  // "process.new.submit": "Save",
+  "process.new.submit": "Tallenna",
 
   // "process.new.select-script": "Script",
   "process.new.select-script": "Skripti",
@@ -3463,6 +4698,9 @@
   // "process.new.notification.error.content": "An error occurred while creating this process",
   "process.new.notification.error.content": "Virhe prosessia luotaessa",
 
+  // "process.new.notification.error.max-upload.content": "The file exceeds the maximum upload size",
+  "process.new.notification.error.max-upload.content": "Tiedoston koko ylittää latauksen maksimikoon",
+
   // "process.new.header": "Create a new process",
   "process.new.header": "Luo uusi prosessi",
 
@@ -3472,18 +4710,16 @@
   // "process.new.breadcrumbs": "Create a new process",
   "process.new.breadcrumbs": "Luo uusi prosessi",
 
+  // "process.detail.arguments": "Arguments",
+  "process.detail.arguments": "Perustelut",
 
+  // "process.detail.arguments.empty": "This process doesn't contain any arguments",
+  "process.detail.arguments.empty": "Prosessiin ei liity perusteluja",
 
-  // "process.detail.arguments" : "Arguments",
-  "process.detail.arguments": "Muuttujat",
-
-  // "process.detail.arguments.empty" : "This process doesn't contain any arguments",
-  "process.detail.arguments.empty": "Prosessiin ei liity muuttujia",
-
-  // "process.detail.back" : "Back",
+  // "process.detail.back": "Back",
   "process.detail.back": "Paluu",
 
-  // "process.detail.output" : "Process Output",
+  // "process.detail.output": "Process Output",
   "process.detail.output": "Prosessin tulos",
 
   // "process.detail.logs.button": "Retrieve process output",
@@ -3495,48 +4731,70 @@
   // "process.detail.logs.none": "This process has no output",
   "process.detail.logs.none": "Prosessilla ei tulosta",
 
-  // "process.detail.output-files" : "Output Files",
+  // "process.detail.output-files": "Output Files",
   "process.detail.output-files": "Tulostiedostot",
 
-  // "process.detail.output-files.empty" : "This process doesn't contain any output files",
+  // "process.detail.output-files.empty": "This process doesn't contain any output files",
   "process.detail.output-files.empty": "Prosessilla ei ole tulostiedostoja",
 
-  // "process.detail.script" : "Script",
+  // "process.detail.script": "Script",
   "process.detail.script": "Skripti",
 
-  // "process.detail.title" : "Process: {{ id }} - {{ name }}",
+  // "process.detail.title": "Process: {{ id }} - {{ name }}",
   "process.detail.title": "Prosessi: {{ id }} - {{ name }}",
 
-  // "process.detail.start-time" : "Start time",
+  // "process.detail.start-time": "Start time",
   "process.detail.start-time": "Aloitusaika",
 
-  // "process.detail.end-time" : "Finish time",
+  // "process.detail.end-time": "Finish time",
   "process.detail.end-time": "Lopetusaika",
 
-  // "process.detail.status" : "Status",
+  // "process.detail.status": "Status",
   "process.detail.status": "Tila",
 
-  // "process.detail.create" : "Create similar process",
+  // "process.detail.create": "Create similar process",
   "process.detail.create": "Luo vastaava prosessi",
 
+  // "process.detail.actions": "Actions",
+  "process.detail.actions": "Toiminnot",
 
+  // "process.detail.delete.button": "Delete process",
+  "process.detail.delete.button": "Poista prosessi",
 
-  // "process.overview.table.finish" : "Finish time",
-  "process.overview.table.finish": "Lopetusaika",
+  // "process.detail.delete.header": "Delete process",
+  "process.detail.delete.header": "Poista prosessi",
 
-  // "process.overview.table.id" : "Process ID",
+  // "process.detail.delete.body": "Are you sure you want to delete the current process?",
+  "process.detail.delete.body": "Haluatko varmasti poistaa nykyisen prosessin?",
+
+  // "process.detail.delete.cancel": "Cancel",
+  "process.detail.delete.cancel": "Peruuta",
+
+  // "process.detail.delete.confirm": "Delete process",
+  "process.detail.delete.confirm": "Poista prosessi",
+
+  // "process.detail.delete.success": "The process was successfully deleted.",
+  "process.detail.delete.success": "Prosessi on poistettu.",
+
+  // "process.detail.delete.error": "Something went wrong when deleting the process",
+  "process.detail.delete.error": "Virhe prosessia poistettaessa",
+
+  // "process.overview.table.finish": "Finish time (UTC)",
+  "process.overview.table.finish": "Lopetusaika (UTC)",
+
+  // "process.overview.table.id": "Process ID",
   "process.overview.table.id": "Prosessin ID",
 
-  // "process.overview.table.name" : "Name",
+  // "process.overview.table.name": "Name",
   "process.overview.table.name": "Nimi",
 
-  // "process.overview.table.start" : "Start time",
-  "process.overview.table.start": "Aloitusaika",
+  // "process.overview.table.start": "Start time (UTC)",
+  "process.overview.table.start": "Aloitusaika (UTC)",
 
-  // "process.overview.table.status" : "Status",
+  // "process.overview.table.status": "Status",
   "process.overview.table.status": "Tila",
 
-  // "process.overview.table.user" : "User",
+  // "process.overview.table.user": "User",
   "process.overview.table.user": "Käyttäjä",
 
   // "process.overview.title": "Processes Overview",
@@ -3548,6 +4806,32 @@
   // "process.overview.new": "New",
   "process.overview.new": "Uusi",
 
+  // "process.overview.table.actions": "Actions",
+  "process.overview.table.actions": "Toiminnot",
+
+  // "process.overview.delete": "Delete {{count}} processes",
+  "process.overview.delete": "Poista {{count}} prosessi(a)",
+
+  // "process.overview.delete.clear": "Clear delete selection",
+  "process.overview.delete.clear": "Tyhjennä poistettavien valinta",
+
+  // "process.overview.delete.processing": "{{count}} process(es) are being deleted. Please wait for the deletion to fully complete. Note that this can take a while.",
+  "process.overview.delete.processing": "{{count}} prosessi(a) poistetaan. Odota poiston päättymistä. Poisto saattaa kestää hetken.",
+
+  // "process.overview.delete.body": "Are you sure you want to delete {{count}} process(es)?",
+  "process.overview.delete.body": "Haluatko varmasti poistaa {{count}} prosessin/prosessia?",
+
+  // "process.overview.delete.header": "Delete processes",
+  "process.overview.delete.header": "Poista prosessi",
+
+  // "process.bulk.delete.error.head": "Error on deleteing process",
+  "process.bulk.delete.error.head": "Virhe poistettaessa prosessia",
+
+  // "process.bulk.delete.error.body": "The process with ID {{processId}} could not be deleted. The remaining processes will continue being deleted. ",
+  "process.bulk.delete.error.body": "Prosessia, jonka ID on {{processId}}, ei voitu poistaa. Muiden prosessien poistamista jatketaan.",
+
+  // "process.bulk.delete.success": "{{count}} process(es) have been succesfully deleted",
+  "process.bulk.delete.success": "{{count}} prosessi(a) poistettu",
 
   // "profile.breadcrumbs": "Update Profile",
   "profile.breadcrumbs": "Päivitä profiili",
@@ -3558,11 +4842,14 @@
   // "profile.card.security": "Security",
   "profile.card.security": "Suojaus",
 
-  // "profile.form.submit": "Update Profile",
-  "profile.form.submit": "Päivitä profiili",
+  // "profile.form.submit": "Save",
+  "profile.form.submit": "Tallenna",
 
   // "profile.groups.head": "Authorization groups you belong to",
-  "profile.groups.head": "Ryhmät, joihin kuulut",
+  "profile.groups.head": "Käyttöoikeusryhmät, joihin kuulut",
+
+  // "profile.special.groups.head": "Authorization special groups you belong to",
+  "profile.special.groups.head": "Erityiset käyttöoikeusryhmät, joihin kuulut",
 
   // "profile.head": "Update Profile",
   "profile.head": "Päivitä profiili",
@@ -3603,11 +4890,8 @@
   // "profile.security.form.error.matching-passwords": "The passwords do not match.",
   "profile.security.form.error.matching-passwords": "Salasanat eivät täsmää.",
 
-  // "profile.security.form.error.password-length": "The password should be at least 6 characters long.",
-  "profile.security.form.error.password-length": "Salasanan on oltava vähintään 6 merkkiä pitkä.",
-
-  // "profile.security.form.info": "Optionally, you can enter a new password in the box below, and confirm it by typing it again into the second box. It should be at least six characters long.",
-  "profile.security.form.info": "Voit kirjoittaa uuden salasanan alla olevaan kenttään ja varmentaa sen kirjoittamalla sen uudelleen seuraavaan kenttään. Salasanan pituus on vähintään kuusi merkkiä.",
+  // "profile.security.form.info": "Optionally, you can enter a new password in the box below, and confirm it by typing it again into the second box.",
+  "profile.security.form.info": "Voit kirjoittaa uuden salasanan alla olevaan kenttään ja varmentaa sen kirjoittamalla sen uudelleen seuraavaan kenttään.",
 
   // "profile.security.form.label.password": "Password",
   "profile.security.form.label.password": "Salasana",
@@ -3615,6 +4899,9 @@
   // "profile.security.form.label.passwordrepeat": "Retype to confirm",
   "profile.security.form.label.passwordrepeat": "Kirjoita uudelleen",
 
+  // "profile.security.form.label.current-password": "Current password",
+  "profile.security.form.label.current-password": "Nykyinen salasana",
+
   // "profile.security.form.notifications.success.content": "Your changes to the password were saved.",
   "profile.security.form.notifications.success.content": "Muuttunut salasana on tallennettu.",
 
@@ -3624,16 +4911,20 @@
   // "profile.security.form.notifications.error.title": "Error changing passwords",
   "profile.security.form.notifications.error.title": "Virhe salasanaa muutettaessa",
 
-  // "profile.security.form.notifications.error.not-long-enough": "The password has to be at least 6 characters long.",
-  "profile.security.form.notifications.error.not-long-enough": "Salasanan on oltava vähintään 6 merkkiä pitkä.",
+  // "profile.security.form.notifications.error.change-failed": "An error occurred while trying to change the password. Please check if the current password is correct.",
+  "profile.security.form.notifications.error.change-failed": "Tapahtui virhe salasanaa muutettaessa. Tarkista, että nykyinen salasana on oikea.",
 
   // "profile.security.form.notifications.error.not-same": "The provided passwords are not the same.",
   "profile.security.form.notifications.error.not-same": "Annetut salasanat eivät täsmää.",
 
+  // "profile.security.form.notifications.error.general": "Please fill required fields of security form.",
+  "profile.security.form.notifications.error.general": "Täytä suojauslomakkeen vaaditut kentät.",
+
   // "profile.title": "Update Profile",
   "profile.title": "Päivitä profiili",
 
-
+  // "profile.card.researcher": "Researcher Profile",
+  "profile.card.researcher": "Tutkijaprofiili",
 
   // "project.listelement.badge": "Research Project",
   "project.listelement.badge": "Tutkimusprojekti",
@@ -3668,7 +4959,8 @@
   // "project.search.results.head": "Project Search Results",
   "project.search.results.head": "Projektihaun tulokset",
 
-
+  // "project-relationships.search.results.head": "Project Search Results",
+  "project-relationships.search.results.head": "Projektihaun tulokset",
 
   // "publication.listelement.badge": "Publication",
   "publication.listelement.badge": "Julkaisu",
@@ -3697,9 +4989,20 @@
   // "publication.search.results.head": "Publication Search Results",
   "publication.search.results.head": "Aineistohaun tulokset",
 
-  // "publication.search.title": "DSpace Angular :: Publication Search",
-  "publication.search.title": "DSpace Angular :: Aineistohaku",
+  // "publication-relationships.search.results.head": "Publication Search Results",
+  "publication-relationships.search.results.head": "Aineistohaun tulokset",
 
+  // "publication.search.title": "Publication Search",
+  "publication.search.title": "Aineistohaku",
+
+  // "media-viewer.next": "Next",
+  "media-viewer.next": "Seuraava",
+
+  // "media-viewer.previous": "Previous",
+  "media-viewer.previous": "Edellinen",
+
+  // "media-viewer.playlist": "Playlist",
+  "media-viewer.playlist": "Soittolista",
 
   // "register-email.title": "New user registration",
   "register-email.title": "Uuden käyttäjän rekisteröinti",
@@ -3734,8 +5037,8 @@
   // "register-page.create-profile.security.header": "Security",
   "register-page.create-profile.security.header": "Suojaus",
 
-  // "register-page.create-profile.security.info": "Please enter a password in the box below, and confirm it by typing it again into the second box. It should be at least six characters long.",
-  "register-page.create-profile.security.info": "Syötä salasana alla olevaan kenttään ja vahvista se kirjoittamalla salasana uudelleen seuraavaan kenttään. Salasanan on oltava vähintään kuusi merkkiä pitkä.",
+  // "register-page.create-profile.security.info": "Please enter a password in the box below, and confirm it by typing it again into the second box.",
+  "register-page.create-profile.security.info": "Syötä salasana alla olevaan kenttään ja vahvista se kirjoittamalla salasana uudelleen seuraavaan kenttään.",
 
   // "register-page.create-profile.security.label.password": "Password *",
   "register-page.create-profile.security.label.password": "Salasana *",
@@ -3749,14 +5052,11 @@
   // "register-page.create-profile.security.error.matching-passwords": "The passwords do not match.",
   "register-page.create-profile.security.error.matching-passwords": "Salasanat eivät täsmää.",
 
-  // "register-page.create-profile.security.error.password-length": "The password should be at least 6 characters long.",
-  "register-page.create-profile.security.error.password-length": "Salasanan on oltava vähintään 6 merkkiä pitkä.",
-
   // "register-page.create-profile.submit": "Complete Registration",
   "register-page.create-profile.submit": "Viimeistele rekisteröinti",
 
   // "register-page.create-profile.submit.error.content": "Something went wrong while registering a new user.",
-  "register-page.create-profile.submit.error.content": "Tapahtui virhe uuden käyttäjän rekisteröinnissä.",
+  "register-page.create-profile.submit.error.content": "Virhe uuden käyttäjän rekisteröinnissä.",
 
   // "register-page.create-profile.submit.error.head": "Registration failed",
   "register-page.create-profile.submit.error.head": "Rekisteröinti epäonnistui",
@@ -3767,7 +5067,6 @@
   // "register-page.create-profile.submit.success.head": "Registration completed",
   "register-page.create-profile.submit.success.head": "Rekisteröinti valmis",
 
-
   // "register-page.registration.header": "New user registration",
   "register-page.registration.header": "Uuden käyttäjän rekisteröinti",
 
@@ -3780,8 +5079,11 @@
   // "register-page.registration.email.error.required": "Please fill in an email address",
   "register-page.registration.email.error.required": "Anna sähköpostiosoite",
 
-  // "register-page.registration.email.error.pattern": "Please fill in a valid email address",
-  "register-page.registration.email.error.pattern": "Anna toimiva sähköpostiosoite, ole hyvä",
+  // "register-page.registration.email.error.not-email-form": "Please fill in a valid email address.",
+  "register-page.registration.email.error.not-email-form": "Anna toimiva sähköpostiosoite",
+
+  // "register-page.registration.email.error.not-valid-domain": "Use email with allowed domains: {{ domains }}",
+  "register-page.registration.email.error.not-valid-domain": "Käytä sähköpostiosoitetta näillä verkkoalueilla: {{ domains }}",
 
   // "register-page.registration.email.hint": "This address will be verified and used as your login name.",
   "register-page.registration.email.hint": "Osoite varmistetaan, ja se toimii käyttäjätunnuksenasi kirjautumisessa.",
@@ -3801,7 +5103,29 @@
   // "register-page.registration.error.content": "An error occured when registering the following email address: {{ email }}",
   "register-page.registration.error.content": "Virhe rekisteröitäessä tätä sähköpostiosoitetta: {{ email }}",
 
+  // "register-page.registration.error.recaptcha": "Error when trying to authenticate with recaptcha",
+  "register-page.registration.error.recaptcha": "Virhe autentikoitaessa recaptcha-toiminnolla",
 
+  // "register-page.registration.google-recaptcha.must-accept-cookies": "In order to register you must accept the <b>Registration and Password recovery</b> (Google reCaptcha) cookies.",
+  "register-page.registration.google-recaptcha.must-accept-cookies": "Rekisteröityäksesi sinun on hyväksyttävä <b>Rekisteröinnin ja salasanan palauttamisen</b> (Google reCaptcha) evästeet.",
+
+  // "register-page.registration.error.maildomain": "This email address is not on the list of domains who can register. Allowed domains are {{ domains }}",
+  "register-page.registration.error.maildomain": "Annettu sähköpostiosoite ei ole rekisteröinnille sallittujen verkkoalueiden joukossa. Sallitut verkkoalueet ovat {{ domains }}",
+
+  // "register-page.registration.google-recaptcha.open-cookie-settings": "Open cookie settings",
+  "register-page.registration.google-recaptcha.open-cookie-settings": "Avaa evästeasetukset",
+
+  // "register-page.registration.google-recaptcha.notification.title": "Google reCaptcha",
+  "register-page.registration.google-recaptcha.notification.title": "Google reCaptcha",
+
+  // "register-page.registration.google-recaptcha.notification.message.error": "An error occurred during reCaptcha verification",
+  "register-page.registration.google-recaptcha.notification.message.error": "Virhe reCaptcha-todennuksessa",
+
+  // "register-page.registration.google-recaptcha.notification.message.expired": "Verification expired. Please verify again.",
+  "register-page.registration.google-recaptcha.notification.message.expired": "Todentaminen vanhentunut. Todenna uudelleen.",
+
+  // "register-page.registration.info.maildomain": "Accounts can be registered for mail addresses of the domains",
+  "register-page.registration.info.maildomain": "Tili voidaan rekisteröidä näiden verkkoalueiden sähköpostiosoitteille",
 
   // "relationships.add.error.relationship-type.content": "No suitable match could be found for relationship type {{ type }} between the two items",
   "relationships.add.error.relationship-type.content": "Ei {{ type }}-tyyppistä yhteysvastaavuutta kahden tietueen välillä",
@@ -3857,7 +5181,23 @@
   // "relationships.isContributorOf": "Contributors",
   "relationships.isContributorOf": "Muut tekijät",
 
+  // "relationships.isContributorOf.OrgUnit": "Contributor (Organizational Unit)",
+  "relationships.isContributorOf.OrgUnit": "Osallistuja (Organisaatioyksikkö)",
 
+  // "relationships.isContributorOf.Person": "Contributor",
+  "relationships.isContributorOf.Person": "Osallistuja",
+
+  // "relationships.isFundingAgencyOf.OrgUnit": "Funder",
+  "relationships.isFundingAgencyOf.OrgUnit": "Rahoittaja",
+
+  // "repository.image.logo": "Repository logo",
+  "repository.image.logo": "Julkaisuarkiston logo",
+
+  // "repository.title": "DSpace Repository",
+  "repository.title": "Julkaisuarkisto",
+
+  // "repository.title.prefix": "DSpace Repository :: ",
+  "repository.title.prefix": "Julkaisuarkisto :: ",
 
   // "resource-policies.add.button": "Add",
   "resource-policies.add.button": "Lisää",
@@ -3910,6 +5250,12 @@
   // "resource-policies.edit.page.failure.content": "An error occurred while editing the resource policy.",
   "resource-policies.edit.page.failure.content": "Virhe muokattaessa resurssikäytäntöä.",
 
+  // "resource-policies.edit.page.target-failure.content": "An error occurred while editing the target (ePerson or group) of the resource policy.",
+  "resource-policies.edit.page.target-failure.content": "Tapahtui virhe muokattaessa resurssikäytännön kohdetta (käyttäjä tai ryhmä).",
+
+  // "resource-policies.edit.page.other-failure.content": "An error occurred while editing the resource policy. The target (ePerson or group) has been successfully updated.",
+  "resource-policies.edit.page.other-failure.content": "Tapahtui virhe resurssikäytäntöä muokattaessa. Kohde (käyttäjä tai ryhmä) on päivitetty onnistuneesti.",
+
   // "resource-policies.edit.page.success.content": "Operation successful",
   "resource-policies.edit.page.success.content": "Toiminto onnistui",
 
@@ -3943,10 +5289,25 @@
   // "resource-policies.form.eperson-group-list.table.headers.name": "Name",
   "resource-policies.form.eperson-group-list.table.headers.name": "Nimi",
 
+  // "resource-policies.form.eperson-group-list.modal.header": "Cannot change type",
+  "resource-policies.form.eperson-group-list.modal.header": "Tyypin muuttaminen ei onnistu",
+
+  // "resource-policies.form.eperson-group-list.modal.text1.toGroup": "It is not possible to replace an ePerson with a group.",
+  "resource-policies.form.eperson-group-list.modal.text1.toGroup": "Käyttäjän korvaaminen ryhmällä ei ole mahdollista.",
+
+  // "resource-policies.form.eperson-group-list.modal.text1.toEPerson": "It is not possible to replace a group with an ePerson.",
+  "resource-policies.form.eperson-group-list.modal.text1.toEPerson": "Ryhmän korvaaminen käyttäjällä ei ole mahdollista.",
+
+  // "resource-policies.form.eperson-group-list.modal.text2": "Delete the current resource policy and create a new one with the desired type.",
+  "resource-policies.form.eperson-group-list.modal.text2": "Poista nykyinen resurssikäytäntö ja luo uusi halutulla tyypillä.",
+
+  // "resource-policies.form.eperson-group-list.modal.close": "Ok",
+  "resource-policies.form.eperson-group-list.modal.close": "Ok",
+
   // "resource-policies.form.date.end.label": "End Date",
   "resource-policies.form.date.end.label": "Loppupäivämäärä",
 
-  // "resource-policies.form.date.start.label": "Start Date
+  // "resource-policies.form.date.start.label": "Start Date",
   "resource-policies.form.date.start.label": "Alkupäivämäärä",
 
   // "resource-policies.form.description.label": "Description",
@@ -3955,6 +5316,9 @@
   // "resource-policies.form.name.label": "Name",
   "resource-policies.form.name.label": "Nimi",
 
+  //"resource-policies.form.name.hint": "Max 30 characters",
+  "resource-policies.form.name.hint": "Enintään 30 merkkiä",
+
   // "resource-policies.form.policy-type.label": "Select the policy type",
   "resource-policies.form.policy-type.label": "Valitse käytäntötyyppi",
 
@@ -4009,21 +5373,19 @@
   // "resource-policies.table.headers.title.for.collection": "Policies for Collection",
   "resource-policies.table.headers.title.for.collection": "Kokoelmakäytännöt",
 
-
-
   // "search.description": "",
   "search.description": "",
 
   // "search.switch-configuration.title": "Show",
   "search.switch-configuration.title": "Näytä",
 
-  // "search.title": "DSpace Angular :: Search",
-  "search.title": "DSpace Angular :: Hae",
+  // "search.title": "Search",
+  "search.title": "Hae",
 
   // "search.breadcrumbs": "Search",
   "search.breadcrumbs": "Hae",
 
-  //  "search.search-form.placeholder": "Search the repository ...",
+  // "search.search-form.placeholder": "Search the repository ...",
   "search.search-form.placeholder": "Hae julkaisuarkistosta ...",
 
   // "search.filters.applied.f.author": "Author",
@@ -4038,7 +5400,7 @@
   // "search.filters.applied.f.dateSubmitted": "Date submitted",
   "search.filters.applied.f.dateSubmitted": "Tallennusajankohta",
 
-  // "search.filters.applied.f.discoverable": "Private",
+  // "search.filters.applied.f.discoverable": "Non-discoverable",
   "search.filters.applied.f.discoverable": "Yksityinen",
 
   // "search.filters.applied.f.entityType": "Item Type",
@@ -4068,28 +5430,41 @@
   // "search.filters.applied.f.birthDate.min": "Start birth date",
   "search.filters.applied.f.birthDate.min": "Varhaisin syntymäaika",
 
+  // "search.filters.applied.f.supervisedBy": "Supervised by",
+  "search.filters.applied.f.supervisedBy": "Ohjaajana:",
+
   // "search.filters.applied.f.withdrawn": "Withdrawn",
   "search.filters.applied.f.withdrawn": "Poistettu käytöstä",
 
-
-
   // "search.filters.filter.author.head": "Author",
   "search.filters.filter.author.head": "Tekijä",
 
   // "search.filters.filter.author.placeholder": "Author name",
   "search.filters.filter.author.placeholder": "Tekijän nimi",
 
+  // "search.filters.filter.author.label": "Search author name",
+  "search.filters.filter.author.label": "Hae tekijän nimellä",
+
   // "search.filters.filter.birthDate.head": "Birth Date",
   "search.filters.filter.birthDate.head": "Syntymäaika",
 
   // "search.filters.filter.birthDate.placeholder": "Birth Date",
   "search.filters.filter.birthDate.placeholder": "Syntymäaika",
 
+  // "search.filters.filter.birthDate.label": "Search birth date",
+  "search.filters.filter.birthDate.label": "Hae syntymäajalla",
+
+  // "search.filters.filter.collapse": "Collapse filter",
+  "search.filters.filter.collapse": "Sulje suodatin",
+
   // "search.filters.filter.creativeDatePublished.head": "Date Published",
-  "search.filters.filter.creativeDatePublished.head": "Julkaisuajankohta",
+  "search.filters.filter.creativeDatePublished.head": "Julkaisuaika",
 
   // "search.filters.filter.creativeDatePublished.placeholder": "Date Published",
-  "search.filters.filter.creativeDatePublished.placeholder": "Julkaisuajankohta",
+  "search.filters.filter.creativeDatePublished.placeholder": "Julkaisuaika",
+
+  // "search.filters.filter.creativeDatePublished.label": "Search date published",
+  "search.filters.filter.creativeDatePublished.label": "Hae julkaisuaikaa",
 
   // "search.filters.filter.creativeWorkEditor.head": "Editor",
   "search.filters.filter.creativeWorkEditor.head": "Toimittaja",
@@ -4097,26 +5472,41 @@
   // "search.filters.filter.creativeWorkEditor.placeholder": "Editor",
   "search.filters.filter.creativeWorkEditor.placeholder": "Toimittaja",
 
+  // "search.filters.filter.creativeWorkEditor.label": "Search editor",
+  "search.filters.filter.creativeWorkEditor.label": "Hae toimittajaa",
+
   // "search.filters.filter.creativeWorkKeywords.head": "Subject",
   "search.filters.filter.creativeWorkKeywords.head": "Asiasana",
 
   // "search.filters.filter.creativeWorkKeywords.placeholder": "Subject",
   "search.filters.filter.creativeWorkKeywords.placeholder": "Asiasana",
 
+  // "search.filters.filter.creativeWorkKeywords.label": "Search subject",
+  "search.filters.filter.creativeWorkKeywords.label": "Hae asiasanaa",
+
   // "search.filters.filter.creativeWorkPublisher.head": "Publisher",
   "search.filters.filter.creativeWorkPublisher.head": "Julkaisija",
 
   // "search.filters.filter.creativeWorkPublisher.placeholder": "Publisher",
   "search.filters.filter.creativeWorkPublisher.placeholder": "Julkaisija",
 
+  // "search.filters.filter.creativeWorkPublisher.label": "Search publisher",
+  "search.filters.filter.creativeWorkPublisher.label": "Hae julkaisijaa",
+
   // "search.filters.filter.dateIssued.head": "Date",
   "search.filters.filter.dateIssued.head": "Päivämäärä",
 
-  // "search.filters.filter.dateIssued.max.placeholder": "Minimum Date",
-  "search.filters.filter.dateIssued.max.placeholder": "Alkupäivämäärä",
+  // "search.filters.filter.dateIssued.max.placeholder": "Maximum Date",
+  "search.filters.filter.dateIssued.max.placeholder": "Suurin päivämäärä",
 
-  // "search.filters.filter.dateIssued.min.placeholder": "Maximum Date",
-  "search.filters.filter.dateIssued.min.placeholder": "Loppupäivämäärä",
+  // "search.filters.filter.dateIssued.max.label": "End",
+  "search.filters.filter.dateIssued.max.label": "Loppu",
+
+  // "search.filters.filter.dateIssued.min.placeholder": "Minimum Date",
+  "search.filters.filter.dateIssued.min.placeholder": "Pienin päivämäärä",
+
+  // "search.filters.filter.dateIssued.min.label": "Start",
+  "search.filters.filter.dateIssued.min.label": "Alku",
 
   // "search.filters.filter.dateSubmitted.head": "Date submitted",
   "search.filters.filter.dateSubmitted.head": "Tallennusajankohta",
@@ -4124,7 +5514,10 @@
   // "search.filters.filter.dateSubmitted.placeholder": "Date submitted",
   "search.filters.filter.dateSubmitted.placeholder": "Tallennnusajankohta",
 
-  // "search.filters.filter.discoverable.head": "Private",
+  // "search.filters.filter.dateSubmitted.label": "Search date submitted",
+  "search.filters.filter.dateSubmitted.label": "Hakupäivä lähetetty",
+
+  // "search.filters.filter.discoverable.head": "Non-discoverable",
   "search.filters.filter.discoverable.head": "Yksityinen",
 
   // "search.filters.filter.withdrawn.head": "Withdrawn",
@@ -4136,6 +5529,12 @@
   // "search.filters.filter.entityType.placeholder": "Item Type",
   "search.filters.filter.entityType.placeholder": "Tietueen tyyppi",
 
+  // "search.filters.filter.entityType.label": "Search item type",
+  "search.filters.filter.entityType.label": "Hae tietueen tyyppiä",
+
+  // "search.filters.filter.expand": "Expand filter",
+  "search.filters.filter.expand": "Laajenna suodinta",
+
   // "search.filters.filter.has_content_in_original_bundle.head": "Has files",
   "search.filters.filter.has_content_in_original_bundle.head": "On tiedostoja",
 
@@ -4145,53 +5544,80 @@
   // "search.filters.filter.itemtype.placeholder": "Type",
   "search.filters.filter.itemtype.placeholder": "Tyyppi",
 
+  // "search.filters.filter.itemtype.label": "Search type",
+  "search.filters.filter.itemtype.label": "Hakutyyppi",
+
   // "search.filters.filter.jobTitle.head": "Job Title",
   "search.filters.filter.jobTitle.head": "Tehtävänimike",
 
   // "search.filters.filter.jobTitle.placeholder": "Job Title",
   "search.filters.filter.jobTitle.placeholder": "Tehtävänimike",
 
+  // "search.filters.filter.jobTitle.label": "Search job title",
+  "search.filters.filter.jobTitle.label": "Hae tehtävänimikettä",
+
   // "search.filters.filter.knowsLanguage.head": "Known language",
   "search.filters.filter.knowsLanguage.head": "Tunnettu kieli",
 
   // "search.filters.filter.knowsLanguage.placeholder": "Known language",
   "search.filters.filter.knowsLanguage.placeholder": "Tunnettu kieli",
 
+  // "search.filters.filter.knowsLanguage.label": "Search known language",
+  "search.filters.filter.knowsLanguage.label": "Hae tunnettua kieltä",
+
   // "search.filters.filter.namedresourcetype.head": "Status",
   "search.filters.filter.namedresourcetype.head": "Tila",
 
   // "search.filters.filter.namedresourcetype.placeholder": "Status",
   "search.filters.filter.namedresourcetype.placeholder": "Tila",
 
+  // "search.filters.filter.namedresourcetype.label": "Search status",
+  "search.filters.filter.namedresourcetype.label": "Haun tila",
+
   // "search.filters.filter.objectpeople.head": "People",
   "search.filters.filter.objectpeople.head": "Käyttäjät",
 
   // "search.filters.filter.objectpeople.placeholder": "People",
   "search.filters.filter.objectpeople.placeholder": "Käyttäjät",
 
+  // "search.filters.filter.objectpeople.label": "Search people",
+  "search.filters.filter.objectpeople.label": "Hae ihmisiä",
+
   // "search.filters.filter.organizationAddressCountry.head": "Country",
   "search.filters.filter.organizationAddressCountry.head": "Maa",
 
   // "search.filters.filter.organizationAddressCountry.placeholder": "Country",
   "search.filters.filter.organizationAddressCountry.placeholder": "Maa",
 
+  // "search.filters.filter.organizationAddressCountry.label": "Search country",
+  "search.filters.filter.organizationAddressCountry.label": "Hae maata",
+
   // "search.filters.filter.organizationAddressLocality.head": "City",
   "search.filters.filter.organizationAddressLocality.head": "Kaupunki",
 
   // "search.filters.filter.organizationAddressLocality.placeholder": "City",
   "search.filters.filter.organizationAddressLocality.placeholder": "Kaupunki",
 
+  // "search.filters.filter.organizationAddressLocality.label": "Search city",
+  "search.filters.filter.organizationAddressLocality.label": "Hae kaupunkia",
+
   // "search.filters.filter.organizationFoundingDate.head": "Date Founded",
   "search.filters.filter.organizationFoundingDate.head": "Perustamispäivämäärä",
 
   // "search.filters.filter.organizationFoundingDate.placeholder": "Date Founded",
   "search.filters.filter.organizationFoundingDate.placeholder": "Perustamispäivämäärä",
 
+  // "search.filters.filter.organizationFoundingDate.label": "Search date founded",
+  "search.filters.filter.organizationFoundingDate.label": "Hae perustamispäivämäärää",
+
   // "search.filters.filter.scope.head": "Scope",
   "search.filters.filter.scope.head": "Rajaus",
 
   // "search.filters.filter.scope.placeholder": "Scope filter",
-  "search.filters.filter.scope.placeholder": "Haun tarkennus",
+  "search.filters.filter.scope.placeholder": "Hakusuodattimet",
+
+  // "search.filters.filter.scope.label": "Search scope filter",
+  "search.filters.filter.scope.label": "Hae hakusuodatinta",
 
   // "search.filters.filter.show-less": "Collapse",
   "search.filters.filter.show-less": "Sulje",
@@ -4205,13 +5631,29 @@
   // "search.filters.filter.subject.placeholder": "Subject",
   "search.filters.filter.subject.placeholder": "Asiasana",
 
+  // "search.filters.filter.subject.label": "Search subject",
+  "search.filters.filter.subject.label": "Hae asiasanaa",
+
   // "search.filters.filter.submitter.head": "Submitter",
   "search.filters.filter.submitter.head": "Tallentaja",
 
   // "search.filters.filter.submitter.placeholder": "Submitter",
   "search.filters.filter.submitter.placeholder": "Tallentaja",
 
+  // "search.filters.filter.submitter.label": "Search submitter",
+  "search.filters.filter.submitter.label": "Hae tallentajaa",
 
+  // "search.filters.filter.show-tree": "Browse {{ name }} tree",
+  "search.filters.filter.show-tree": "Selaa {{ name }}-puuta",
+
+  // "search.filters.filter.supervisedBy.head": "Supervised By",
+  "search.filters.filter.supervisedBy.head": "Ohjaajana:",
+
+  // "search.filters.filter.supervisedBy.placeholder": "Supervised By",
+  "search.filters.filter.supervisedBy.placeholder": "Ohjaajana:",
+
+  // "search.filters.filter.supervisedBy.label": "Search Supervised By",
+  "search.filters.filter.supervisedBy.label": "Hae ohjaajan mukaan",
 
   // "search.filters.entityType.JournalIssue": "Journal Issue",
   "search.filters.entityType.JournalIssue": "Kausijulkaisun numero",
@@ -4240,25 +5682,23 @@
   // "search.filters.withdrawn.false": "No",
   "search.filters.withdrawn.false": "Ei",
 
-
   // "search.filters.head": "Filters",
   "search.filters.head": "Suodattimet",
 
   // "search.filters.reset": "Reset filters",
   "search.filters.reset": "Tyhjennä suodattimet",
 
-
+  // "search.filters.search.submit": "Submit",
+  "search.filters.search.submit": "Lähetä",
 
   // "search.form.search": "Search",
   "search.form.search": "Hae",
 
-  // "search.form.search_dspace": "Search DSpace",
-  "search.form.search_dspace": "Hae arkistosta",
-
-  // "search.form.search_mydspace": "Search MyDSpace",
-  "search.form.search_mydspace": "Hae omista tiedoista",
-
+  // "search.form.search_dspace": "All repository",
+  "search.form.search_dspace": "Koko julkaisuarkisto",
 
+  // "search.form.scope.all": "All of DSpace",
+  "search.form.scope.all": "Koko julkaisuarkisto",
 
   // "search.results.head": "Search Results",
   "search.results.head": "Hakutulokset",
@@ -4272,7 +5712,17 @@
   // "search.results.empty": "Your search returned no results.",
   "search.results.empty": "Ei hakutuloksia.",
 
+  // "search.results.view-result": "View",
+  "search.results.view-result": "Näytä",
 
+  // "search.results.response.500": "An error occurred during query execution, please try again later",
+  "search.results.response.500": "Virhe hakua suoritettaessa, yritä myöhemmin uudelleen",
+
+  // "default.search.results.head": "Search Results",
+  "default.search.results.head": "Hakutulokset",
+
+  // "default-relationships.search.results.head": "Search Results",
+  "default-relationships.search.results.head": "Hakutulokset",
 
   // "search.sidebar.close": "Back to results",
   "search.sidebar.close": "Paluu tuloksiin",
@@ -4295,19 +5745,15 @@
   // "search.sidebar.settings.title": "Settings",
   "search.sidebar.settings.title": "Asetukset",
 
-
-
   // "search.view-switch.show-detail": "Show detail",
   "search.view-switch.show-detail": "Näytä lisätiedot",
 
   // "search.view-switch.show-grid": "Show as grid",
-  "search.view-switch.show-grid": "Näydä ruudukkona",
+  "search.view-switch.show-grid": "Näytä ruudukkona",
 
   // "search.view-switch.show-list": "Show as list",
   "search.view-switch.show-list": "Näytä luettelona",
 
-
-
   // "sorting.ASC": "Ascending",
   "sorting.ASC": "Laskeva",
 
@@ -4320,10 +5766,29 @@
   // "sorting.dc.title.DESC": "Title Descending",
   "sorting.dc.title.DESC": "Nimeke (Ö-A)",
 
-  // "sorting.score.DESC": "Relevance",
-  "sorting.score.DESC": "Relevanssi",
+  // "sorting.score.ASC": "Least Relevant",
+  "sorting.score.ASC": "Vähiten relevantti",
 
+  // "sorting.score.DESC": "Most Relevant",
+  "sorting.score.DESC": "Relevantein",
 
+  // "sorting.dc.date.issued.ASC": "Date Issued Ascending",
+  "sorting.dc.date.issued.ASC": "Julkaisuaika nouseva",
+
+  // "sorting.dc.date.issued.DESC": "Date Issued Descending",
+  "sorting.dc.date.issued.DESC": "Julkaisuaika laskeva",
+
+  // "sorting.dc.date.accessioned.ASC": "Accessioned Date Ascending",
+  "sorting.dc.date.accessioned.ASC": "Hyväksymispäivä nouseva",
+
+  // "sorting.dc.date.accessioned.DESC": "Accessioned Date Descending",
+  "sorting.dc.date.accessioned.DESC": "Hyväksymispäivä laskeva",
+
+  // "sorting.lastModified.ASC": "Last modified Ascending",
+  "sorting.lastModified.ASC": "Viimeksi muokattu nouseva",
+
+  // "sorting.lastModified.DESC": "Last modified Descending",
+  "sorting.lastModified.DESC": "Viimeksi muokattu laskeva",
 
   // "statistics.title": "Statistics",
   "statistics.title": "Tilastot",
@@ -4358,12 +5823,19 @@
   // "statistics.table.header.views": "Views",
   "statistics.table.header.views": "Katseluita",
 
+  // "statistics.table.no-name": "(object name could not be loaded)",
+  "statistics.table.no-name": "(kohteen nimeä ei voitu ladata)",
 
+  // "submission.edit.breadcrumbs": "Edit Submission",
+  "submission.edit.breadcrumbs": "Muokkaa tallennusta",
 
   // "submission.edit.title": "Edit Submission",
   "submission.edit.title": "Muokkaa tallennusta",
 
-  // "submission.general.cannot_submit": "You have not the privilege to make a new submission.",
+  // "submission.general.cancel": "Cancel",
+  "submission.general.cancel": "Peruuta",
+
+  // "submission.general.cannot_submit": "You don't have permission to make a new submission.",
   "submission.general.cannot_submit": "Sinulla ei ole oikeuksia aineiston tallentamiseen.",
 
   // "submission.general.deposit": "Deposit",
@@ -4384,21 +5856,50 @@
   // "submission.general.discard.submit": "Discard",
   "submission.general.discard.submit": "Hylkää",
 
+  // "submission.general.info.saved": "Saved",
+  "submission.general.info.saved": "Tallennettu",
+
+  // "submission.general.info.pending-changes": "Unsaved changes",
+  "submission.general.info.pending-changes": "Tallentamattomat muutokset",
+
   // "submission.general.save": "Save",
   "submission.general.save": "Tallenna",
 
   // "submission.general.save-later": "Save for later",
   "submission.general.save-later": "Tallenna myöhemmäksi",
 
-
   // "submission.import-external.page.title": "Import metadata from an external source",
   "submission.import-external.page.title": "Importoi metadata ulkoisesta lähteestä",
 
   // "submission.import-external.title": "Import metadata from an external source",
   "submission.import-external.title": "Importoi metadata ulkoisesta lähteestä",
 
+  // "submission.import-external.title.Journal": "Import a journal from an external source",
+  "submission.import-external.title.Journal": "Importoi Muokkaa kausijulkaisu ulkoisesta lähteestä",
+
+  // "submission.import-external.title.JournalIssue": "Import a journal issue from an external source",
+  "submission.import-external.title.JournalIssue": "Importoi kausijulkaisun numero ulkoisesta lähteestä",
+
+  // "submission.import-external.title.JournalVolume": "Import a journal volume from an external source",
+  "submission.import-external.title.JournalVolume": "Importoi kausijulkaisun vuosikerta ulkoisesta lähteestä",
+
+  // "submission.import-external.title.OrgUnit": "Import a publisher from an external source",
+  "submission.import-external.title.OrgUnit": "Importoi julkaisija ulkoisesta lähteestä",
+
+  // "submission.import-external.title.Person": "Import a person from an external source",
+  "submission.import-external.title.Person": "Importoi käyttäjä ulkoisesta lähteestä",
+
+  // "submission.import-external.title.Project": "Import a project from an external source",
+  "submission.import-external.title.Project": "Importoi projekti ulkoisesta lähteestä",
+
+  // "submission.import-external.title.Publication": "Import a publication from an external source",
+  "submission.import-external.title.Publication": "Importoi julkaisu ulkoisesta lähteestä",
+
+  // "submission.import-external.title.none": "Import metadata from an external source",
+  "submission.import-external.title.none": "Importoi metadata ulkoisesta lähteestä",
+
   // "submission.import-external.page.hint": "Enter a query above to find items from the web to import in to DSpace.",
-  "submission.import-external.page.hint": "Anna hakulauseke etsiäksesi verkosta arkistoon importoitavia tietueita.",
+  "submission.import-external.page.hint": "Anna hakulauseke etsiäksesi verkosta julkaisuarkistoon importoitavia tietueita.",
 
   // "submission.import-external.back-to-my-dspace": "Back to MyDSpace",
   "submission.import-external.back-to-my-dspace": "Paluu omiin tietoihin",
@@ -4418,27 +5919,84 @@
   // "submission.import-external.source.arxiv": "arXiv",
   "submission.import-external.source.arxiv": "arXiv",
 
+  // "submission.import-external.source.ads": "NASA/ADS",
+  "submission.import-external.source.ads": "NASA/ADS",
+
+  // "submission.import-external.source.cinii": "CiNii",
+  "submission.import-external.source.cinii": "CiNii",
+
+  // "submission.import-external.source.crossref": "Crossref",
+  "submission.import-external.source.crossref": "Crossref",
+
+  // "submission.import-external.source.datacite": "DataCite",
+  "submission.import-external.source.datacite": "DataCite",
+
+  // "submission.import-external.source.scielo": "SciELO",
+  "submission.import-external.source.scielo": "SciELO",
+
+  // "submission.import-external.source.scopus": "Scopus",
+  "submission.import-external.source.scopus": "Scopus",
+
+  // "submission.import-external.source.vufind": "VuFind",
+  "submission.import-external.source.vufind": "VuFind",
+
+  // "submission.import-external.source.wos": "Web Of Science",
+  "submission.import-external.source.wos": "Web Of Science",
+
+  // "submission.import-external.source.orcidWorks": "ORCID",
+  "submission.import-external.source.orcidWorks": "ORCID",
+
+  // "submission.import-external.source.epo": "European Patent Office (EPO)",
+  "submission.import-external.source.epo": "Euroopan patenttivirasto (EPO)",
+
   // "submission.import-external.source.loading": "Loading ...",
   "submission.import-external.source.loading": "Ladataan ...",
 
   // "submission.import-external.source.sherpaJournal": "SHERPA Journals",
   "submission.import-external.source.sherpaJournal": "SHERPA-kausijulkaisut",
 
+  // "submission.import-external.source.sherpaJournalIssn": "SHERPA Journals by ISSN",
+  "submission.import-external.source.sherpaJournalIssn": "SHERPA-kausijulkaisut ISSN-tunnuksen mukaan",
+
   // "submission.import-external.source.sherpaPublisher": "SHERPA Publishers",
   "submission.import-external.source.sherpaPublisher": "SHERPA-kustantajat",
 
+  // "submission.import-external.source.openAIREFunding": "Funding OpenAIRE API",
+  "submission.import-external.source.openAIREFunding": "OpenAIRE API-rahoitus",
+
   // "submission.import-external.source.orcid": "ORCID",
   "submission.import-external.source.orcid": "ORCID-tunniste",
 
   // "submission.import-external.source.pubmed": "Pubmed",
   "submission.import-external.source.pubmed": "Pubmed",
 
+  // "submission.import-external.source.pubmedeu": "Pubmed Europe",
+  "submission.import-external.source.pubmedeu": "Euroopan Pubmed",
+
   // "submission.import-external.source.lcname": "Library of Congress Names",
   "submission.import-external.source.lcname": "Library of Congress -nimet",
 
   // "submission.import-external.preview.title": "Item Preview",
   "submission.import-external.preview.title": "Tietueen esikatselu",
 
+  // "submission.import-external.preview.title.Publication": "Publication Preview",
+  "submission.import-external.preview.title.Publication": "Julkaisun esikatselu",
+
+  // "submission.import-external.preview.title.none": "Item Preview",
+  "submission.import-external.preview.title.none": "Tietueen esikatselu",
+
+  // "submission.import-external.preview.title.Journal": "Journal Preview",
+  "submission.import-external.preview.title.Journal": "Kausijulkaisun esikatselu",
+
+  // "submission.import-external.preview.title.OrgUnit": "Organizational Unit Preview",
+  "submission.import-external.preview.title.OrgUnit": "Organisaatioyksikön esikatselu",
+
+  // "submission.import-external.preview.title.Person": "Person Preview",
+  "submission.import-external.preview.title.Person": "Käyttäjän esikatselu",
+
+  // "submission.import-external.preview.title.Project": "Project Preview",
+  "submission.import-external.preview.title.Project": "Projektin esikatselu",
+
   // "submission.import-external.preview.subtitle": "The metadata below was imported from an external source. It will be pre-filled when you start the submission.",
   "submission.import-external.preview.subtitle": "Alla oleva metadata importoitiin ulkoisesta lähteestä. Sillä esitäytetään metadata, kun aloitat tallennuksen.",
 
@@ -4469,6 +6027,48 @@
   // "submission.sections.describe.relationship-lookup.external-source.import-button-title.Journal Volume": "Import remote journal volume",
   "submission.sections.describe.relationship-lookup.external-source.import-button-title.Journal Volume": "Importoi kausijulkaisun vuosikerta ulkoisesta lähteestä",
 
+  // "submission.sections.describe.relationship-lookup.external-source.import-button-title.isProjectOfPublication": "Project",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.isProjectOfPublication": "Projekti",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-button-title.none": "Import remote item",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.none": "Importoi tietue ulkoisesta lähteestä",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-button-title.Event": "Import remote event",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Event": "Importoi tapahtuma ulkoisesta lähteestä",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-button-title.Product": "Import remote product",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Product": "Importoi tuote ulkoisesta lähteestä",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-button-title.Equipment": "Import remote equipment",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Equipment": "Importoi laite ulkoisesta lähteestä",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-button-title.OrgUnit": "Import remote organizational unit",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.OrgUnit": "Importoi organisaatioyksikkö ulkoisesta lähteestä",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-button-title.Funding": "Import remote fund",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Funding": "Importoi rahoitus ulkoisesta lähteestä",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-button-title.Person": "Import remote person",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Person": "Importoi käyttäjä ulkoisesta lähteestä",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-button-title.Patent": "Import remote patent",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Patent": "Importoi patentti ulkoisesta lähteestä",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-button-title.Project": "Import remote project",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Project": "Importoi projekti ulkoisesta lähteestä",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-button-title.Publication": "Import remote publication",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Publication": "Importoi julkaisu ulkoisesta lähteestä",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.isProjectOfPublication.added.new-entity": "New Entity Added!",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.isProjectOfPublication.added.new-entity": "Uusi entiteetti lisätty",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.isProjectOfPublication.title": "Project",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.isProjectOfPublication.title": "Projekti",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.openAIREFunding": "Funding OpenAIRE API",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.openAIREFunding": "Funding OpenAIRE API-rahoitus",
+
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.isAuthorOfPublication.title": "Import Remote Author",
   "submission.sections.describe.relationship-lookup.external-source.import-modal.isAuthorOfPublication.title": "Importoi tekijä ulkoisesta lähteestä",
 
@@ -4562,6 +6162,9 @@
   // "submission.sections.describe.relationship-lookup.search-tab.search": "Go",
   "submission.sections.describe.relationship-lookup.search-tab.search": "Ok",
 
+  // "submission.sections.describe.relationship-lookup.search-tab.search-form.placeholder": "Search...",
+  "submission.sections.describe.relationship-lookup.search-tab.search-form.placeholder": "Haetaan...",
+
   // "submission.sections.describe.relationship-lookup.search-tab.select-all": "Select all",
   "submission.sections.describe.relationship-lookup.search-tab.select-all": "Valitse kaikki",
 
@@ -4637,13 +6240,39 @@
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isChildOrgUnitOf": "Search for Organizational Units",
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.isChildOrgUnitOf": "Hae organisaatioyksiköitä",
 
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.openAIREFunding": "Funding OpenAIRE API",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.openAIREFunding": "OpenAIRE API -rahoitus",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isProjectOfPublication": "Projects",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isProjectOfPublication": "Projektit",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingAgencyOfProject": "Funder of the Project",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingAgencyOfProject": "Projektin rahoittaja",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isPublicationOfAuthor": "Publication of the Author",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isPublicationOfAuthor": "Tekijän julkaisu",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.openAIREFunding": "Funding OpenAIRE API",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.openAIREFunding": "OpenAIRE API API-rahoitus",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.isProjectOfPublication": "Project",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isProjectOfPublication": "Projekti",
+
+  // "submission.sections.describe.relationship-lookup.title.isProjectOfPublication": "Projects",
+  "submission.sections.describe.relationship-lookup.title.isProjectOfPublication": "Projektit",
+
+  // "submission.sections.describe.relationship-lookup.title.isFundingAgencyOfProject": "Funder of the Project",
+  "submission.sections.describe.relationship-lookup.title.isFundingAgencyOfProject": "Projektin rahoittaja",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.search-form.placeholder": "Search...",
+  "submission.sections.describe.relationship-lookup.selection-tab.search-form.placeholder": "Haetaan...",
+
   // "submission.sections.describe.relationship-lookup.selection-tab.tab-title": "Current Selection ({{ count }})",
   "submission.sections.describe.relationship-lookup.selection-tab.tab-title": "Nykyinen valinta ({{ count }})",
 
   // "submission.sections.describe.relationship-lookup.title.isJournalIssueOfPublication": "Journal Issues",
   "submission.sections.describe.relationship-lookup.title.isJournalIssueOfPublication": "Kausijulkaisun numerot",
 
-
   // "submission.sections.describe.relationship-lookup.title.JournalIssue": "Journal Issues",
   "submission.sections.describe.relationship-lookup.title.JournalIssue": "Kausijulkaisun numerot",
 
@@ -4689,8 +6318,11 @@
   // "submission.sections.describe.relationship-lookup.title.isChildOrgUnitOf": "Parent Organizational Unit",
   "submission.sections.describe.relationship-lookup.title.isChildOrgUnitOf": "Ylempi organisaatioyksikkö",
 
+  // "submission.sections.describe.relationship-lookup.title.isPublicationOfAuthor": "Publication",
+  "submission.sections.describe.relationship-lookup.title.isPublicationOfAuthor": "Julkaisu",
+
   // "submission.sections.describe.relationship-lookup.search-tab.toggle-dropdown": "Toggle dropdown",
-  "submission.sections.describe.relationship-lookup.search-tab.toggle-dropdown": "Vaihda valikon tilaa",
+  "submission.sections.describe.relationship-lookup.search-tab.toggle-dropdown": "Näytä/piilota pudotusvalikko",
 
   // "submission.sections.describe.relationship-lookup.selection-tab.settings": "Settings",
   "submission.sections.describe.relationship-lookup.selection-tab.settings": "Asetukset",
@@ -4767,6 +6399,24 @@
   // "submission.sections.describe.relationship-lookup.selection-tab.title.arxiv": "Search Results",
   "submission.sections.describe.relationship-lookup.selection-tab.title.arxiv": "Hakutulokset",
 
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.crossref": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.crossref": "Hakutulokset",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.epo": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.epo": "Hakutulokset",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.scopus": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.scopus": "Hakutulokset",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.scielo": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.scielo": "Hakutulokset",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.wos": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.wos": "Hakutulokset",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title": "Hakutulokset",
+
   // "submission.sections.describe.relationship-lookup.name-variant.notification.content": "Would you like to save \"{{ value }}\" as a name variant for this person so you and others can reuse it for future submissions? If you don't you can still use it for this submission.",
   "submission.sections.describe.relationship-lookup.name-variant.notification.content": "Haluatko tallentaa nimen \"{{ value }}\" käyttäjän vaihtoehtoiseksi nimeksi, jota muutkin voivat käyttää uudelleen myös tulevissa tallennuksissa? Ellet tallenna nimeä, voit silti käyttää sitä tässä tallennuksessa.",
 
@@ -4792,14 +6442,17 @@
   "submission.sections.ccLicense.option.select": "Valitse vaihtoehto…",
 
   // "submission.sections.ccLicense.link": "You’ve selected the following license:",
-  "submission.sections.ccLicense.link": "Olet valinunt seuraavan lisenssin:",
+  "submission.sections.ccLicense.link": "Olet valinnut seuraavan lisenssin:",
 
   // "submission.sections.ccLicense.confirmation": "I grant the license above",
-  "submission.sections.ccLicense.confirmation": "Myönnän yllä olevan lisenssin",
+  "submission.sections.ccLicense.confirmation": "Hyväksyn yllä olevan lisenssin",
 
   // "submission.sections.general.add-more": "Add more",
   "submission.sections.general.add-more": "Lisää enemmän",
 
+  // "submission.sections.general.cannot_deposit": "Deposit cannot be completed due to errors in the form.<br>Please fill out all required fields to complete the deposit.",
+  "submission.sections.general.cannot_deposit": "Tallennus ei onnistu, koska lomakkeella on virheitä.<br>Täytä kaikki pakolliset kentät viimeistelläksesi tallennuksen.",
+
   // "submission.sections.general.collection": "Collection",
   "submission.sections.general.collection": "Kokoelma",
 
@@ -4839,7 +6492,26 @@
   // "submission.sections.general.sections_not_valid": "There are incomplete sections.",
   "submission.sections.general.sections_not_valid": "Tallennuksessa keskeneräisiä osioita.",
 
+  // "submission.sections.identifiers.info": "The following identifiers will be created for your item:",
+  "submission.sections.identifiers.info": "Tietueellesi luodaan seuraavat tunnisteet:",
 
+  // "submission.sections.identifiers.no_handle": "No handles have been minted for this item.",
+  "submission.sections.identifiers.no_handle": "Tietueelle ei ole luotu handleja.",
+
+  // "submission.sections.identifiers.no_doi": "No DOIs have been minted for this item.",
+  "submission.sections.identifiers.no_doi": "Tietueelle ei ole luotu DOI-tunnuksia.",
+
+  // "submission.sections.identifiers.handle_label": "Handle: ",
+  "submission.sections.identifiers.handle_label": "Handle: ",
+
+  // "submission.sections.identifiers.doi_label": "DOI: ",
+  "submission.sections.identifiers.doi_label": "DOI: ",
+
+  // "submission.sections.identifiers.otherIdentifiers_label": "Other identifiers: ",
+  "submission.sections.identifiers.otherIdentifiers_label": "Muut tunnisteet: ",
+
+  // "submission.sections.submit.progressbar.accessCondition": "Item access conditions",
+  "submission.sections.submit.progressbar.accessCondition": "Tietueen pääsyoikeudet",
 
   // "submission.sections.submit.progressbar.CClicense": "Creative commons license",
   "submission.sections.submit.progressbar.CClicense": "Creative commons -lisenssi",
@@ -4859,19 +6531,65 @@
   // "submission.sections.submit.progressbar.detect-duplicate": "Potential duplicates",
   "submission.sections.submit.progressbar.detect-duplicate": "Mahdollisia kaksoiskappaleita",
 
+  // "submission.sections.submit.progressbar.identifiers": "Identifiers",
+  "submission.sections.submit.progressbar.identifiers": "Tunnisteet",
+
   // "submission.sections.submit.progressbar.license": "Deposit license",
   "submission.sections.submit.progressbar.license": "Tallennuslisenssi",
 
+  // "submission.sections.submit.progressbar.sherpapolicy": "Sherpa policies",
+  "submission.sections.submit.progressbar.sherpapolicy": "Sherpa-käytännöt",
+
   // "submission.sections.submit.progressbar.upload": "Upload files",
   "submission.sections.submit.progressbar.upload": "Lataa tiedostoja",
 
+  // "submission.sections.submit.progressbar.sherpaPolicies": "Publisher open access policy information",
+  "submission.sections.submit.progressbar.sherpaPolicies": "Tietoa julkaisijan open access -käytännöistä",
 
+  // "submission.sections.sherpa-policy.title-empty": "No publisher policy information available. If your work has an associated ISSN, please enter it above to see any related publisher open access policies.",
+  "submission.sections.sherpa-policy.title-empty": "Ei tietoa julkausijan käytännöistä. Jos työlläsi on ISSN-tunnus, syötä se alapuolella olevan kenttään nähdäksesi siihen liittyvät julkaisijan open access -käytännöt.",
+
+  // "submission.sections.status.errors.title": "Errors",
+  "submission.sections.status.errors.title": "Virheet",
+
+  // "submission.sections.status.valid.title": "Valid",
+  "submission.sections.status.valid.title": "Hyväksytty",
+
+  // "submission.sections.status.warnings.title": "Warnings",
+  "submission.sections.status.warnings.title": "Varoitukset",
+
+  // "submission.sections.status.errors.aria": "has errors",
+  "submission.sections.status.errors.aria": "sisältää virheitä",
+
+  // "submission.sections.status.valid.aria": "is valid",
+  "submission.sections.status.valid.aria": "on validi",
+
+  // "submission.sections.status.warnings.aria": "has warnings",
+  "submission.sections.status.warnings.aria": "sisältää varoituksia",
+
+  // "submission.sections.status.info.title": "Additional Information",
+  "submission.sections.status.info.title": "Lisätiedot",
+
+  // "submission.sections.status.info.aria": "Additional Information",
+  "submission.sections.status.info.aria": "Lisätiedot",
+
+  // "submission.sections.toggle.open": "Open section",
+  "submission.sections.toggle.open": "Avaa osio",
+
+  // "submission.sections.toggle.close": "Close section",
+  "submission.sections.toggle.close": "Sulje osio",
+
+  // "submission.sections.toggle.aria.open": "Expand {{sectionHeader}} section",
+  "submission.sections.toggle.aria.open": "Laajenna {{sectionHeader}}-osio",
+
+  // "submission.sections.toggle.aria.close": "Collapse {{sectionHeader}} section",
+  "submission.sections.toggle.aria.close": "Sulje {{sectionHeader}}-osio",
 
   // "submission.sections.upload.delete.confirm.cancel": "Cancel",
   "submission.sections.upload.delete.confirm.cancel": "Peruuta",
 
   // "submission.sections.upload.delete.confirm.info": "This operation can't be undone. Are you sure?",
-  "submission.sections.upload.delete.confirm.info": "Tätä toimintoa ei voi peruuttaa. Oletko varma?",
+  "submission.sections.upload.delete.confirm.info": "Tätä toimintoa ei voi perua. Oletko varma?",
 
   // "submission.sections.upload.delete.confirm.submit": "Yes, I'm sure",
   "submission.sections.upload.delete.confirm.submit": "Kyllä, olen varma",
@@ -4882,18 +6600,36 @@
   // "submission.sections.upload.delete.submit": "Delete",
   "submission.sections.upload.delete.submit": "Poista",
 
+  // "submission.sections.upload.download.title": "Download bitstream",
+  "submission.sections.upload.download.title": "Lataa tiedosto",
+
   // "submission.sections.upload.drop-message": "Drop files to attach them to the item",
   "submission.sections.upload.drop-message": "Pudota tiedostot liittääksesi ne tietueeseen",
 
+  // "submission.sections.upload.edit.title": "Edit bitstream",
+  "submission.sections.upload.edit.title": "Muokkaa tiedostoa",
+
   // "submission.sections.upload.form.access-condition-label": "Access condition type",
   "submission.sections.upload.form.access-condition-label": "Pääsyoikeustyyppi",
 
+  // "submission.sections.upload.form.access-condition-hint": "Select an access condition to apply on the bitstream once the item is deposited",
+  "submission.sections.upload.form.access-condition-hint": "Valitse pääsyoikeus, jota sovelletaan tiedostoon tietueen tallentamisen jälkeen",
+
   // "submission.sections.upload.form.date-required": "Date is required.",
   "submission.sections.upload.form.date-required": "Päivämäärä on pakollinen tieto.",
 
+  // "submission.sections.upload.form.date-required-from": "Grant access from date is required.",
+  "submission.sections.upload.form.date-required-from": "Pääsyoikeuden alkupäivä on pakollinen tieto.",
+
+  // "submission.sections.upload.form.date-required-until": "Grant access until date is required.",
+  "submission.sections.upload.form.date-required-until": "Pääsyoikeuden loppupäivä on pakollinen tieto.",
+
   // "submission.sections.upload.form.from-label": "Grant access from",
   "submission.sections.upload.form.from-label": "Pääsyoikeus alkaa",
 
+  // "submission.sections.upload.form.from-hint": "Select the date from which the related access condition is applied",
+  "submission.sections.upload.form.from-hint": "Valitse päivämäärä josta lukien pääsyoikeutta sovelletaan",
+
   // "submission.sections.upload.form.from-placeholder": "From",
   "submission.sections.upload.form.from-placeholder": "Alkaen",
 
@@ -4906,6 +6642,9 @@
   // "submission.sections.upload.form.until-label": "Grant access until",
   "submission.sections.upload.form.until-label": "Pääsyoikeus päättyy",
 
+  // "submission.sections.upload.form.until-hint": "Select the date until which the related access condition is applied",
+  "submission.sections.upload.form.until-hint": "Valitse päivämäärä, johon asti pääsyoikeus on voimassa",
+
   // "submission.sections.upload.form.until-placeholder": "Until",
   "submission.sections.upload.form.until-placeholder": "Asti",
 
@@ -4915,7 +6654,7 @@
   // "submission.sections.upload.header.policy.default.withlist": "Please note that uploaded files in the {{collectionName}} collection will be accessible, in addition to what is explicitly decided for the single file, with the following group(s):",
   "submission.sections.upload.header.policy.default.withlist": "Yksittäisten tiedostojen pääsyrajoitusten lisäksi {{collectionName}}-kokoelmaan ladatut tiedostot ovat seuraavien ryhmien saatavilla:",
 
-  // "submission.sections.upload.info": "Here you will find all the files currently in the item. You can update the file metadata and access conditions or <strong>upload additional files just dragging & dropping them everywhere in the page</strong>",
+  // "submission.sections.upload.info": "Here you will find all the files currently in the item. You can update the file metadata and access conditions or <strong>upload additional files by dragging & dropping them anywhere on the page.</strong>",
   "submission.sections.upload.info": "Tietueen kaikki tiedostot on lueteltu tässä. Voit päivittää tiedoston metadataa ja pääsyehtoja tai <strong>ladata lisää tiedostoja raahaamalla ne mihin hyvänsä sivun kohtaan.</strong>",
 
   // "submission.sections.upload.no-entry": "No",
@@ -4936,18 +6675,149 @@
   // "submission.sections.upload.upload-successful": "Upload successful",
   "submission.sections.upload.upload-successful": "Lataus valmis",
 
+  // "submission.sections.accesses.form.discoverable-description": "When checked, this item will be discoverable in search/browse. When unchecked, the item will only be available via a direct link and will never appear in search/browse.",
+  "submission.sections.accesses.form.discoverable-description": "Kun tämä on valittu, tietue on löydettävissä haussa ja selailtaessa. Kun tätä ei ole valittu, tietue on saatavilla vain suoran linkin kautta, eikä se näy haussa tai selailtaessa.",
 
+  // "submission.sections.accesses.form.discoverable-label": "Discoverable",
+  "submission.sections.accesses.form.discoverable-label": "Löydettävissä",
 
-  // "submission.submit.title": "Tallennus",
-  "submission.submit.title": "Julkaisu",
+  // "submission.sections.accesses.form.access-condition-label": "Access condition type",
+  "submission.sections.accesses.form.access-condition-label": "Pääsyoikeustyyppi",
 
+  // "submission.sections.accesses.form.access-condition-hint": "Select an access condition to apply on the item once it is deposited",
+  "submission.sections.accesses.form.access-condition-hint": "Valitse pääsyoikeus, jota sovelletaan tietueeseen tallentamisen jälkeen",
 
+  // "submission.sections.accesses.form.date-required": "Date is required.",
+  "submission.sections.accesses.form.date-required": "Päivämäärä on pakollinen tieto.",
+
+  // "submission.sections.accesses.form.date-required-from": "Grant access from date is required.",
+  "submission.sections.accesses.form.date-required-from": "Pääsyoikeuden alkupäivä on pakollinen tieto.",
+
+  // "submission.sections.accesses.form.date-required-until": "Grant access until date is required.",
+  "submission.sections.accesses.form.date-required-until": "Pääsyoikeuden loppupäivä on pakollinen tieto.",
+
+  // "submission.sections.accesses.form.from-label": "Grant access from",
+  "submission.sections.accesses.form.from-label": "Pääsyoikeus alkaa",
+
+  // "submission.sections.accesses.form.from-hint": "Select the date from which the related access condition is applied",
+  "submission.sections.accesses.form.from-hint": "Valitse päivämäärä, josta alkaen pääsyoikeutta sovelletaan",
+
+  // "submission.sections.accesses.form.from-placeholder": "From",
+  "submission.sections.accesses.form.from-placeholder": "Alkaen",
+
+  // "submission.sections.accesses.form.group-label": "Group",
+  "submission.sections.accesses.form.group-label": "Ryhmä",
+
+  // "submission.sections.accesses.form.group-required": "Group is required.",
+  "submission.sections.accesses.form.group-required": "Ryhmä on pakollinen tieto.",
+
+  // "submission.sections.accesses.form.until-label": "Grant access until",
+  "submission.sections.accesses.form.until-label": "Pääsyoikeus päättyy",
+
+  // "submission.sections.accesses.form.until-hint": "Select the date until which the related access condition is applied",
+  "submission.sections.accesses.form.until-hint": "Valitse päivämäärä, johon asti pääsyoikeutta sovelletaan",
+
+  // "submission.sections.accesses.form.until-placeholder": "Until",
+  "submission.sections.accesses.form.until-placeholder": "Asti",
+
+  // "submission.sections.license.granted-label": "I confirm the license above",
+  "submission.sections.license.granted-label": "Vahvistan edellä olevan lisenssin",
+
+  // "submission.sections.license.required": "You must accept the license",
+  "submission.sections.license.required": "Sinun on hyväksyttävä lisenssi",
+
+  // "submission.sections.license.notgranted": "You must accept the license",
+  "submission.sections.license.notgranted": "Sinun on hyväksyttävä lisenssi",
+
+  // "submission.sections.sherpa.publication.information": "Publication information",
+  "submission.sections.sherpa.publication.information": "Julkaisun tiedot",
+
+  // "submission.sections.sherpa.publication.information.title": "Title",
+  "submission.sections.sherpa.publication.information.title": "Nimeke",
+
+  // "submission.sections.sherpa.publication.information.issns": "ISSNs",
+  "submission.sections.sherpa.publication.information.issns": "ISSN-tunnukset",
+
+  // "submission.sections.sherpa.publication.information.url": "URL",
+  "submission.sections.sherpa.publication.information.url": "URL",
+
+  // "submission.sections.sherpa.publication.information.publishers": "Publisher",
+  "submission.sections.sherpa.publication.information.publishers": "Julkaisija",
+
+  // "submission.sections.sherpa.publication.information.romeoPub": "Romeo Pub",
+  "submission.sections.sherpa.publication.information.romeoPub": "Romeo Pub",
+
+  // "submission.sections.sherpa.publication.information.zetoPub": "Zeto Pub",
+  "submission.sections.sherpa.publication.information.zetoPub": "Zeto Pub",
+
+  // "submission.sections.sherpa.publisher.policy": "Publisher Policy",
+  "submission.sections.sherpa.publisher.policy": "Julkaisukäytännöt",
+
+  // "submission.sections.sherpa.publisher.policy.description": "The below information was found via Sherpa Romeo. Based on the policies of your publisher, it provides advice regarding whether an embargo may be necessary and/or which files you are allowed to upload. If you have questions, please contact your site administrator via the feedback form in the footer.",
+  "submission.sections.sherpa.publisher.policy.description": "Alla olevat tiedot on noudettu Sherpa Romeosta. Julkaisijan käytännöt määrittävät, vaaditaanko embargoa ja mitkä tiedostoista ovat ladattavissa. Jos sinulla on kysyttävää, ota yhteyttä ylläpitäjään.",
+
+  // "submission.sections.sherpa.publisher.policy.openaccess": "Open Access pathways permitted by this journal's policy are listed below by article version. Click on a pathway for a more detailed view",
+  "submission.sections.sherpa.publisher.policy.openaccess": "Tämän kausijulkaisun käytäntöjen sallimat Open Access -reitit on lueteltu alla artikkeliversioittain. Napsauttamalla polkua saat yksityiskohtaisempia tietoja",
+
+  // "submission.sections.sherpa.publisher.policy.more.information": "For more information, please see the following links:",
+  "submission.sections.sherpa.publisher.policy.more.information": "Lisätietoa saat seuraavista linkeistä:",
+
+  // "submission.sections.sherpa.publisher.policy.version": "Version",
+  "submission.sections.sherpa.publisher.policy.version": "Versio",
+
+  // "submission.sections.sherpa.publisher.policy.embargo": "Embargo",
+  "submission.sections.sherpa.publisher.policy.embargo": "Embargo",
+
+  // "submission.sections.sherpa.publisher.policy.noembargo": "No Embargo",
+  "submission.sections.sherpa.publisher.policy.noembargo": "Ei embargoa",
+
+  // "submission.sections.sherpa.publisher.policy.nolocation": "None",
+  "submission.sections.sherpa.publisher.policy.nolocation": "Ei mitään",
+
+  // "submission.sections.sherpa.publisher.policy.license": "License",
+  "submission.sections.sherpa.publisher.policy.license": "Lisenssi",
+
+  // "submission.sections.sherpa.publisher.policy.prerequisites": "Prerequisites",
+  "submission.sections.sherpa.publisher.policy.prerequisites": "Vaatimukset",
+
+  // "submission.sections.sherpa.publisher.policy.location": "Location",
+  "submission.sections.sherpa.publisher.policy.location": "Sijainti",
+
+  // "submission.sections.sherpa.publisher.policy.conditions": "Conditions",
+  "submission.sections.sherpa.publisher.policy.conditions": "Ehdot",
+
+  // "submission.sections.sherpa.publisher.policy.refresh": "Refresh",
+  "submission.sections.sherpa.publisher.policy.refresh": "Päivitä",
+
+  // "submission.sections.sherpa.record.information": "Record Information",
+  "submission.sections.sherpa.record.information": "Tietueen tiedot",
+
+  // "submission.sections.sherpa.record.information.id": "ID",
+  "submission.sections.sherpa.record.information.id": "ID",
+
+  // "submission.sections.sherpa.record.information.date.created": "Date Created",
+  "submission.sections.sherpa.record.information.date.created": "Luontipäivä",
+
+  // "submission.sections.sherpa.record.information.date.modified": "Last Modified",
+  "submission.sections.sherpa.record.information.date.modified": "Viimeksi muokattu",
+
+  // "submission.sections.sherpa.record.information.uri": "URI",
+  "submission.sections.sherpa.record.information.uri": "URI",
+
+  // "submission.sections.sherpa.error.message": "There was an error retrieving sherpa informations",
+  "submission.sections.sherpa.error.message": "Virhe haettaessa Sherpa-tietoja",
+
+  // "submission.submit.breadcrumbs": "New submission",
+  "submission.submit.breadcrumbs": "Uusi tallennus",
+
+  // "submission.submit.title": "New submission",
+  "submission.submit.title": "Uusi tallennus",
 
   // "submission.workflow.generic.delete": "Delete",
   "submission.workflow.generic.delete": "Poista",
 
-  // "submission.workflow.generic.delete-help": "If you would to discard this item, select \"Delete\".  You will then be asked to confirm it.",
-  "submission.workflow.generic.delete-help": "Valitse \"Poista\" hylätäksesi tietueen. Poisto pyydetään vielä vahvistamaan.",
+  // "submission.workflow.generic.delete-help": "Select this option to discard this item. You will then be asked to confirm it.",
+  "submission.workflow.generic.delete-help": "Valitse hylätäksesi tietueen. Poisto pyydetään vielä vahvistamaan.",
 
   // "submission.workflow.generic.edit": "Edit",
   "submission.workflow.generic.edit": "Muokkaa",
@@ -4961,7 +6831,17 @@
   // "submission.workflow.generic.view-help": "Select this option to view the item's metadata.",
   "submission.workflow.generic.view-help": "Valitse tämä katsoaksesi tietueen metadataa.",
 
+  // "submission.workflow.generic.submit_select_reviewer": "Select Reviewer",
+  "submission.workflow.generic.submit_select_reviewer": "Valitse tarkastaja",
 
+  // "submission.workflow.generic.submit_select_reviewer-help": "",
+  "submission.workflow.generic.submit_select_reviewer-help": "",
+
+  // "submission.workflow.generic.submit_score": "Rate",
+  "submission.workflow.generic.submit_score": "Arvioi",
+
+  // "submission.workflow.generic.submit_score-help": "",
+  "submission.workflow.generic.submit_score-help": "",
 
   // "submission.workflow.tasks.claimed.approve": "Approve",
   "submission.workflow.tasks.claimed.approve": "Hyväksy",
@@ -4975,6 +6855,12 @@
   // "submission.workflow.tasks.claimed.edit_help": "Select this option to change the item's metadata.",
   "submission.workflow.tasks.claimed.edit_help": "Valitse tämä muuttaaksesi tietueen metadataa.",
 
+  // "submission.workflow.tasks.claimed.decline": "Decline",
+  "submission.workflow.tasks.claimed.decline": "Hylkää",
+
+  // "submission.workflow.tasks.claimed.decline_help": "",
+  "submission.workflow.tasks.claimed.decline_help": "",
+
   // "submission.workflow.tasks.claimed.reject.reason.info": "Please enter your reason for rejecting the submission into the box below, indicating whether the submitter may fix a problem and resubmit.",
   "submission.workflow.tasks.claimed.reject.reason.info": "Syötä kenttään syy tallennuksen hylkäämiselle. Kerro myös, voiko tallentaja korjata ongelman ja lähettää aineiston uudelleen.",
 
@@ -4999,8 +6885,6 @@
   // "submission.workflow.tasks.claimed.return_help": "Return the task to the pool so that another user may perform the task.",
   "submission.workflow.tasks.claimed.return_help": "Palauta tehtävä tehtäväjonoon, jotta toinen käyttäjä voi suorittaa tehtävän.",
 
-
-
   // "submission.workflow.tasks.generic.error": "Error occurred during operation...",
   "submission.workflow.tasks.generic.error": "Virhe toimintoa suoritettaessa...",
 
@@ -5013,8 +6897,6 @@
   // "submission.workflow.tasks.generic.success": "Operation successful",
   "submission.workflow.tasks.generic.success": "Toiminto onnistui",
 
-
-
   // "submission.workflow.tasks.pool.claim": "Claim",
   "submission.workflow.tasks.pool.claim": "Ota itsellesi",
 
@@ -5027,13 +6909,147 @@
   // "submission.workflow.tasks.pool.show-detail": "Show detail",
   "submission.workflow.tasks.pool.show-detail": "Näytä lisätiedot",
 
+  // "submission.workspace.generic.view": "View",
+  "submission.workspace.generic.view": "Näytå",
 
+  // "submission.workspace.generic.view-help": "Select this option to view the item's metadata.",
+  "submission.workspace.generic.view-help": "Valitse tarkastellaksesi tietueen metadataa.",
+
+  // "submitter.empty": "N/A",
+  "submitter.empty": "Ei saatavilla",
+
+  // "subscriptions.title": "Subscriptions",
+  "subscriptions.title": "Tilaukset",
+
+  // "subscriptions.item": "Subscriptions for items",
+  "subscriptions.item": "Tietueiden tilaukset",
+
+  // "subscriptions.collection": "Subscriptions for collections",
+  "subscriptions.collection": "Kokoelmien tilaukset",
+
+  // "subscriptions.community": "Subscriptions for communities",
+  "subscriptions.community": "Yhteisöjen tilaukset",
+
+  // "subscriptions.subscription_type": "Subscription type",
+  "subscriptions.subscription_type": "Tilaustyyppi",
+
+  // "subscriptions.frequency": "Subscription frequency",
+  "subscriptions.frequency": "Tilaustiheys",
+
+  // "subscriptions.frequency.D": "Daily",
+  "subscriptions.frequency.D": "Päivittäin",
+
+  // "subscriptions.frequency.M": "Monthly",
+  "subscriptions.frequency.M": "Kuukausittain",
+
+  // "subscriptions.frequency.W": "Weekly",
+  "subscriptions.frequency.W": "Viikoittain",
+
+  // "subscriptions.tooltip": "Subscribe",
+  "subscriptions.tooltip": "Tilaa",
+
+  // "subscriptions.modal.title": "Subscriptions",
+  "subscriptions.modal.title": "Tilaukset",
+
+  // "subscriptions.modal.type-frequency": "Type and frequency",
+  "subscriptions.modal.type-frequency": "Tyyppi ja tiheys",
+
+  // "subscriptions.modal.close": "Close",
+  "subscriptions.modal.close": "Sulje",
+
+  // "subscriptions.modal.delete-info": "To remove this subscription, please visit the \"Subscriptions\" page under your user profile",
+  "subscriptions.modal.delete-info": "Voit poistaa tilauksen käyttäjäprofiilisi \"Tilaukset\"-sivulla ",
+
+  // "subscriptions.modal.new-subscription-form.type.content": "Content",
+  "subscriptions.modal.new-subscription-form.type.content": "Sisältö",
+
+  // "subscriptions.modal.new-subscription-form.frequency.D": "Daily",
+  "subscriptions.modal.new-subscription-form.frequency.D": "Päivittäin",
+
+  // "subscriptions.modal.new-subscription-form.frequency.W": "Weekly",
+  "subscriptions.modal.new-subscription-form.frequency.W": "Viikottain",
+
+  // "subscriptions.modal.new-subscription-form.frequency.M": "Monthly",
+  "subscriptions.modal.new-subscription-form.frequency.M": "Kuukausittain",
+
+  // "subscriptions.modal.new-subscription-form.submit": "Submit",
+  "subscriptions.modal.new-subscription-form.submit": "Lähetä",
+
+  // "subscriptions.modal.new-subscription-form.processing": "Processing...",
+  "subscriptions.modal.new-subscription-form.processing": "Käsitellään...",
+
+  // "subscriptions.modal.create.success": "Subscribed to {{ type }} successfully.",
+  "subscriptions.modal.create.success": "Tilaus {{ type }} onnistui.",
+
+  // "subscriptions.modal.delete.success": "Subscription deleted successfully",
+  "subscriptions.modal.delete.success": "Tilaus poistettu",
+
+  // "subscriptions.modal.update.success": "Subscription to {{ type }} updated successfully",
+  "subscriptions.modal.update.success": "Tilaus {{ type }} päivitetty",
+
+  // "subscriptions.modal.create.error": "An error occurs during the subscription creation",
+  "subscriptions.modal.create.error": "Virhe tilausta luotaessa",
+
+  // "subscriptions.modal.delete.error": "An error occurs during the subscription delete",
+  "subscriptions.modal.delete.error": "Virhe tilausta poistettaessa",
+
+  // "subscriptions.modal.update.error": "An error occurs during the subscription update",
+  "subscriptions.modal.update.error": "Virhe tilausta päivitettäessä",
+
+  // "subscriptions.table.dso": "Subject",
+  "subscriptions.table.dso": "Asiasana",
+
+  // "subscriptions.table.subscription_type": "Subscription Type",
+  "subscriptions.table.subscription_type": "Tilaustyyppi",
+
+  // "subscriptions.table.subscription_frequency": "Subscription Frequency",
+  "subscriptions.table.subscription_frequency": "Tilaustiheys",
+
+  // "subscriptions.table.action": "Action",
+  "subscriptions.table.action": "Toiminto",
+
+  // "subscriptions.table.edit": "Edit",
+  "subscriptions.table.edit": "Muokkaa",
+
+  // "subscriptions.table.delete": "Delete",
+  "subscriptions.table.delete": "Poista",
+
+  // "subscriptions.table.not-available": "Not available",
+  "subscriptions.table.not-available": "Ei saatavilla",
+
+  // "subscriptions.table.not-available-message": "The subscribed item has been deleted, or you don't currently have the permission to view it",
+  "subscriptions.table.not-available-message": "Tilattu tietue on poistettu, tai sinulla ei ole oikeuksia nähdä sitä",
+
+  // "subscriptions.table.empty.message": "You do not have any subscriptions at this time. To subscribe to email updates for a Community or Collection, use the subscription button on the object's page.",
+  "subscriptions.table.empty.message": "Sinulla ei tällä hetkellä ole tilauksia. Voit tilata yhteisön tai kokoelman sähköposti-ilmoitukset kohteen sivulla olevalla tilauspainikkeella.",
+
+  // "thumbnail.default.alt": "Thumbnail Image",
+  "thumbnail.default.alt": "Pienoiskuva",
+
+  // "thumbnail.default.placeholder": "No Thumbnail Available",
+  "thumbnail.default.placeholder": "Ei pienoiskuvaa saatavilla",
+
+  // "thumbnail.project.alt": "Project Logo",
+  "thumbnail.project.alt": "Projektin logo",
+
+  // "thumbnail.project.placeholder": "Project Placeholder Image",
+  "thumbnail.project.placeholder": "Projektin paikkamerkin kuva",
+
+  // "thumbnail.orgunit.alt": "OrgUnit Logo",
+  "thumbnail.orgunit.alt": "Organisaatioykiskön logo",
+
+  // "thumbnail.orgunit.placeholder": "OrgUnit Placeholder Image",
+  "thumbnail.orgunit.placeholder": "Organisaatioyksikön paikkamerkin kuva",
+
+  // "thumbnail.person.alt": "Profile Picture",
+  "thumbnail.person.alt": "Profiilikuva",
+
+  // "thumbnail.person.placeholder": "No Profile Picture Available",
+  "thumbnail.person.placeholder": "Ei profiilikuva saatavilla",
 
   // "title": "DSpace",
   "title": "Julkaisuarkisto",
 
-
-
   // "vocabulary-treeview.header": "Hierarchical tree view",
   "vocabulary-treeview.header": "Hierarkkinen puunäkymä",
 
@@ -5055,7 +7071,8 @@
   // "vocabulary-treeview.tree.description.srsc": "Research Subject Categories",
   "vocabulary-treeview.tree.description.srsc": "Tutkimusaiheiden kategoriat",
 
-
+  // "vocabulary-treeview.info": "Select a subject to add as search filter",
+  "vocabulary-treeview.info": "Valitse asiasana hakusuodattimeksi",
 
   // "uploader.browse": "browse",
   "uploader.browse": "selaa",
@@ -5063,6 +7080,9 @@
   // "uploader.drag-message": "Drag & Drop your files here",
   "uploader.drag-message": "Raahaa tiedostot tähän",
 
+  // "uploader.delete.btn-title": "Delete",
+  "uploader.delete.btn-title": "Poista",
+
   // "uploader.or": ", or ",
   "uploader.or": " tai",
 
@@ -5081,30 +7101,44 @@
   // "virtual-metadata.delete-relationship.modal-head": "Select the items for which you want to save the virtual metadata as real metadata",
   "virtual-metadata.delete-relationship.modal-head": "Valitse tietueet, joiden virtuaalisen metadatan haluat tallentaa varsinaiseksi metadataksi",
 
+  // "supervisedWorkspace.search.results.head": "Supervised Items",
+  "supervisedWorkspace.search.results.head": "Valvotut tietueet",
 
+  // "workspace.search.results.head": "Your submissions",
+  "workspace.search.results.head": "Tallennuksesi",
 
   // "workflowAdmin.search.results.head": "Administer Workflow",
   "workflowAdmin.search.results.head": "Hallinnoi työnkulkua",
 
+  // "workflow.search.results.head": "Workflow tasks",
+  "workflow.search.results.head": "Työnkulun tehtävät",
 
+  // "supervision.search.results.head": "Workflow and Workspace tasks",
+  "supervision.search.results.head": "Työnkulun ja työtilan tehtävät",
+
+  // "workflow-item.edit.breadcrumbs": "Edit workflowitem",
+  "workflow-item.edit.breadcrumbs": "Muokkaa työnkulun tietuetta",
+
+  // "workflow-item.edit.title": "Edit workflowitem",
+  "workflow-item.edit.title": "Muokkaa työnkulun tietuetta",
 
   // "workflow-item.delete.notification.success.title": "Deleted",
   "workflow-item.delete.notification.success.title": "Poistettu",
 
   // "workflow-item.delete.notification.success.content": "This workflow item was successfully deleted",
-  "workflow-item.delete.notification.success.content": "Tarkastamaton tietue poistettu",
+  "workflow-item.delete.notification.success.content": "Työnkulun tietue poistettu",
 
   // "workflow-item.delete.notification.error.title": "Something went wrong",
   "workflow-item.delete.notification.error.title": "Tapahtui virhe",
 
   // "workflow-item.delete.notification.error.content": "The workflow item could not be deleted",
-  "workflow-item.delete.notification.error.content": "Tarkastamatonta tietuetta ei voitu poistaa",
+  "workflow-item.delete.notification.error.content": "Työnkulun tietuetta ei voitu poistaa",
 
   // "workflow-item.delete.title": "Delete workflow item",
-  "workflow-item.delete.title": "Poista tarkastamaton tietue",
+  "workflow-item.delete.title": "Poista työnkulkuun tietue",
 
   // "workflow-item.delete.header": "Delete workflow item",
-  "workflow-item.delete.header": "Poista tarkastamaton tietue",
+  "workflow-item.delete.header": "Poista työnkulkuun tietue",
 
   // "workflow-item.delete.button.cancel": "Cancel",
   "workflow-item.delete.button.cancel": "Peruuta",
@@ -5112,30 +7146,565 @@
   // "workflow-item.delete.button.confirm": "Delete",
   "workflow-item.delete.button.confirm": "Poista",
 
-
   // "workflow-item.send-back.notification.success.title": "Sent back to submitter",
   "workflow-item.send-back.notification.success.title": "Lähetetty takaisin tallentajalle",
 
   // "workflow-item.send-back.notification.success.content": "This workflow item was successfully sent back to the submitter",
-  "workflow-item.send-back.notification.success.content": "Tarkastamaton tietue lähetetty takaisin tallentajalle",
+  "workflow-item.send-back.notification.success.content": "Työnkulun tietue lähetetty takaisin tallentajalle",
 
   // "workflow-item.send-back.notification.error.title": "Something went wrong",
   "workflow-item.send-back.notification.error.title": "Tapahtui virhe",
 
   // "workflow-item.send-back.notification.error.content": "The workflow item could not be sent back to the submitter",
-  "workflow-item.send-back.notification.error.content": "Tarkastamatonta tietuetta ei voitu lähettää takaisin tallentajalle",
+  "workflow-item.send-back.notification.error.content": "Työnkulun tietuetta ei voitu lähettää takaisin tallentajalle",
 
   // "workflow-item.send-back.title": "Send workflow item back to submitter",
-  "workflow-item.send-back.title": "Lähetä tarkastamaton tietue takaisin tallentajalle",
+  "workflow-item.send-back.title": "Lähetä työnkulkuun tietue takaisin tallentajalle",
 
   // "workflow-item.send-back.header": "Send workflow item back to submitter",
-  "workflow-item.send-back.header": "Lähetä tarkastamaton tietue takaisin tallentajalle",
+  "workflow-item.send-back.header": "Lähetä työnkulun tietue takaisin tallentajalle",
 
   // "workflow-item.send-back.button.cancel": "Cancel",
   "workflow-item.send-back.button.cancel": "Peruuta",
 
-  // "workflow-item.send-back.button.confirm": "Send back"
+  // "workflow-item.send-back.button.confirm": "Send back",
   "workflow-item.send-back.button.confirm": "Lähetä takaisin",
 
+  // "workflow-item.view.breadcrumbs": "Workflow View",
+  "workflow-item.view.breadcrumbs": "Työnkulkunäkymä",
+
+  // "workspace-item.view.breadcrumbs": "Workspace View",
+  "workspace-item.view.breadcrumbs": "Työnkulkunäkymä",
+
+  // "workspace-item.view.title": "Workspace View",
+  "workspace-item.view.title": "Työnkulkunäkymä",
+
+  // "workspace-item.delete.breadcrumbs": "Workspace Delete",
+  "workspace-item.delete.breadcrumbs": "Työnkulku - poisto",
+
+  // "workspace-item.delete.header": "Delete workspace item",
+  "workspace-item.delete.header": "Poista työnkulun tietue",
+
+  // "workspace-item.delete.button.confirm": "Delete",
+  "workspace-item.delete.button.confirm": "Poista",
+
+  // "workspace-item.delete.button.cancel": "Cancel",
+  "workspace-item.delete.button.cancel": "Peruuta",
+
+  // "workspace-item.delete.notification.success.title": "Deleted",
+  "workspace-item.delete.notification.success.title": "Poistettu",
+
+  // "workspace-item.delete.title": "This workspace item was successfully deleted",
+  "workspace-item.delete.title": "Työnkulun tietue poistettu",
+
+  // "workspace-item.delete.notification.error.title": "Something went wrong",
+  "workspace-item.delete.notification.error.title": "Tapahtui virhe",
+
+  // "workspace-item.delete.notification.error.content": "The workspace item could not be deleted",
+  "workspace-item.delete.notification.error.content": "Työnkulun tietuetta ei voitu poistaa",
+
+  // "workflow-item.advanced.title": "Advanced workflow",
+  "workflow-item.advanced.title": "Laajennettu työnkulku",
+
+  // "workflow-item.selectrevieweraction.notification.success.title": "Selected reviewer",
+  "workflow-item.selectrevieweraction.notification.success.title": "Valittu tarkastaja",
+
+  // "workflow-item.selectrevieweraction.notification.success.content": "The reviewer for this workflow item has been successfully selected",
+  "workflow-item.selectrevieweraction.notification.success.content": "Työnkulun tarkastaja on valittu",
+
+  // "workflow-item.selectrevieweraction.notification.error.title": "Something went wrong",
+  "workflow-item.selectrevieweraction.notification.error.title": "Tapahtui virhe",
+
+  // "workflow-item.selectrevieweraction.notification.error.content": "Couldn't select the reviewer for this workflow item",
+  "workflow-item.selectrevieweraction.notification.error.content": "Työnkulun tietueelle ei voitu valita tarkastajaa",
+
+  // "workflow-item.selectrevieweraction.title": "Select Reviewer",
+  "workflow-item.selectrevieweraction.title": "Valitse tarkastaja",
+
+  // "workflow-item.selectrevieweraction.header": "Select Reviewer",
+  "workflow-item.selectrevieweraction.header": "Valitse tarkastaja",
+
+  // "workflow-item.selectrevieweraction.button.cancel": "Cancel",
+  "workflow-item.selectrevieweraction.button.cancel": "Peruuta",
+
+  // "workflow-item.selectrevieweraction.button.confirm": "Confirm",
+  "workflow-item.selectrevieweraction.button.confirm": "Vahvista",
+
+  // "workflow-item.scorereviewaction.notification.success.title": "Rating review",
+  "workflow-item.scorereviewaction.notification.success.title": "Arviointikatselmus",
+
+  // "workflow-item.scorereviewaction.notification.success.content": "The rating for this item workflow item has been successfully submitted",
+  "workflow-item.scorereviewaction.notification.success.content": "Tietueen arviointi on lähetetty",
+
+  // "workflow-item.scorereviewaction.notification.error.title": "Something went wrong",
+  "workflow-item.scorereviewaction.notification.error.title": "Tapahtui virhe",
+
+  // "workflow-item.scorereviewaction.notification.error.content": "Couldn't rate this item",
+  "workflow-item.scorereviewaction.notification.error.content": "Tietueen arviointi epäonnistui",
+
+  // "workflow-item.scorereviewaction.title": "Rate this item",
+  "workflow-item.scorereviewaction.title": "Arvioi tietue",
+
+  // "workflow-item.scorereviewaction.header": "Rate this item",
+  "workflow-item.scorereviewaction.header": "Arvioi tietue",
+
+  // "workflow-item.scorereviewaction.button.cancel": "Cancel",
+  "workflow-item.scorereviewaction.button.cancel": "Peruuta",
+
+  // "workflow-item.scorereviewaction.button.confirm": "Confirm",
+  "workflow-item.scorereviewaction.button.confirm": "Vahvista",
+
+  // "idle-modal.header": "Session will expire soon",
+  "idle-modal.header": "Istunto vanhenee pian",
+
+  // "idle-modal.info": "For security reasons, user sessions expire after {{ timeToExpire }} minutes of inactivity. Your session will expire soon. Would you like to extend it or log out?",
+  "idle-modal.info": "Turvallisuussyistä käyttäjän istunto vanhenee, kun käyttäjä on ollut epäaktiivinen {{ timeToExpire }} minuuttia. Istuntosi vanhenee pian. Haluatko pidentää istuntoasi vai kirjautua ulos?",
+
+  // "idle-modal.log-out": "Log out",
+  "idle-modal.log-out": "Kirjaudu ulos",
+
+  // "idle-modal.extend-session": "Extend session",
+  "idle-modal.extend-session": "Pidennä istuntoa",
+
+  // "researcher.profile.action.processing": "Processing...",
+  "researcher.profile.action.processing": "Käsitellään...",
+
+  // "researcher.profile.associated": "Researcher profile associated",
+  "researcher.profile.associated": "Tutkijaprofiili liitetty",
+
+  // "researcher.profile.change-visibility.fail": "An unexpected error occurs while changing the profile visibility",
+  "researcher.profile.change-visibility.fail": "Odottamaton virhe muutettaessa profiilin näkyvyyttä",
+
+  // "researcher.profile.create.new": "Create new",
+  "researcher.profile.create.new": "Luo uusi",
+
+  // "researcher.profile.create.success": "Researcher profile created successfully",
+  "researcher.profile.create.success": "Tutkijaprofiili luotu",
+
+  // "researcher.profile.create.fail": "An error occurs during the researcher profile creation",
+  "researcher.profile.create.fail": "Virhe luotaessa tutkijaprofiilia",
+
+  // "researcher.profile.delete": "Delete",
+  "researcher.profile.delete": "Poista",
+
+  // "researcher.profile.expose": "Expose",
+  "researcher.profile.expose": "Paljasta",
+
+  // "researcher.profile.hide": "Hide",
+  "researcher.profile.hide": "Piilota",
+
+  // "researcher.profile.not.associated": "Researcher profile not yet associated",
+  "researcher.profile.not.associated": "Tutkijaprofiilia ei ole vielä liitetty",
+
+  // "researcher.profile.view": "View",
+  "researcher.profile.view": "Näytä",
+
+  // "researcher.profile.private.visibility": "PRIVATE",
+  "researcher.profile.private.visibility": "YKSITYINEN",
+
+  // "researcher.profile.public.visibility": "PUBLIC",
+  "researcher.profile.public.visibility": "JULKINEN",
+
+  // "researcher.profile.status": "Status:",
+  "researcher.profile.status": "Tila :",
+
+  // "researcherprofile.claim.not-authorized": "You are not authorized to claim this item. For more details contact the administrator(s).",
+  "researcherprofile.claim.not-authorized": "Sinulla ei ole valtuuksia ottaa itsellesi tätä tietuetta. Lisätietoa saat ylläpitäjiltä.",
+
+  // "researcherprofile.error.claim.body": "An error occurred while claiming the profile, please try again later",
+  "researcherprofile.error.claim.body": "Tapahtui virhe profiilia haettaessa, yritä myöhemmin uudelleen",
+
+  // "researcherprofile.error.claim.title": "Error",
+  "researcherprofile.error.claim.title": "Virhe",
+
+  // "researcherprofile.success.claim.body": "Profile claimed with success",
+  "researcherprofile.success.claim.body": "Profiili haettu",
+
+  // "researcherprofile.success.claim.title": "Success",
+  "researcherprofile.success.claim.title": "Valmis",
+
+  // "person.page.orcid.create": "Create an ORCID ID",
+  "person.page.orcid.create": "Luo ORCID-tunniste",
+
+  // "person.page.orcid.granted-authorizations": "Granted authorizations",
+  "person.page.orcid.granted-authorizations": "Myönnetyt valtuudet",
+
+  // "person.page.orcid.grant-authorizations": "Grant authorizations",
+  "person.page.orcid.grant-authorizations": "Myönnä valtuuksia",
+
+  // "person.page.orcid.link": "Connect to ORCID ID",
+  "person.page.orcid.link": "Yhdistä ORCID-tunniste",
+
+  // "person.page.orcid.link.processing": "Linking profile to ORCID...",
+  "person.page.orcid.link.processing": "Liitetään profiilia ORCID-tunnisteeseen...",
+
+  // "person.page.orcid.link.error.message": "Something went wrong while connecting the profile with ORCID. If the problem persists, contact the administrator.",
+  "person.page.orcid.link.error.message": "Virhe yhdistettäessä profiilia ORCID-tunnisteeseen. Jos virhe jatkuu, ota yhteyttä ylläpitäjään.",
+
+  // "person.page.orcid.orcid-not-linked-message": "The ORCID iD of this profile ({{ orcid }}) has not yet been connected to an account on the ORCID registry or the connection is expired.",
+  "person.page.orcid.orcid-not-linked-message": "Tämän profiilin ORCID-tunnistetta ({{ orcid }}) ei ole vielä yhdistetty tiliin ORCID-rekisterissä tai yhteys on vanhentunut.",
+
+  // "person.page.orcid.unlink": "Disconnect from ORCID",
+  "person.page.orcid.unlink": "Katkaise yhteys ORCIDiin",
+
+  // "person.page.orcid.unlink.processing": "Processing...",
+  "person.page.orcid.unlink.processing": "Käsitellään...",
+
+  // "person.page.orcid.missing-authorizations": "Missing authorizations",
+  "person.page.orcid.missing-authorizations": "Puuttuvia valtuuksia",
+
+  // "person.page.orcid.missing-authorizations-message": "The following authorizations are missing:",
+  "person.page.orcid.missing-authorizations-message": "Seuraavat valtuudet puuttuvat:",
+
+  // "person.page.orcid.no-missing-authorizations-message": "Great! This box is empty, so you have granted all access rights to use all functions offers by your institution.",
+  "person.page.orcid.no-missing-authorizations-message": "Hyvä! Tämä laatikko on tyhjä, joten olet myöntänyt kaikki käyttöoikeudet instituutiosi tarjoamiin toimintoihin.",
+
+  // "person.page.orcid.no-orcid-message": "No ORCID iD associated yet. By clicking on the button below it is possible to link this profile with an ORCID account.",
+  "person.page.orcid.no-orcid-message": "ORCID-tunnistetta ei ole vielä liitetty. Painamalla alapuolella olevaa painiketta voit yhdistää tämän profiilin ORCID-tiliin.",
+
+  // "person.page.orcid.profile-preferences": "Profile preferences",
+  "person.page.orcid.profile-preferences": "Profiiliasetukset",
+
+  // "person.page.orcid.funding-preferences": "Funding preferences",
+  "person.page.orcid.funding-preferences": "Rahoitusasetukset",
+
+  // "person.page.orcid.publications-preferences": "Publication preferences",
+  "person.page.orcid.publications-preferences": "Julkaisuasetukset",
+
+  // "person.page.orcid.remove-orcid-message": "If you need to remove your ORCID, please contact the repository administrator",
+  "person.page.orcid.remove-orcid-message": "Jos haluat poistaa ORCID-tunnuksesi, ota yhteyttä julkaisuarkiston ylläpitäjään",
+
+  // "person.page.orcid.save.preference.changes": "Update settings",
+  "person.page.orcid.save.preference.changes": "Muokkaa asetuksia",
+
+  // "person.page.orcid.sync-profile.affiliation": "Affiliation",
+  "person.page.orcid.sync-profile.affiliation": "Affiliaatio",
+
+  // "person.page.orcid.sync-profile.biographical": "Biographical data",
+  "person.page.orcid.sync-profile.biographical": "Elämäkerralliset tiedot",
+
+  // "person.page.orcid.sync-profile.education": "Education",
+  "person.page.orcid.sync-profile.education": "Koulutus",
+
+  // "person.page.orcid.sync-profile.identifiers": "Identifiers",
+  "person.page.orcid.sync-profile.identifiers": "Tunnisteet",
+
+  // "person.page.orcid.sync-fundings.all": "All fundings",
+  "person.page.orcid.sync-fundings.all": "Kaikki rahoitukset",
+
+  // "person.page.orcid.sync-fundings.mine": "My fundings",
+  "person.page.orcid.sync-fundings.mine": "Omat rahoitukset",
+
+  // "person.page.orcid.sync-fundings.my_selected": "Selected fundings",
+  "person.page.orcid.sync-fundings.my_selected": "Valitut rahoitukset",
+
+  // "person.page.orcid.sync-fundings.disabled": "Disabled",
+  "person.page.orcid.sync-fundings.disabled": "Poistettu käytöstä",
+
+  // "person.page.orcid.sync-publications.all": "All publications",
+  "person.page.orcid.sync-publications.all": "Kaikki julkaisut",
+
+  // "person.page.orcid.sync-publications.mine": "My publications",
+  "person.page.orcid.sync-publications.mine": "Omat julkaisut",
+
+  // "person.page.orcid.sync-publications.my_selected": "Selected publications",
+  "person.page.orcid.sync-publications.my_selected": "Valitut julkaisut",
+
+  // "person.page.orcid.sync-publications.disabled": "Disabled",
+  "person.page.orcid.sync-publications.disabled": "Poistettu käytöstä",
+
+  // "person.page.orcid.sync-queue.discard": "Discard the change and do not synchronize with the ORCID registry",
+  "person.page.orcid.sync-queue.discard": "Hylkää muutos. Älä synkronoi ORCID-rekisterin kanssa.",
+
+  // "person.page.orcid.sync-queue.discard.error": "The discarding of the ORCID queue record failed",
+  "person.page.orcid.sync-queue.discard.error": "ORCID-jonotietueen hylkääminen epäonnistui",
+
+  // "person.page.orcid.sync-queue.discard.success": "The ORCID queue record have been discarded successfully",
+  "person.page.orcid.sync-queue.discard.success": "ORCID-jonotietue hylätty",
+
+  // "person.page.orcid.sync-queue.empty-message": "The ORCID queue registry is empty",
+  "person.page.orcid.sync-queue.empty-message": "ORCID-jonorekisteri on tyhjä",
+
+  // "person.page.orcid.sync-queue.table.header.type": "Type",
+  "person.page.orcid.sync-queue.table.header.type": "Tyyppi",
+
+  // "person.page.orcid.sync-queue.table.header.description": "Description",
+  "person.page.orcid.sync-queue.table.header.description": "Kuvaus",
+
+  // "person.page.orcid.sync-queue.table.header.action": "Action",
+  "person.page.orcid.sync-queue.table.header.action": "Toiminto",
+
+  // "person.page.orcid.sync-queue.description.affiliation": "Affiliations",
+  "person.page.orcid.sync-queue.description.affiliation": "Affiliaatiot",
+
+  // "person.page.orcid.sync-queue.description.country": "Country",
+  "person.page.orcid.sync-queue.description.country": "Maa",
+
+  // "person.page.orcid.sync-queue.description.education": "Educations",
+  "person.page.orcid.sync-queue.description.education": "Koulutukset",
+
+  // "person.page.orcid.sync-queue.description.external_ids": "External ids",
+  "person.page.orcid.sync-queue.description.external_ids": "Ulkoiset tunnisteet",
+
+  // "person.page.orcid.sync-queue.description.other_names": "Other names",
+  "person.page.orcid.sync-queue.description.other_names": "Muut nimet",
+
+  // "person.page.orcid.sync-queue.description.qualification": "Qualifications",
+  "person.page.orcid.sync-queue.description.qualification": "Pätevyydet",
+
+  // "person.page.orcid.sync-queue.description.researcher_urls": "Researcher urls",
+  "person.page.orcid.sync-queue.description.researcher_urls": "Tutkijan URL-osoitteet",
+
+  // "person.page.orcid.sync-queue.description.keywords": "Keywords",
+  "person.page.orcid.sync-queue.description.keywords": "Avainsanat",
+
+  // "person.page.orcid.sync-queue.tooltip.insert": "Add a new entry in the ORCID registry",
+  "person.page.orcid.sync-queue.tooltip.insert": "Lisää uusi kohde ORCID-rekisteriin",
+
+  // "person.page.orcid.sync-queue.tooltip.update": "Update this entry on the ORCID registry",
+  "person.page.orcid.sync-queue.tooltip.update": "Päivitä tämä kohde ORCID-rekisterissä",
+
+  // "person.page.orcid.sync-queue.tooltip.delete": "Remove this entry from the ORCID registry",
+  "person.page.orcid.sync-queue.tooltip.delete": "Poista tämä kohde ORCID-rekisteristä",
+
+  // "person.page.orcid.sync-queue.tooltip.publication": "Publication",
+  "person.page.orcid.sync-queue.tooltip.publication": "Julkaisu",
+
+  // "person.page.orcid.sync-queue.tooltip.project": "Project",
+  "person.page.orcid.sync-queue.tooltip.project": "Projekti",
+
+  // "person.page.orcid.sync-queue.tooltip.affiliation": "Affiliation",
+  "person.page.orcid.sync-queue.tooltip.affiliation": "Affiliaatio",
+
+  // "person.page.orcid.sync-queue.tooltip.education": "Education",
+  "person.page.orcid.sync-queue.tooltip.education": "Koulutus",
+
+  // "person.page.orcid.sync-queue.tooltip.qualification": "Qualification",
+  "person.page.orcid.sync-queue.tooltip.qualification": "Pätevyys",
+
+  // "person.page.orcid.sync-queue.tooltip.other_names": "Other name",
+  "person.page.orcid.sync-queue.tooltip.other_names": "Toinen nimi",
+
+  // "person.page.orcid.sync-queue.tooltip.country": "Country",
+  "person.page.orcid.sync-queue.tooltip.country": "Maa",
+
+  // "person.page.orcid.sync-queue.tooltip.keywords": "Keyword",
+  "person.page.orcid.sync-queue.tooltip.keywords": "Asiasana",
+
+  // "person.page.orcid.sync-queue.tooltip.external_ids": "External identifier",
+  "person.page.orcid.sync-queue.tooltip.external_ids": "Ulkoinen tunniste",
+
+  // "person.page.orcid.sync-queue.tooltip.researcher_urls": "Researcher url",
+  "person.page.orcid.sync-queue.tooltip.researcher_urls": "Tutkijan URL-osoite",
+
+  // "person.page.orcid.sync-queue.send": "Synchronize with ORCID registry",
+  "person.page.orcid.sync-queue.send": "Synkronoi ORCID-rekisterin kanssa",
+
+  // "person.page.orcid.sync-queue.send.unauthorized-error.title": "The submission to ORCID failed for missing authorizations.",
+  "person.page.orcid.sync-queue.send.unauthorized-error.title": "ORCID-tunnisteen lähettäminen epäonnistui puuttuvien käyttöoikeuksien takia.",
+
+  // "person.page.orcid.sync-queue.send.unauthorized-error.content": "Click <a href='{{orcid}}'>here</a> to grant again the required permissions. If the problem persists, contact the administrator",
+  "person.page.orcid.sync-queue.send.unauthorized-error.content": "Napsauta <a href='{{orcid}}'>tästä</a> myöntääksesi vaaditut käyttöoikeudet. Jos virhe jatkuu, ota yhteyttä ylläpitäjään.",
+
+  // "person.page.orcid.sync-queue.send.bad-request-error": "The submission to ORCID failed because the resource sent to ORCID registry is not valid",
+  "person.page.orcid.sync-queue.send.bad-request-error": "ORCID-lähetys epäonnistui, koska ORCID-rekisteriin lähetetty resurssi ei ole kelvollinen",
+
+  // "person.page.orcid.sync-queue.send.error": "The submission to ORCID failed",
+  "person.page.orcid.sync-queue.send.error": "ORCID-lähetys epäonnistui",
+
+  // "person.page.orcid.sync-queue.send.conflict-error": "The submission to ORCID failed because the resource is already present on the ORCID registry",
+  "person.page.orcid.sync-queue.send.conflict-error": "ORCID-lähetys epäonnistui, koska lähetetty resurssi on jo ORCID-rekisterissä",
+
+  // "person.page.orcid.sync-queue.send.not-found-warning": "The resource does not exists anymore on the ORCID registry.",
+  "person.page.orcid.sync-queue.send.not-found-warning": "Resurssia ei enää ole ORCID-rekisterissä..",
+
+  // "person.page.orcid.sync-queue.send.success": "The submission to ORCID was completed successfully",
+  "person.page.orcid.sync-queue.send.success": "ORCID-lähetys onnistui",
+
+  // "person.page.orcid.sync-queue.send.validation-error": "The data that you want to synchronize with ORCID is not valid",
+  "person.page.orcid.sync-queue.send.validation-error": "ORCIDin kanssa synkronoitava data ei ole kelvollista",
+
+  // "person.page.orcid.sync-queue.send.validation-error.amount-currency.required": "The amount's currency is required",
+  "person.page.orcid.sync-queue.send.validation-error.amount-currency.required": "Valuutta on pakollinen tieto",
+
+  // "person.page.orcid.sync-queue.send.validation-error.external-id.required": "The resource to be sent requires at least one identifier",
+  "person.page.orcid.sync-queue.send.validation-error.external-id.required": "Lähetettävällä resurssilla on oltava ainakin yksi tunniste",
+
+  // "person.page.orcid.sync-queue.send.validation-error.title.required": "The title is required",
+  "person.page.orcid.sync-queue.send.validation-error.title.required": "Nimeke on pakollinen tieto",
+
+  // "person.page.orcid.sync-queue.send.validation-error.type.required": "The dc.type is required",
+  "person.page.orcid.sync-queue.send.validation-error.type.required": "dc.type on pakollinen tieto",
+
+  // "person.page.orcid.sync-queue.send.validation-error.start-date.required": "The start date is required",
+  "person.page.orcid.sync-queue.send.validation-error.start-date.required": "Alkupäivämäärä on pakollinen tieto",
+
+  // "person.page.orcid.sync-queue.send.validation-error.funder.required": "The funder is required",
+  "person.page.orcid.sync-queue.send.validation-error.funder.required": "Rahoittaja on pakollinen tieto",
+
+  // "person.page.orcid.sync-queue.send.validation-error.country.invalid": "Invalid 2 digits ISO 3166 country",
+  "person.page.orcid.sync-queue.send.validation-error.country.invalid": "Virheelliset kaksi merkkiä ISO 3166 -maatunnisteessa",
+
+  // "person.page.orcid.sync-queue.send.validation-error.organization.required": "The organization is required",
+  "person.page.orcid.sync-queue.send.validation-error.organization.required": "Organisaatio on pakollinen tieto",
+
+  // "person.page.orcid.sync-queue.send.validation-error.organization.name-required": "The organization's name is required",
+  "person.page.orcid.sync-queue.send.validation-error.organization.name-required": "Organisaation nimi on pakollinen tieto",
+
+  // "person.page.orcid.sync-queue.send.validation-error.publication.date-invalid": "The publication date must be one year after 1900",
+  "person.page.orcid.sync-queue.send.validation-error.publication.date-invalid": "Julkaisuajan on oltava vuoden 1900 jälkeen",
+
+  // "person.page.orcid.sync-queue.send.validation-error.organization.address-required": "The organization to be sent requires an address",
+  "person.page.orcid.sync-queue.send.validation-error.organization.address-required": "Organisaatiolla on oltava osoite",
+
+  // "person.page.orcid.sync-queue.send.validation-error.organization.city-required": "The address of the organization to be sent requires a city",
+  "person.page.orcid.sync-queue.send.validation-error.organization.city-required": "Organisaation osoitteessa on oltava kaupunki",
+
+  // "person.page.orcid.sync-queue.send.validation-error.organization.country-required": "The address of the organization to be sent requires a valid 2 digits ISO 3166 country",
+  "person.page.orcid.sync-queue.send.validation-error.organization.country-required": "Organisaation osoitteessa on oltava oikeelliset kaksi ISO 3166 -maatunnisteen merkkiä",
+
+  // "person.page.orcid.sync-queue.send.validation-error.disambiguated-organization.required": "An identifier to disambiguate organizations is required. Supported ids are GRID, Ringgold, Legal Entity identifiers (LEIs) and Crossref Funder Registry identifiers",
+  "person.page.orcid.sync-queue.send.validation-error.disambiguated-organization.required": "Tunniste vaaditaan organisaatioiden erottelemiseksi. Tuetut tunnisteet ovat GRID, Ringgold, Legal Entity identifier -tunnisteet (LEIt) ja Crossrefin rahoittaharekisterin tunnisteet (FUNDREF)",
+
+  // "person.page.orcid.sync-queue.send.validation-error.disambiguated-organization.value-required": "The organization's identifiers requires a value",
+  "person.page.orcid.sync-queue.send.validation-error.disambiguated-organization.value-required": "Organisaation tunnisteilla on oltava arvo",
+
+  // "person.page.orcid.sync-queue.send.validation-error.disambiguation-source.required": "The organization's identifiers requires a source",
+  "person.page.orcid.sync-queue.send.validation-error.disambiguation-source.required": "Organisaation tunnisteilla on oltava lähde",
+
+  // "person.page.orcid.sync-queue.send.validation-error.disambiguation-source.invalid": "The source of one of the organization identifiers is invalid. Supported sources are RINGGOLD, GRID, LEI and FUNDREF",
+  "person.page.orcid.sync-queue.send.validation-error.disambiguation-source.invalid": "Organisaation tunnisteen lähde ei ole validi. Tuetut lähteet ovat RINGGOLD, GRID, LEI ja FUNDREF",
+
+  // "person.page.orcid.synchronization-mode": "Synchronization mode",
+  "person.page.orcid.synchronization-mode": "Synkronointimoodi",
+
+  // "person.page.orcid.synchronization-mode.batch": "Batch",
+  "person.page.orcid.synchronization-mode.batch": "Erä",
+
+  // "person.page.orcid.synchronization-mode.label": "Synchronization mode",
+  "person.page.orcid.synchronization-mode.label": "Synkronointimoodi",
+
+  // "person.page.orcid.synchronization-mode-message": "Please select how you would like synchronization to ORCID to occur. The options include \"Manual\" (you must send your data to ORCID manually), or \"Batch\" (the system will send your data to ORCID via a scheduled script).",
+  "person.page.orcid.synchronization-mode-message": "Valitse, miten haluat synkronoinnin ORCIDiin tapahtuvan. Vaihtoehdot ovat \"Manuaalinen\" (sinun on lähetettävä tietosi ORCIDiin manuaalisesti) tai \"Erä\" (järjestelmä lähettää tietosi ORCIDiin ajastetun skriptin avulla).",
+
+  // "person.page.orcid.synchronization-mode-funding-message": "Select whether to send your linked Project entities to your ORCID record's list of funding information.",
+  "person.page.orcid.synchronization-mode-funding-message": "Valitse, lähetetäänkö linkitetyt projektisi ORCID-rekisterin rahoitustietoluetteloon.",
+
+  // "person.page.orcid.synchronization-mode-publication-message": "Select whether to send your linked Publication entities to your ORCID record's list of works.",
+  "person.page.orcid.synchronization-mode-publication-message": "Valitse, lähetetäänkö linkitetyt julkaisusi ORCID-rekisterin luetteloon.",
+
+  // "person.page.orcid.synchronization-mode-profile-message": "Select whether to send your biographical data or personal identifiers to your ORCID record.",
+  "person.page.orcid.synchronization-mode-profile-message": "Valitse, lähetetäänkö elämäkerralliset tietosi tai henkilökohtaiset tunnisteesi ORCID-rekisteriin.",
+
+  // "person.page.orcid.synchronization-settings-update.success": "The synchronization settings have been updated successfully",
+  "person.page.orcid.synchronization-settings-update.success": "Synkronisointiasetukset päivitetty",
+
+  // "person.page.orcid.synchronization-settings-update.error": "The update of the synchronization settings failed",
+  "person.page.orcid.synchronization-settings-update.error": "Synkronisointiasetusten päivittäminen epäonnistui",
+
+  // "person.page.orcid.synchronization-mode.manual": "Manual",
+  "person.page.orcid.synchronization-mode.manual": "Manuaalinen",
+
+  // "person.page.orcid.scope.authenticate": "Get your ORCID iD",
+  "person.page.orcid.scope.authenticate": "Hae ORCID-tunnisteesi",
+
+  // "person.page.orcid.scope.read-limited": "Read your information with visibility set to Trusted Parties",
+  "person.page.orcid.scope.read-limited": "Lue omat tietosi Trusted Parties -näkyvyysasetuksilla",
+
+  // "person.page.orcid.scope.activities-update": "Add/update your research activities",
+  "person.page.orcid.scope.activities-update": "Lisää/päivitä tutkimustoimiasi",
+
+  // "person.page.orcid.scope.person-update": "Add/update other information about you",
+  "person.page.orcid.scope.person-update": "Lisää/päivitä muita tietojasi",
+
+  // "person.page.orcid.unlink.success": "The disconnection between the profile and the ORCID registry was successful",
+  "person.page.orcid.unlink.success": "Yhteys katkaistu profiilin ja ORCID-rekisterin välillä",
+
+  // "person.page.orcid.unlink.error": "An error occurred while disconnecting between the profile and the ORCID registry. Try again",
+  "person.page.orcid.unlink.error": "Tapahtui virhe katkaistaessa yhteyttä profiilin ja ORCID-rekisterin välillä. Yritä uudelleen",
+
+  // "person.orcid.sync.setting": "ORCID Synchronization settings",
+  "person.orcid.sync.setting": "ORCIDin synkronisointiasetukset",
+
+  // "person.orcid.registry.queue": "ORCID Registry Queue",
+  "person.orcid.registry.queue": "ORCIDin rekisteröintijono",
+
+  // "person.orcid.registry.auth": "ORCID Authorizations",
+  "person.orcid.registry.auth": "ORCID-käyttöoikeudet",
+
+  // "home.recent-submissions.head": "Recent Submissions",
+  "home.recent-submissions.head": "Viimeksi tallennetut",
+
+  // "listable-notification-object.default-message": "This object couldn't be retrieved",
+  "listable-notification-object.default-message": "Kohdetta ei voitu noutaa",
+
+  // "system-wide-alert-banner.retrieval.error": "Something went wrong retrieving the system-wide alert banner",
+  "system-wide-alert-banner.retrieval.error": "Virhe noudettaessa järjestelmänlaajuista hälytysbanneria",
+
+  // "system-wide-alert-banner.countdown.prefix": "In",
+  "system-wide-alert-banner.countdown.prefix": "Aikaa",
+
+  // "system-wide-alert-banner.countdown.days": "{{days}} day(s),",
+  "system-wide-alert-banner.countdown.days": "{{days}} päivää(ä),",
+
+  // "system-wide-alert-banner.countdown.hours": "{{hours}} hour(s) and",
+  "system-wide-alert-banner.countdown.hours": "{{hours}} tunti(a) and",
+
+  // "system-wide-alert-banner.countdown.minutes": "{{minutes}} minute(s):",
+  "system-wide-alert-banner.countdown.minutes": "{{minutes}} minuutti(a):",
+
+  // "menu.section.system-wide-alert": "System-wide Alert",
+  "menu.section.system-wide-alert": "Järjestelmänlaajuinen hälytys",
+
+  // "system-wide-alert.form.header": "System-wide Alert",
+  "system-wide-alert.form.header": "Järjestelmänlaajuinen hälytys",
+
+  // "system-wide-alert-form.retrieval.error": "Something went wrong retrieving the system-wide alert",
+  "system-wide-alert-form.retrieval.error": "Virhe noudettaessa järjestelmänlaajuista hälytystä",
+
+  // "system-wide-alert.form.cancel": "Cancel",
+  "system-wide-alert.form.cancel": "Peruuta",
+
+  // "system-wide-alert.form.save": "Save",
+  "system-wide-alert.form.save": "Tallenna",
+
+  // "system-wide-alert.form.label.active": "ACTIVE",
+  "system-wide-alert.form.label.active": "AKTIIVINEN",
+
+  // "system-wide-alert.form.label.inactive": "INACTIVE",
+  "system-wide-alert.form.label.inactive": "EI-AKTIIVINEN",
+
+  // "system-wide-alert.form.error.message": "The system wide alert must have a message",
+  "system-wide-alert.form.error.message": "Järjestelmänlaajuisessa hälytyksessä on oltava viesti",
+
+  // "system-wide-alert.form.label.message": "Alert message",
+  "system-wide-alert.form.label.message": "Hälytysviesti",
+
+  // "system-wide-alert.form.label.countdownTo.enable": "Enable a countdown timer",
+  "system-wide-alert.form.label.countdownTo.enable": "Ota käyttöön lähtölaskennan ajastin",
+
+  // "system-wide-alert.form.label.countdownTo.hint": "Hint: Set a countdown timer. When enabled, a date can be set in the future and the system-wide alert banner will perform a countdown to the set date. When this timer ends, it will disappear from the alert. The server will NOT be automatically stopped.",
+  "system-wide-alert.form.label.countdownTo.hint": "Vinkki: Aseta lähtölaskennan ajastin. Kun se on käytössä, voidaan päivämäärä asettaa tulevaisuuteen,  jolloin  järjestelmänlaajuinen hälytysbanneri suorittaa lähtölaskennan asetettuun päivämäärään. Kun ajastin päättyy, hälytys katoaa. Palvelinta EI pysäytetä automaattisesti.",
+
+  // "system-wide-alert.form.label.preview": "System-wide alert preview",
+  "system-wide-alert.form.label.preview": "Järjestelmänlaajuisen hälytyksen esikatselu",
+
+  // "system-wide-alert.form.update.success": "The system-wide alert was successfully updated",
+  "system-wide-alert.form.update.success": "Järjestelmänlaajuinen hälytys päivitetty",
+
+  // "system-wide-alert.form.update.error": "Something went wrong when updating the system-wide alert",
+  "system-wide-alert.form.update.error": "Virhe päivitettäessä järjestelmänlaajuista hälytystä",
+
+  // "system-wide-alert.form.create.success": "The system-wide alert was successfully created",
+  "system-wide-alert.form.create.success": "Järjestelmänlaajuinen hälytys luotu",
+
+  // "system-wide-alert.form.create.error": "Something went wrong when creating the system-wide alert",
+  "system-wide-alert.form.create.error": "Virhe luotaessa järjestelmänlaajuista hälytystä",
+
+  // "admin.system-wide-alert.breadcrumbs": "System-wide Alerts",
+  "admin.system-wide-alert.breadcrumbs": "Järjestelmänlaajuiset hälytykset",
+
+  // "admin.system-wide-alert.title": "System-wide Alerts",
+  "admin.system-wide-alert.title": "Järjestelmänlaajuiset hälytykset",
 
 }
diff --git a/src/assets/i18n/fr.json5 b/src/assets/i18n/fr.json5
index 8ee4dc7d22..279506e470 100644
--- a/src/assets/i18n/fr.json5
+++ b/src/assets/i18n/fr.json5
@@ -313,6 +313,33 @@
   // "admin.registries.schema.title": "Metadata Schema Registry",
   "admin.registries.schema.title": "Registre des schémas de métadonnées",
 
+  //"admin.access-control.bulk-access.breadcrumbs": "Bulk Access Management",
+  "admin.access-control.bulk-access.breadcrumbs": "Gestion des accès en lot",
+
+  //"administrativeBulkAccess.search.results.head": "Search Results",
+  "administrativeBulkAccess.search.results.head": "Résultats de recherche",
+
+  //"admin.access-control.bulk-access": "Bulk Access Management",
+  "admin.access-control.bulk-access": "Gestion des accès en lot",
+
+  //"admin.access-control.bulk-access.title": "Bulk Access Management",
+  "admin.access-control.bulk-access.title": "Gestion des accès en lot",
+
+
+  //"admin.access-control.bulk-access-browse.header": "Step 1: Select Objects",
+  "admin.access-control.bulk-access-browse.header": "Étape 1 : Sélectionner les objets",
+
+  //"admin.access-control.bulk-access-browse.search.header": "Search",
+  "admin.access-control.bulk-access-browse.search.header": "Chercher",
+
+
+  //"admin.access-control.bulk-access-browse.selected.header": "Current selection({{number}})",
+  "admin.access-control.bulk-access-browse.selected.header": "Sélection actuelle({{number}})",
+
+
+  //"admin.access-control.bulk-access-settings.header": "Step 2: Operation to Perform",
+  "admin.access-control.bulk-access-settings.header": "Étape 2 : Opération à exécuter",
+
   // "admin.access-control.epeople.actions.delete": "Delete EPerson",
   "admin.access-control.epeople.actions.delete": "Supprimer un(e) EPerson",
 
@@ -763,27 +790,52 @@
   // "admin.workflow.item.workflow": "Workflow",
   "admin.workflow.item.workflow": "En traitement",
 
+  //"admin.workflow.item.workspace": "Workspace",
+  "admin.workflow.item.workspace": "Dépôts en cours",
+
   // "admin.workflow.item.delete": "Delete",
   "admin.workflow.item.delete": "Supprimer",
 
   // "admin.workflow.item.send-back": "Send back",
   "admin.workflow.item.send-back": "Retourner au déposant",
 
+  //"admin.workflow.item.policies": "Policies",
+  "admin.workflow.item.policies": "Politiques",
+
+  // "admin.workflow.item.supervision": "Supervision",
+  "admin.workflow.item.supervision": "Supervision",
+
   // "admin.metadata-import.breadcrumbs": "Import Metadata",
   "admin.metadata-import.breadcrumbs": "Importer Métadonnées",
 
+  //"admin.batch-import.breadcrumbs": "Import Batch",
+  "admin.batch-import.breadcrumbs": "Importation en lots",
+
   // "admin.metadata-import.title": "Import Metadata",
   "admin.metadata-import.title": "Importer Métadonnées",
 
   // "admin.metadata-import.page.header": "Import Metadata",
   "admin.metadata-import.page.header": "Importer Métadonnées",
 
+  //"admin.batch-import.page.header": "Import Batch",
+  "admin.batch-import.page.header": "Importation en lots",
+
   // "admin.metadata-import.page.help": "You can drop or browse CSV files that contain batch metadata operations on files here",
   "admin.metadata-import.page.help": "Vous pouvez glisser-déposer ou rechercher ici des fichiers CSV qui contiennent des opérations en lot sur les métadonnées",
 
+  //"admin.batch-import.page.help": "Select the Collection to import into. Then, drop or browse to a Simple Archive Format (SAF) zip file that includes the Items to import",
+  "admin.batch-import.page.help": "Sélectionner la collection dans laquelle importer les données. Ensuite, ajouter le fichier zip Simple Archive Format (SAF) contenant tous les Items à importer.",
+
+  //"admin.batch-import.page.toggle.help": "It is possible to perform import either with file upload or via URL, use above toggle to set the input source",
+  "admin.batch-import.page.toggle.help": "Il est possible d'effectuer l'importation en téléversant un fichier ou en utilisant un URL. Utiliser le bouton à bascule ci-dessus afin de sélectionner la source.",
+
   // "admin.metadata-import.page.dropMsg": "Drop a metadata CSV to import",
   "admin.metadata-import.page.dropMsg": "Déposer un fichier CSV à importer",
 
+  //"admin.batch-import.page.dropMsg": "Drop a batch ZIP to import",
+  "admin.batch-import.page.dropMsg": "Glisser/déposer un fichier zip à importer",
+
+
   // "admin.metadata-import.page.dropMsgReplace": "Drop to replace the metadata CSV to import",
   "admin.metadata-import.page.dropMsgReplace": "Déposer un nouveau fichier CSV pour remplacer le fichier à importer",
 
@@ -793,9 +845,27 @@
   // "admin.metadata-import.page.button.proceed": "Proceed",
   "admin.metadata-import.page.button.proceed": "Importer",
 
+  //"admin.metadata-import.page.button.select-collection": "Select Collection",
+  "admin.metadata-import.page.button.select-collection": "Sélectionner une collection",
+
   // "admin.metadata-import.page.error.addFile": "Select file first!",
   "admin.metadata-import.page.error.addFile": "Veuillez d'abord sélectionner un fichier",
 
+  //"admin.metadata-import.page.toggle.upload": "Upload",
+  "admin.metadata-import.page.toggle.upload": "Téléverser",
+
+  //"admin.metadata-import.page.validateOnly": "Validate Only",
+  "admin.metadata-import.page.validateOnly": "Valider seulement",
+
+  //"admin.metadata-import.page.validateOnly.hint": "When selected, the uploaded CSV will be validated. You will receive a report of detected changes, but no changes will be saved.",
+  "admin.metadata-import.page.validateOnly.hint": "Si activé, le fichier CSV sera uniquement validé. Vous recevrez un rapport identifiant les changements détectés, mais aucun changement ne sera appliqué aux métadonnées.",
+
+  //"admin.batch-import.page.validateOnly.hint": "When selected, the uploaded ZIP will be validated. You will receive a report of detected changes, but no changes will be saved.",
+  "admin.batch-import.page.validateOnly.hint": "Si activé, le fichier ZIP SAF sera uniquement validé. Vous recevrez un rapport identifiant les changements détectés, mais aucun changement ne sera appliqué aux données.",
+
+  //"admin.batch-import.page.remove": "remove",
+  "admin.batch-import.page.remove": "supprimer",
+
   // "auth.errors.invalid-user": "Invalid email address or password.",
   "auth.errors.invalid-user": "Adresse électronique ou mot de passe non valide.",
 
@@ -1374,6 +1444,12 @@
   // "collection.listelement.badge": "Collection",
   "collection.listelement.badge": "Collection",
 
+  // "collection.logo": "Collection logo",
+  "collection.logo": "Logo de la collection",
+
+  // "collection.page.browse.search.head": "Search",
+  "collection.page.browse.search.head": "Chercher",
+
   // "collection.page.browse.recent.head": "Recent Submissions",
   "collection.page.browse.recent.head": "Dépôts récents",
 
@@ -1392,6 +1468,9 @@
   // "collection.page.news": "News",
   "collection.page.news": "Nouvelles",
 
+  // "collection.search.results.head": "Search Results",
+  "collection.search.results.head": "Résultats de recherche",
+
   // "collection.select.confirm": "Confirm selected",
   "collection.select.confirm": "Confirmer la sélection",
 
@@ -1695,8 +1774,11 @@
   // "community.all-lists.head": "Subcommunities and Collections",
   "community.all-lists.head": "Sous-communautés et collections",
 
+  //"community.search.results.head": "Search Results",
+  "community.search.results.head": "Résultats de recherche",
+
   // "community.sub-collection-list.head": "Collections of this Community",
-  "community.sub-collection-list.head": "collections au sein de cette communauté",
+  "community.sub-collection-list.head": "Collections au sein de cette communauté",
 
   // "community.sub-community-list.head": "Communities of this Community",
   "community.sub-community-list.head": "Sous-communautés au sein de cette communauté",
@@ -3108,7 +3190,13 @@
   // "item.page.version.create": "Create new version",
   "item.page.version.create": "Créer une nouvelle version",
 
-  // "item.page.version.hasDraft": "A new version cannot be created because there is an inprogress submission in the version history",
+  //"item.page.withdrawn": "Request a withdrawal for this item",
+  "item.page.withdrawn": "Demander le retrait de cet Item",
+
+  //"item.page.reinstate": "Request reinstatement",
+  "item.page.reinstate": "Demander la réintégration de cet Item",
+
+  // "item.page.version.hasDraft": "A new version cannot be created because there is an in-progress submission in the version history",
   "item.page.version.hasDraft": "Une nouvelle version ne peut être créée car il y a une soumission en cours dans l'historique des versions",
 
   // "item.preview.dc.identifier.uri": "Identifier:",
@@ -3234,7 +3322,7 @@
   // "item.version.history.table.action.deleteVersion": "Delete version",
   "item.version.history.table.action.deleteVersion": "Supprimer la version",
 
-  // "item.version.history.table.action.hasDraft": "A new version cannot be created because there is an inprogress submission in the version history",
+  // "item.version.history.table.action.hasDraft": "A new version cannot be created because there is an in-progress submission in the version history",
   "item.version.history.table.action.hasDraft": "Une nouvelle version ne peut pas être créée parce qu'il y a une soumission en cours dans l'historique des versions.",
 
   // "item.version.notice": "This is not the latest version of this item. The latest version can be found <a href='{{destination}}'>here</a>.",
@@ -3273,7 +3361,7 @@
   // "item.version.create.notification.failure": "New version has not been created",
   "item.version.create.notification.failure": "La nouvelle version n'a pas été créée",
 
-  // "item.version.create.notification.inProgress": "A new version cannot be created because there is an inprogress submission in the version history",
+  // "item.version.create.notification.inProgress": "A new version cannot be created because there is an in-progress submission in the version history",
   "item.version.create.notification.inProgress": "Une nouvelle version ne peut pas être créée parce qu'il y a une soumission en cours dans l'historique des versions.",
 
   // "item.version.delete.modal.header": "Delete version",
@@ -3669,6 +3757,15 @@
   // "menu.section.new_process": "Process",
   "menu.section.new_process": "Processus",
 
+  //"menu.section.notifications": "Notifications",
+  "menu.section.notifications": "Notifications",
+
+  //"menu.section.quality-assurance": "Quality Assurance",
+  "menu.section.quality-assurance": "Assurance qualité",
+
+  //"menu.section.notifications_publication-claim": "Publication Claim",
+  "menu.section.notifications_publication-claim": "Réclamation de publication",
+
   // "menu.section.pin": "Pin sidebar",
   "menu.section.pin": "Épingler le menu latéral",
 
@@ -3822,20 +3919,20 @@
   //"mydspace.show.supervisedWorkspace": "Supervised items",
   "mydspace.show.supervisedWorkspace": "Items supervisés",
 
-  // "mydspace.status.archived": "Archived",
-  "mydspace.status.archived": "Archivés",
+  // "mydspace.status.mydspaceArchived": "Archived",
+  "mydspace.status.mydspaceArchived": "Archivés",
 
-  // "mydspace.status.validation": "Validation",
-  "mydspace.status.validation": "En cours de validation",
+  // "mydspace.status.mydspaceValidation": "Validation",
+  "mydspace.status.mydspaceValidation": "En cours de validation",
 
-  // "mydspace.status.waiting-for-controller": "Waiting for controller",
-  "mydspace.status.waiting-for-controller": "En attente d'assignation",
+  // "mydspace.status.mydspaceWaitingController": "Waiting for reviewer",
+  "mydspace.status.mydspaceWaitingController": "En attente d'assignation",
 
-  // "mydspace.status.workflow": "Workflow",
-  "mydspace.status.workflow": "En traitement",
+  // "mydspace.status.mydspaceWorkflow": "Workflow",
+  "mydspace.status.mydspaceWorkflow": "En traitement",
 
-  // "mydspace.status.workspace": "Workspace",
-  "mydspace.status.workspace": "Dépôts en cours",
+  // "mydspace.status.mydspaceWorkspace": "Workspace",
+  "mydspace.status.mydspaceWorkspace": "Dépôts en cours",
 
   // "mydspace.title": "MyDSpace",
   "mydspace.title": "Mon compte DSpace",
@@ -4047,6 +4144,27 @@
   // "process.detail.back": "Back",
   "process.detail.back": "Retour",
 
+  //"process.detail.delete.body": "Are you sure you want to delete the current process?",
+  "process.detail.delete.body": "Êtes-vous sûr de vouloir supprimer ce processus?",
+
+  //"process.detail.delete.button": "Delete process",
+  "process.detail.delete.button": "Supprimer le processus",
+
+  //"process.detail.delete.cancel": "Cancel",
+  "process.detail.delete.cancel": "Annuler",
+
+  //"process.detail.delete.confirm": "Delete process",
+  "process.detail.delete.confirm": "Supprimer le processus",
+
+  //"process.detail.delete.error": "Something went wrong when deleting the process",
+  "process.detail.delete.error": "Une erreur s'est produite lors de la suppression du processus",
+
+  //"process.detail.delete.header": "Delete process",
+  "process.detail.delete.header": "Supprimer un processus",
+
+  //"process.detail.delete.success": "The process was successfully deleted.",
+  "process.detail.delete.success": "Le processus a bien été supprimé.",
+
   // "process.detail.output": "Process Output",
   "process.detail.output": "Sortie du processus",
 
@@ -4065,6 +4183,9 @@
   // "process.detail.output-files.empty": "This process doesn't contain any output files",
   "process.detail.output-files.empty": "Ce processus ne contient pas de fichiers de sortie",
 
+  //"process.detail.refreshing": "Auto-refreshing…",
+  "process.detail.refreshing": "Actualisation automatique...",
+
   // "process.detail.script": "Script",
   "process.detail.script": "Script",
 
@@ -4559,6 +4680,9 @@
   // "resource-policies.form.name.label": "Name",
   "resource-policies.form.name.label": "Nom",
 
+  //"resource-policies.form.name.hint": "Max 30 characters",
+  "resource-policies.form.name.hint": "30 caractères maximum",
+
   // "resource-policies.form.policy-type.label": "Select the policy type",
   "resource-policies.form.policy-type.label": "Sélectionner le type de règle",
 
@@ -5144,8 +5268,8 @@
   // "submission.import-external.source.cinii": "CiNii",
   "submission.import-external.source.cinii": "CiNii",
 
-  // "submission.import-external.source.crossref": "CrossRef",
-  "submission.import-external.source.crossref": "CrossRef (DOI)",
+  // "submission.import-external.source.crossref": "Crossref",
+  "submission.import-external.source.crossref": "Crossref (DOI)",
 
   //"submission.import-external.source.datacite": "DataCite",
   "submission.import-external.source.datacite": "DataCite (DOI)",
@@ -5636,6 +5760,24 @@
   // "submission.sections.general.sections_not_valid": "There are incomplete sections.",
   "submission.sections.general.sections_not_valid": "Sections incomplètes.",
 
+  //"submission.sections.identifiers.info": "The following identifiers will be created for your item:",
+  "submission.sections.identifiers.info": "Les identifiants uniques suivants seront attribués à votre document :",
+
+  //"submission.sections.identifiers.no_handle": "No handles have been minted for this item.",
+  "submission.sections.identifiers.no_handle": "Aucun handle n'a été crée pour ce document.",
+
+  //"submission.sections.identifiers.no_doi": "No DOIs have been minted for this item.",
+  "submission.sections.identifiers.no_doi": "Aucun DOI n'a été créé pour ce document.",
+
+  //"submission.sections.identifiers.handle_label": "Handle: ",
+  "submission.sections.identifiers.handle_label": "Handle : ",
+
+  //"submission.sections.identifiers.doi_label": "DOI: ",
+  "submission.sections.identifiers.doi_label": "DOI : ",
+
+  //"submission.sections.identifiers.otherIdentifiers_label": "Other identifiers: ",
+  "submission.sections.identifiers.otherIdentifiers_label": "Autres identifiants : ",
+
   // "submission.sections.submit.progressbar.accessCondition": "Item access conditions",
   "submission.sections.submit.progressbar.accessCondition": "Autorisations d'accès à l'Item",
 
@@ -5657,6 +5799,9 @@
   // "submission.sections.submit.progressbar.detect-duplicate": "Potential duplicates",
   "submission.sections.submit.progressbar.detect-duplicate": "Doublon(s) potentiel(s)",
 
+  //"submission.sections.submit.progressbar.identifiers": "Identifiers",
+  "submission.sections.submit.progressbar.identifiers": "Identifiants",
+
   // "submission.sections.submit.progressbar.license": "Deposit license",
   "submission.sections.submit.progressbar.license": "Licence du dépôt",
 
@@ -6002,10 +6147,91 @@
   "submission.workflow.tasks.pool.show-detail": "Afficher le détail",
 
   // "submission.workspace.generic.view": "View",
-  "submission.workspace.generic.view": "Voir",
+  "submission.workspace.generic.view": "Afficher",
 
-  // "submission.workspace.generic.view-help": "Select this option to view the item's metadata.",
-  "submission.workspace.generic.view-help": "Sélectionner cette option pour voir les métadonnées de l'item.",
+  //"submission.workspace.generic.view-help": "Select this option to view the item's metadata.",
+  "submission.workspace.generic.view-help": "Sélectionner cette option pour afficher les métadonnées de l'item.",
+
+  //"submitter.empty": "N/A",
+  "submitter.empty": "S/O",
+
+  //"subscriptions.modal.title": "Subscriptions",
+  "subscriptions.modal.title": "Abonnements",
+
+  //"subscriptions.modal.type-frequency": "Type and frequency",
+  "subscriptions.modal.type-frequency": "Type et fréquence",
+
+  //"subscriptions.modal.close": "Close",
+  "subscriptions.modal.close": "Fermer",
+
+  //"subscriptions.modal.delete-info": "To remove this subscription, please visit the \"Subscriptions\" page under your user profile",
+  "subscriptions.modal.delete-info": "Pour vous désabonner, visitez la page Abonnements dans votre profil utilisateur",
+
+  //"subscriptions.modal.new-subscription-form.type.content": "Content",
+  "subscriptions.modal.new-subscription-form.type.content": "Contenu",
+
+  //"subscriptions.modal.new-subscription-form.frequency.D": "Daily",
+  "subscriptions.modal.new-subscription-form.frequency.D": "Quotidienne",
+
+  //"subscriptions.modal.new-subscription-form.frequency.W": "Weekly",
+  "subscriptions.modal.new-subscription-form.frequency.W": "Hebdomadaire",
+
+  //"subscriptions.modal.new-subscription-form.frequency.M": "Monthly",
+  "subscriptions.modal.new-subscription-form.frequency.M": "Mensuelle",
+
+  //"subscriptions.tooltip": "Subscribe",
+  "subscriptions.tooltip": "S'abonner",
+
+  //"subscriptions.modal.new-subscription-form.submit": "Submit",
+  "subscriptions.modal.new-subscription-form.submit": "Soumettre",
+
+  //"subscriptions.modal.new-subscription-form.processing": "Processing...",
+  "subscriptions.modal.new-subscription-form.processing": "En traitement...",
+
+  //"subscriptions.modal.create.success": "Subscribed to {{ type }} successfully.",
+  "subscriptions.modal.create.success": "Abonnement à {{ type }} réussi.",
+
+  //"subscriptions.modal.delete.success": "Subscription deleted successfully",
+  "subscriptions.modal.delete.success": "L'abonnement a été résilié avec succès",
+
+  //"subscriptions.modal.update.success": "Subscription to {{ type }} updated successfully",
+  "subscriptions.modal.update.success": "L'abonnement à {{ type }} a été mis à jour avec succès",
+
+  //"subscriptions.modal.create.error": "An error occurs during the subscription creation",
+  "subscriptions.modal.create.error": "Une erreur s'est produite lors de la création de l'abonnement",
+
+  //"subscriptions.modal.delete.error": "An error occurs during the subscription delete",
+  "subscriptions.modal.delete.error": "Une erreur s'est produite lors de la résiliation de l'abonnement",
+
+  //"subscriptions.modal.update.error": "An error occurs during the subscription update",
+  "subscriptions.modal.update.error": "Une erreur s'est produite lors de la mise à jour de l'abonnement",
+
+  //"subscriptions.table.dso": "Subject",
+  "subscriptions.table.dso": "Sujet",
+
+  //"subscriptions.table.subscription_type": "Subscription Type",
+  "subscriptions.table.subscription_type": "Type d'abonnement",
+
+  //"subscriptions.table.subscription_frequency": "Subscription Frequency",
+  "subscriptions.table.subscription_frequency": "Fréquence",
+
+  //"subscriptions.table.action": "Action",
+  "subscriptions.table.action": "Action",
+
+  //"subscriptions.table.edit": "Edit",
+  "subscriptions.table.edit": "Éditer",
+
+  //"subscriptions.table.delete": "Delete",
+  "subscriptions.table.delete": "Supprimer",
+
+  //"subscriptions.table.not-available": "Not available",
+  "subscriptions.table.not-available": "Indisponible",
+
+  //"subscriptions.table.not-available-message": "The subscribed item has been deleted, or you don't currently have the permission to view it",
+  "subscriptions.table.not-available-message": "L'Item auquel vous étiez abonné a été supprimé, ou vous n'êtes pas autorisé à le consulter.",
+
+  //"subscriptions.table.empty.message": "You do not have any subscriptions at this time. To subscribe to email updates for a Community or Collection, use the subscription button on the object's page.",
+  "subscriptions.table.empty.message": "Vous n'avez aucun abonnement. Pour vous abonnez à des mises à jour par courriel pour une commmunauté ou une collection, utilisez le bouton d'abonnement sur la page de l'Item.",
 
   // "thumbnail.default.alt": "Thumbnail Image",
   "thumbnail.default.alt": "Vignette d'image",
@@ -6177,7 +6403,377 @@
   // "idle-modal.extend-session": "Extend session",
   "idle-modal.extend-session": "Prolonger la session",
 
+  //"researcher.profile.action.processing": "Processing...",
+  "researcher.profile.action.processing": "En traitement...",
 
+  //"researcher.profile.associated": "Researcher profile associated",
+  "researcher.profile.associated": "Profil du chercheur associé",
+
+  //"researcher.profile.change-visibility.fail": "An unexpected error occurs while changing the profile visibility",
+  "researcher.profile.change-visibility.fail": "Une erreur inattendue s'est produite pendant le changement apporté à la visibilité du profil.",
+
+  //"researcher.profile.create.new": "Create new",
+  "researcher.profile.create.new": "Créer un nouveau",
+
+  //"researcher.profile.create.success": "Researcher profile created successfully",
+  "researcher.profile.create.success": "Profil créé avec succès",
+
+  //"researcher.profile.create.fail": "An error occurs during the researcher profile creation",
+  "researcher.profile.create.fail": "Une erreur s'est produite lors de la création du profil",
+
+  //"researcher.profile.delete": "Delete",
+  "researcher.profile.delete": "Supprimer",
+
+  //"researcher.profile.expose": "Expose",
+  "researcher.profile.expose": "Exposer",
+
+  //"researcher.profile.hide": "Hide",
+  "researcher.profile.hide": "Cacher",
+
+  //"researcher.profile.not.associated": "Researcher profile not yet associated",
+  "researcher.profile.not.associated": "Profil non associé",
+
+  //"researcher.profile.view": "View",
+  "researcher.profile.view": "Voir",
+
+  //"researcher.profile.private.visibility": "PRIVATE",
+  "researcher.profile.private.visibility": "PRIVÉ",
+
+  //"researcher.profile.public.visibility": "PUBLIC",
+  "researcher.profile.public.visibility": "PUBLIC",
+
+  //"researcher.profile.status": "Status:",
+  "researcher.profile.status": "Statut:",
+
+  //"researcherprofile.claim.not-authorized": "You are not authorized to claim this item. For more details contact the administrator(s).",
+  "researcherprofile.claim.not-authorized": "Vous n'êtes pas autorisé à réclamer cet item. Pour plus de détails contacter la personne administratrice.",
+
+  //"researcherprofile.error.claim.body": "An error occurred while claiming the profile, please try again later",
+  "researcherprofile.error.claim.body": "Une erreur s'est produite lors de la réclamation du profil, veuillez réessayer plus tard.",
+
+  //"researcherprofile.error.claim.title": "Error",
+  "researcherprofile.error.claim.title": "Erreur",
+
+  //"researcherprofile.success.claim.body": "Profile claimed with success",
+  "researcherprofile.success.claim.body": "Profil réclamé avec succès",
+
+  //"researcherprofile.success.claim.title": "Success",
+  "researcherprofile.success.claim.title": "Succès",
+
+  //"person.page.orcid.create": "Create an ORCID ID",
+  "person.page.orcid.create": "Créer un identifiant ORCID",
+
+  //"person.page.orcid.granted-authorizations": "Granted authorizations",
+  "person.page.orcid.granted-authorizations": "Autorisations accordées",
+
+  //"person.page.orcid.grant-authorizations": "Grant authorizations",
+  "person.page.orcid.grant-authorizations": "Accorder des autorisations",
+
+  //"person.page.orcid.link": "Connect to ORCID ID",
+  "person.page.orcid.link": "Se connecter à ORCID",
+
+  //"person.page.orcid.link.processing": "Linking profile to ORCID...",
+  "person.page.orcid.link.processing": "Liaison du profil avec ORCID en cours...",
+
+  //"person.page.orcid.link.error.message": "Something went wrong while connecting the profile with ORCID. If the problem persists, contact the administrator.",
+  "person.page.orcid.link.error.message": "Quelque chose a échoué lors de la connection du profil avec ORCID. Si le problème persiste, contacter la personne administratice.",
+
+  //"person.page.orcid.orcid-not-linked-message": "The ORCID iD of this profile ({{ orcid }}) has not yet been connected to an account on the ORCID registry or the connection is expired.",
+  "person.page.orcid.orcid-not-linked-message": "L'identifiant ORCID du profil ({{ orcid }}) n'a pas encore été connecté à une compte du registre ORCID ou la connection a expiré. ",
+
+  //"person.page.orcid.unlink": "Disconnect from ORCID",
+  "person.page.orcid.unlink": "Déconnecter d'ORCID",
+
+  //"person.page.orcid.unlink.processing": "Processing...",
+  "person.page.orcid.unlink.processing": "Traitement en cours...",
+
+  //"person.page.orcid.missing-authorizations": "Missing authorizations",
+  "person.page.orcid.missing-authorizations": "Autorisations manquantes",
+
+  //"person.page.orcid.missing-authorizations-message": "The following authorizations are missing:",
+  "person.page.orcid.missing-authorizations-message": "Les autorisations suivantes sont manquantes :",
+
+  //"person.page.orcid.no-missing-authorizations-message": "Great! This box is empty, so you have granted all access rights to use all functions offers by your institution.",
+  "person.page.orcid.no-missing-authorizations-message": "Cette boite est vide, vous avez autorisé l'utilisation de toutes les fonctions proposées par votre organisation.",
+
+  //"person.page.orcid.no-orcid-message": "No ORCID iD associated yet. By clicking on the button below it is possible to link this profile with an ORCID account.",
+  "person.page.orcid.no-orcid-message": "Aucun identifiant ORCID n'est encore associé. En cliquant sur le bouton ci-dessous, il est possible de lier ce profil à un compte ORCID.",
+
+  //"person.page.orcid.profile-preferences": "Profile preferences",
+  "person.page.orcid.profile-preferences": "Préférences du profil",
+
+  //"person.page.orcid.funding-preferences": "Funding preferences",
+  "person.page.orcid.funding-preferences": "Préférence pour la section Financement",
+
+  //"person.page.orcid.publications-preferences": "Publication preferences",
+  "person.page.orcid.publications-preferences": "Préférence pour la section Publication",
+
+  //"person.page.orcid.remove-orcid-message": "If you need to remove your ORCID, please contact the repository administrator",
+  "person.page.orcid.remove-orcid-message": "Si vous avez besoin de retirer votre ORCID, contacter la personne administratrice du dépôt.",
+
+  //"person.page.orcid.save.preference.changes": "Update settings",
+  "person.page.orcid.save.preference.changes": "Mettre à jour les configurations",
+
+  //"person.page.orcid.sync-profile.affiliation": "Affiliation",
+  "person.page.orcid.sync-profile.affiliation": "Affiliation",
+
+  //"person.page.orcid.sync-profile.biographical": "Biographical data",
+  "person.page.orcid.sync-profile.biographical": "Données biographiques",
+
+  //"person.page.orcid.sync-profile.education": "Education",
+  "person.page.orcid.sync-profile.education": "Éducation",
+
+  //"person.page.orcid.sync-profile.identifiers": "Identifiers",
+  "person.page.orcid.sync-profile.identifiers": "Identifiants",
+
+  //"person.page.orcid.sync-fundings.all": "All fundings",
+  "person.page.orcid.sync-fundings.all": "Tous les financements",
+
+  //"person.page.orcid.sync-fundings.mine": "My fundings",
+  "person.page.orcid.sync-fundings.mine": "Mes financements",
+
+  //"person.page.orcid.sync-fundings.my_selected": "Selected fundings",
+  "person.page.orcid.sync-fundings.my_selected": "Financements sélectionnés",
+
+  //"person.page.orcid.sync-fundings.disabled": "Disabled",
+  "person.page.orcid.sync-fundings.disabled": "Désactivé",
+
+  //"person.page.orcid.sync-publications.all": "All publications",
+  "person.page.orcid.sync-publications.all": "Toutes les publications",
+
+  //"person.page.orcid.sync-publications.mine": "My publications",
+  "person.page.orcid.sync-publications.mine": "Mes publications",
+
+  //"person.page.orcid.sync-publications.my_selected": "Selected publications",
+  "person.page.orcid.sync-publications.my_selected": "Publications sélectionnées",
+
+  //"person.page.orcid.sync-publications.disabled": "Disabled",
+  "person.page.orcid.sync-publications.disabled": "Désactivé",
+
+  //"person.page.orcid.sync-queue.discard": "Discard the change and do not synchronize with the ORCID registry",
+  "person.page.orcid.sync-queue.discard": "Ignorer les changements et ne pas synchroniser avec le registre ORCID.",
+
+  //"person.page.orcid.sync-queue.discard.error": "The discarding of the ORCID queue record failed",
+  "person.page.orcid.sync-queue.discard.error": "L'annulation de la file d'attente ORCID a échoué.",
+
+  //"person.page.orcid.sync-queue.discard.success": "The ORCID queue record have been discarded successfully",
+  "person.page.orcid.sync-queue.discard.success": "La file d'attente ORCID a été annulée avec succès.",
+
+  //"person.page.orcid.sync-queue.empty-message": "The ORCID queue registry is empty",
+  "person.page.orcid.sync-queue.empty-message": "La file d'attente ORCID est vide.",
+
+  //"person.page.orcid.sync-queue.table.header.type": "Type",
+  "person.page.orcid.sync-queue.table.header.type": "Type",
+
+  //"person.page.orcid.sync-queue.table.header.description": "Description",
+  "person.page.orcid.sync-queue.table.header.description": "Description",
+
+  //"person.page.orcid.sync-queue.table.header.action": "Action",
+  "person.page.orcid.sync-queue.table.header.action": "Action",
+
+  //"person.page.orcid.sync-queue.description.affiliation": "Affiliations",
+  "person.page.orcid.sync-queue.description.affiliation": "Affiliations",
+
+  //"person.page.orcid.sync-queue.description.country": "Country",
+  "person.page.orcid.sync-queue.description.country": "Pays",
+
+  //"person.page.orcid.sync-queue.description.education": "Educations",
+  "person.page.orcid.sync-queue.description.education": "Éducation",
+
+  //"person.page.orcid.sync-queue.description.external_ids": "External ids",
+  "person.page.orcid.sync-queue.description.external_ids": "Identifiants externes",
+
+  //"person.page.orcid.sync-queue.description.other_names": "Other names",
+  "person.page.orcid.sync-queue.description.other_names": "Autres noms",
+
+  //"person.page.orcid.sync-queue.description.qualification": "Qualifications",
+  "person.page.orcid.sync-queue.description.qualification": "Qualifications",
+
+  //"person.page.orcid.sync-queue.description.researcher_urls": "Researcher urls",
+  "person.page.orcid.sync-queue.description.researcher_urls": "URLs du chercheur",
+
+  //"person.page.orcid.sync-queue.description.keywords": "Keywords",
+  "person.page.orcid.sync-queue.description.keywords": "Mots clés",
+
+  //"person.page.orcid.sync-queue.tooltip.insert": "Add a new entry in the ORCID registry",
+  "person.page.orcid.sync-queue.tooltip.insert": "Ajouter une nouvelle entrée dans le registre ORCID",
+
+  //"person.page.orcid.sync-queue.tooltip.update": "Update this entry on the ORCID registry",
+  "person.page.orcid.sync-queue.tooltip.update": "Mettre à jour cette entrée dans le registre ORCID",
+
+  //"person.page.orcid.sync-queue.tooltip.delete": "Remove this entry from the ORCID registry",
+  "person.page.orcid.sync-queue.tooltip.delete": "Supprimer cette entrée du registre ORCID",
+
+  //"person.page.orcid.sync-queue.tooltip.publication": "Publication",
+  "person.page.orcid.sync-queue.tooltip.publication": "Publication",
+
+  //"person.page.orcid.sync-queue.tooltip.project": "Project",
+  "person.page.orcid.sync-queue.tooltip.project": "Projet",
+
+  //"person.page.orcid.sync-queue.tooltip.affiliation": "Affiliation",
+  "person.page.orcid.sync-queue.tooltip.affiliation": "Affiliation",
+
+  //"person.page.orcid.sync-queue.tooltip.education": "Education",
+  "person.page.orcid.sync-queue.tooltip.education": "Éducation",
+
+  //"person.page.orcid.sync-queue.tooltip.qualification": "Qualification",
+  "person.page.orcid.sync-queue.tooltip.qualification": "Qualification",
+
+  //"person.page.orcid.sync-queue.tooltip.other_names": "Other name",
+  "person.page.orcid.sync-queue.tooltip.other_names": "Autre nom",
+
+  //"person.page.orcid.sync-queue.tooltip.country": "Country",
+  "person.page.orcid.sync-queue.tooltip.country": "Pays",
+
+  //"person.page.orcid.sync-queue.tooltip.keywords": "Keyword",
+  "person.page.orcid.sync-queue.tooltip.keywords": "Mot clé",
+
+  //"person.page.orcid.sync-queue.tooltip.external_ids": "External identifier",
+  "person.page.orcid.sync-queue.tooltip.external_ids": "Identifiant externe",
+
+  //"person.page.orcid.sync-queue.tooltip.researcher_urls": "Researcher url",
+  "person.page.orcid.sync-queue.tooltip.researcher_urls": "URL du chercheur",
+
+  //"person.page.orcid.sync-queue.send": "Synchronize with ORCID registry",
+  "person.page.orcid.sync-queue.send": "Synchroniser avec le registre ORCID",
+
+  //"person.page.orcid.sync-queue.send.unauthorized-error.title": "The submission to ORCID failed for missing authorizations.",
+  "person.page.orcid.sync-queue.send.unauthorized-error.title": "La transmission à ORCID a échoué en raison d'autorisations manquantes.",
+
+  //"person.page.orcid.sync-queue.send.unauthorized-error.content": "Click <a href='{{orcid}}'>here</a> to grant again the required permissions. If the problem persists, contact the administrator",
+  "person.page.orcid.sync-queue.send.unauthorized-error.content": "Cliquer <a href='{{orcid}}'>ici</a> afin d'accorder à nouveau les permissions nécessaires. Si le problème persiste, contacter l'administrateur.",
+
+  //"person.page.orcid.sync-queue.send.bad-request-error": "The submission to ORCID failed because the resource sent to ORCID registry is not valid",
+  "person.page.orcid.sync-queue.send.bad-request-error": "La transmission à ORCID a échoué en raison du fait que la ressource envoyée n'est pas valide.",
+
+  //"person.page.orcid.sync-queue.send.error": "The submission to ORCID failed",
+  "person.page.orcid.sync-queue.send.error": "La transmission à ORCID a échoué.",
+
+  //"person.page.orcid.sync-queue.send.conflict-error": "The submission to ORCID failed because the resource is already present on the ORCID registry",
+  "person.page.orcid.sync-queue.send.conflict-error": "La transmission à ORCID a échoué en raison du fait que la ressource est déjà présente dans le registre ORCID.",
+
+  //"person.page.orcid.sync-queue.send.not-found-warning": "The resource does not exists anymore on the ORCID registry.",
+  "person.page.orcid.sync-queue.send.not-found-warning": "La ressource n'existe plus dans le registre ORCID.",
+
+  //"person.page.orcid.sync-queue.send.success": "The submission to ORCID was completed successfully",
+  "person.page.orcid.sync-queue.send.success": "La transmission à ORCID a été effectuée avec succès.",
+
+  //"person.page.orcid.sync-queue.send.validation-error": "The data that you want to synchronize with ORCID is not valid",
+  "person.page.orcid.sync-queue.send.validation-error": "Les données que vous souhaitez synchroniser avec ORCID ne sont pas valides.",
+
+  //"person.page.orcid.sync-queue.send.validation-error.amount-currency.required": "The amount's currency is required",
+  "person.page.orcid.sync-queue.send.validation-error.amount-currency.required": "La devise du montant est requise.",
+
+  //"person.page.orcid.sync-queue.send.validation-error.external-id.required": "The resource to be sent requires at least one identifier",
+  "person.page.orcid.sync-queue.send.validation-error.external-id.required": "La ressource à transmettre doit avoir au moins un identifiant.",
+
+  //"person.page.orcid.sync-queue.send.validation-error.title.required": "The title is required",
+  "person.page.orcid.sync-queue.send.validation-error.title.required": "Le titre est obligatoire.",
+
+  //"person.page.orcid.sync-queue.send.validation-error.type.required": "The dc.type is required",
+  "person.page.orcid.sync-queue.send.validation-error.type.required": "Le type de document est obligatoire.",
+
+  //"person.page.orcid.sync-queue.send.validation-error.start-date.required": "The start date is required",
+  "person.page.orcid.sync-queue.send.validation-error.start-date.required": "La date de début est obbligatoire.",
+
+  //"person.page.orcid.sync-queue.send.validation-error.funder.required": "The funder is required",
+  "person.page.orcid.sync-queue.send.validation-error.funder.required": "L'organisme subventionnaire est obligatoire.",
+
+  //"person.page.orcid.sync-queue.send.validation-error.country.invalid": "Invalid 2 digits ISO 3166 country",
+  "person.page.orcid.sync-queue.send.validation-error.country.invalid": "Code de pays ISO 3166 à 2 chiffres invalide",
+
+  //"person.page.orcid.sync-queue.send.validation-error.organization.required": "The organization is required",
+  "person.page.orcid.sync-queue.send.validation-error.organization.required": "L'organisation est obligatoire.",
+
+  //"person.page.orcid.sync-queue.send.validation-error.organization.name-required": "The organization's name is required",
+  "person.page.orcid.sync-queue.send.validation-error.organization.name-required": "Le nom de l'organisation est obligatoire.",
+
+  //"person.page.orcid.sync-queue.send.validation-error.publication.date-invalid": "The publication date must be one year after 1900",
+  "person.page.orcid.sync-queue.send.validation-error.publication.date-invalid": "La date de publication doit être d'au moins un an après 1900.",
+
+  //"person.page.orcid.sync-queue.send.validation-error.organization.address-required": "The organization to be sent requires an address",
+  "person.page.orcid.sync-queue.send.validation-error.organization.address-required": "L'organisation a transmettre doit avoir une adresse.",
+
+  //"person.page.orcid.sync-queue.send.validation-error.organization.city-required": "The address of the organization to be sent requires a city",
+  "person.page.orcid.sync-queue.send.validation-error.organization.city-required": "L'adresse de l'organisation à transmettre doit mentionner une ville.",
+
+  //"person.page.orcid.sync-queue.send.validation-error.organization.country-required": "The address of the organization to be sent requires a valid 2 digits ISO 3166 country",
+  "person.page.orcid.sync-queue.send.validation-error.organization.country-required": "L'adresse de l'organisation à transmettre doit avoir une code de pays ISO 3166 à 2 chiffres valide.",
+
+  //"person.page.orcid.sync-queue.send.validation-error.disambiguated-organization.required": "An identifier to disambiguate organizations is required. Supported ids are GRID, Ringgold, Legal Entity identifiers (LEIs) and Crossref Funder Registry identifiers",
+  "person.page.orcid.sync-queue.send.validation-error.disambiguated-organization.required": "Un identifiant pour désambiguer l'orgnisation est obligatoire. Les identifiants possibles sont GRID, Ringgold, Legal Entity identifiers (LEIs) et Crossref Funder Registry identifiers",
+
+  //"person.page.orcid.sync-queue.send.validation-error.disambiguated-organization.value-required": "The organization's identifiers requires a value",
+  "person.page.orcid.sync-queue.send.validation-error.disambiguated-organization.value-required": "Une valeur pour l'identifiant de l'organisation est obligatoire.",
+
+  //"person.page.orcid.sync-queue.send.validation-error.disambiguation-source.required": "The organization's identifiers requires a source",
+  "person.page.orcid.sync-queue.send.validation-error.disambiguation-source.required": "La source de l'identifiant de l'organisation est obligatoire.",
+
+  //"person.page.orcid.sync-queue.send.validation-error.disambiguation-source.invalid": "The source of one of the organization identifiers is invalid. Supported sources are RINGGOLD, GRID, LEI and FUNDREF",
+  "person.page.orcid.sync-queue.send.validation-error.disambiguation-source.invalid": "La source d'un des identifiants d'organisation est invalide. Les sources possibles sont RINGGOLD, GRID, LEI and FUNDREF",
+
+  //"person.page.orcid.synchronization-mode": "Synchronization mode",
+  "person.page.orcid.synchronization-mode": "Mode de synchronisation",
+
+  //"person.page.orcid.synchronization-mode.batch": "Batch",
+  "person.page.orcid.synchronization-mode.batch": "En lot",
+
+  //"person.page.orcid.synchronization-mode.label": "Synchronization mode",
+  "person.page.orcid.synchronization-mode.label": "Mode de synchronisation",
+
+  //"person.page.orcid.synchronization-mode-message": "Please select how you would like synchronization to ORCID to occur. The options include \"Manual\" (you must send your data to ORCID manually), or \"Batch\" (the system will send your data to ORCID via a scheduled script).",
+  "person.page.orcid.synchronization-mode-message": "Sélectionner le mode de synchronisation vers ORCID. Les options sont \"Manuel\" (vous devrez sélectionner les données à transmettre vers ORCID manuellement), ou \"En lot\" (le système transmettra vos données vers ORCID automatiquement).",
+
+  //"person.page.orcid.synchronization-mode-funding-message": "Select whether to send your linked Project entities to your ORCID record's list of funding information.",
+  "person.page.orcid.synchronization-mode-funding-message": "Sélectionnez si vous souhaitez transmettre vos projets de recherche vers votre profil ORCID.",
+
+  //"person.page.orcid.synchronization-mode-publication-message": "Select whether to send your linked Publication entities to your ORCID record's list of works.",
+  "person.page.orcid.synchronization-mode-publication-message": "Sélectionnez si vous souhaitez transmettre vos publications vers votre profil ORCID.",
+
+  //"person.page.orcid.synchronization-mode-profile-message": "Select whether to send your biographical data or personal identifiers to your ORCID record.",
+  "person.page.orcid.synchronization-mode-profile-message": "Sélectionnez si vous souhaitez transmettre vos données biographiques vers votre profil ORCID.",
+
+  //"person.page.orcid.synchronization-settings-update.success": "The synchronization settings have been updated successfully",
+  "person.page.orcid.synchronization-settings-update.success": "Les paramètres de synchronisation ont été mis à jour avec succès.",
+
+  //"person.page.orcid.synchronization-settings-update.error": "The update of the synchronization settings failed",
+  "person.page.orcid.synchronization-settings-update.error": "La mise à jour des paramètres de synchronisation a échoué.",
+
+  //"person.page.orcid.synchronization-mode.manual": "Manual",
+  "person.page.orcid.synchronization-mode.manual": "Manuel",
+
+  //"person.page.orcid.scope.authenticate": "Get your ORCID iD",
+  "person.page.orcid.scope.authenticate": "Obtenez votre identifiant ORCID",
+
+  //"person.page.orcid.scope.read-limited": "Read your information with visibility set to Trusted Parties",
+  "person.page.orcid.scope.read-limited": "Consultez vos informations ayant le paramètre de visibilité réglé sur Parties de confiance.",
+
+  //"person.page.orcid.scope.activities-update": "Add/update your research activities",
+  "person.page.orcid.scope.activities-update": "Ajouter ou mettre à jour vos activités de recherche",
+
+  //"person.page.orcid.scope.person-update": "Add/update other information about you",
+  "person.page.orcid.scope.person-update": "Ajouter ou mettre à jour d'autre information sur vous",
+
+  //"person.page.orcid.unlink.success": "The disconnection between the profile and the ORCID registry was successful",
+  "person.page.orcid.unlink.success": "La déconnexion entre votre profil et le registre ORCID a été effectuée avec succès.",
+
+  //"person.page.orcid.unlink.error": "An error occurred while disconnecting between the profile and the ORCID registry. Try again",
+  "person.page.orcid.unlink.error": "Une erreur s'est produite lors de la déconnexion entre votre profil et le registre ORCID. Veuillez réessayer.",
+
+  //"person.orcid.sync.setting": "ORCID Synchronization settings",
+  "person.orcid.sync.setting": "Paramètres de synchronisation ORCID",
+
+  //"person.orcid.registry.queue": "ORCID Registry Queue",
+  "person.orcid.registry.queue": "Liste d'attente pour le registre ORCID",
+
+  //"person.orcid.registry.auth": "ORCID Authorizations",
+  "person.orcid.registry.auth": "Autorisation ORCID",
+
+  //"home.recent-submissions.head": "Recent Submissions",
+  "home.recent-submissions.head": "Dépôts récents",
+
+  //"listable-notification-object.default-message": "This object couldn't be retrieved",
+  "listable-notification-object.default-message": "Cet objet n'a pas été trouvé.",
 
   // "system-wide-alert-banner.retrieval.error": "Something went wrong retrieving the system-wide alert banner",
   "system-wide-alert-banner.retrieval.error": "Une erreur s'est produite lors de la récupération de la bannière du message d'avertissement",
@@ -6194,8 +6790,6 @@
   // "system-wide-alert-banner.countdown.minutes": "{{minutes}} minute(s):",
   "system-wide-alert-banner.countdown.minutes": "{{minutes}} minute(s):",
 
-
-
   // "menu.section.system-wide-alert": "System-wide Alert",
   "menu.section.system-wide-alert": "Messages d'avertissement",
 
@@ -6251,6 +6845,63 @@
   //"admin.system-wide-alert.title": "System-wide Alerts",
   "admin.system-wide-alert.title": "Messages d'avertissement",
 
+  //"item-access-control-title": "This form allows you to perform changes to the access conditions of the item's metadata or its bitstreams.",
+  "item-access-control-title": "Ce formulaire vous permet de changer les conditions d'accès des métadonnées de l'Item et de ses Bitstreams.",
+
+  //"collection-access-control-title": "This form allows you to perform changes to the access conditions of all the items owned by this collection. Changes may be performed to either all Item metadata or all content (bitstreams).",
+  "collection-access-control-title": "Ce formulaire vous permet de changer les conditions d'accès de tous les Items de cette collection. Les changements peuvent être appliqués aux métadonnées des Items ou à leur contenu (Bitstreams).",
+
+  //"community-access-control-title": "This form allows you to perform changes to the access conditions of all the items owned by any collection under this community. Changes may be performed to either all Item metadata or all content (bitstreams).",
+  "community-access-control-title": "Ce formulaire vous permet de changer les conditions d'accès de tous les Items de toutes les collections de cette communauté. Les changements peuvent être appliqués aux métadonnées des Items ou à leur contenu (Bitstreams).",
+
+  //"access-control-item-header-toggle": "Item's Metadata",
+  "access-control-item-header-toggle": "Métadonnées de l'Item",
+
+  //"access-control-item-toggle.enable": "Enable option to perform changes on the item's metadata",
+  "access-control-item-toggle.enable": "Activer l'option permettant d'effectuer des modifications sur les métadonnées de l'Item",
+
+  //"access-control-item-toggle.disable": "Disable option to perform changes on the item's metadata",
+  "access-control-item-toggle.disable": "Désactiver l'option permettant d'effectuer des modifications sur les métadonnées de l'Item",
+
+  //"access-control-bitstream-header-toggle": "Bitstreams",
+  "access-control-bitstream-header-toggle": "Bitstreams",
+
+  //"access-control-bitstream-toggle.enable": "Enable option to perform changes on the bitstreams",
+  "access-control-bitstream-toggle.enable": "Activer l'option permettant d'effectuer des modifications sur les Bitstreams",
+
+  //"access-control-bitstream-toggle.disable": "Disable option to perform changes on the bitstreams",
+  "access-control-bitstream-toggle.disable": "Désactiver l'option permettant d'effectuer des modifications sur les Bitstreams",
+
+  //"access-control-mode": "Mode",
+  "access-control-mode": "Mode",
+
+  //"access-control-access-conditions": "Access conditions",
+  "access-control-access-conditions": "Conditions d'accès",
+
+  //"access-control-no-access-conditions-warning-message": "Currently, no access conditions are specified below. If executed, this will replace the current access conditions with the default access conditions inherited from the owning collection.",
+  //"access-control-no-access-conditions-warning-message": "Aucune condition d'accès n'est spécifiée ci-dessous pour l'instant. Si exécuté, ceci remplacera les conditions d'accès actuelles par les conditions d'accès par défaut héritées de celles de la collection.",
+
+  //"access-control-replace-all": "Replace access conditions",
+  "access-control-replace-all": "Remplacer les conditions d'accès",
+
+  //"access-control-add-to-existing":"Add to existing ones",
+  "access-control-add-to-existing": "Ajouter aux conditions d'accès existantes",
+
+  //"access-control-limit-to-specific": "Limit the changes to specific bitstreams",
+  "access-control-limit-to-specific": "Limiter les modifications à des Bitstreams spécifiques",
+
+  //"access-control-process-all-bitstreams": "Update all the bitstreams in the item",
+  "access-control-process-all-bitstreams": "Mise à jour de tous les Bitstreams de l'Item",
+
+  //"access-control-bitstreams-selected": "bitstreams selected",
+  "access-control-bitstreams-selected": "Bitstreams sélectionnés",
+
+  //"access-control-bitstreams-select": "Select bitstreams",
+  "access-control-bitstreams-select": "Sélectionner les Bitstreams",
+
+  //"access-control-cancel": "Cancel",
+  "access-control-cancel": "Annuler",
+
 
 }
 
diff --git a/src/assets/i18n/gd.json5 b/src/assets/i18n/gd.json5
index 6096073d56..4bd6980e42 100644
--- a/src/assets/i18n/gd.json5
+++ b/src/assets/i18n/gd.json5
@@ -3106,7 +3106,7 @@
   // "item.page.version.create": "Create new version",
   "item.page.version.create": "Cruthaich dreach ùr",
 
-  // "item.page.version.hasDraft": "A new version cannot be created because there is an inprogress submission in the version history",
+  // "item.page.version.hasDraft": "A new version cannot be created because there is an in-progress submission in the version history",
   "item.page.version.hasDraft": "Cha ghabh dreach ùr a chruthachadh oir tha cur-a-steach a' tachairt ann an eachdraidh nan dreachan",
 
   // "item.preview.dc.identifier.uri": "Identifier:",
@@ -3235,7 +3235,7 @@
   // "item.version.history.table.action.deleteVersion": "Delete version",
   "item.version.history.table.action.deleteVersion": "Dubh às dreach",
 
-  // "item.version.history.table.action.hasDraft": "A new version cannot be created because there is an inprogress submission in the version history",
+  // "item.version.history.table.action.hasDraft": "A new version cannot be created because there is an in-progress submission in the version history",
   "item.version.history.table.action.hasDraft": "Cha ghabh dreach ùr a chruthachadh oir tha cur-a-steach a' tachairt ann an eachdraidh nan dreachan",
 
 
@@ -3276,7 +3276,7 @@
   // "item.version.create.notification.failure" : "New version has not been created",
   "item.version.create.notification.failure": "Cha deach dreach ùr a chruthachadh",
 
-  // "item.version.create.notification.inProgress" : "A new version cannot be created because there is an inprogress submission in the version history",
+  // "item.version.create.notification.inProgress" : "A new version cannot be created because there is an in-progress submission in the version history",
   "item.version.create.notification.inProgress": "Cha ghabh dreach ùr a chruthachadh oir tha cur-a-steach a' tachairt ann an eachdraidh nan dreachan",
 
 
@@ -3867,20 +3867,20 @@
   // "mydspace.show.workspace": "Your Submissions",
   "mydspace.show.workspace": "Do Chur-a-steachan",
 
-  // "mydspace.status.archived": "Archived",
-  "mydspace.status.archived": "San Tasglann",
+  // "mydspace.status.mydspaceArchived": "Archived",
+  "mydspace.status.mydspaceArchived": "San Tasglann",
 
-  // "mydspace.status.validation": "Validation",
-  "mydspace.status.validation": "Dearbhadh",
+  // "mydspace.status.mydspaceValidation": "Validation",
+  "mydspace.status.mydspaceValidation": "Dearbhadh",
 
-  // "mydspace.status.waiting-for-controller": "Waiting for controller",
-  "mydspace.status.waiting-for-controller": "A' feitheamh riaghladair",
+  // "mydspace.status.mydspaceWaitingController": "Waiting for reviewer",
+  "mydspace.status.mydspaceWaitingController": "A' feitheamh riaghladair",
 
-  // "mydspace.status.workflow": "Workflow",
-  "mydspace.status.workflow": "Sruth-obrach",
+  // "mydspace.status.mydspaceWorkflow": "Workflow",
+  "mydspace.status.mydspaceWorkflow": "Sruth-obrach",
 
-  // "mydspace.status.workspace": "Workspace",
-  "mydspace.status.workspace": "Raon-obrach",
+  // "mydspace.status.mydspaceWorkspace": "Workspace",
+  "mydspace.status.mydspaceWorkspace": "Raon-obrach",
 
   // "mydspace.title": "MyDSpace",
   "mydspace.title": "MoDSpace",
@@ -4611,6 +4611,10 @@
   // "resource-policies.form.name.label": "Name",
   "resource-policies.form.name.label": "Ainm",
 
+  //"resource-policies.form.name.hint": "Max 30 characters",
+  // TODO New key - Add a translation
+  "resource-policies.form.name.hint": "Max 30 characters",
+
   // "resource-policies.form.policy-type.label": "Select the policy type",
   "resource-policies.form.policy-type.label": "Tagh an seòrsa poileasaidh",
 
diff --git a/src/assets/i18n/hi.json5 b/src/assets/i18n/hi.json5
index 53fc106187..77b4929cc4 100644
--- a/src/assets/i18n/hi.json5
+++ b/src/assets/i18n/hi.json5
@@ -2677,15 +2677,15 @@
 
   "mydspace.show.workspace": "आपकी प्रस्तुतियां",
 
-  "mydspace.status.archived": "संग्रहीत",
+  "mydspace.status.mydspaceArchived": "संग्रहीत",
 
-  "mydspace.status.validation": "सत्यापन",
+  "mydspace.status.mydspaceValidation": "सत्यापन",
 
-  "mydspace.status.waiting-for-controller": "नियंत्रक की प्रतीक्षा कर रहा है",
+  "mydspace.status.mydspaceWaitingController": "नियंत्रक की प्रतीक्षा कर रहा है",
 
-  "mydspace.status.workflow": "कार्यप्रवाह",
+  "mydspace.status.mydspaceWorkflow": "कार्यप्रवाह",
 
-  "mydspace.status.workspace": "कार्यस्थान",
+  "mydspace.status.mydspaceWorkspace": "कार्यस्थान",
 
   "mydspace.title": "मेरा डीस्पेस",
 
@@ -3421,6 +3421,10 @@
 
   "resource-policies.form.name.label": "नाम",
 
+  //"resource-policies.form.name.hint": "Max 30 characters",
+  // TODO New key - Add a translation
+  "resource-policies.form.name.hint": "Max 30 characters",
+
   "resource-policies.form.policy-type.label": "नीति प्रकार चुनें",
 
   "resource-policies.form.policy-type.required": "आपको संसाधन नीति प्रकार का चयन करना होगा।",
@@ -3811,7 +3815,7 @@
 
   "submission.import-external.source.cinii": "CiNii",
 
-  "submission.import-external.source.crossref": "CrossRef",
+  "submission.import-external.source.crossref": "Crossref",
 
   "submission.import-external.source.epo": "यूरोपीय पेटेंट कार्यालय",
 
diff --git a/src/assets/i18n/hu.json5 b/src/assets/i18n/hu.json5
index 373d73aec5..7f939a071e 100644
--- a/src/assets/i18n/hu.json5
+++ b/src/assets/i18n/hu.json5
@@ -2228,9 +2228,9 @@
   // "curation-task.task.vscan.label": "Virus Scan",
   "curation-task.task.vscan.label": "Virus ellenőrzés",
 
-  // "curation-task.task.register-doi.label": "Register DOI",
+  // "curation-task.task.registerdoi.label": "Register DOI",
   // TODO New key - Add a translation
-  "curation-task.task.register-doi.label": "Register DOI",
+  "curation-task.task.registerdoi.label": "Register DOI",
 
 
 
@@ -3975,9 +3975,9 @@
   // TODO New key - Add a translation
   "item.page.version.create": "Create new version",
 
-  // "item.page.version.hasDraft": "A new version cannot be created because there is an inprogress submission in the version history",
+  // "item.page.version.hasDraft": "A new version cannot be created because there is an in-progress submission in the version history",
   // TODO New key - Add a translation
-  "item.page.version.hasDraft": "A new version cannot be created because there is an inprogress submission in the version history",
+  "item.page.version.hasDraft": "A new version cannot be created because there is an in-progress submission in the version history",
 
   // "item.page.claim.button": "Claim",
   // TODO New key - Add a translation
@@ -4162,9 +4162,9 @@
   // TODO New key - Add a translation
   "item.version.history.table.action.deleteVersion": "Delete version",
 
-  // "item.version.history.table.action.hasDraft": "A new version cannot be created because there is an inprogress submission in the version history",
+  // "item.version.history.table.action.hasDraft": "A new version cannot be created because there is an in-progress submission in the version history",
   // TODO New key - Add a translation
-  "item.version.history.table.action.hasDraft": "A new version cannot be created because there is an inprogress submission in the version history",
+  "item.version.history.table.action.hasDraft": "A new version cannot be created because there is an in-progress submission in the version history",
 
 
   // "item.version.notice": "This is not the latest version of this item. The latest version can be found <a href='{{destination}}'>here</a>.",
@@ -4223,9 +4223,9 @@
   // TODO New key - Add a translation
   "item.version.create.notification.failure": "New version has not been created",
 
-  // "item.version.create.notification.inProgress" : "A new version cannot be created because there is an inprogress submission in the version history",
+  // "item.version.create.notification.inProgress" : "A new version cannot be created because there is an in-progress submission in the version history",
   // TODO New key - Add a translation
-  "item.version.create.notification.inProgress": "A new version cannot be created because there is an inprogress submission in the version history",
+  "item.version.create.notification.inProgress": "A new version cannot be created because there is an in-progress submission in the version history",
 
 
   // "item.version.delete.modal.header": "Delete version",
@@ -4983,20 +4983,20 @@
   // TODO New key - Add a translation
   "mydspace.show.supervisedWorkspace": "Supervised items",
 
-  // "mydspace.status.archived": "Archived",
-  "mydspace.status.archived": "Tárolva",
+  // "mydspace.status.mydspaceArchived": "Archived",
+  "mydspace.status.mydspaceArchived": "Tárolva",
 
-  // "mydspace.status.validation": "Validation",
-  "mydspace.status.validation": "Érvényesítés",
+  // "mydspace.status.mydspaceValidation": "Validation",
+  "mydspace.status.mydspaceValidation": "Érvényesítés",
 
-  // "mydspace.status.waiting-for-controller": "Waiting for controller",
-  "mydspace.status.waiting-for-controller": "Várakozás a kontrollerre",
+  // "mydspace.status.mydspaceWaitingController": "Waiting for reviewer",
+  "mydspace.status.mydspaceWaitingController": "Várakozás a kontrollerre",
 
-  // "mydspace.status.workflow": "Workflow",
-  "mydspace.status.workflow": "Munkafolyamat",
+  // "mydspace.status.mydspaceWorkflow": "Workflow",
+  "mydspace.status.mydspaceWorkflow": "Munkafolyamat",
 
-  // "mydspace.status.workspace": "Workspace",
-  "mydspace.status.workspace": "Munkafelület",
+  // "mydspace.status.mydspaceWorkspace": "Workspace",
+  "mydspace.status.mydspaceWorkspace": "Munkafelület",
 
   // "mydspace.title": "MyDSpace",
   "mydspace.title": "MyDSpace",
@@ -5906,6 +5906,10 @@
   // "resource-policies.form.name.label": "Name",
   "resource-policies.form.name.label": "Név",
 
+  //"resource-policies.form.name.hint": "Max 30 characters",
+  // TODO New key - Add a translation
+  "resource-policies.form.name.hint": "Max 30 characters",
+
   // "resource-policies.form.policy-type.label": "Select the policy type",
   "resource-policies.form.policy-type.label": "Szabály típus kiválasztása",
 
@@ -6580,9 +6584,9 @@
   // TODO New key - Add a translation
   "submission.import-external.source.cinii": "CiNii",
 
-  // "submission.import-external.source.crossref": "CrossRef",
+  // "submission.import-external.source.crossref": "Crossref",
   // TODO New key - Add a translation
-  "submission.import-external.source.crossref": "CrossRef",
+  "submission.import-external.source.crossref": "Crossref",
 
   // "submission.import-external.source.datacite": "DataCite",
   // TODO New key - Add a translation
diff --git a/src/assets/i18n/it.json5 b/src/assets/i18n/it.json5
index 4131d0bee6..0dd3b31983 100644
--- a/src/assets/i18n/it.json5
+++ b/src/assets/i18n/it.json5
@@ -195,7 +195,6 @@
   // "admin.registries.bitstream-formats.table.name": "Name",
   "admin.registries.bitstream-formats.table.name": "Nome",
   // "admin.registries.bitstream-formats.table.id": "ID",
-  // TODO New key - Add a translation
   "admin.registries.bitstream-formats.table.id": "ID",
 
   // "admin.registries.bitstream-formats.table.return": "Back",
@@ -277,7 +276,6 @@
   // "admin.registries.schema.fields.table.field": "Field",
   "admin.registries.schema.fields.table.field": "Campo",
   // "admin.registries.schema.fields.table.id": "ID",
-  // TODO New key - Add a translation
   "admin.registries.schema.fields.table.id": "ID",
 
   // "admin.registries.schema.fields.table.scopenote": "Scope Note",
@@ -501,7 +499,6 @@
   "admin.access-control.groups.addGroup.breadcrumbs": "Nuovo Gruppo",
 
   // "admin.access-control.groups.head": "Groups",
-  // TODO Source message changed - Revise the translation
   "admin.access-control.groups.head": "Gruppi/Ruoli",
 
   // "admin.access-control.groups.button.add": "Add group",
@@ -538,8 +535,7 @@
   "admin.access-control.groups.table.edit.buttons.edit": "Modifica \"{{name}}\"",
 
   // "admin.access-control.groups.table.edit.buttons.remove": "Delete \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.table.edit.buttons.remove": "Delete \"{{name}}\"",
+  "admin.access-control.groups.table.edit.buttons.remove": "Elimina \"{{name}}\"",
 
   // "admin.access-control.groups.no-items": "No groups found with this in their name or this as UUID",
   "admin.access-control.groups.no-items": "Nessun gruppo trovato con questo nel loro nome o questo come UUID",
@@ -751,16 +747,13 @@
   "admin.access-control.groups.form.return": "Indietro",
 
   // "admin.access-control.groups.form.tooltip.editGroupPage": "On this page, you can modify the properties and members of a group. In the top section, you can edit the group name and description, unless this is an admin group for a collection or community, in which case the group name and description are auto-generated and cannot be edited. In the following sections, you can edit group membership. See [the wiki](https://wiki.lyrasis.org/display/DSDOC7x/Create+or+manage+a+user+group) for more details.",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.tooltip.editGroupPage": "On this page, you can modify the properties and members of a group. In the top section, you can edit the group name and description, unless this is an admin group for a collection or community, in which case the group name and description are auto-generated and cannot be edited. In the following sections, you can edit group membership. See [the wiki](https://wiki.lyrasis.org/display/DSDOC7x/Create+or+manage+a+user+group) for more details.",
+  "admin.access-control.groups.form.tooltip.editGroupPage": "In questa pagina è possibile modificare le proprietà e i membri di un gruppo. Nella sezione in alto, è possibile modificare il nome e la descrizione del gruppo, a meno che non si tratti di un gruppo di amministratori di una collection o una community. In quel caso il nome e la descrizione del gruppo sono generati automaticamente e non possono essere modificati. Nelle sezioni successive è possibile modificare l'appartenenza al gruppo. Per maggiori dettagli, vedere [la wiki](https://wiki.lyrasis.org/display/DSDOC7x/Create+o+gestire+un+gruppo+utente)",
 
   // "admin.access-control.groups.form.tooltip.editGroup.addEpeople": "To add or remove an EPerson to/from this group, either click the 'Browse All' button or use the search bar below to search for users (use the dropdown to the left of the search bar to choose whether to search by metadata or by email). Then click the plus icon for each user you wish to add in the list below, or the trash can icon for each user you wish to remove. The list below may have several pages: use the page controls below the list to navigate to the next pages. Once you are ready, save your changes by clicking the 'Save' button in the top section.",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.tooltip.editGroup.addEpeople": "To add or remove an EPerson to/from this group, either click the 'Browse All' button or use the search bar below to search for users (use the dropdown to the left of the search bar to choose whether to search by metadata or by email). Then click the plus icon for each user you wish to add in the list below, or the trash can icon for each user you wish to remove. The list below may have several pages: use the page controls below the list to navigate to the next pages. Once you are ready, save your changes by clicking the 'Save' button in the top section.",
+  "admin.access-control.groups.form.tooltip.editGroup.addEpeople": "Per aggiungere o rimuovere un EPerson a/da questo gruppo, cliccare sul pulsante 'Sfoglia tutti' o utilizzare la barra di ricerca in basso per cercare gli utenti (utilizzare il menu a tendina a sinistra della barra di ricerca per selezionare la ricerca per metadati o per e-mail). Cliccare quindi sull'icona + per ogni utente che si desidera aggiungere nell'elenco sottostante o sull'icona del cestino per ogni utente che si desidera rimuovere. L'elenco può avere diverse pagine: utilizzare i controlli di pagina in basso per spostarsi alle pagine successive. Per salvare le modifiche, cliccare sul pulsante 'Salvare' nella sezione in alto.",
 
   // "admin.access-control.groups.form.tooltip.editGroup.addSubgroups": "To add or remove a Subgroup to/from this group, either click the 'Browse All' button or use the search bar below to search for users. Then click the plus icon for each user you wish to add in the list below, or the trash can icon for each user you wish to remove. The list below may have several pages: use the page controls below the list to navigate to the next pages. Once you are ready, save your changes by clicking the 'Save' button in the top section.",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.tooltip.editGroup.addSubgroups": "To add or remove a Subgroup to/from this group, either click the 'Browse All' button or use the search bar below to search for users. Then click the plus icon for each user you wish to add in the list below, or the trash can icon for each user you wish to remove. The list below may have several pages: use the page controls below the list to navigate to the next pages. Once you are ready, save your changes by clicking the 'Save' button in the top section.",
+  "admin.access-control.groups.form.tooltip.editGroup.addSubgroups": "Per aggiungere o rimuovere un Sottogruppo a/da questo gruppo, cliccare sul pulsante 'Sfoglia tutti' o utilizzare la barra di ricerca in basso per cercare gli utenti. Cliccare quindi sull'icona + per ogni utente che si desidera aggiungere nell'elenco sottostante o sull'icona del cestino per ogni utente che si desidera rimuovere. L'elenco può avere diverse pagine: utilizzare i controlli di pagina in basso per spostarsi alle pagine successive. Per salvare le modifiche, cliccare sul pulsante 'Salva' nella sezione in alto.",
 
   // "admin.search.breadcrumbs": "Administrative Search",
   "admin.search.breadcrumbs": "Ricerca amministrativa",
@@ -811,7 +804,6 @@
   "admin.workflow.item.workflow": "Flusso di lavoro",
 
   // "admin.workflow.item.workspace": "Workspace",
-  // TODO New key - Add a translation
   "admin.workflow.item.workspace": "Workspace",
 
   // "admin.workflow.item.delete": "Delete",
@@ -821,12 +813,10 @@
   "admin.workflow.item.send-back": "Rinviare",
 
   // "admin.workflow.item.policies": "Policies",
-  // TODO New key - Add a translation
-  "admin.workflow.item.policies": "Policies",
+  "admin.workflow.item.policies": "Policy",
 
   // "admin.workflow.item.supervision": "Supervision",
-  // TODO New key - Add a translation
-  "admin.workflow.item.supervision": "Supervision",
+  "admin.workflow.item.supervision": "Supervisione",
 
 
 
@@ -834,43 +824,37 @@
   "admin.metadata-import.breadcrumbs": "Importare metadati",
 
   // "admin.batch-import.breadcrumbs": "Import Batch",
-  // TODO New key - Add a translation
-  "admin.batch-import.breadcrumbs": "Import Batch",
+  "admin.batch-import.breadcrumbs": "Batch Import",
 
   // "admin.metadata-import.title": "Import Metadata",
   "admin.metadata-import.title": "Importare metadati",
 
   // "admin.batch-import.title": "Import Batch",
-  // TODO New key - Add a translation
-  "admin.batch-import.title": "Import Batch",
+  "admin.batch-import.title": "Batch Import",
 
   // "admin.metadata-import.page.header": "Import Metadata",
   "admin.metadata-import.page.header": "Importare metadati",
 
   // "admin.batch-import.page.header": "Import Batch",
-  // TODO New key - Add a translation
-  "admin.batch-import.page.header": "Import Batch",
+  "admin.batch-import.page.header": "Batch Import",
 
   // "admin.metadata-import.page.help": "You can drop or browse CSV files that contain batch metadata operations on files here",
-  "admin.metadata-import.page.help": "È possibile eliminare o sfogliare i file CSV che contengono operazioni di metadati batch sui file qui",
+  "admin.metadata-import.page.help": "È possibile rilasciare o sfogliare i file CSV che contengono operazioni di metadati batch sui file qui",
 
   // "admin.batch-import.page.help": "Select the Collection to import into. Then, drop or browse to a Simple Archive Format (SAF) zip file that includes the Items to import",
-  // TODO New key - Add a translation
-  "admin.batch-import.page.help": "Select the Collection to import into. Then, drop or browse to a Simple Archive Format (SAF) zip file that includes the Items to import",
+  "admin.batch-import.page.help": "Selezionare la Collection in cui effettuare l'import. Quindi, rilasciare o sfogliare un file zip Simple Archive Format (SAF) che include gli elementi da importare",
 
   // "admin.metadata-import.page.dropMsg": "Drop a metadata CSV to import",
   "admin.metadata-import.page.dropMsg": "Rilasciare un CSV di metadati da importare",
 
   // "admin.batch-import.page.dropMsg": "Drop a batch ZIP to import",
-  // TODO New key - Add a translation
-  "admin.batch-import.page.dropMsg": "Drop a batch ZIP to import",
+  "admin.batch-import.page.dropMsg": "Rilasciare un batch ZIP da importare",
 
   // "admin.metadata-import.page.dropMsgReplace": "Drop to replace the metadata CSV to import",
-  "admin.metadata-import.page.dropMsgReplace": "Rilascia per sostituire i metadati CSV da importare",
+  "admin.metadata-import.page.dropMsgReplace": "Rilasciare per sostituire i metadati CSV da importare",
 
   // "admin.batch-import.page.dropMsgReplace": "Drop to replace the batch ZIP to import",
-  // TODO New key - Add a translation
-  "admin.batch-import.page.dropMsgReplace": "Drop to replace the batch ZIP to import",
+  "admin.batch-import.page.dropMsgReplace": "Rilasciare per sostituire il batch ZIP da importare",
 
   // "admin.metadata-import.page.button.return": "Back",
   "admin.metadata-import.page.button.return": "Indietro",
@@ -879,15 +863,13 @@
   "admin.metadata-import.page.button.proceed": "Procedere",
 
   // "admin.metadata-import.page.button.select-collection": "Select Collection",
-  // TODO New key - Add a translation
-  "admin.metadata-import.page.button.select-collection": "Select Collection",
+  "admin.metadata-import.page.button.select-collection": "Selezionare una Collection",
 
   // "admin.metadata-import.page.error.addFile": "Select file first!",
   "admin.metadata-import.page.error.addFile": "Seleziona prima il file!",
 
   // "admin.batch-import.page.error.addFile": "Select Zip file first!",
-  // TODO New key - Add a translation
-  "admin.batch-import.page.error.addFile": "Select Zip file first!",
+  "admin.batch-import.page.error.addFile": "Seleziona prima il file ZIP!",
 
   // "admin.metadata-import.page.validateOnly": "Validate Only",
   "admin.metadata-import.page.validateOnly": "Solo Validazione",
@@ -896,138 +878,105 @@
   "admin.metadata-import.page.validateOnly.hint": "Una volta selezionato, il CSV caricato sarà validato. Riceverai un report delle modifiche rilevate, ma nessuna modifica verrà salvata.",
 
   // "advanced-workflow-action.rating.form.rating.label": "Rating",
-  // TODO New key - Add a translation
-  "advanced-workflow-action.rating.form.rating.label": "Rating",
+  "advanced-workflow-action.rating.form.rating.label": "Valutazione",
 
   // "advanced-workflow-action.rating.form.rating.error": "You must rate the item",
-  // TODO New key - Add a translation
-  "advanced-workflow-action.rating.form.rating.error": "You must rate the item",
+  "advanced-workflow-action.rating.form.rating.error": "È necessario valutare l'item",
 
   // "advanced-workflow-action.rating.form.review.label": "Review",
-  // TODO New key - Add a translation
-  "advanced-workflow-action.rating.form.review.label": "Review",
+  "advanced-workflow-action.rating.form.review.label": "Revisione",
 
   // "advanced-workflow-action.rating.form.review.error": "You must enter a review to submit this rating",
-  // TODO New key - Add a translation
-  "advanced-workflow-action.rating.form.review.error": "You must enter a review to submit this rating",
+  "advanced-workflow-action.rating.form.review.error": "Per inviare questa valutazione è necessario inserire una revisione",
 
   // "advanced-workflow-action.rating.description": "Please select a rating below",
-  // TODO New key - Add a translation
-  "advanced-workflow-action.rating.description": "Please select a rating below",
+  "advanced-workflow-action.rating.description": "Selezionare una valutazione qui sotto",
 
   // "advanced-workflow-action.rating.description-requiredDescription": "Please select a rating below and also add a review",
-  // TODO New key - Add a translation
-  "advanced-workflow-action.rating.description-requiredDescription": "Please select a rating below and also add a review",
+  "advanced-workflow-action.rating.description-requiredDescription": "Selezionare una valutazione qui sotto e aggiungere anche una revisione",
 
 
   // "advanced-workflow-action.select-reviewer.description-single": "Please select a single reviewer below before submitting",
-  // TODO New key - Add a translation
-  "advanced-workflow-action.select-reviewer.description-single": "Please select a single reviewer below before submitting",
+  "advanced-workflow-action.select-reviewer.description-single": "Selezionare un solo revisione prima di procedere con l'inserimento",
 
   // "advanced-workflow-action.select-reviewer.description-multiple": "Please select one or more reviewers below before submitting",
-  // TODO New key - Add a translation
-  "advanced-workflow-action.select-reviewer.description-multiple": "Please select one or more reviewers below before submitting",
+  "advanced-workflow-action.select-reviewer.description-multiple": "Selezionare uno o più revisori prima di procedere con l'inserimento",
 
 
   // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.head": "EPeople",
-  // TODO New key - Add a translation
   "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.head": "EPeople",
 
   // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.head": "Add EPeople",
-  // TODO New key - Add a translation
-  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.head": "Add EPeople",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.head": "Aggiungi EPeople",
 
   // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.button.see-all": "Browse All",
-  // TODO New key - Add a translation
-  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.button.see-all": "Browse All",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.button.see-all": "Sfoglia tutto",
 
   // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.headMembers": "Current Members",
-  // TODO New key - Add a translation
-  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.headMembers": "Current Members",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.headMembers": "Membri attuali",
 
   // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.scope.metadata": "Metadata",
-  // TODO New key - Add a translation
-  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.scope.metadata": "Metadata",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.scope.metadata": "Metadati",
 
   // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.scope.email": "E-mail (exact)",
-  // TODO New key - Add a translation
-  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.scope.email": "E-mail (exact)",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.scope.email": "E-mail (esatta)",
 
   // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.button": "Search",
-  // TODO New key - Add a translation
-  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.button": "Search",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.button": "Ricerca",
 
   // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.id": "ID",
-  // TODO New key - Add a translation
   "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.id": "ID",
 
   // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.name": "Name",
-  // TODO New key - Add a translation
-  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.name": "Name",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.name": "Nome",
 
   // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.identity": "Identity",
-  // TODO New key - Add a translation
-  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.identity": "Identity",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.identity": "Identità",
 
   // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.email": "Email",
-  // TODO New key - Add a translation
-  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.email": "Email",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.email": "E-mail",
 
   // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.netid": "NetID",
-  // TODO New key - Add a translation
   "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.netid": "NetID",
 
   // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.edit": "Remove / Add",
-  // TODO New key - Add a translation
-  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.edit": "Remove / Add",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.edit": "Rimuovi / Aggiungi",
 
   // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.edit.buttons.remove": "Remove member with name \"{{name}}\"",
-  // TODO New key - Add a translation
-  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.edit.buttons.remove": "Remove member with name \"{{name}}\"",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.edit.buttons.remove": "Rimuovi membro con il nome \"{{name}}\"",
 
   // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.success.addMember": "Successfully added member: \"{{name}}\"",
-  // TODO New key - Add a translation
-  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.success.addMember": "Successfully added member: \"{{name}}\"",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.success.addMember": "Membro inserito con successo: \"{{name}}\"",
 
   // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.failure.addMember": "Failed to add member: \"{{name}}\"",
-  // TODO New key - Add a translation
-  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.failure.addMember": "Failed to add member: \"{{name}}\"",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.failure.addMember": "Impossibile aggiungere il membro: \"{{name}}\"",
 
   // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.success.deleteMember": "Successfully deleted member: \"{{name}}\"",
-  // TODO New key - Add a translation
-  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.success.deleteMember": "Successfully deleted member: \"{{name}}\"",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.success.deleteMember": "Membro eliminato con successo: \"{{name}}\"",
 
   // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.failure.deleteMember": "Failed to delete member: \"{{name}}\"",
-  // TODO New key - Add a translation
-  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.failure.deleteMember": "Failed to delete member: \"{{name}}\"",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.failure.deleteMember": "Impossibile eliminare il membro: \"{{name}}\"",
 
   // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.edit.buttons.add": "Add member with name \"{{name}}\"",
-  // TODO New key - Add a translation
-  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.edit.buttons.add": "Add member with name \"{{name}}\"",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.edit.buttons.add": "Aggiungi membro con il nome \"{{name}}\"",
 
   // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.failure.noActiveGroup": "No current active group, submit a name first.",
-  // TODO New key - Add a translation
-  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.failure.noActiveGroup": "No current active group, submit a name first.",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.failure.noActiveGroup": "Nessun gruppo attivo al momento, inserire prima un nome.",
 
   // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.no-members-yet": "No members in group yet, search and add.",
-  // TODO New key - Add a translation
-  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.no-members-yet": "No members in group yet, search and add.",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.no-members-yet": "Questo gruppo è vuoto, cercare e aggiungere membri.",
 
   // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.no-items": "No EPeople found in that search",
-  // TODO New key - Add a translation
-  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.no-items": "No EPeople found in that search",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.no-items": "La ricerca non ha trovato EPeople",
 
   // "advanced-workflow-action.select-reviewer.no-reviewer-selected.error": "No reviewer selected.",
-  // TODO New key - Add a translation
-  "advanced-workflow-action.select-reviewer.no-reviewer-selected.error": "No reviewer selected.",
+  "advanced-workflow-action.select-reviewer.no-reviewer-selected.error": "Nessun revisore selezionato.",
 
   // "admin.batch-import.page.validateOnly.hint": "When selected, the uploaded ZIP will be validated. You will receive a report of detected changes, but no changes will be saved.",
-  // TODO New key - Add a translation
-  "admin.batch-import.page.validateOnly.hint": "When selected, the uploaded ZIP will be validated. You will receive a report of detected changes, but no changes will be saved.",
+  "admin.batch-import.page.validateOnly.hint": "Una volta selezionato, il file ZIP caricato verrà convalidato. Si riceverà un rapporto sulle modifiche rilevate, ma non verrà salvata alcuna modifica.",
 
   // "admin.batch-import.page.remove": "remove",
-  // TODO New key - Add a translation
-  "admin.batch-import.page.remove": "remove",
+  "admin.batch-import.page.remove": "rimuovere",
 
   // "auth.errors.invalid-user": "Invalid email address or password.",
   "auth.errors.invalid-user": "Indirizzo e-mail o password non validi.",
@@ -1043,8 +992,7 @@
   // "bitstream.download.page": "Now downloading {{bitstream}}..." ,
   "bitstream.download.page": "Sto scaricando {{bitstream}}...",
 
-  // "bitstream.download.page.back": "Back" ,
-  // TODO Source message changed - Revise the translation
+  // "bitstream.download.page.back": "Back",
   "bitstream.download.page.back": "Indietro",
 
 
@@ -1073,7 +1021,7 @@
   "bitstream.edit.form.embargo.label": "Embargo fino a data specifica",
 
   // "bitstream.edit.form.fileName.hint": "Change the filename for the bitstream. Note that this will change the display bitstream URL, but old links will still resolve as long as the sequence ID does not change.",
-  "bitstream.edit.form.fileName.hint": "Modificare il nome del file per il bitstream. Si noti che questo cambierà il display bitstream URL , i vecchi collegamenti verranno comunque risolti finché il sequence ID non cambierà  .",
+  "bitstream.edit.form.fileName.hint": "Modificare il nome del file per il bitstream. Si noti che questo cambierà il display bitstream URL, i vecchi collegamenti verranno comunque risolti finché il sequence ID non cambierà.",
 
   // "bitstream.edit.form.fileName.label": "Filename",
   "bitstream.edit.form.fileName.label": "Filename",
@@ -1246,8 +1194,7 @@
   "pagination.next.button.disabled.tooltip": "Non ci sono ulteriori pagine di risultati",
 
   // "browse.startsWith": ", starting with {{ startsWith }}",
-  // TODO New key - Add a translation
-  "browse.startsWith": ", starting with {{ startsWith }}",
+  "browse.startsWith": ", inizia per {{ startsWith }}",
 
   // "browse.startsWith.choose_start": "(Choose start)",
   "browse.startsWith.choose_start": "(Scegli start)",
@@ -1323,8 +1270,7 @@
 
 
   // "search.browse.item-back": "Back to Results",
-  // TODO New key - Add a translation
-  "search.browse.item-back": "Back to Results",
+  "search.browse.item-back": "Torna ai risultati",
 
 
   // "chips.remove": "Remove chip",
@@ -1332,23 +1278,20 @@
 
 
   // "claimed-approved-search-result-list-element.title": "Approved",
-  // TODO New key - Add a translation
-  "claimed-approved-search-result-list-element.title": "Approved",
+  "claimed-approved-search-result-list-element.title": "Approvato",
 
   // "claimed-declined-search-result-list-element.title": "Rejected, sent back to submitter",
-  // TODO New key - Add a translation
-  "claimed-declined-search-result-list-element.title": "Rejected, sent back to submitter",
+  "claimed-declined-search-result-list-element.title": "Respinto, rinviato al submitter",
 
   // "claimed-declined-task-search-result-list-element.title": "Declined, sent back to Review Manager's workflow",
-  // TODO New key - Add a translation
-  "claimed-declined-task-search-result-list-element.title": "Declined, sent back to Review Manager's workflow",
+  "claimed-declined-task-search-result-list-element.title": "Rifiutato, rinviato al flusso di lavoro del Responsabile delle revisioni",
 
 
   // "collection.create.head": "Create a Collection",
   "collection.create.head": "Creare una collection",
 
   // "collection.create.notifications.success": "Successfully created the Collection",
-  "collection.create.notifications.success": "Creata con successo la collection",
+  "collection.create.notifications.success": "Collection creata con successo",
 
   // "collection.create.sub-head": "Create a Collection for Community {{ parent }}",
   "collection.create.sub-head": "Creare una collection per la Community {{ parent }}",
@@ -1478,8 +1421,6 @@
   // "collection.edit.logo.upload": "Drop a Collection Logo to upload",
   "collection.edit.logo.upload": "Rilascia un logo della collection da caricare",
 
-
-
   // "collection.edit.notifications.success": "Successfully edited the Collection",
   "collection.edit.notifications.success": "Modificata correttamente la collection",
 
@@ -1507,8 +1448,7 @@
   "collection.edit.item.authorizations.load-more-button": "Carica più risorse",
 
   // "collection.edit.item.authorizations.show-bitstreams-button": "Show bitstream policies for bundle",
-  // TODO New key - Add a translation
-  "collection.edit.item.authorizations.show-bitstreams-button": "Show bitstream policies for bundle",
+  "collection.edit.item.authorizations.show-bitstreams-button": "Mostra le policy del bitstream per il bundle",
 
   // "collection.edit.tabs.metadata.head": "Edit Metadata",
   "collection.edit.tabs.metadata.head": "Modifica metadati",
@@ -1559,8 +1499,7 @@
   "collection.edit.tabs.source.notifications.discarded.content": "Le modifiche sono state annullate. Per ripristinarle, fai clic sul pulsante \"Annulla\"",
 
   // "collection.edit.tabs.source.notifications.discarded.title": "Changes discarded",
-  // TODO Source message changed - Revise the translation
-  "collection.edit.tabs.source.notifications.discarded.title": "Modifiche eliminate",
+  "collection.edit.tabs.source.notifications.discarded.title": "Modifiche annullate",
 
   // "collection.edit.tabs.source.notifications.invalid.content": "Your changes were not saved. Please make sure all fields are valid before you save.",
   "collection.edit.tabs.source.notifications.invalid.content": "Le modifiche non sono state salvate. Assicurati che tutti i campi siano validi prima di salvare.",
@@ -1718,16 +1657,12 @@
   // "collection.source.controls.reset.running": "Resetting and reimporting...",
   "collection.source.controls.reset.running": "Reimpostazione e reimportazione...",
   // "collection.source.controls.harvest.status": "Harvest status:",
-  // TODO New key - Add a translation
-  "collection.source.controls.harvest.status": "Harvest status:",
+  "collection.source.controls.harvest.status": "Stato dell'harvest:",
   // "collection.source.controls.harvest.start": "Harvest start time:",
-  // TODO New key - Add a translation
-  "collection.source.controls.harvest.start": "Harvest start time:",
+  "collection.source.controls.harvest.start": "Ora di inizio dell'harvest:",
   // "collection.source.controls.harvest.last": "Last time harvested:",
-  // TODO New key - Add a translation
-  "collection.source.controls.harvest.last": "Last time harvested:",
+  "collection.source.controls.harvest.last": "Ulimo harvest effettuato:",
   // "collection.source.controls.harvest.message": "Harvest info:",
-  // TODO New key - Add a translation
   "collection.source.controls.harvest.message": "Harvest info:",
   // "collection.source.controls.harvest.no-information": "N/A",
   "collection.source.controls.harvest.no-information": "N/D",
@@ -1954,12 +1889,10 @@
 
 
   // "comcol-role.edit.scorereviewers.name": "Score Reviewers",
-  // TODO New key - Add a translation
-  "comcol-role.edit.scorereviewers.name": "Score Reviewers",
+  "comcol-role.edit.scorereviewers.name": "Valutatori",
 
   // "comcol-role.edit.scorereviewers.description": "Reviewers are able to give a score to incoming submissions, this will define whether the submission will be rejected or not.",
-  // TODO New key - Add a translation
-  "comcol-role.edit.scorereviewers.description": "Reviewers are able to give a score to incoming submissions, this will define whether the submission will be rejected or not.",
+  "comcol-role.edit.scorereviewers.description": "I valutatori possono assegnare un punteggio ai contributi in entrata, questo definirà se il contributo verrà rifiutato o meno.",
 
 
 
@@ -2026,12 +1959,10 @@
   "cookies.consent.app.required.title": "(sempre obbligatorio)",
 
   // "cookies.consent.app.disable-all.description": "Use this switch to enable or disable all services.",
-  // TODO New key - Add a translation
-  "cookies.consent.app.disable-all.description": "Use this switch to enable or disable all services.",
+  "cookies.consent.app.disable-all.description": "Utilizzare questo interruttore per abilitare o disabilitare tutti i servizi.",
 
   // "cookies.consent.app.disable-all.title": "Enable or disable all services",
-  // TODO New key - Add a translation
-  "cookies.consent.app.disable-all.title": "Enable or disable all services",
+  "cookies.consent.app.disable-all.title": "Abilitare o disabilitare tutti i servizi",
 
   // "cookies.consent.update": "There were changes since your last visit, please update your consent.",
   "cookies.consent.update": "Ci sono stati dei cambiamenti dal tuo ultimo accesso, aggiorna il tuo consenso.",
@@ -2043,23 +1974,19 @@
   "cookies.consent.decline": "Declinare",
 
   // "cookies.consent.ok": "That's ok",
-  // TODO New key - Add a translation
-  "cookies.consent.ok": "That's ok",
+  "cookies.consent.ok": "Accetta",
 
   // "cookies.consent.save": "Save",
-  // TODO New key - Add a translation
-  "cookies.consent.save": "Save",
+  "cookies.consent.save": "Salvare",
 
   // "cookies.consent.content-notice.title": "Cookie Consent",
-  // TODO New key - Add a translation
-  "cookies.consent.content-notice.title": "Cookie Consent",
+  "cookies.consent.content-notice.title": "Consenso ai cookie",
 
   // "cookies.consent.content-notice.description": "We collect and process your personal information for the following purposes: <strong>Authentication, Preferences, Acknowledgement and Statistics</strong>. <br/> To learn more, please read our {privacyPolicy}.",
-  "cookies.consent.content-notice.description": "Raccogliamo e processiamo le tue informazioni personali per i seguenti scopi: <strong>Autenticazione, Preferenze, Accettazione e Statistiche</strong>. <br/> Per saperne di più, leggi la nostra {privacyPolicy}.",
+  "cookies.consent.content-notice.description": "Raccogliamo ed elaboriamo le tue informazioni personali per i seguenti scopi: <strong>Autenticazione, Preferenze, Accettazione e Statistiche</strong>. <br/> Per saperne di più, leggi la nostra {privacyPolicy}.",
 
   // "cookies.consent.content-notice.description.no-privacy": "We collect and process your personal information for the following purposes: <strong>Authentication, Preferences, Acknowledgement and Statistics</strong>.",
-  // TODO New key - Add a translation
-  "cookies.consent.content-notice.description.no-privacy": "We collect and process your personal information for the following purposes: <strong>Authentication, Preferences, Acknowledgement and Statistics</strong>.",
+  "cookies.consent.content-notice.description.no-privacy": "Raccogliamo ed elaboriamo le tue informazioni personali per i seguenti scopi: <strong>Autenticazione, Preferenze, Accettazione e Statistiche</strong>.",
 
   // "cookies.consent.content-notice.learnMore": "Customize",
   "cookies.consent.content-notice.learnMore": "Personalizza",
@@ -2077,12 +2004,10 @@
   "cookies.consent.content-modal.title": "Informazioni che raccogliamo",
 
   // "cookies.consent.content-modal.services": "services",
-  // TODO New key - Add a translation
-  "cookies.consent.content-modal.services": "services",
+  "cookies.consent.content-modal.services": "servizi",
 
   // "cookies.consent.content-modal.service": "service",
-  // TODO New key - Add a translation
-  "cookies.consent.content-modal.service": "service",
+  "cookies.consent.content-modal.service": "servizio",
 
   // "cookies.consent.app.title.authentication": "Authentication",
   "cookies.consent.app.title.authentication": "Autenticazione",
@@ -2116,12 +2041,10 @@
 
 
   // "cookies.consent.app.title.google-recaptcha": "Google reCaptcha",
-  // TODO New key - Add a translation
   "cookies.consent.app.title.google-recaptcha": "Google reCaptcha",
 
   // "cookies.consent.app.description.google-recaptcha": "We use google reCAPTCHA service during registration and password recovery",
-  // TODO New key - Add a translation
-  "cookies.consent.app.description.google-recaptcha": "We use google reCAPTCHA service during registration and password recovery",
+  "cookies.consent.app.description.google-recaptcha": "Utilizziamo il servizio Google reCAPTCHA nelle fasi di registrazione e recupero password",
 
 
   // "cookies.consent.purpose.functional": "Functional",
@@ -2131,18 +2054,15 @@
   "cookies.consent.purpose.statistical": "Statistico",
 
   // "cookies.consent.purpose.registration-password-recovery": "Registration and Password recovery",
-  // TODO New key - Add a translation
-  "cookies.consent.purpose.registration-password-recovery": "Registration and Password recovery",
+  "cookies.consent.purpose.registration-password-recovery": "Registrazione e recupero password",
 
   // "cookies.consent.purpose.sharing": "Sharing",
   "cookies.consent.purpose.sharing": "Condivisione",
 
   // "curation-task.task.citationpage.label": "Generate Citation Page",
-  // TODO New key - Add a translation
-  "curation-task.task.citationpage.label": "Generate Citation Page",
+  "curation-task.task.citationpage.label": "Genera una pagina di citazioni",
 
   // "curation-task.task.checklinks.label": "Check Links in Metadata",
-  // TODO Source message changed - Revise the translation
   "curation-task.task.checklinks.label": "Controllare i collegamenti nei metadati",
 
   // "curation-task.task.noop.label": "NOOP",
@@ -2161,8 +2081,7 @@
   "curation-task.task.vscan.label": "Scansione antivirus",
 
   // "curation-task.task.register-doi.label": "Register DOI",
-  // TODO New key - Add a translation
-  "curation-task.task.register-doi.label": "Register DOI",
+  "curation-task.task.register-doi.label": "Registra DOI",
 
 
 
@@ -2230,8 +2149,7 @@
   "dso-selector.create.community.head": "Nuova Community",
 
   // "dso-selector.create.community.or-divider": "or",
-  // TODO New key - Add a translation
-  "dso-selector.create.community.or-divider": "or",
+  "dso-selector.create.community.or-divider": "oppure",
 
   // "dso-selector.create.community.sub-level": "Create a new community in",
   "dso-selector.create.community.sub-level": "Creare una nuova community in",
@@ -2264,12 +2182,10 @@
   "dso-selector.export-metadata.dspaceobject.head": "Esportare metadati da",
 
   // "dso-selector.export-batch.dspaceobject.head": "Export Batch (ZIP) from",
-  // TODO New key - Add a translation
-  "dso-selector.export-batch.dspaceobject.head": "Export Batch (ZIP) from",
+  "dso-selector.export-batch.dspaceobject.head": "Esporta batch (ZIP) da",
 
   // "dso-selector.import-batch.dspaceobject.head": "Import batch from",
-  // TODO New key - Add a translation
-  "dso-selector.import-batch.dspaceobject.head": "Import batch from",
+  "dso-selector.import-batch.dspaceobject.head": "Importa batch da",
 
   // "dso-selector.no-results": "No {{ type }} found",
   "dso-selector.no-results": "Nessun {{ type }} trovato",
@@ -2287,8 +2203,7 @@
   "dso-selector.set-scope.community.button": "Cerca in tutto DSpace",
 
   // "dso-selector.set-scope.community.or-divider": "or",
-  // TODO New key - Add a translation
-  "dso-selector.set-scope.community.or-divider": "or",
+  "dso-selector.set-scope.community.or-divider": "oppure",
 
   // "dso-selector.set-scope.community.input-header": "Search for a community or collection",
   "dso-selector.set-scope.community.input-header": "Cercare una community o una collection",
@@ -2306,60 +2221,46 @@
   "dso-selector.claim.item.create-from-scratch": "Crea uno nuovo profilo",
 
   // "dso-selector.results-could-not-be-retrieved": "Something went wrong, please refresh again ↻",
-  // TODO New key - Add a translation
-  "dso-selector.results-could-not-be-retrieved": "Something went wrong, please refresh again ↻",
+  "dso-selector.results-could-not-be-retrieved": "Qualcosa è andato storto, aggiorna di nuovo ↻",
 
   // "supervision-group-selector.header": "Supervision Group Selector",
-  // TODO New key - Add a translation
-  "supervision-group-selector.header": "Supervision Group Selector",
+  "supervision-group-selector.header": "Selezione del gruppo di supervisione",
 
   // "supervision-group-selector.select.type-of-order.label": "Select a type of Order",
-  // TODO New key - Add a translation
-  "supervision-group-selector.select.type-of-order.label": "Select a type of Order",
+  "supervision-group-selector.select.type-of-order.label": "Seleziona un tipo di ordine",
 
   // "supervision-group-selector.select.type-of-order.option.none": "NONE",
-  // TODO New key - Add a translation
-  "supervision-group-selector.select.type-of-order.option.none": "NONE",
+  "supervision-group-selector.select.type-of-order.option.none": "NESSUNO",
 
   // "supervision-group-selector.select.type-of-order.option.editor": "EDITOR",
-  // TODO New key - Add a translation
-  "supervision-group-selector.select.type-of-order.option.editor": "EDITOR",
+  "supervision-group-selector.select.type-of-order.option.editor": "EDITORE",
 
   // "supervision-group-selector.select.type-of-order.option.observer": "OBSERVER",
-  // TODO New key - Add a translation
-  "supervision-group-selector.select.type-of-order.option.observer": "OBSERVER",
+  "supervision-group-selector.select.type-of-order.option.observer": "OSSERVATORE",
 
   // "supervision-group-selector.select.group.label": "Select a Group",
-  // TODO New key - Add a translation
-  "supervision-group-selector.select.group.label": "Select a Group",
+  "supervision-group-selector.select.group.label": "Seleziona un gruppo",
 
   // "supervision-group-selector.button.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "supervision-group-selector.button.cancel": "Cancel",
+  "supervision-group-selector.button.cancel": "Annulla",
 
   // "supervision-group-selector.button.save": "Save",
-  // TODO New key - Add a translation
-  "supervision-group-selector.button.save": "Save",
+  "supervision-group-selector.button.save": "Salva",
 
   // "supervision-group-selector.select.type-of-order.error": "Please select a type of order",
-  // TODO New key - Add a translation
-  "supervision-group-selector.select.type-of-order.error": "Please select a type of order",
+  "supervision-group-selector.select.type-of-order.error": "Seleziona un tipo di ordine",
 
   // "supervision-group-selector.select.group.error": "Please select a group",
-  // TODO New key - Add a translation
-  "supervision-group-selector.select.group.error": "Please select a group",
+  "supervision-group-selector.select.group.error": "Seleziona un gruppo",
 
   // "supervision-group-selector.notification.create.success.title": "Successfully created supervision order for group {{ name }}",
-  // TODO New key - Add a translation
-  "supervision-group-selector.notification.create.success.title": "Successfully created supervision order for group {{ name }}",
+  "supervision-group-selector.notification.create.success.title": "Ordine di supervisione per il gruppo {{ name }} creato con successo",
 
   // "supervision-group-selector.notification.create.failure.title": "Error",
-  // TODO New key - Add a translation
-  "supervision-group-selector.notification.create.failure.title": "Error",
+  "supervision-group-selector.notification.create.failure.title": "Errore",
 
   // "supervision-group-selector.notification.create.already-existing": "A supervision order already exists on this item for selected group",
-  // TODO New key - Add a translation
-  "supervision-group-selector.notification.create.already-existing": "A supervision order already exists on this item for selected group",
+  "supervision-group-selector.notification.create.already-existing": "Per questo item esiste già un ordine di supervisione per il gruppo selezionato",
 
   // "confirmation-modal.export-metadata.header": "Export metadata for {{ dsoName }}",
   "confirmation-modal.export-metadata.header": "Esportare i metadati per {{ dsoName }}",
@@ -2374,20 +2275,16 @@
   "confirmation-modal.export-metadata.confirm": "Export",
 
   // "confirmation-modal.export-batch.header": "Export batch (ZIP) for {{ dsoName }}",
-  // TODO New key - Add a translation
-  "confirmation-modal.export-batch.header": "Export batch (ZIP) for {{ dsoName }}",
+  "confirmation-modal.export-batch.header": "Esporta batch (ZIP) per {{ dsoName }}",
 
   // "confirmation-modal.export-batch.info": "Are you sure you want to export batch (ZIP) for {{ dsoName }}",
-  // TODO New key - Add a translation
-  "confirmation-modal.export-batch.info": "Are you sure you want to export batch (ZIP) for {{ dsoName }}",
+  "confirmation-modal.export-batch.info": "Sei sicuro di voler esportare batch (ZIP) per {{ dsoName }}?",
 
   // "confirmation-modal.export-batch.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "confirmation-modal.export-batch.cancel": "Cancel",
+  "confirmation-modal.export-batch.cancel": "Annulla",
 
   // "confirmation-modal.export-batch.confirm": "Export",
-  // TODO New key - Add a translation
-  "confirmation-modal.export-batch.confirm": "Export",
+  "confirmation-modal.export-batch.confirm": "Esporta",
 
   // "confirmation-modal.delete-eperson.header": "Delete EPerson \"{{ dsoName }}\"",
   "confirmation-modal.delete-eperson.header": "Elimina EPerson \"{{ dsoName }}\"",
@@ -2478,11 +2375,10 @@
   "error.top-level-communities": "Errore durante il recupero delle community di primo livello",
 
   // "error.validation.license.notgranted": "You must grant this license to complete your submission. If you are unable to grant this license at this time you may save your work and return later or remove the submission.",
-  "error.validation.license.notgranted": "È necessario concedere questa licenza per completare la submission. Se non sei in grado di concedere questa licenza in questo momento, puoi salvare il tuo lavoro e tornare più tardi o rimuovere la submission.",
+  "error.validation.license.notgranted": "È necessario concedere questa licenza per completare l'immisione. Se non sei in grado di concedere questa licenza in questo momento, puoi salvare il tuo lavoro e tornare più tardi o rimuovere l'immissione.",
 
   // "error.validation.pattern": "This input is restricted by the current pattern: {{ pattern }}.",
-  // TODO New key - Add a translation
-  "error.validation.pattern": "This input is restricted by the current pattern: {{ pattern }}.",
+  "error.validation.pattern": "L'input è limitato dal pattern in uso: {{ pattern }}.",
 
   // "error.validation.filerequired": "The file upload is mandatory",
   "error.validation.filerequired": "Il caricamento del file è obbligatorio",
@@ -2501,7 +2397,6 @@
 
 
   // "feed.description": "Syndication feed",
-  // TODO New key - Add a translation
   "feed.description": "Syndication feed",
 
 
@@ -2525,12 +2420,10 @@
   // "footer.link.privacy-policy": "Privacy policy",
   "footer.link.privacy-policy": "Informativa sulla privacy",
 
-  // "footer.link.end-user-agreement": "End User Agreement",
-  // TODO Source message changed - Revise the translation
+  // "footer.link.end-user-agreement":"End User Agreement",
   "footer.link.end-user-agreement": "Accordo con l'utente finale",
 
-  // "footer.link.feedback": "Send Feedback",
-  // TODO Source message changed - Revise the translation
+  // "footer.link.feedback":"Send Feedback",
   "footer.link.feedback": "Invia Feedback",
 
 
@@ -2539,8 +2432,7 @@
   "forgot-email.form.header": "Password dimenticata",
 
   // "forgot-email.form.info": "Enter the email address associated with the account.",
-  // TODO Source message changed - Revise the translation
-  "forgot-email.form.info": "Accedi a registra un account per iscriverti alle collections, per ricevere aggiornamenti via email e per poter inserire nuovi item in DSpace.",
+  "forgot-email.form.info": "Inserisci l'indirizzo email associato all'account.",
 
   // "forgot-email.form.email": "Email Address *",
   "forgot-email.form.email": "Indirizzo email *",
@@ -2549,31 +2441,25 @@
   "forgot-email.form.email.error.required": "Si prega di inserire un indirizzo email",
 
   // "forgot-email.form.email.error.not-email-form": "Please fill in a valid email address",
-  // TODO New key - Add a translation
-  "forgot-email.form.email.error.not-email-form": "Please fill in a valid email address",
+  "forgot-email.form.email.error.not-email-form": "Si prega di inserire un idirizzo email valido",
 
   // "forgot-email.form.email.hint": "An email will be sent to this address with a further instructions.",
-  // TODO Source message changed - Revise the translation
-  "forgot-email.form.email.hint": "Questo indirizzo verrà verificato e utilizzato come login name.",
+  "forgot-email.form.email.hint": "Una email con ulteriori indicazioni sarà invita a questo indrizzo.",
 
   // "forgot-email.form.submit": "Reset password",
-  // TODO Source message changed - Revise the translation
-  "forgot-email.form.submit": "Salva",
+  "forgot-email.form.submit": "Reimposta la password",
 
   // "forgot-email.form.success.head": "Password reset email sent",
-  // TODO Source message changed - Revise the translation
-  "forgot-email.form.success.head": "Email di verifica inviata",
+  "forgot-email.form.success.head": "Email di reimpostazione password inviata",
 
   // "forgot-email.form.success.content": "An email has been sent to {{ email }} containing a special URL and further instructions.",
   "forgot-email.form.success.content": "È stata inviata un'email a {{ email }} contenente un URL speciale e ulteriori indicazioni.",
 
   // "forgot-email.form.error.head": "Error when trying to reset password",
-  // TODO Source message changed - Revise the translation
-  "forgot-email.form.error.head": "Errore durante il tentativo di registrare l'email",
+  "forgot-email.form.error.head": "Errore durante il tentativo di reimpostare la password",
 
   // "forgot-email.form.error.content": "An error occured when attempting to reset the password for the account associated with the following email address: {{ email }}",
-  // TODO New key - Add a translation
-  "forgot-email.form.error.content": "An error occured when attempting to reset the password for the account associated with the following email address: {{ email }}",
+  "forgot-email.form.error.content": "Si è verificato un errore durante il tentativo di reimpostare la password per l'account associato al seguente indirizzo email: {{ email }}",
 
 
 
@@ -2584,8 +2470,7 @@
   "forgot-password.form.head": "Password dimenticata",
 
   // "forgot-password.form.info": "Enter a new password in the box below, and confirm it by typing it again into the second box.",
-  // TODO Source message changed - Revise the translation
-  "forgot-password.form.info": "Inserisci una nuova password nella casella qui sotto e confermala digitandola di nuovo nella seconda casella. Dovrebbe avere una lunghezza di almeno sei caratteri.",
+  "forgot-password.form.info": "Inserisci una nuova password nella casella qui sotto e confermala digitandola di nuovo nella seconda casella.",
 
   // "forgot-password.form.card.security": "Security",
   "forgot-password.form.card.security": "Sicurezza",
@@ -2651,21 +2536,14 @@
   // "form.first-name": "First name",
   "form.first-name": "Nome",
 
-  // "form.group-collapse": "Collapse",
-  // TODO New key - Add a translation
-  "form.group-collapse": "Collapse",
+  // "form.group.add": "Add",
+  "form.group.add": "Aggiungi",
 
-  // "form.group-collapse-help": "Click here to collapse",
-  // TODO New key - Add a translation
-  "form.group-collapse-help": "Click here to collapse",
+  // "form.group.close": "Close",
+  "form.group.close": "Chiudi",
 
-  // "form.group-expand": "Expand",
-  // TODO New key - Add a translation
-  "form.group-expand": "Expand",
-
-  // "form.group-expand-help": "Click here to expand and add more elements",
-  // TODO New key - Add a translation
-  "form.group-expand-help": "Click here to expand and add more elements",
+  // "form.group.set": "Set",
+  "form.group.set": "Set",
 
   // "form.last-name": "Last name",
   "form.last-name": "Cognome",
@@ -2685,9 +2563,8 @@
   // "form.no-value": "No value entered",
   "form.no-value": "Non è stato inserito nessun valore",
 
-  // "form.other-information": {},
-  // TODO New key - Add a translation
-  "form.other-information": {},
+  // "form.other-information": "",
+  "form.other-information": "",
 
   // "form.remove": "Remove",
   "form.remove": "Rimuovi",
@@ -2708,8 +2585,7 @@
   "form.submit": "Salva",
 
   // "form.create": "Create",
-  // TODO New key - Add a translation
-  "form.create": "Create",
+  "form.create": "Crea",
 
   // "form.repeatable.sort.tip": "Drop the item in the new position",
   "form.repeatable.sort.tip": "Rilascia l'item nella nuova posizione",
@@ -2783,49 +2659,39 @@
 
 
   // "health.breadcrumbs": "Health",
-  // TODO New key - Add a translation
   "health.breadcrumbs": "Health",
 
   // "health-page.heading": "Health",
-  // TODO New key - Add a translation
   "health-page.heading": "Health",
 
   // "health-page.info-tab": "Info",
-  // TODO New key - Add a translation
-  "health-page.info-tab": "Info",
+  "health-page.info-tab": "Informazioni",
 
   // "health-page.status-tab": "Status",
-  // TODO New key - Add a translation
-  "health-page.status-tab": "Status",
+  "health-page.status-tab": "Stato",
 
   // "health-page.error.msg": "The health check service is temporarily unavailable",
   "health-page.error.msg": "Il servizio di health check è temporaneamente non disponibile.",
 
   // "health-page.property.status": "Status code",
-  // TODO New key - Add a translation
-  "health-page.property.status": "Status code",
+  "health-page.property.status": "Codice di stato",
 
   // "health-page.section.db.title": "Database",
   "health-page.section.db.title": "Database",
 
   // "health-page.section.geoIp.title": "GeoIp",
-  // TODO New key - Add a translation
   "health-page.section.geoIp.title": "GeoIp",
 
   // "health-page.section.solrAuthorityCore.title": "Solr: authority core",
-  // TODO New key - Add a translation
   "health-page.section.solrAuthorityCore.title": "Solr: authority core",
 
   // "health-page.section.solrOaiCore.title": "Solr: oai core",
-  // TODO New key - Add a translation
   "health-page.section.solrOaiCore.title": "Solr: oai core",
 
   // "health-page.section.solrSearchCore.title": "Solr: search core",
-  // TODO New key - Add a translation
   "health-page.section.solrSearchCore.title": "Solr: search core",
 
   // "health-page.section.solrStatisticsCore.title": "Solr: statistics core",
-  // TODO New key - Add a translation
   "health-page.section.solrStatisticsCore.title": "Solr: statistics core",
 
   // "health-page.section-info.app.title": "Application Backend",
@@ -2835,12 +2701,10 @@
   "health-page.section-info.java.title": "Java",
 
   // "health-page.status": "Status",
-  // TODO New key - Add a translation
-  "health-page.status": "Status",
+  "health-page.status": "Stato",
 
   // "health-page.status.ok.info": "Operational",
-  // TODO New key - Add a translation
-  "health-page.status.ok.info": "Operational",
+  "health-page.status.ok.info": "Operativo",
 
   // "health-page.status.error.info": "Problems detected",
   "health-page.status.error.info": "Sono stati rilevati dei problemi",
@@ -2849,7 +2713,6 @@
   "health-page.status.warning.info": "Sono stati rilevati dei potenziali problemi",
 
   // "health-page.title": "Health",
-  // TODO New key - Add a translation
   "health-page.title": "Health",
 
   // "health-page.section.no-issues": "No issues detected",
@@ -2869,10 +2732,9 @@
   "home.title": "Home",
 
   // "home.top-level-communities.head": "Communities in DSpace",
-  "home.top-level-communities.head": "Community in DSpace",
+  "home.top-level-communities.head": "DSpace Communities",
 
-  // "home.top-level-communities.help": "Select a community to browse its collections.",
-  // TODO Source message changed - Revise the translation
+  // "home.top-level-communities.help": "Search for a collection",
   "home.top-level-communities.help": "Cerca una collection",
 
 
@@ -2935,23 +2797,18 @@
   "info.feedback.email-label": "La tua email",
 
   // "info.feedback.create.success": "Feedback Sent Successfully!",
-  // TODO Source message changed - Revise the translation
   "info.feedback.create.success": "Feedback inviato con successo!",
 
   // "info.feedback.error.email.required": "A valid email address is required",
-  // TODO Source message changed - Revise the translation
   "info.feedback.error.email.required": "Inserire un un indirizzo email valido",
 
   // "info.feedback.error.message.required": "A comment is required",
-  // TODO Source message changed - Revise the translation
   "info.feedback.error.message.required": "Inserire un commento",
 
   // "info.feedback.page-label": "Page",
-  // TODO Source message changed - Revise the translation
   "info.feedback.page-label": "Pagina",
 
   // "info.feedback.page_help": "Tha page related to your feedback",
-  // TODO Source message changed - Revise the translation
   "info.feedback.page_help": "In questa pagina trovi i tuoi feedback",
 
 
@@ -2973,7 +2830,6 @@
 
 
   // "item.badge.private": "Non-discoverable",
-  // TODO Source message changed - Revise the translation
   "item.badge.private": "Privato",
 
   // "item.badge.withdrawn": "Withdrawn",
@@ -2985,14 +2841,12 @@
   "item.bitstreams.upload.bundle": "Bundle",
 
   // "item.bitstreams.upload.bundle.placeholder": "Select a bundle or input new bundle name",
-  // TODO Source message changed - Revise the translation
   "item.bitstreams.upload.bundle.placeholder": "Seleziona un bundle o inserisci il nome di un nuovo bundle",
 
   // "item.bitstreams.upload.bundle.new": "Create bundle",
   "item.bitstreams.upload.bundle.new": "Crea un bundle",
 
   // "item.bitstreams.upload.bundles.empty": "This item doesn't contain any bundles to upload a bitstream to.",
-  // TODO Source message changed - Revise the translation
   "item.bitstreams.upload.bundles.empty": "Questo item non contiene alcun bundle in cui caricare un bitstream.",
 
   // "item.bitstreams.upload.cancel": "Cancel",
@@ -3145,88 +2999,67 @@
   "item.edit.tabs.item-mapper.title": "Modifica item - Mapper Collection",
 
   // "item.edit.identifiers.doi.status.UNKNOWN": "Unknown",
-  // TODO New key - Add a translation
-  "item.edit.identifiers.doi.status.UNKNOWN": "Unknown",
+  "item.edit.identifiers.doi.status.UNKNOWN": "Sconosciuto",
 
   // "item.edit.identifiers.doi.status.TO_BE_REGISTERED": "Queued for registration",
-  // TODO New key - Add a translation
-  "item.edit.identifiers.doi.status.TO_BE_REGISTERED": "Queued for registration",
+  "item.edit.identifiers.doi.status.TO_BE_REGISTERED": "In coda per la registrazione",
 
   // "item.edit.identifiers.doi.status.TO_BE_RESERVED": "Queued for reservation",
-  // TODO New key - Add a translation
-  "item.edit.identifiers.doi.status.TO_BE_RESERVED": "Queued for reservation",
+  "item.edit.identifiers.doi.status.TO_BE_RESERVED": "In coda per l'assegnazione",
 
   // "item.edit.identifiers.doi.status.IS_REGISTERED": "Registered",
-  // TODO New key - Add a translation
-  "item.edit.identifiers.doi.status.IS_REGISTERED": "Registered",
+  "item.edit.identifiers.doi.status.IS_REGISTERED": "Registrato",
 
   // "item.edit.identifiers.doi.status.IS_RESERVED": "Reserved",
-  // TODO New key - Add a translation
-  "item.edit.identifiers.doi.status.IS_RESERVED": "Reserved",
+  "item.edit.identifiers.doi.status.IS_RESERVED": "Assegnato",
 
   // "item.edit.identifiers.doi.status.UPDATE_RESERVED": "Reserved (update queued)",
-  // TODO New key - Add a translation
-  "item.edit.identifiers.doi.status.UPDATE_RESERVED": "Reserved (update queued)",
+  "item.edit.identifiers.doi.status.UPDATE_RESERVED": "Assegnato (aggiornamento in coda)",
 
   // "item.edit.identifiers.doi.status.UPDATE_REGISTERED": "Registered (update queued)",
-  // TODO New key - Add a translation
-  "item.edit.identifiers.doi.status.UPDATE_REGISTERED": "Registered (update queued)",
+  "item.edit.identifiers.doi.status.UPDATE_REGISTERED": "Registrato (aggiornamento in coda)",
 
   // "item.edit.identifiers.doi.status.UPDATE_BEFORE_REGISTRATION": "Queued for update and registration",
-  // TODO New key - Add a translation
-  "item.edit.identifiers.doi.status.UPDATE_BEFORE_REGISTRATION": "Queued for update and registration",
+  "item.edit.identifiers.doi.status.UPDATE_BEFORE_REGISTRATION": "In coda per aggiornamento e registrazione",
 
   // "item.edit.identifiers.doi.status.TO_BE_DELETED": "Queued for deletion",
-  // TODO New key - Add a translation
-  "item.edit.identifiers.doi.status.TO_BE_DELETED": "Queued for deletion",
+  "item.edit.identifiers.doi.status.TO_BE_DELETED": "In coda per l'eliminazione",
 
   // "item.edit.identifiers.doi.status.DELETED": "Deleted",
-  // TODO New key - Add a translation
-  "item.edit.identifiers.doi.status.DELETED": "Deleted",
+  "item.edit.identifiers.doi.status.DELETED": "Eliminato",
 
   // "item.edit.identifiers.doi.status.PENDING": "Pending (not registered)",
-  // TODO New key - Add a translation
-  "item.edit.identifiers.doi.status.PENDING": "Pending (not registered)",
+  "item.edit.identifiers.doi.status.PENDING": "In sospeso (non registrato)",
 
   // "item.edit.identifiers.doi.status.MINTED": "Minted (not registered)",
-  // TODO New key - Add a translation
-  "item.edit.identifiers.doi.status.MINTED": "Minted (not registered)",
+  "item.edit.identifiers.doi.status.MINTED": "Creato (non registrato)",
 
   // "item.edit.tabs.status.buttons.register-doi.label": "Register a new or pending DOI",
-  // TODO New key - Add a translation
-  "item.edit.tabs.status.buttons.register-doi.label": "Register a new or pending DOI",
+  "item.edit.tabs.status.buttons.register-doi.label": "Registra un nuovo DOI o un DOI in sospeso",
 
   // "item.edit.tabs.status.buttons.register-doi.button": "Register DOI...",
-  // TODO New key - Add a translation
-  "item.edit.tabs.status.buttons.register-doi.button": "Register DOI...",
+  "item.edit.tabs.status.buttons.register-doi.button": "Registra DOI...",
 
   // "item.edit.register-doi.header": "Register a new or pending DOI",
-  // TODO New key - Add a translation
-  "item.edit.register-doi.header": "Register a new or pending DOI",
+  "item.edit.register-doi.header": "Registra un nuovo DOI o un DOI in sospeso",
 
   // "item.edit.register-doi.description": "Review any pending identifiers and item metadata below and click Confirm to proceed with DOI registration, or Cancel to back out",
-  // TODO New key - Add a translation
-  "item.edit.register-doi.description": "Review any pending identifiers and item metadata below and click Confirm to proceed with DOI registration, or Cancel to back out",
+  "item.edit.register-doi.description": "Esaminare gli identificatori e i metadati dell'item in sospeso e cliccare su Conferma per procedere con la registrazione DOI, oppure su Annulla per tornare indietro",
 
   // "item.edit.register-doi.confirm": "Confirm",
-  // TODO New key - Add a translation
-  "item.edit.register-doi.confirm": "Confirm",
+  "item.edit.register-doi.confirm": "Conferma",
 
   // "item.edit.register-doi.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "item.edit.register-doi.cancel": "Cancel",
+  "item.edit.register-doi.cancel": "Annulla",
 
   // "item.edit.register-doi.success": "DOI queued for registration successfully.",
-  // TODO New key - Add a translation
-  "item.edit.register-doi.success": "DOI queued for registration successfully.",
+  "item.edit.register-doi.success": "DOI in coda per la registrazione.",
 
   // "item.edit.register-doi.error": "Error registering DOI",
-  // TODO New key - Add a translation
-  "item.edit.register-doi.error": "Error registering DOI",
+  "item.edit.register-doi.error": "Errore nella registrazione del DOI",
 
   // "item.edit.register-doi.to-update": "The following DOI has already been minted and will be queued for registration online",
-  // TODO New key - Add a translation
-  "item.edit.register-doi.to-update": "The following DOI has already been minted and will be queued for registration online",
+  "item.edit.register-doi.to-update": "Il seguente DOI è stato già creato e sarà inserito in coda per la registrazione online",
 
   // "item.edit.item-mapper.buttons.add": "Map item to selected collections",
   "item.edit.item-mapper.buttons.add": "Mappare l'item nelle collections selezionate",
@@ -3291,12 +3124,10 @@
   "item.edit.metadata.discard-button": "Annulla",
 
   // "item.edit.metadata.edit.buttons.confirm": "Confirm",
-  // TODO New key - Add a translation
-  "item.edit.metadata.edit.buttons.confirm": "Confirm",
+  "item.edit.metadata.edit.buttons.confirm": "Conferma",
 
   // "item.edit.metadata.edit.buttons.drag": "Drag to reorder",
-  // TODO New key - Add a translation
-  "item.edit.metadata.edit.buttons.drag": "Drag to reorder",
+  "item.edit.metadata.edit.buttons.drag": "Trascina per riordinare",
 
   // "item.edit.metadata.edit.buttons.edit": "Edit",
   "item.edit.metadata.edit.buttons.edit": "Edita",
@@ -3311,8 +3142,7 @@
   "item.edit.metadata.edit.buttons.unedit": "Interrompi la modifica",
 
   // "item.edit.metadata.edit.buttons.virtual": "This is a virtual metadata value, i.e. a value inherited from a related entity. It can’t be modified directly. Add or remove the corresponding relationship in the \"Relationships\" tab",
-  // TODO New key - Add a translation
-  "item.edit.metadata.edit.buttons.virtual": "This is a virtual metadata value, i.e. a value inherited from a related entity. It can’t be modified directly. Add or remove the corresponding relationship in the \"Relationships\" tab",
+  "item.edit.metadata.edit.buttons.virtual": "Si tratta di un valore virtuale di metadati, cioè un valore ereditato da un'entità correlata. Non può essere modificato direttamente. Aggiungere o rimuovere la relazione corrispondente nella scheda 'Relazioni'.",
 
   // "item.edit.metadata.empty": "The item currently doesn't contain any metadata. Click Add to start adding a metadata value.",
   "item.edit.metadata.empty": "Attualmente l'item non contiene metadati. Fai clic su Aggiungi per iniziare ad aggiungere il valore di un metadata.",
@@ -3330,8 +3160,7 @@
   "item.edit.metadata.headers.value": "Valore",
 
   // "item.edit.metadata.metadatafield.error": "An error occurred validating the metadata field",
-  // TODO New key - Add a translation
-  "item.edit.metadata.metadatafield.error": "An error occurred validating the metadata field",
+  "item.edit.metadata.metadatafield.error": "Si è verificato un errore nella validazione del campo dei metadati",
 
   // "item.edit.metadata.metadatafield.invalid": "Please choose a valid metadata field",
   "item.edit.metadata.metadatafield.invalid": "Scegli un campo di metadati valido",
@@ -3340,7 +3169,6 @@
   "item.edit.metadata.notifications.discarded.content": "Le modifiche sono state annullate. Per ripristinarle, fai clic sul pulsante \"Annulla\"",
 
   // "item.edit.metadata.notifications.discarded.title": "Changes discarded",
-  // TODO Source message changed - Revise the translation
   "item.edit.metadata.notifications.discarded.title": "Modifiche eliminate",
 
   // "item.edit.metadata.notifications.error.title": "An error occurred",
@@ -3356,7 +3184,6 @@
   "item.edit.metadata.notifications.outdated.content": "L'item su cui stai attualmente lavorando è stato modificato da un altro utente. Le modifiche correnti verranno eliminate per evitare conflitti",
 
   // "item.edit.metadata.notifications.outdated.title": "Changes outdated",
-  // TODO Source message changed - Revise the translation
   "item.edit.metadata.notifications.outdated.title": "Modifiche obsolete",
 
   // "item.edit.metadata.notifications.saved.content": "Your changes to this item's metadata were saved.",
@@ -3369,8 +3196,7 @@
   "item.edit.metadata.reinstate-button": "Annulla",
 
   // "item.edit.metadata.reset-order-button": "Undo reorder",
-  // TODO New key - Add a translation
-  "item.edit.metadata.reset-order-button": "Undo reorder",
+  "item.edit.metadata.reset-order-button": "Annulla il riordinamento",
 
   // "item.edit.metadata.save-button": "Save",
   "item.edit.metadata.save-button": "Salva",
@@ -3433,16 +3259,13 @@
   "item.edit.private.cancel": "Annulla",
 
   // "item.edit.private.confirm": "Make it non-discoverable",
-  // TODO Source message changed - Revise the translation
   "item.edit.private.confirm": "Rendilo privato",
 
   // "item.edit.private.description": "Are you sure this item should be made non-discoverable in the archive?",
-  // TODO Source message changed - Revise the translation
-  "item.edit.private.description": "Sei sicuro che questo oggetto debba essere reso privato nell'archivio?",
+  "item.edit.private.description": "Sei sicuro che questo item debba essere reso privato nell'archivio?",
 
   // "item.edit.private.error": "An error occurred while making the item non-discoverable",
-  // TODO Source message changed - Revise the translation
-  "item.edit.private.error": "Si è verificato un errore durante la creazione di un item privato",
+  "item.edit.private.error": "Si è verificato un errore durante la modifica dell'item in privato",
 
   // "item.edit.private.header": "Make item non-discoverable: {{ id }}",
   "item.edit.private.header": "Rendi privato l'item: {{ id }}",
@@ -3456,22 +3279,18 @@
   "item.edit.public.cancel": "Annulla",
 
   // "item.edit.public.confirm": "Make it discoverable",
-  // TODO Source message changed - Revise the translation
   "item.edit.public.confirm": "Rendilo pubblico",
 
   // "item.edit.public.description": "Are you sure this item should be made discoverable in the archive?",
-  // TODO Source message changed - Revise the translation
-  "item.edit.public.description": "Sei sicuro che questo articolo debba essere reso pubblico nell'archivio?",
+  "item.edit.public.description": "Sei sicuro che questo item debba essere reso pubblico nell'archivio?",
 
   // "item.edit.public.error": "An error occurred while making the item discoverable",
-  // TODO Source message changed - Revise the translation
-  "item.edit.public.error": "Si è verificato un errore durante la creazione di un item pubblico",
+  "item.edit.public.error": "Si è verificato un errore durante la modifica dell'item in pubblico",
 
   // "item.edit.public.header": "Make item discoverable: {{ id }}",
   "item.edit.public.header": "Rendi pubblico l'item: {{ id }}",
 
   // "item.edit.public.success": "The item is now discoverable",
-  // TODO Source message changed - Revise the translation
   "item.edit.public.success": "L'item è ora pubblico",
 
 
@@ -3558,7 +3377,6 @@
   // "item.edit.tabs.curate.title": "Item Edit - Curate",
   "item.edit.tabs.curate.title": "Modifica item - Curate",
   // "item.edit.curate.title": "Curate Item: {{item}}",
-  // TODO New key - Add a translation
   "item.edit.curate.title": "Curate Item: {{item}}",
 
   // "item.edit.tabs.metadata.head": "Metadata",
@@ -3592,26 +3410,21 @@
   "item.edit.tabs.status.buttons.mappedCollections.label": "Gestire le collections mappate",
 
   // "item.edit.tabs.status.buttons.move.button": "Move this Item to a different Collection",
-  // TODO Source message changed - Revise the translation
-  "item.edit.tabs.status.buttons.move.button": "Sposta...",
+  "item.edit.tabs.status.buttons.move.button": "Sposta questo item in un'altra collection...",
 
   // "item.edit.tabs.status.buttons.move.label": "Move item to another collection",
   "item.edit.tabs.status.buttons.move.label": "Spostare l'item in un'altra collection",
 
   // "item.edit.tabs.status.buttons.private.button": "Make it non-discoverable...",
-  // TODO Source message changed - Revise the translation
-  "item.edit.tabs.status.buttons.private.button": "...",
+  "item.edit.tabs.status.buttons.private.button": "Rendilo privato...",
 
   // "item.edit.tabs.status.buttons.private.label": "Make item non-discoverable",
-  // TODO Source message changed - Revise the translation
   "item.edit.tabs.status.buttons.private.label": "Rendere l'item privato",
 
   // "item.edit.tabs.status.buttons.public.button": "Make it discoverable...",
-  // TODO Source message changed - Revise the translation
-  "item.edit.tabs.status.buttons.public.button": "...",
+  "item.edit.tabs.status.buttons.public.button": "Rendilo pubblico...",
 
   // "item.edit.tabs.status.buttons.public.label": "Make item discoverable",
-  // TODO Source message changed - Revise the translation
   "item.edit.tabs.status.buttons.public.label": "Rendere l'item pubblico",
 
   // "item.edit.tabs.status.buttons.reinstate.button": "Reinstate...",
@@ -3624,8 +3437,7 @@
   "item.edit.tabs.status.buttons.unauthorized": "Non sei autorizzato a eseguire questa azione",
 
   // "item.edit.tabs.status.buttons.withdraw.button": "Withdraw this item",
-  // TODO Source message changed - Revise the translation
-  "item.edit.tabs.status.buttons.withdraw.button": "Rimozione...",
+  "item.edit.tabs.status.buttons.withdraw.button": "Rimuovi questo item",
 
   // "item.edit.tabs.status.buttons.withdraw.label": "Withdraw item from the repository",
   "item.edit.tabs.status.buttons.withdraw.label": "Rimuovere l'item dal repository",
@@ -3724,36 +3536,28 @@
   "item.truncatable-part.show-less": "Riduci",
 
   // "workflow-item.search.result.delete-supervision.modal.header": "Delete Supervision Order",
-  // TODO New key - Add a translation
-  "workflow-item.search.result.delete-supervision.modal.header": "Delete Supervision Order",
+  "workflow-item.search.result.delete-supervision.modal.header": "Elimina l'ordine di supervisione",
 
   // "workflow-item.search.result.delete-supervision.modal.info": "Are you sure you want to delete Supervision Order",
-  // TODO New key - Add a translation
-  "workflow-item.search.result.delete-supervision.modal.info": "Are you sure you want to delete Supervision Order",
+  "workflow-item.search.result.delete-supervision.modal.info": "Sei sicuro di voler eliminare l'ordine di supervisione?",
 
   // "workflow-item.search.result.delete-supervision.modal.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "workflow-item.search.result.delete-supervision.modal.cancel": "Cancel",
+  "workflow-item.search.result.delete-supervision.modal.cancel": "Annulla",
 
   // "workflow-item.search.result.delete-supervision.modal.confirm": "Delete",
-  // TODO New key - Add a translation
-  "workflow-item.search.result.delete-supervision.modal.confirm": "Delete",
+  "workflow-item.search.result.delete-supervision.modal.confirm": "Elimina",
 
   // "workflow-item.search.result.notification.deleted.success": "Successfully deleted supervision order \"{{name}}\"",
-  // TODO New key - Add a translation
-  "workflow-item.search.result.notification.deleted.success": "Successfully deleted supervision order \"{{name}}\"",
+  "workflow-item.search.result.notification.deleted.success": "Ordine di supervisione \"{{name}}\" eliminato con successo",
 
   // "workflow-item.search.result.notification.deleted.failure": "Failed to delete supervision order \"{{name}}\"",
-  // TODO New key - Add a translation
-  "workflow-item.search.result.notification.deleted.failure": "Failed to delete supervision order \"{{name}}\"",
+  "workflow-item.search.result.notification.deleted.failure": "Impossibile eliminare l'ordine di supervisione \"{{name}}\"",
 
   // "workflow-item.search.result.list.element.supervised-by": "Supervised by:",
-  // TODO New key - Add a translation
-  "workflow-item.search.result.list.element.supervised-by": "Supervised by:",
+  "workflow-item.search.result.list.element.supervised-by": "Supervisionato da:",
 
   // "workflow-item.search.result.list.element.supervised.remove-tooltip": "Remove supervision group",
-  // TODO New key - Add a translation
-  "workflow-item.search.result.list.element.supervised.remove-tooltip": "Remove supervision group",
+  "workflow-item.search.result.list.element.supervised.remove-tooltip": "Rimuovi gruppo di supervisione",
 
 
 
@@ -3848,11 +3652,9 @@
   "item.page.bitstreams.collapse": "Riduci",
 
   // "item.page.filesection.original.bundle": "Original bundle",
-  // TODO New key - Add a translation
   "item.page.filesection.original.bundle": "Original bundle",
 
   // "item.page.filesection.license.bundle": "License bundle",
-  // TODO New key - Add a translation
   "item.page.filesection.license.bundle": "License bundle",
 
   // "item.page.return": "Back",
@@ -3861,7 +3663,7 @@
   // "item.page.version.create": "Create new version",
   "item.page.version.create": "Crea una nuova versione",
 
-  // "item.page.version.hasDraft": "A new version cannot be created because there is an inprogress submission in the version history",
+  // "item.page.version.hasDraft": "A new version cannot be created because there is an in-progress submission in the version history",
   "item.page.version.hasDraft": "Impossibile creare una nuova versione perché è presente un'submission in corso nella cronologia delle versioni",
 
   // "item.page.claim.button": "Claim",
@@ -3889,8 +3691,7 @@
   "item.preview.dc.language.iso": "Lingua:",
 
   // "item.preview.dc.subject": "Subjects:",
-  // TODO New key - Add a translation
-  "item.preview.dc.subject": "Subjects:",
+  "item.preview.dc.subject": "Soggetti:",
 
   // "item.preview.dc.title": "Title:",
   "item.preview.dc.title": "Titolo:",
@@ -3899,30 +3700,24 @@
   "item.preview.dc.type": "Tipologia:",
 
   // "item.preview.oaire.citation.issue": "Issue",
-  // TODO Source message changed - Revise the translation
   "item.preview.oaire.citation.issue": "Fascicolo",
 
   // "item.preview.oaire.citation.volume": "Volume",
-  // TODO Source message changed - Revise the translation
   "item.preview.oaire.citation.volume": "Volume",
 
   // "item.preview.dc.relation.issn": "ISSN",
-  // TODO Source message changed - Revise the translation
   "item.preview.dc.relation.issn": "ISSN",
 
   // "item.preview.dc.identifier.isbn": "ISBN",
-  // TODO Source message changed - Revise the translation
   "item.preview.dc.identifier.isbn": "ISBN",
 
   // "item.preview.dc.identifier": "Identifier:",
   "item.preview.dc.identifier": "Identificativo:",
 
   // "item.preview.dc.relation.ispartof": "Journal or Serie",
-  // TODO Source message changed - Revise the translation
   "item.preview.dc.relation.ispartof": "Periodico or Serie",
 
   // "item.preview.dc.identifier.doi": "DOI",
-  // TODO Source message changed - Revise the translation
   "item.preview.dc.identifier.doi": "DOI",
 
   // "item.preview.person.familyName": "Surname:",
@@ -3944,8 +3739,7 @@
   "item.preview.oaire.awardNumber": "ID del finanziamento:",
 
   // "item.preview.dc.title.alternative": "Acronym:",
-  // TODO New key - Add a translation
-  "item.preview.dc.title.alternative": "Acronym:",
+  "item.preview.dc.title.alternative": "Acronimo:",
 
   // "item.preview.dc.coverage.spatial": "Jurisdiction:",
   "item.preview.dc.coverage.spatial": "Giurisdizione:",
@@ -4028,7 +3822,7 @@
   // "item.version.history.table.action.deleteVersion": "Delete version",
   "item.version.history.table.action.deleteVersion": "Elimina versione",
 
-  // "item.version.history.table.action.hasDraft": "A new version cannot be created because there is an inprogress submission in the version history",
+  // "item.version.history.table.action.hasDraft": "A new version cannot be created because there is an in-progress submission in the version history",
   "item.version.history.table.action.hasDraft": "Non è possibile creare una nuova versione perchè c'è già una submission in progress nella cronologia delle versioni",
 
 
@@ -4070,14 +3864,12 @@
   "item.version.create.modal.submitted.text": "La nuova versione è in fase di creazione. Questa operazione potrebbe richiedere un po' di temo se l'item ha molte relazioni.",
 
   // "item.version.create.notification.success": "New version has been created with version number {{version}}",
-  // TODO Source message changed - Revise the translation
   "item.version.create.notification.success": "È stata creata una nuova versione con il numero {{version}}",
 
   // "item.version.create.notification.failure": "New version has not been created",
-  // TODO Source message changed - Revise the translation
   "item.version.create.notification.failure": "Non è stata creata una nuova versione",
 
-  // "item.version.create.notification.inProgress": "A new version cannot be created because there is an inprogress submission in the version history",
+  // "item.version.create.notification.inProgress": "A new version cannot be created because there is an in-progress submission in the version history",
   // TODO Source message changed - Revise the translation
   "item.version.create.notification.inProgress": "Non è possibile creare una nuova versione perchè c'è già una submission in progress nella cronologia delle versioni",
 
@@ -4101,131 +3893,100 @@
   "item.version.delete.modal.button.cancel.tooltip": "Non eliminare questa versione",
 
   // "item.version.delete.notification.success": "Version number {{version}} has been deleted",
-  // TODO Source message changed - Revise the translation
   "item.version.delete.notification.success": "La versione numero {{version}} è stata eliminata",
 
   // "item.version.delete.notification.failure": "Version number {{version}} has not been deleted",
-  // TODO Source message changed - Revise the translation
   "item.version.delete.notification.failure": "La versione numero {{version}} non è stata eliminata",
 
 
   // "item.version.edit.notification.success": "The summary of version number {{version}} has been changed",
-  // TODO Source message changed - Revise the translation
   "item.version.edit.notification.success": "Il riepilogo della versione numero {{version}} è stato modificato",
 
   // "item.version.edit.notification.failure": "The summary of version number {{version}} has not been changed",
-  // TODO Source message changed - Revise the translation
   "item.version.edit.notification.failure": "Il riepilogo della versione numero {{version}} non è stato modificato",
 
 
 
   // "itemtemplate.edit.metadata.add-button": "Add",
-  // TODO New key - Add a translation
-  "itemtemplate.edit.metadata.add-button": "Add",
+  "itemtemplate.edit.metadata.add-button": "Aggiungi",
 
   // "itemtemplate.edit.metadata.discard-button": "Discard",
-  // TODO New key - Add a translation
-  "itemtemplate.edit.metadata.discard-button": "Discard",
+  "itemtemplate.edit.metadata.discard-button": "Elimina",
 
   // "itemtemplate.edit.metadata.edit.buttons.confirm": "Confirm",
-  // TODO New key - Add a translation
-  "itemtemplate.edit.metadata.edit.buttons.confirm": "Confirm",
+  "itemtemplate.edit.metadata.edit.buttons.confirm": "Conferma",
 
   // "itemtemplate.edit.metadata.edit.buttons.drag": "Drag to reorder",
-  // TODO New key - Add a translation
-  "itemtemplate.edit.metadata.edit.buttons.drag": "Drag to reorder",
+  "itemtemplate.edit.metadata.edit.buttons.drag": "Trascina per riordinare",
 
   // "itemtemplate.edit.metadata.edit.buttons.edit": "Edit",
-  // TODO New key - Add a translation
-  "itemtemplate.edit.metadata.edit.buttons.edit": "Edit",
+  "itemtemplate.edit.metadata.edit.buttons.edit": "Modifica",
 
   // "itemtemplate.edit.metadata.edit.buttons.remove": "Remove",
-  // TODO New key - Add a translation
-  "itemtemplate.edit.metadata.edit.buttons.remove": "Remove",
+  "itemtemplate.edit.metadata.edit.buttons.remove": "Rimuovi",
 
   // "itemtemplate.edit.metadata.edit.buttons.undo": "Undo changes",
-  // TODO New key - Add a translation
-  "itemtemplate.edit.metadata.edit.buttons.undo": "Undo changes",
+  "itemtemplate.edit.metadata.edit.buttons.undo": "Annulla le modifiche",
 
   // "itemtemplate.edit.metadata.edit.buttons.unedit": "Stop editing",
-  // TODO New key - Add a translation
-  "itemtemplate.edit.metadata.edit.buttons.unedit": "Stop editing",
+  "itemtemplate.edit.metadata.edit.buttons.unedit": "Smetti di modificare",
 
   // "itemtemplate.edit.metadata.empty": "The item template currently doesn't contain any metadata. Click Add to start adding a metadata value.",
-  // TODO New key - Add a translation
-  "itemtemplate.edit.metadata.empty": "The item template currently doesn't contain any metadata. Click Add to start adding a metadata value.",
+  "itemtemplate.edit.metadata.empty": "Il template dell'item al momento non contiene nessun metadato. Clicca su 'Aggiungi' per inserire un metadato.",
 
   // "itemtemplate.edit.metadata.headers.edit": "Edit",
-  // TODO New key - Add a translation
-  "itemtemplate.edit.metadata.headers.edit": "Edit",
+  "itemtemplate.edit.metadata.headers.edit": "Modifica",
 
   // "itemtemplate.edit.metadata.headers.field": "Field",
-  // TODO New key - Add a translation
-  "itemtemplate.edit.metadata.headers.field": "Field",
+  "itemtemplate.edit.metadata.headers.field": "Campo",
 
   // "itemtemplate.edit.metadata.headers.language": "Lang",
-  // TODO New key - Add a translation
-  "itemtemplate.edit.metadata.headers.language": "Lang",
+  "itemtemplate.edit.metadata.headers.language": "Lingua",
 
   // "itemtemplate.edit.metadata.headers.value": "Value",
-  // TODO New key - Add a translation
-  "itemtemplate.edit.metadata.headers.value": "Value",
+  "itemtemplate.edit.metadata.headers.value": "Valore",
 
   // "itemtemplate.edit.metadata.metadatafield.error": "An error occurred validating the metadata field",
-  // TODO New key - Add a translation
-  "itemtemplate.edit.metadata.metadatafield.error": "An error occurred validating the metadata field",
+  "itemtemplate.edit.metadata.metadatafield.error": "Si è verificato un errore durante la validazione del campo dei metadati",
 
   // "itemtemplate.edit.metadata.metadatafield.invalid": "Please choose a valid metadata field",
-  // TODO New key - Add a translation
-  "itemtemplate.edit.metadata.metadatafield.invalid": "Please choose a valid metadata field",
+  "itemtemplate.edit.metadata.metadatafield.invalid": "Si prega di scegliere un campo di metadati valido",
 
   // "itemtemplate.edit.metadata.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button",
-  // TODO New key - Add a translation
-  "itemtemplate.edit.metadata.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button",
+  "itemtemplate.edit.metadata.notifications.discarded.content": "Le tue modifiche sono state eliminate. Per riprtinarle, cliccare sul tasto 'Annulla'",
 
-  // "itemtemplate.edit.metadata.notifications.discarded.title": "Changes discarded",
-  // TODO New key - Add a translation
-  "itemtemplate.edit.metadata.notifications.discarded.title": "Changes discarded",
+  // "itemtemplate.edit.metadata.notifications.discarded.title": "Changed discarded",
+  "itemtemplate.edit.metadata.notifications.discarded.title": "Modifiche eliminate",
 
   // "itemtemplate.edit.metadata.notifications.error.title": "An error occurred",
-  // TODO New key - Add a translation
-  "itemtemplate.edit.metadata.notifications.error.title": "An error occurred",
+  "itemtemplate.edit.metadata.notifications.error.title": "Si è verificato un errore",
 
   // "itemtemplate.edit.metadata.notifications.invalid.content": "Your changes were not saved. Please make sure all fields are valid before you save.",
-  // TODO New key - Add a translation
-  "itemtemplate.edit.metadata.notifications.invalid.content": "Your changes were not saved. Please make sure all fields are valid before you save.",
+  "itemtemplate.edit.metadata.notifications.invalid.content": "Le tue modifiche non sono state salvate. Assicurati che tutti i campi siano validi prima di salvare.",
 
   // "itemtemplate.edit.metadata.notifications.invalid.title": "Metadata invalid",
-  // TODO New key - Add a translation
-  "itemtemplate.edit.metadata.notifications.invalid.title": "Metadata invalid",
+  "itemtemplate.edit.metadata.notifications.invalid.title": "Metadati non validi",
 
   // "itemtemplate.edit.metadata.notifications.outdated.content": "The item template you're currently working on has been changed by another user. Your current changes are discarded to prevent conflicts",
-  // TODO New key - Add a translation
-  "itemtemplate.edit.metadata.notifications.outdated.content": "The item template you're currently working on has been changed by another user. Your current changes are discarded to prevent conflicts",
+  "itemtemplate.edit.metadata.notifications.outdated.content": "Il template dell'item su cui stai lavorando è stato modificato da un altro utente. Le tue ultime modifiche sono state eliminate per prevenire conflitti",
 
-  // "itemtemplate.edit.metadata.notifications.outdated.title": "Changes outdated",
-  // TODO New key - Add a translation
-  "itemtemplate.edit.metadata.notifications.outdated.title": "Changes outdated",
+  // "itemtemplate.edit.metadata.notifications.outdated.title": "Changed outdated",
+  "itemtemplate.edit.metadata.notifications.outdated.title": "Modifiche obsolete",
 
   // "itemtemplate.edit.metadata.notifications.saved.content": "Your changes to this item template's metadata were saved.",
-  // TODO New key - Add a translation
-  "itemtemplate.edit.metadata.notifications.saved.content": "Your changes to this item template's metadata were saved.",
+  "itemtemplate.edit.metadata.notifications.saved.content": "Le tue modifiche ai metadati di questo template sono state salvate.",
 
   // "itemtemplate.edit.metadata.notifications.saved.title": "Metadata saved",
-  // TODO New key - Add a translation
-  "itemtemplate.edit.metadata.notifications.saved.title": "Metadata saved",
+  "itemtemplate.edit.metadata.notifications.saved.title": "Metadati salvati",
 
   // "itemtemplate.edit.metadata.reinstate-button": "Undo",
-  // TODO New key - Add a translation
-  "itemtemplate.edit.metadata.reinstate-button": "Undo",
+  "itemtemplate.edit.metadata.reinstate-button": "Annulla",
 
   // "itemtemplate.edit.metadata.reset-order-button": "Undo reorder",
-  // TODO New key - Add a translation
-  "itemtemplate.edit.metadata.reset-order-button": "Undo reorder",
+  "itemtemplate.edit.metadata.reset-order-button": "Annulla riordinamento",
 
   // "itemtemplate.edit.metadata.save-button": "Save",
-  // TODO New key - Add a translation
-  "itemtemplate.edit.metadata.save-button": "Save",
+  "itemtemplate.edit.metadata.save-button": "Salva",
 
 
 
@@ -4492,27 +4253,22 @@
 
   // "menu.section.browse_global": "All of DSpace",
   // TODO New key - Add a translation
-  "menu.section.browse_global": "All of DSpace",
+  "menu.section.browse_global": "Tutto DSpace",
 
   // "menu.section.browse_global_by_author": "By Author",
-  // TODO New key - Add a translation
-  "menu.section.browse_global_by_author": "By Author",
+  "menu.section.browse_global_by_author": "Per autore",
 
   // "menu.section.browse_global_by_dateissued": "By Issue Date",
-  // TODO New key - Add a translation
-  "menu.section.browse_global_by_dateissued": "By Issue Date",
+  "menu.section.browse_global_by_dateissued": "Per data di pubblicazione",
 
   // "menu.section.browse_global_by_subject": "By Subject",
-  // TODO New key - Add a translation
-  "menu.section.browse_global_by_subject": "By Subject",
+  "menu.section.browse_global_by_subject": "Per argomento",
 
   // "menu.section.browse_global_by_title": "By Title",
-  // TODO New key - Add a translation
-  "menu.section.browse_global_by_title": "By Title",
+  "menu.section.browse_global_by_title": "Per titolo",
 
   // "menu.section.browse_global_communities_and_collections": "Communities & Collections",
-  // TODO New key - Add a translation
-  "menu.section.browse_global_communities_and_collections": "Communities & Collections",
+  "menu.section.communities_and_collections": "Community & Collezioni",
 
 
 
@@ -4554,7 +4310,6 @@
   "menu.section.export_metadata": "Metadati",
 
   // "menu.section.export_batch": "Batch Export (ZIP)",
-  // TODO New key - Add a translation
   "menu.section.export_batch": "Batch Export (ZIP)",
 
 
@@ -4580,8 +4335,7 @@
   "menu.section.icon.find": "Trova sezione menu",
 
   // "menu.section.icon.health": "Health check menu section",
-  // TODO New key - Add a translation
-  "menu.section.icon.health": "Health check menu section",
+  "menu.section.icon.health": "Sezione del menu Health check",
 
   // "menu.section.icon.import": "Import menu section",
   "menu.section.icon.import": "Sezione del menu Importa",
@@ -4593,8 +4347,7 @@
   "menu.section.icon.pin": "Fissa la barra laterale",
 
   // "menu.section.icon.processes": "Processes Health",
-  // TODO Source message changed - Revise the translation
-  "menu.section.icon.processes": "Sezione del menu Processi",
+  "menu.section.icon.processes": "Processi",
 
   // "menu.section.icon.registries": "Registries menu section",
   "menu.section.icon.registries": "Sezione del menu Registri",
@@ -4810,23 +4563,22 @@
   "mydspace.show.workspace": "I tuoi contributi",
 
   // "mydspace.show.supervisedWorkspace": "Supervised items",
-  // TODO New key - Add a translation
-  "mydspace.show.supervisedWorkspace": "Supervised items",
+  "mydspace.show.supervisedWorkspace": "Item supervisionati",
 
-  // "mydspace.status.archived": "Archived",
-  "mydspace.status.archived": "Archiviati",
+  // "mydspace.status.mydspaceArchived": "Archived",
+  "mydspace.status.mydspaceArchived": "Archiviati",
 
-  // "mydspace.status.validation": "Validation",
-  "mydspace.status.validation": "Convalida",
+  // "mydspace.status.mydspaceValidation": "Validation",
+  "mydspace.status.mydspaceValidation": "Convalida",
 
-  // "mydspace.status.waiting-for-controller": "Waiting for controller",
-  "mydspace.status.waiting-for-controller": "In attesa del controllo",
+  // "mydspace.status.mydspaceWaitingController": "Waiting for reviewer",
+  "mydspace.status.mydspaceWaitingController": "In attesa del controllo",
 
-  // "mydspace.status.workflow": "Workflow",
-  "mydspace.status.workflow": "Workflow",
+  // "mydspace.status.mydspaceWorkflow": "Workflow",
+  "mydspace.status.mydspaceWorkflow": "Workflow",
 
-  // "mydspace.status.workspace": "Workspace",
-  "mydspace.status.workspace": "Workspace",
+  // "mydspace.status.mydspaceWorkspace": "Workspace",
+  "mydspace.status.mydspaceWorkspace": "Workspace",
 
   // "mydspace.title": "MyDSpace",
   "mydspace.title": "MyDSpace",
@@ -4855,8 +4607,7 @@
   "nav.community-browse.header": "Per Community",
 
   // "nav.context-help-toggle": "Toggle context help",
-  // TODO New key - Add a translation
-  "nav.context-help-toggle": "Toggle context help",
+  "nav.context-help-toggle": "Attivare la guida contestuale",
 
   // "nav.language": "Language switch",
   "nav.language": "Cambio di lingua",
@@ -4865,12 +4616,10 @@
   "nav.login": "Accedi",
 
   // "nav.user-profile-menu-and-logout": "User profile menu and Log Out",
-  // TODO New key - Add a translation
-  "nav.user-profile-menu-and-logout": "User profile menu and Log Out",
+  "nav.user-profile-menu-and-logout": "Menu profilo utente e Disconnetti",
 
   // "nav.logout": "Log Out",
-  // TODO Source message changed - Revise the translation
-  "nav.logout": "Menu profilo utente e Disconnetti",
+  "nav.logout": "Disconnetti",
 
   // "nav.main.description": "Main navigation bar",
   "nav.main.description": "Barra di navigazione principale",
@@ -4885,8 +4634,7 @@
   "nav.search": "Ricerca",
 
   // "nav.search.button": "Submit search",
-  // TODO New key - Add a translation
-  "nav.search.button": "Submit search",
+  "nav.search.button": "Invia ricerca",
 
 
   // "nav.statistics.header": "Statistics",
@@ -4896,27 +4644,23 @@
   "nav.stop-impersonating": "Smetti di impersonare EPerson",
 
   // "nav.subscriptions": "Subscriptions",
-  // TODO New key - Add a translation
-  "nav.subscriptions": "Subscriptions",
+  "nav.subscriptions": "Subscription",
 
   // "nav.toggle": "Toggle navigation",
-  // TODO New key - Add a translation
-  "nav.toggle": "Toggle navigation",
+  "nav.toggle": "Attivare la navigazione",
 
   // "nav.user.description": "User profile bar",
-  // TODO New key - Add a translation
-  "nav.user.description": "User profile bar",
+  "nav.user.description": "Barra del profilo utente",
 
   // "none.listelement.badge": "Item",
-  "none.listelement.badge": "Articolo",
+  "none.listelement.badge": "Item",
 
 
   // "orgunit.listelement.badge": "Organizational Unit",
   "orgunit.listelement.badge": "Unità organizzativa",
 
   // "orgunit.listelement.no-title": "Untitled",
-  // TODO New key - Add a translation
-  "orgunit.listelement.no-title": "Untitled",
+  "orgunit.listelement.no-title": "Senza titolo",
 
   // "orgunit.page.city": "City",
   "orgunit.page.city": "Città",
@@ -4937,8 +4681,7 @@
   "orgunit.page.id": "ID",
 
   // "orgunit.page.titleprefix": "Organizational Unit: ",
-  // TODO New key - Add a translation
-  "orgunit.page.titleprefix": "Organizational Unit: ",
+  "orgunit.page.titleprefix": "Unità organizzativa: ",
 
 
 
@@ -4984,8 +4727,7 @@
   "person.page.lastname": "Cognome",
 
   // "person.page.name": "Name",
-  // TODO New key - Add a translation
-  "person.page.name": "Name",
+  "person.page.name": "Nome",
 
   // "person.page.link.full": "Show all metadata",
   "person.page.link.full": "Mostra tutti i metadati",
@@ -5000,11 +4742,10 @@
   "person.page.titleprefix": "Persona: ",
 
   // "person.search.results.head": "Person Search Results",
-  "person.search.results.head": "Risultati della ricerca per Ricercatore",
+  "person.search.results.head": "Risultati della ricerca per persona",
 
   // "person-relationships.search.results.head": "Person Search Results",
-  // TODO New key - Add a translation
-  "person-relationships.search.results.head": "Person Search Results",
+  "person-relationships.search.results.head": "Risultati della ricerca per persona",
 
   // "person.search.title": "Person Search",
   "person.search.title": "Cerca i Ricercatori",
@@ -5045,8 +4786,7 @@
   "process.new.parameter.type.file": "file",
 
   // "process.new.parameter.required.missing": "The following parameters are required but still missing:",
-  // TODO New key - Add a translation
-  "process.new.parameter.required.missing": "The following parameters are required but still missing:",
+  "process.new.parameter.required.missing": "I seguenti parametri mancanti sono obbligatori:",
 
   // "process.new.notification.success.title": "Success",
   "process.new.notification.success.title": "Successo",
@@ -5061,8 +4801,7 @@
   "process.new.notification.error.content": "Si è verificato un errore durante la creazione di questo processo",
 
   // "process.new.notification.error.max-upload.content": "The file exceeds the maximum upload size",
-  // TODO New key - Add a translation
-  "process.new.notification.error.max-upload.content": "The file exceeds the maximum upload size",
+  "process.new.notification.error.max-upload.content": "Il file è più grande della dimensione massima di upload",
 
   // "process.new.header": "Create a new process",
   "process.new.header": "Creare un nuovo processo",
@@ -5076,20 +4815,16 @@
 
 
   // "process.detail.arguments": "Arguments",
-  // TODO New key - Add a translation
-  "process.detail.arguments": "Arguments",
+  "process.detail.arguments": "Parametri",
 
   // "process.detail.arguments.empty": "This process doesn't contain any arguments",
-  // TODO New key - Add a translation
-  "process.detail.arguments.empty": "This process doesn't contain any arguments",
+  "process.detail.arguments.empty": "Questo processo non contiene alcun parametro",
 
   // "process.detail.back": "Back",
-  // TODO New key - Add a translation
-  "process.detail.back": "Back",
+  "process.detail.back": "Indietro",
 
   // "process.detail.output": "Process Output",
-  // TODO New key - Add a translation
-  "process.detail.output": "Process Output",
+  "process.detail.output": "Output del processo",
 
   // "process.detail.logs.button": "Retrieve process output",
   "process.detail.logs.button": "Recupera l'output del processo",
@@ -5101,94 +4836,72 @@
   "process.detail.logs.none": "Questo processo non ha output",
 
   // "process.detail.output-files": "Output Files",
-  // TODO New key - Add a translation
-  "process.detail.output-files": "Output Files",
+  "process.detail.output-files": "File di output",
 
   // "process.detail.output-files.empty": "This process doesn't contain any output files",
-  // TODO New key - Add a translation
-  "process.detail.output-files.empty": "This process doesn't contain any output files",
+  "process.detail.output-files.empty": "Questo processo non contiene nessun file di output",
 
   // "process.detail.script": "Script",
-  // TODO New key - Add a translation
   "process.detail.script": "Script",
 
   // "process.detail.title": "Process: {{ id }} - {{ name }}",
-  // TODO New key - Add a translation
-  "process.detail.title": "Process: {{ id }} - {{ name }}",
+  "process.detail.title": "Processo: {{ id }} - {{ name }}",
 
   // "process.detail.start-time": "Start time",
-  // TODO New key - Add a translation
-  "process.detail.start-time": "Start time",
+  "process.detail.start-time": "Orario di inizio",
 
   // "process.detail.end-time": "Finish time",
-  // TODO New key - Add a translation
-  "process.detail.end-time": "Finish time",
+  "process.detail.end-time": "Orario di fine",
 
   // "process.detail.status": "Status",
-  // TODO New key - Add a translation
-  "process.detail.status": "Status",
+  "process.detail.status": "Stato",
 
   // "process.detail.create": "Create similar process",
-  // TODO New key - Add a translation
-  "process.detail.create": "Create similar process",
+  "process.detail.create": "Crea un processo analogo",
 
   // "process.detail.actions": "Actions",
-  // TODO New key - Add a translation
-  "process.detail.actions": "Actions",
+  "process.detail.actions": "Azioni",
 
   // "process.detail.delete.button": "Delete process",
-  // TODO New key - Add a translation
-  "process.detail.delete.button": "Delete process",
+  "process.detail.delete.button": "Elimina processo",
 
   // "process.detail.delete.header": "Delete process",
-  // TODO New key - Add a translation
-  "process.detail.delete.header": "Delete process",
+  "process.detail.delete.header": "Elimina processo",
 
   // "process.detail.delete.body": "Are you sure you want to delete the current process?",
-  // TODO New key - Add a translation
-  "process.detail.delete.body": "Are you sure you want to delete the current process?",
+  "process.detail.delete.body": "Sei sicuro di voler eliminare il processo corrente?",
 
   // "process.detail.delete.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "process.detail.delete.cancel": "Cancel",
+  "process.detail.delete.cancel": "Annulla",
 
   // "process.detail.delete.confirm": "Delete process",
-  // TODO New key - Add a translation
-  "process.detail.delete.confirm": "Delete process",
+  "process.detail.delete.confirm": "Elimina processo",
 
   // "process.detail.delete.success": "The process was successfully deleted.",
-  // TODO New key - Add a translation
-  "process.detail.delete.success": "The process was successfully deleted.",
+  "process.detail.delete.success": "Il processo è stato eliminato con successo",
 
   // "process.detail.delete.error": "Something went wrong when deleting the process",
-  // TODO New key - Add a translation
-  "process.detail.delete.error": "Something went wrong when deleting the process",
+  "process.detail.delete.error": "Qualcosa è andato storto durante l'elininazione del processo",
 
 
 
   // "process.overview.table.finish": "Finish time (UTC)",
-  // TODO New key - Add a translation
-  "process.overview.table.finish": "Finish time (UTC)",
+  "process.overview.table.finish": "Orario di fine (UTC)",
 
   // "process.overview.table.id": "Process ID",
-  // TODO New key - Add a translation
-  "process.overview.table.id": "Process ID",
+  "process.overview.table.id": "ID del processo",
 
   // "process.overview.table.name": "Name",
-  // TODO New key - Add a translation
-  "process.overview.table.name": "Name",
+  "process.overview.table.name": "Nome",
 
   // "process.overview.table.start": "Start time (UTC)",
-  // TODO New key - Add a translation
-  "process.overview.table.start": "Start time (UTC)",
+  "process.overview.table.start": "Orario di inizio (UTC)",
 
   // "process.overview.table.status": "Status",
-  // TODO New key - Add a translation
-  "process.overview.table.status": "Status",
+  "process.overview.table.status": "Stato",
 
   // "process.overview.table.user": "User",
-  // TODO New key - Add a translation
-  "process.overview.table.user": "User",
+  "process.overview.table.user": "Utente",
 
   // "process.overview.title": "Processes Overview",
   "process.overview.title": "Panoramica dei processi",
@@ -5200,40 +4913,31 @@
   "process.overview.new": "Nuovo",
 
   // "process.overview.table.actions": "Actions",
-  // TODO New key - Add a translation
-  "process.overview.table.actions": "Actions",
+  "process.overview.table.actions": "Azioni",
 
   // "process.overview.delete": "Delete {{count}} processes",
-  // TODO New key - Add a translation
-  "process.overview.delete": "Delete {{count}} processes",
+  "process.overview.delete": "Elimina {{count}} processi",
 
   // "process.overview.delete.clear": "Clear delete selection",
-  // TODO New key - Add a translation
-  "process.overview.delete.clear": "Clear delete selection",
+  "process.overview.delete.clear": "Ripulisci la sezione Elimina",
 
   // "process.overview.delete.processing": "{{count}} process(es) are being deleted. Please wait for the deletion to fully complete. Note that this can take a while.",
-  // TODO New key - Add a translation
-  "process.overview.delete.processing": "{{count}} process(es) are being deleted. Please wait for the deletion to fully complete. Note that this can take a while.",
+  "process.overview.delete.processing": "{{count}} processi sono in fase di eliminazione. Attendere che l'attività sia completata. Potrebbe volerci qualche minuto.",
 
   // "process.overview.delete.body": "Are you sure you want to delete {{count}} process(es)?",
-  // TODO New key - Add a translation
-  "process.overview.delete.body": "Are you sure you want to delete {{count}} process(es)?",
+  "process.overview.delete.body": "Sei sicuro di voler eliminare {{count}} processo/i?",
 
   // "process.overview.delete.header": "Delete processes",
-  // TODO New key - Add a translation
-  "process.overview.delete.header": "Delete processes",
+  "process.overview.delete.header": "Elimina processi",
 
   // "process.bulk.delete.error.head": "Error on deleteing process",
-  // TODO New key - Add a translation
-  "process.bulk.delete.error.head": "Error on deleteing process",
+  "process.bulk.delete.error.head": "Errore nell'eliminazione dei processi",
 
   // "process.bulk.delete.error.body": "The process with ID {{processId}} could not be deleted. The remaining processes will continue being deleted. ",
-  // TODO New key - Add a translation
-  "process.bulk.delete.error.body": "The process with ID {{processId}} could not be deleted. The remaining processes will continue being deleted. ",
+  "process.bulk.delete.error.body": "Il processo con l'ID {{processId}} non può essere eliminato. I restanti processi saranno eliminati.",
 
   // "process.bulk.delete.success": "{{count}} process(es) have been succesfully deleted",
-  // TODO New key - Add a translation
-  "process.bulk.delete.success": "{{count}} process(es) have been succesfully deleted",
+  "process.bulk.delete.success": "{{count}} processi sono stati eliminati con successo",
 
 
 
@@ -5246,16 +4950,14 @@
   // "profile.card.security": "Security",
   "profile.card.security": "Sicurezza",
 
-  // "profile.form.submit": "Save",
-  // TODO Source message changed - Revise the translation
+  // "profile.form.submit": "Update Profile",
   "profile.form.submit": "Aggiorna profilo",
 
   // "profile.groups.head": "Authorization groups you belong to",
   "profile.groups.head": "Gruppi di autorizzazione a cui appartieni",
 
   // "profile.special.groups.head": "Authorization special groups you belong to",
-  // TODO New key - Add a translation
-  "profile.special.groups.head": "Authorization special groups you belong to",
+  "profile.special.groups.head": "Gruppi speciali di autorizzazione a cui appartieni",
 
   // "profile.head": "Update Profile",
   "profile.head": "Aggiorna profilo",
@@ -5297,8 +4999,7 @@
   "profile.security.form.error.matching-passwords": "Le password non corrispondono.",
 
   // "profile.security.form.info": "Optionally, you can enter a new password in the box below, and confirm it by typing it again into the second box.",
-  // TODO Source message changed - Revise the translation
-  "profile.security.form.info": "Facoltativamente, è possibile inserire una nuova password nella casella qui sotto e confermarla digitandola nuovamente nella seconda casella. Dovrebbe essere lungo almeno sei caratteri.",
+  "profile.security.form.info": "Facoltativamente, è possibile inserire una nuova password nella casella qui sotto e confermarla digitandola nuovamente nella seconda casella.",
 
   // "profile.security.form.label.password": "Password",
   "profile.security.form.label.password": "Password",
@@ -5307,8 +5008,7 @@
   "profile.security.form.label.passwordrepeat": "Ridigitare per confermare",
 
   // "profile.security.form.label.current-password": "Current password",
-  // TODO New key - Add a translation
-  "profile.security.form.label.current-password": "Current password",
+  "profile.security.form.label.current-password": "Password corrente",
 
   // "profile.security.form.notifications.success.content": "Your changes to the password were saved.",
   "profile.security.form.notifications.success.content": "Le modifiche apportate alla password sono state salvate.",
@@ -5320,15 +5020,13 @@
   "profile.security.form.notifications.error.title": "Errore durante la modifica delle password",
 
   // "profile.security.form.notifications.error.change-failed": "An error occurred while trying to change the password. Please check if the current password is correct.",
-  // TODO New key - Add a translation
-  "profile.security.form.notifications.error.change-failed": "An error occurred while trying to change the password. Please check if the current password is correct.",
+  "profile.security.form.notifications.error.change-failed": "Si è verificato un errore durante la modifica della password. Assicurati che la password corrente sia corretta.",
 
   // "profile.security.form.notifications.error.not-same": "The provided passwords are not the same.",
   "profile.security.form.notifications.error.not-same": "Le password fornite non sono le stesse.",
 
   // "profile.security.form.notifications.error.general": "Please fill required fields of security form.",
-  // TODO New key - Add a translation
-  "profile.security.form.notifications.error.general": "Please fill required fields of security form.",
+  "profile.security.form.notifications.error.general": "Si prega di inserire i campi richiesti nel modulo di sicurezza.",
 
   // "profile.title": "Update Profile",
   "profile.title": "Aggiorna profilo",
@@ -5364,15 +5062,13 @@
   "project.page.status": "Parole chiave",
 
   // "project.page.titleprefix": "Research Project: ",
-  // TODO New key - Add a translation
-  "project.page.titleprefix": "Research Project: ",
+  "project.page.titleprefix": "Progetto di ricerca: ",
 
   // "project.search.results.head": "Project Search Results",
-  "project.search.results.head": "Progetto di ricerca: ",
+  "project.search.results.head": "Risultati della ricerca per progetti",
 
   // "project-relationships.search.results.head": "Project Search Results",
-  // TODO New key - Add a translation
-  "project-relationships.search.results.head": "Project Search Results",
+  "project-relationships.search.results.head": "Risultati della ricerca per progetti",
 
 
 
@@ -5395,18 +5091,16 @@
   "publication.page.publisher": "Editore",
 
   // "publication.page.titleprefix": "Publication: ",
-  // TODO New key - Add a translation
-  "publication.page.titleprefix": "Publication: ",
+  "publication.page.titleprefix": "Pubblicazione: ",
 
   // "publication.page.volume-title": "Volume Title",
   "publication.page.volume-title": "Titolo volume",
 
   // "publication.search.results.head": "Publication Search Results",
-  "publication.search.results.head": "Risultati della ricerca di pubblicazioni",
+  "publication.search.results.head": "Risultati della ricerca per pubblicazioni",
 
   // "publication-relationships.search.results.head": "Publication Search Results",
-  // TODO New key - Add a translation
-  "publication-relationships.search.results.head": "Publication Search Results",
+  "publication-relationships.search.results.head": "Risultati della ricerca per pubblicazioni",
 
   // "publication.search.title": "Publication Search",
   "publication.search.title": "Ricerca pubblicazione",
@@ -5456,8 +5150,7 @@
   "register-page.create-profile.security.header": "Sicurezza",
 
   // "register-page.create-profile.security.info": "Please enter a password in the box below, and confirm it by typing it again into the second box.",
-  // TODO Source message changed - Revise the translation
-  "register-page.create-profile.security.info": "Inserisci una password nella casella qui sotto e confermala digitandola nuovamente nella seconda casella. Dovrebbe essere lungo almeno sei caratteri.",
+  "register-page.create-profile.security.info": "Inserisci una password nella casella qui sotto e confermala digitandola nuovamente nella seconda casella.",
 
   // "register-page.create-profile.security.label.password": "Password *",
   "register-page.create-profile.security.label.password": "Password *",
@@ -5500,12 +5193,10 @@
   "register-page.registration.email.error.required": "Inserire un indirizzo e-mail",
 
   // "register-page.registration.email.error.not-email-form": "Please fill in a valid email address.",
-  // TODO New key - Add a translation
-  "register-page.registration.email.error.not-email-form": "Please fill in a valid email address.",
+  "register-page.registration.email.error.not-email-form": "Inserisci un indirizzo e-mail valido.",
 
   // "register-page.registration.email.error.not-valid-domain": "Use email with allowed domains: {{ domains }}",
-  // TODO New key - Add a translation
-  "register-page.registration.email.error.not-valid-domain": "Use email with allowed domains: {{ domains }}",
+  "register-page.registration.email.error.not-valid-domain": "Utilizza una e-mail con un dominio valido: {{ domains }}",
 
   // "register-page.registration.email.hint": "This address will be verified and used as your login name.",
   "register-page.registration.email.hint": "Questo indirizzo verrà verificato e utilizzato come nome di accesso.",
@@ -5523,39 +5214,30 @@
   "register-page.registration.error.head": "Errore durante il tentativo di registrazione dell'e-mail",
 
   // "register-page.registration.error.content": "An error occured when registering the following email address: {{ email }}",
-  // TODO New key - Add a translation
-  "register-page.registration.error.content": "An error occured when registering the following email address: {{ email }}",
+  "register-page.registration.error.content": "Si è verificato un errore durante la registrazione del seguente indirizzo e-mail: {{ email }}",
 
   // "register-page.registration.error.recaptcha": "Error when trying to authenticate with recaptcha",
-  // TODO New key - Add a translation
-  "register-page.registration.error.recaptcha": "Error when trying to authenticate with recaptcha",
+  "register-page.registration.error.recaptcha": "Errore durante l'autenticazione con reCaptcha",
 
   // "register-page.registration.google-recaptcha.must-accept-cookies": "In order to register you must accept the <b>Registration and Password recovery</b> (Google reCaptcha) cookies.",
-  // TODO New key - Add a translation
-  "register-page.registration.google-recaptcha.must-accept-cookies": "In order to register you must accept the <b>Registration and Password recovery</b> (Google reCaptcha) cookies.",
+  "register-page.registration.google-recaptcha.must-accept-cookies": "Per registrarsi è obbligatorio accettare i cookie <b>Registration and Password recovery</b> (Google reCaptcha).",
   // "register-page.registration.error.maildomain": "This email address is not on the list of domains who can register. Allowed domains are {{ domains }}",
-  // TODO New key - Add a translation
-  "register-page.registration.error.maildomain": "This email address is not on the list of domains who can register. Allowed domains are {{ domains }}",
+  "register-page.registration.error.maildomain": "Questo indirizzo e-mail non è nella lista dei dominii che possono essere registrati. I domini validi sono {{ domains }}",
 
 
   // "register-page.registration.google-recaptcha.open-cookie-settings": "Open cookie settings",
-  // TODO New key - Add a translation
-  "register-page.registration.google-recaptcha.open-cookie-settings": "Open cookie settings",
+  "register-page.registration.google-recaptcha.open-cookie-settings": "Aprire le impostazioni dei cookie",
 
   // "register-page.registration.google-recaptcha.notification.title": "Google reCaptcha",
-  // TODO New key - Add a translation
   "register-page.registration.google-recaptcha.notification.title": "Google reCaptcha",
 
   // "register-page.registration.google-recaptcha.notification.message.error": "An error occurred during reCaptcha verification",
-  // TODO New key - Add a translation
-  "register-page.registration.google-recaptcha.notification.message.error": "An error occurred during reCaptcha verification",
+  "register-page.registration.google-recaptcha.notification.message.error": "Si è verificato un errore durante la verifica reCaptcha",
 
   // "register-page.registration.google-recaptcha.notification.message.expired": "Verification expired. Please verify again.",
-  // TODO New key - Add a translation
-  "register-page.registration.google-recaptcha.notification.message.expired": "Verification expired. Please verify again.",
+  "register-page.registration.google-recaptcha.notification.message.expired": "Verifica scaduta. Si prega di verificare di nuovo.",
   // "register-page.registration.info.maildomain": "Accounts can be registered for mail addresses of the domains",
-  // TODO New key - Add a translation
-  "register-page.registration.info.maildomain": "Accounts can be registered for mail addresses of the domains",
+  "register-page.registration.info.maildomain": "Gli account possono essere registrati per gli indirizzi e-mail dei dominii",
 
   // "relationships.add.error.relationship-type.content": "No suitable match could be found for relationship type {{ type }} between the two items",
   "relationships.add.error.relationship-type.content": "Non è stata trovata alcuna corrispondenza adatta per il tipo di relazione {{ type }} tra i due item",
@@ -5625,7 +5307,6 @@
   "repository.image.logo": "Logo del repository",
 
   // "repository.title.prefix": "DSpace Angular :: ",
-  // TODO New key - Add a translation
   "repository.title.prefix": "DSpace Angular :: ",
 
   // "repository.title.prefixDSpace": "DSpace Angular ::",
@@ -5636,60 +5317,58 @@
   "resource-policies.add.button": "Aggiungi",
 
   // "resource-policies.add.for.": "Add a new policy",
-  "resource-policies.add.for.": "Aggiungi un nuovo criterio",
+  "resource-policies.add.for.": "Aggiungi una nuova policy",
 
   // "resource-policies.add.for.bitstream": "Add a new Bitstream policy",
-  "resource-policies.add.for.bitstream": "Aggiungi un nuovo criterio Bitstream",
+  "resource-policies.add.for.bitstream": "Aggiungi una nuova policy di Bitstream",
 
   // "resource-policies.add.for.bundle": "Add a new Bundle policy",
-  "resource-policies.add.for.bundle": "Aggiungi un nuovo criterio Bundle",
+  "resource-policies.add.for.bundle": "Aggiungi una nuova policy di Bundle",
 
   // "resource-policies.add.for.item": "Add a new Item policy",
-  "resource-policies.add.for.item": "Aggiungi un nuovo criterio item",
+  "resource-policies.add.for.item": "Aggiungi una nuova policy di Item",
 
   // "resource-policies.add.for.community": "Add a new Community policy",
-  "resource-policies.add.for.community": "Aggiungere un nuovo criterio comunitario",
+  "resource-policies.add.for.community": "Aggiungi una nuova policy di community",
 
   // "resource-policies.add.for.collection": "Add a new Collection policy",
-  "resource-policies.add.for.collection": "Aggiungere un nuovo criterio di collezione",
+  "resource-policies.add.for.collection": "Aggiungi una nuova policy di collezione",
 
   // "resource-policies.create.page.heading": "Create new resource policy for ",
-  "resource-policies.create.page.heading": "Creare nuovi criteri di risorsa per ",
+  "resource-policies.create.page.heading": "Creare una nuova policy di risorsa per ",
 
   // "resource-policies.create.page.failure.content": "An error occurred while creating the resource policy.",
-  "resource-policies.create.page.failure.content": "Si è verificato un errore durante la creazione del criterio della risorsa.",
+  "resource-policies.create.page.failure.content": "Si è verificato un errore durante la creazione della policy di risorsa.",
 
   // "resource-policies.create.page.success.content": "Operation successful",
   "resource-policies.create.page.success.content": "Operazione riuscita",
 
   // "resource-policies.create.page.title": "Create new resource policy",
-  "resource-policies.create.page.title": "Creare nuovi criteri risorse",
+  "resource-policies.create.page.title": "Creare nuove policy di risorsa",
 
   // "resource-policies.delete.btn": "Delete selected",
   "resource-policies.delete.btn": "Elimina selezionato",
 
   // "resource-policies.delete.btn.title": "Delete selected resource policies",
-  "resource-policies.delete.btn.title": "Elimina criteri risorse selezionati",
+  "resource-policies.delete.btn.title": "Elimina le policy di risorsa selezionate",
 
   // "resource-policies.delete.failure.content": "An error occurred while deleting selected resource policies.",
-  "resource-policies.delete.failure.content": "Si è verificato un errore durante l'eliminazione dei criteri delle risorse selezionati.",
+  "resource-policies.delete.failure.content": "Si è verificato un errore durante l'eliminazione delle policy di risorsa selezionate.",
 
   // "resource-policies.delete.success.content": "Operation successful",
   "resource-policies.delete.success.content": "Operazione riuscita",
 
   // "resource-policies.edit.page.heading": "Edit resource policy ",
-  "resource-policies.edit.page.heading": "Modifica criterio risorse",
+  "resource-policies.edit.page.heading": "Modifica policy di risorsa",
 
   // "resource-policies.edit.page.failure.content": "An error occurred while editing the resource policy.",
-  "resource-policies.edit.page.failure.content": "Si è verificato un errore durante la modifica del criterio delle risorse.",
+  "resource-policies.edit.page.failure.content": "Si è verificato un errore durante la modifica della policy di risorsa.",
 
   // "resource-policies.edit.page.target-failure.content": "An error occurred while editing the target (ePerson or group) of the resource policy.",
-  // TODO New key - Add a translation
-  "resource-policies.edit.page.target-failure.content": "An error occurred while editing the target (ePerson or group) of the resource policy.",
+  "resource-policies.edit.page.target-failure.content": "Si è verificato un errore durante la modifica dell'obiettivo (ePerson o gruppo) della policy di risorsa.",
 
   // "resource-policies.edit.page.other-failure.content": "An error occurred while editing the resource policy. The target (ePerson or group) has been successfully updated.",
-  // TODO New key - Add a translation
-  "resource-policies.edit.page.other-failure.content": "An error occurred while editing the resource policy. The target (ePerson or group) has been successfully updated.",
+  "resource-policies.edit.page.other-failure.content": "Si è verificato un errore durante la modifica della policy di risorsa. L'obiettio (ePerson o gruppo) è stato aggiornato con successo.",
 
   // "resource-policies.edit.page.success.content": "Operation successful",
   "resource-policies.edit.page.success.content": "Operazione riuscita",
@@ -5725,20 +5404,16 @@
   "resource-policies.form.eperson-group-list.table.headers.name": "Nome",
 
   // "resource-policies.form.eperson-group-list.modal.header": "Cannot change type",
-  // TODO New key - Add a translation
-  "resource-policies.form.eperson-group-list.modal.header": "Cannot change type",
+  "resource-policies.form.eperson-group-list.modal.header": "Impossibile modificare il tipo",
 
   // "resource-policies.form.eperson-group-list.modal.text1.toGroup": "It is not possible to replace an ePerson with a group.",
-  // TODO New key - Add a translation
-  "resource-policies.form.eperson-group-list.modal.text1.toGroup": "It is not possible to replace an ePerson with a group.",
+  "resource-policies.form.eperson-group-list.modal.text1.toGroup": "Impossibile sostituire una ePerson con un gruppo.",
 
   // "resource-policies.form.eperson-group-list.modal.text1.toEPerson": "It is not possible to replace a group with an ePerson.",
-  // TODO New key - Add a translation
-  "resource-policies.form.eperson-group-list.modal.text1.toEPerson": "It is not possible to replace a group with an ePerson.",
+  "resource-policies.form.eperson-group-list.modal.text1.toEPerson": "Impossibile sostituire un gruppo con una ePerson.",
 
   // "resource-policies.form.eperson-group-list.modal.text2": "Delete the current resource policy and create a new one with the desired type.",
-  // TODO New key - Add a translation
-  "resource-policies.form.eperson-group-list.modal.text2": "Delete the current resource policy and create a new one with the desired type.",
+  "resource-policies.form.eperson-group-list.modal.text2": "Elimina la policy di risorsa corrente e creane una nuova con il tipo desiderato.",
 
   // "resource-policies.form.eperson-group-list.modal.close": "Ok",
   "resource-policies.form.eperson-group-list.modal.close": "Ok",
@@ -5755,6 +5430,10 @@
   // "resource-policies.form.name.label": "Name",
   "resource-policies.form.name.label": "Nome",
 
+  //"resource-policies.form.name.hint": "Max 30 characters",
+  // TODO New key - Add a translation
+  "resource-policies.form.name.hint": "Max 30 characters",
+
   // "resource-policies.form.policy-type.label": "Select the policy type",
   "resource-policies.form.policy-type.label": "Selezionare il tipo di criterio",
 
@@ -5840,7 +5519,6 @@
   "search.filters.applied.f.dateSubmitted": "Data di invio",
 
   // "search.filters.applied.f.discoverable": "Non-discoverable",
-  // TODO Source message changed - Revise the translation
   "search.filters.applied.f.discoverable": "Privato",
 
   // "search.filters.applied.f.entityType": "Item Type",
@@ -5856,23 +5534,22 @@
   "search.filters.applied.f.namedresourcetype": "Stato",
 
   // "search.filters.applied.f.subject": "Subject",
-  "search.filters.applied.f.subject": "Oggetto",
+  "search.filters.applied.f.subject": "Soggetto",
 
   // "search.filters.applied.f.submitter": "Submitter",
-  "search.filters.applied.f.submitter": "Mittente",
+  "search.filters.applied.f.submitter": "Submitter",
 
   // "search.filters.applied.f.jobTitle": "Job Title",
-  "search.filters.applied.f.jobTitle": "Titolo di lavoro",
+  "search.filters.applied.f.jobTitle": "Ruolo",
 
   // "search.filters.applied.f.birthDate.max": "End birth date",
-  "search.filters.applied.f.birthDate.max": "Data di fine nascita",
+  "search.filters.applied.f.birthDate.max": "Data di nascita finale",
 
   // "search.filters.applied.f.birthDate.min": "Start birth date",
   "search.filters.applied.f.birthDate.min": "Data di nascita iniziale",
 
   // "search.filters.applied.f.supervisedBy": "Supervised by",
-  // TODO New key - Add a translation
-  "search.filters.applied.f.supervisedBy": "Supervised by",
+  "search.filters.applied.f.supervisedBy": "Supervisionato da",
 
   // "search.filters.applied.f.withdrawn": "Withdrawn",
   "search.filters.applied.f.withdrawn": "Ritirato",
@@ -5961,7 +5638,6 @@
   "search.filters.filter.dateSubmitted.label": "Data di ricerca inviata",
 
   // "search.filters.filter.discoverable.head": "Non-discoverable",
-  // TODO Source message changed - Revise the translation
   "search.filters.filter.discoverable.head": "Privato",
 
   // "search.filters.filter.withdrawn.head": "Withdrawn",
@@ -5974,7 +5650,7 @@
   "search.filters.filter.entityType.placeholder": "Tipo di item",
 
   // "search.filters.filter.entityType.label": "Search item type",
-  "search.filters.filter.entityType.label": "Tipo di item di ricerca",
+  "search.filters.filter.entityType.label": "Cerca tipo di item",
 
   // "search.filters.filter.expand": "Expand filter",
   "search.filters.filter.expand": "Espandi filtro",
@@ -6010,13 +5686,13 @@
   "search.filters.filter.knowsLanguage.label": "Cerca nella lingua nota",
 
   // "search.filters.filter.namedresourcetype.head": "Status",
-  "search.filters.filter.namedresourcetype.head": "Status",
+  "search.filters.filter.namedresourcetype.head": "Stato",
 
   // "search.filters.filter.namedresourcetype.placeholder": "Status",
-  "search.filters.filter.namedresourcetype.placeholder": "Status",
+  "search.filters.filter.namedresourcetype.placeholder": "Stato",
 
   // "search.filters.filter.namedresourcetype.label": "Search status",
-  "search.filters.filter.namedresourcetype.label": "Status Ricerca",
+  "search.filters.filter.namedresourcetype.label": "Cerca stato",
 
   // "search.filters.filter.objectpeople.head": "People",
   "search.filters.filter.objectpeople.head": "Ricercatori",
@@ -6088,20 +5764,19 @@
   "search.filters.filter.submitter.label": "Mittente della ricerca",
 
   // "search.filters.filter.show-tree": "Browse {{ name }} tree",
-  // TODO New key - Add a translation
-  "search.filters.filter.show-tree": "Browse {{ name }} tree",
+  "search.filters.filter.show-tree": "Sfoglia l'albero di {{ name }}",
 
   // "search.filters.filter.supervisedBy.head": "Supervised By",
-  // TODO New key - Add a translation
-  "search.filters.filter.supervisedBy.head": "Supervised By",
+  "search.filters.filter.supervisedBy.head": "Supervisionato da",
 
   // "search.filters.filter.supervisedBy.placeholder": "Supervised By",
-  // TODO New key - Add a translation
-  "search.filters.filter.supervisedBy.placeholder": "Supervised By",
+  "search.filters.filter.supervisedBy.placeholder": "Supervisionato da",
 
   // "search.filters.filter.supervisedBy.label": "Search Supervised By",
-  // TODO New key - Add a translation
-  "search.filters.filter.supervisedBy.label": "Search Supervised By",
+  "search.filters.filter.supervisedBy.label": "Cerca supervisionato da",
+
+  // "search.filters.filter.types.head": "Type",
+  "search.filters.filter.types.head": "Tipo",
 
 
 
@@ -6168,19 +5843,16 @@
   "search.results.empty": "La tua ricerca non ha prodotto risultati.",
 
   // "search.results.view-result": "View",
-  // TODO New key - Add a translation
-  "search.results.view-result": "View",
+  "search.results.view-result": "Vedi",
 
   // "search.results.response.500": "An error occurred during query execution, please try again later",
-  // TODO New key - Add a translation
-  "search.results.response.500": "An error occurred during query execution, please try again later",
+  "search.results.response.500": "Si è verificato un errore durante l'esecuzione, si prega di riprovare più tardi",
 
   // "default.search.results.head": "Search Results",
   "default.search.results.head": "Risultati della ricerca",
 
   // "default-relationships.search.results.head": "Search Results",
-  // TODO New key - Add a translation
-  "default-relationships.search.results.head": "Search Results",
+  "default-relationships.search.results.head": "Risultati della ricerca",
 
 
   // "search.sidebar.close": "Back to results",
@@ -6218,13 +5890,13 @@
 
 
   // "sorting.ASC": "Ascending",
-  "sorting.ASC": "Ascendente",
+  "sorting.ASC": "Crescente",
 
   // "sorting.DESC": "Descending",
-  "sorting.DESC": "Discendente",
+  "sorting.DESC": "Decrescente",
 
   // "sorting.dc.title.ASC": "Title Ascending",
-  "sorting.dc.title.ASC": "Titolo ascendente",
+  "sorting.dc.title.ASC": "Titolo crescente",
 
   // "sorting.dc.title.DESC": "Title Descending",
   "sorting.dc.title.DESC": "Titolo decrescente",
@@ -6270,32 +5942,25 @@
   "statistics.table.no-data": "Nessun dato disponibile",
 
   // "statistics.table.title.TotalVisits": "Total visits",
-  // TODO New key - Add a translation
-  "statistics.table.title.TotalVisits": "Total visits",
+  "statistics.table.rppublicationsReports.title.TotalVisits": "Visite totali",
 
   // "statistics.table.title.TotalVisitsPerMonth": "Total visits per month",
-  // TODO New key - Add a translation
-  "statistics.table.title.TotalVisitsPerMonth": "Total visits per month",
+  "statistics.table.title.TotalVisitsPerMonth": "Visite totali al mese",
 
   // "statistics.table.title.TotalDownloads": "File Visits",
-  // TODO New key - Add a translation
-  "statistics.table.title.TotalDownloads": "File Visits",
+  "statistics.table.title.TotalDownloads": "Download",
 
   // "statistics.table.title.TopCountries": "Top country views",
-  // TODO New key - Add a translation
-  "statistics.table.title.TopCountries": "Top country views",
+  "statistics.table.title.TopCountries": "Migliori nazioni",
 
   // "statistics.table.title.TopCities": "Top city views",
-  // TODO New key - Add a translation
-  "statistics.table.title.TopCities": "Top city views",
+  "statistics.table.title.TopCities": "Migliori città",
 
   // "statistics.table.header.views": "Views",
-  // TODO New key - Add a translation
-  "statistics.table.header.views": "Views",
+  "statistics.table.header.views": "Visite",
 
   // "statistics.table.no-name": "(object name could not be loaded)",
-  // TODO New key - Add a translation
-  "statistics.table.no-name": "(object name could not be loaded)",
+  "statistics.table.no-name": "(il nome dell'oggetto non può essere caricato)",
 
 
 
@@ -6399,11 +6064,10 @@
   // "submission.import-external.source.cinii": "CiNii",
   "submission.import-external.source.cinii": "CiNii",
 
-  // "submission.import-external.source.crossref": "CrossRef",
-  "submission.import-external.source.crossref": "CrossRef",
+  // "submission.import-external.source.crossref": "Crossref",
+  "submission.import-external.source.crossref": "Crossref",
 
   // "submission.import-external.source.datacite": "DataCite",
-  // TODO New key - Add a translation
   "submission.import-external.source.datacite": "DataCite",
 
   // "submission.import-external.source.scielo": "SciELO",
@@ -6452,22 +6116,19 @@
   "submission.import-external.source.lcname": "Nomi della Biblioteca del Congresso",
 
   // "submission.import-external.preview.title": "Item Preview",
-  // TODO New key - Add a translation
-  "submission.import-external.preview.title": "Item Preview",
+  "submission.import-external.preview.title": "Anteprima item",
 
   // "submission.import-external.preview.title.Publication": "Publication Preview",
   "submission.import-external.preview.title.Publication": "Anteprima pubblicazione",
 
   // "submission.import-external.preview.title.none": "Item Preview",
-  // TODO New key - Add a translation
-  "submission.import-external.preview.title.none": "Item Preview",
+  "submission.import-external.preview.title.none": "Anteprima item",
 
   // "submission.import-external.preview.title.Journal": "Journal Preview",
   "submission.import-external.preview.title.Journal": "Anteprima journal",
 
   // "submission.import-external.preview.title.OrgUnit": "Organizational Unit Preview",
-  // TODO Source message changed - Revise the translation
-  "submission.import-external.preview.title.OrgUnit": "Anteprima editore",
+  "submission.import-external.preview.title.OrgUnit": "Anteprima struttura",
 
   // "submission.import-external.preview.title.Person": "Person Preview",
   "submission.import-external.preview.title.Person": "Anteprima persona",
@@ -6509,8 +6170,7 @@
   "submission.sections.describe.relationship-lookup.external-source.import-button-title.isProjectOfPublication": "Progetto",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-button-title.none": "Import remote item",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.external-source.import-button-title.none": "Import remote item",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.none": "Importa item remoti",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-button-title.Event": "Import remote event",
   "submission.sections.describe.relationship-lookup.external-source.import-button-title.Event": "Importa evento remoto",
@@ -6522,8 +6182,7 @@
   "submission.sections.describe.relationship-lookup.external-source.import-button-title.Equipment": "Importare apparecchiature remote",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-button-title.OrgUnit": "Import remote organizational unit",
-  // TODO Source message changed - Revise the translation
-  "submission.sections.describe.relationship-lookup.external-source.import-button-title.OrgUnit": "Importa editore remoto",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.OrgUnit": "Importa unitá remota",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-button-title.Funding": "Import remote fund",
   "submission.sections.describe.relationship-lookup.external-source.import-button-title.Funding": "Importa fondo remoto",
@@ -6625,8 +6284,7 @@
   "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Volume.added.new-entity": "Importato e aggiunto con successo volume di journal esterno alla selezione",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.select": "Select a local match:",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.select": "Select a local match:",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.select": "Seleziona una corrispondenza locale:",
 
   // "submission.sections.describe.relationship-lookup.search-tab.deselect-all": "Deselect all",
   "submission.sections.describe.relationship-lookup.search-tab.deselect-all": "Deseleziona tutto",
@@ -6728,8 +6386,7 @@
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingAgencyOfProject": "Finanziatore del progetto",
 
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isPublicationOfAuthor": "Publication of the Author",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isPublicationOfAuthor": "Publication of the Author",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isPublicationOfAuthor": "Pubblicazioni dell'autore",
 
   // "submission.sections.describe.relationship-lookup.selection-tab.title.openAIREFunding": "Funding OpenAIRE API",
   "submission.sections.describe.relationship-lookup.selection-tab.title.openAIREFunding": "Finanziamento dell'API OpenAIRE",
@@ -6798,11 +6455,10 @@
   "submission.sections.describe.relationship-lookup.title.isChildOrgUnitOf": "Unità organizzativa padre",
 
   // "submission.sections.describe.relationship-lookup.title.isPublicationOfAuthor": "Publication",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.title.isPublicationOfAuthor": "Publication",
+  "submission.sections.describe.relationship-lookup.title.isPublicationOfAuthor": "Pubblicazioni",
 
   // "submission.sections.describe.relationship-lookup.search-tab.toggle-dropdown": "Toggle dropdown",
-  "submission.sections.describe.relationship-lookup.search-tab.toggle-dropdown": "Toggle dropdown",
+  "submission.sections.describe.relationship-lookup.search-tab.toggle-dropdown": "Attiva dropdown",
 
   // "submission.sections.describe.relationship-lookup.selection-tab.settings": "Settings",
   "submission.sections.describe.relationship-lookup.selection-tab.settings": "Impostazioni",
@@ -6894,8 +6550,7 @@
   // "submission.sections.describe.relationship-lookup.selection-tab.title": "Search Results",
   "submission.sections.describe.relationship-lookup.selection-tab.title": "Risultati della ricerca",
 
-  // "submission.sections.describe.relationship-lookup.name-variant.notification.content": "Would you like to save \"{{ value }}\" as a name variant for this person so you and others can reuse it for future submissions? If you don't you can still use it for this submission.",
-  // TODO Source message changed - Revise the translation
+  // "submission.sections.describe.relationship-lookup.name-variant.notification.content": "Would you like to save \"{{ value }}\" as a name variant for this person so you and others can reuse it for future submissions? If you don\'t you can still use it for this submission.",
   "submission.sections.describe.relationship-lookup.name-variant.notification.content": "Desideri salvare \"{{ value }}\" come variante del nome per questa persona in modo che tu e altri possiate riutilizzarlo per immissioni future? Se non lo fai, puoi comunque usarlo per questa immissione.",
 
   // "submission.sections.describe.relationship-lookup.name-variant.notification.confirm": "Save a new name variant",
@@ -6920,8 +6575,7 @@
   "submission.sections.ccLicense.option.select": "Seleziona un'opzione...",
 
   // "submission.sections.ccLicense.link": "You’ve selected the following license:",
-  // TODO New key - Add a translation
-  "submission.sections.ccLicense.link": "You’ve selected the following license:",
+  "submission.sections.ccLicense.link": "Hai selezionato la seguente licenza:",
 
   // "submission.sections.ccLicense.confirmation": "I grant the license above",
   "submission.sections.ccLicense.confirmation": "Concedo la licenza di cui sopra",
@@ -6930,14 +6584,13 @@
   "submission.sections.general.add-more": "Aggiungi altro",
 
   // "submission.sections.general.cannot_deposit": "Deposit cannot be completed due to errors in the form.<br>Please fill out all required fields to complete the deposit.",
-  // TODO New key - Add a translation
-  "submission.sections.general.cannot_deposit": "Deposit cannot be completed due to errors in the form.<br>Please fill out all required fields to complete the deposit.",
+  "submission.sections.general.cannot_deposit": "L'immissione non può essere competata a causa di errori nel modulo.<br> Si prega di compilare tutti i campi obbligatori.",
 
   // "submission.sections.general.collection": "Collection",
-  "submission.sections.general.collection": "collezione",
+  "submission.sections.general.collection": "Collezione",
 
   // "submission.sections.general.deposit_error_notice": "There was an issue when submitting the item, please try again later.",
-  "submission.sections.general.deposit_error_notice": "Si è verificato un problema durante l'immissione dell'articolo, riprova più tardi.",
+  "submission.sections.general.deposit_error_notice": "Si è verificato un problema durante l'immissione dell'item, riprova più tardi.",
 
   // "submission.sections.general.deposit_success_notice": "Submission deposited successfully.",
   "submission.sections.general.deposit_success_notice": "Immissione depositata con successo.",
@@ -6960,8 +6613,7 @@
   // "submission.sections.general.no-sections": "No options available",
   "submission.sections.general.no-sections": "Nessuna opzione disponibile",
 
-  // "submission.sections.general.save_error_notice": "There was an issue when saving the item, please try again later.",
-  // TODO Source message changed - Revise the translation
+  // "submission.sections.general.save_error_notice": "There was an unexpected error when saving the item. Refresh the page and try again. After refreshing unsaved modifications could be lost.",
   "submission.sections.general.save_error_notice": "Si è verificato un errore imprevisto durante il salvataggio dell'item. Aggiorna la pagina e riprova. Dopo aver aggiornato le modifiche non salvate potrebbero andare perse.",
 
   // "submission.sections.general.save_success_notice": "Submission saved successfully.",
@@ -6974,28 +6626,22 @@
   "submission.sections.general.sections_not_valid": "Ci sono sezioni incomplete.",
 
   // "submission.sections.identifiers.info": "The following identifiers will be created for your item:",
-  // TODO New key - Add a translation
-  "submission.sections.identifiers.info": "The following identifiers will be created for your item:",
+  "submission.sections.identifiers.info": "Per questo item saranno generati i seguenti identificativi:",
 
   // "submission.sections.identifiers.no_handle": "No handles have been minted for this item.",
-  // TODO New key - Add a translation
-  "submission.sections.identifiers.no_handle": "No handles have been minted for this item.",
+  "submission.sections.identifiers.no_handle": "Non sono stati generati handle per questo item.",
 
   // "submission.sections.identifiers.no_doi": "No DOIs have been minted for this item.",
-  // TODO New key - Add a translation
-  "submission.sections.identifiers.no_doi": "No DOIs have been minted for this item.",
+  "submission.sections.identifiers.no_doi": "Non sono stati generati DOI per questo item.",
 
   // "submission.sections.identifiers.handle_label": "Handle: ",
-  // TODO New key - Add a translation
   "submission.sections.identifiers.handle_label": "Handle: ",
 
   // "submission.sections.identifiers.doi_label": "DOI: ",
-  // TODO New key - Add a translation
   "submission.sections.identifiers.doi_label": "DOI: ",
 
   // "submission.sections.identifiers.otherIdentifiers_label": "Other identifiers: ",
-  // TODO New key - Add a translation
-  "submission.sections.identifiers.otherIdentifiers_label": "Other identifiers: ",
+  "submission.sections.identifiers.otherIdentifiers_label": "Altri identificativi: ",
 
   // "submission.sections.submit.progressbar.accessCondition": "Item access conditions",
   "submission.sections.submit.progressbar.accessCondition": "Condizioni di accesso all'item",
@@ -7019,27 +6665,23 @@
   "submission.sections.submit.progressbar.detect-duplicate": "Potenziali duplicati",
 
   // "submission.sections.submit.progressbar.identifiers": "Identifiers",
-  // TODO New key - Add a translation
-  "submission.sections.submit.progressbar.identifiers": "Identifiers",
+  "submission.sections.submit.progressbar.identifiers": "Identificativi",
 
   // "submission.sections.submit.progressbar.license": "Deposit license",
   "submission.sections.submit.progressbar.license": "Licenza di deposito",
 
   // "submission.sections.submit.progressbar.sherpapolicy": "Sherpa policies",
-  // TODO New key - Add a translation
-  "submission.sections.submit.progressbar.sherpapolicy": "Sherpa policies",
+  "submission.sections.submit.progressbar.sherpapolicy": "Policy di Sherpa",
 
   // "submission.sections.submit.progressbar.upload": "Upload files",
   "submission.sections.submit.progressbar.upload": "Carica file",
 
   // "submission.sections.submit.progressbar.sherpaPolicies": "Publisher open access policy information",
-  // TODO New key - Add a translation
-  "submission.sections.submit.progressbar.sherpaPolicies": "Publisher open access policy information",
+  "submission.sections.submit.progressbar.sherpaPolicies": "Informazioni sulla policy di open access dell'editore",
 
 
   // "submission.sections.sherpa-policy.title-empty": "No publisher policy information available. If your work has an associated ISSN, please enter it above to see any related publisher open access policies.",
-  // TODO New key - Add a translation
-  "submission.sections.sherpa-policy.title-empty": "No publisher policy information available. If your work has an associated ISSN, please enter it above to see any related publisher open access policies.",
+  "submission.sections.sherpa-policy.title-empty": "Non sono disponibili informazioni sulle policy dell'editore. Se il lavoro ha un ISSN associato, si prega di inserirlo qui sopra per vedere le policy di open access dell'editore.",
 
   // "submission.sections.status.errors.title": "Errors",
   "submission.sections.status.errors.title": "Errori",
@@ -7060,12 +6702,10 @@
   "submission.sections.status.warnings.aria": "ha avvisi",
 
   // "submission.sections.status.info.title": "Additional Information",
-  // TODO New key - Add a translation
-  "submission.sections.status.info.title": "Additional Information",
+  "submission.sections.status.info.title": "Informazioni aggiuntive",
 
   // "submission.sections.status.info.aria": "Additional Information",
-  // TODO New key - Add a translation
-  "submission.sections.status.info.aria": "Additional Information",
+  "submission.sections.status.info.aria": "Informazioni aggiuntive",
 
   // "submission.sections.toggle.open": "Open section",
   "submission.sections.toggle.open": "Apri sezione",
@@ -7143,16 +6783,13 @@
   "submission.sections.upload.form.until-placeholder": "Fino a quando",
 
   // "submission.sections.upload.header.policy.default.nolist": "Uploaded files in the {{collectionName}} collection will be accessible according to the following group(s):",
-  // TODO New key - Add a translation
-  "submission.sections.upload.header.policy.default.nolist": "Uploaded files in the {{collectionName}} collection will be accessible according to the following group(s):",
+  "submission.sections.upload.header.policy.default.nolist": "I file caricati nella collection {{collectionName}} saranno accessibili in base ai seguenti gruppi:",
 
   // "submission.sections.upload.header.policy.default.withlist": "Please note that uploaded files in the {{collectionName}} collection will be accessible, in addition to what is explicitly decided for the single file, with the following group(s):",
-  // TODO New key - Add a translation
-  "submission.sections.upload.header.policy.default.withlist": "Please note that uploaded files in the {{collectionName}} collection will be accessible, in addition to what is explicitly decided for the single file, with the following group(s):",
+  "submission.sections.upload.header.policy.default.withlist": "Si prega di notare che i file caricati nella collection {{collectionName}} saranno accessibili, in aggiunta a quanto esplicitamente deciso per il singolo file, con i seguenti gruppi:",
 
   // "submission.sections.upload.info": "Here you will find all the files currently in the item. You can update the file metadata and access conditions or <strong>upload additional files by dragging & dropping them anywhere on the page.</strong>",
-  // TODO Source message changed - Revise the translation
-  "submission.sections.upload.info": "Qui troverai tutti i file attualmente presenti nell'articolo. È possibile aggiornare i metadati dei file e le condizioni di accesso o <fortng>upload di file aggiuntivi semplicemente trascinandoli e rilasciandoli ovunque nella pagina</strong>",
+  "submission.sections.upload.info": "Qui troverai tutti i file attualmente presenti nell'item. È possibile aggiornare i metadati dei file e le condizioni di accesso o <strong>caricare file aggiuntivi semplicemente trascinandoli e rilasciandoli ovunque nella pagina</strong>",
 
   // "submission.sections.upload.no-entry": "No",
   "submission.sections.upload.no-entry": "No",
@@ -7218,121 +6855,92 @@
   "submission.sections.accesses.form.until-placeholder": "Fino a quando",
 
   // "submission.sections.license.granted-label": "I confirm the license above",
-  // TODO New key - Add a translation
-  "submission.sections.license.granted-label": "I confirm the license above",
+  "submission.sections.license.granted-label": "Confermo la licenza di cui sopra",
 
   // "submission.sections.license.required": "You must accept the license",
-  // TODO New key - Add a translation
-  "submission.sections.license.required": "You must accept the license",
+  "submission.sections.license.required": "È necessario accettare la licenza",
 
   // "submission.sections.license.notgranted": "You must accept the license",
-  // TODO New key - Add a translation
-  "submission.sections.license.notgranted": "You must accept the license",
+  "submission.sections.license.notgranted": "È necessario accettare la licenza",
 
 
   // "submission.sections.sherpa.publication.information": "Publication information",
-  // TODO New key - Add a translation
-  "submission.sections.sherpa.publication.information": "Publication information",
+  "submission.sections.sherpa.publication.information": "Informazioni sulla pubblicazione",
 
   // "submission.sections.sherpa.publication.information.title": "Title",
-  // TODO New key - Add a translation
-  "submission.sections.sherpa.publication.information.title": "Title",
+  "submission.sections.sherpa.publication.information.title": "Titolo",
 
   // "submission.sections.sherpa.publication.information.issns": "ISSNs",
-  // TODO New key - Add a translation
-  "submission.sections.sherpa.publication.information.issns": "ISSNs",
+  "submission.sections.sherpa.publication.information.issns": "ISSN",
 
   // "submission.sections.sherpa.publication.information.url": "URL",
-  // TODO New key - Add a translation
   "submission.sections.sherpa.publication.information.url": "URL",
 
   // "submission.sections.sherpa.publication.information.publishers": "Publisher",
-  // TODO New key - Add a translation
-  "submission.sections.sherpa.publication.information.publishers": "Publisher",
+  "submission.sections.sherpa.publication.information.publishers": "Editore",
 
   // "submission.sections.sherpa.publication.information.romeoPub": "Romeo Pub",
-  // TODO New key - Add a translation
   "submission.sections.sherpa.publication.information.romeoPub": "Romeo Pub",
 
   // "submission.sections.sherpa.publication.information.zetoPub": "Zeto Pub",
-  // TODO New key - Add a translation
   "submission.sections.sherpa.publication.information.zetoPub": "Zeto Pub",
 
   // "submission.sections.sherpa.publisher.policy": "Publisher Policy",
-  // TODO New key - Add a translation
-  "submission.sections.sherpa.publisher.policy": "Publisher Policy",
+  "submission.sections.sherpa.publisher.policy": "Policy dell'editore",
 
   // "submission.sections.sherpa.publisher.policy.description": "The below information was found via Sherpa Romeo. Based on the policies of your publisher, it provides advice regarding whether an embargo may be necessary and/or which files you are allowed to upload. If you have questions, please contact your site administrator via the feedback form in the footer.",
-  // TODO New key - Add a translation
-  "submission.sections.sherpa.publisher.policy.description": "The below information was found via Sherpa Romeo. Based on the policies of your publisher, it provides advice regarding whether an embargo may be necessary and/or which files you are allowed to upload. If you have questions, please contact your site administrator via the feedback form in the footer.",
+  "submission.sections.sherpa.publisher.policy.description": "Le informazioni riportate di seguito sono state reperite tramite Sherpa Romeo. In base alle policy del vostro editore, fornisce consigli sull'eventuale necessità di un embargo e/o su quali file è possibile caricare. In caso di domande, contattare l'amministratore del sito tramite il modulo di feedback nel piè di pagina.",
 
   // "submission.sections.sherpa.publisher.policy.openaccess": "Open Access pathways permitted by this journal's policy are listed below by article version. Click on a pathway for a more detailed view",
-  // TODO New key - Add a translation
-  "submission.sections.sherpa.publisher.policy.openaccess": "Open Access pathways permitted by this journal's policy are listed below by article version. Click on a pathway for a more detailed view",
+  "submission.sections.sherpa.publisher.policy.openaccess": "I percorsi open access consentiti dalle policy di questa rivista sono elencati di seguito per versione dell'articolo. Clicca su un percorso per vederlo nel dettaglio",
 
   // "submission.sections.sherpa.publisher.policy.more.information": "For more information, please see the following links:",
-  // TODO New key - Add a translation
-  "submission.sections.sherpa.publisher.policy.more.information": "For more information, please see the following links:",
+  "submission.sections.sherpa.publisher.policy.more.information": "Per maggiori informazioni si prega di consultare il seguente link:",
 
   // "submission.sections.sherpa.publisher.policy.version": "Version",
-  // TODO New key - Add a translation
-  "submission.sections.sherpa.publisher.policy.version": "Version",
+  "submission.sections.sherpa.publisher.policy.version": "Versione",
 
   // "submission.sections.sherpa.publisher.policy.embargo": "Embargo",
-  // TODO New key - Add a translation
   "submission.sections.sherpa.publisher.policy.embargo": "Embargo",
 
   // "submission.sections.sherpa.publisher.policy.noembargo": "No Embargo",
-  // TODO New key - Add a translation
-  "submission.sections.sherpa.publisher.policy.noembargo": "No Embargo",
+  "submission.sections.sherpa.publisher.policy.noembargo": "Nessun embargo",
 
   // "submission.sections.sherpa.publisher.policy.nolocation": "None",
-  // TODO New key - Add a translation
-  "submission.sections.sherpa.publisher.policy.nolocation": "None",
+  "submission.sections.sherpa.publisher.policy.nolocation": "Nessuno",
 
   // "submission.sections.sherpa.publisher.policy.license": "License",
-  // TODO New key - Add a translation
-  "submission.sections.sherpa.publisher.policy.license": "License",
+  "submission.sections.sherpa.publisher.policy.license": "Licenza",
 
   // "submission.sections.sherpa.publisher.policy.prerequisites": "Prerequisites",
-  // TODO New key - Add a translation
-  "submission.sections.sherpa.publisher.policy.prerequisites": "Prerequisites",
+  "submission.sections.sherpa.publisher.policy.prerequisites": "Prerequisiti",
 
   // "submission.sections.sherpa.publisher.policy.location": "Location",
-  // TODO New key - Add a translation
-  "submission.sections.sherpa.publisher.policy.location": "Location",
+  "submission.sections.sherpa.publisher.policy.location": "Località",
 
   // "submission.sections.sherpa.publisher.policy.conditions": "Conditions",
-  // TODO New key - Add a translation
-  "submission.sections.sherpa.publisher.policy.conditions": "Conditions",
+  "submission.sections.sherpa.publisher.policy.conditions": "Condizioni",
 
   // "submission.sections.sherpa.publisher.policy.refresh": "Refresh",
-  // TODO New key - Add a translation
-  "submission.sections.sherpa.publisher.policy.refresh": "Refresh",
+  "submission.sections.sherpa.publisher.policy.refresh": "Ricarica",
 
   // "submission.sections.sherpa.record.information": "Record Information",
-  // TODO New key - Add a translation
-  "submission.sections.sherpa.record.information": "Record Information",
+  "submission.sections.sherpa.record.information": "Informazioni sulla registrazione",
 
   // "submission.sections.sherpa.record.information.id": "ID",
-  // TODO New key - Add a translation
   "submission.sections.sherpa.record.information.id": "ID",
 
   // "submission.sections.sherpa.record.information.date.created": "Date Created",
-  // TODO New key - Add a translation
-  "submission.sections.sherpa.record.information.date.created": "Date Created",
+  "submission.sections.sherpa.record.information.date.created": "Data di creazione",
 
   // "submission.sections.sherpa.record.information.date.modified": "Last Modified",
-  // TODO New key - Add a translation
-  "submission.sections.sherpa.record.information.date.modified": "Last Modified",
+  "submission.sections.sherpa.record.information.date.modified": "Ultima modifica",
 
   // "submission.sections.sherpa.record.information.uri": "URI",
-  // TODO New key - Add a translation
   "submission.sections.sherpa.record.information.uri": "URI",
 
   // "submission.sections.sherpa.error.message": "There was an error retrieving sherpa informations",
-  // TODO New key - Add a translation
-  "submission.sections.sherpa.error.message": "There was an error retrieving sherpa informations",
+  "submission.sections.sherpa.error.message": "Si è verificato un errore nel recuperare le informazioni da Sherpa",
 
 
 
@@ -7347,8 +6955,7 @@
   // "submission.workflow.generic.delete": "Delete",
   "submission.workflow.generic.delete": "Elimina",
 
-  // "submission.workflow.generic.delete-help": "Select this option to discard this item. You will then be asked to confirm it.",
-  // TODO Source message changed - Revise the translation
+  // "submission.workflow.generic.delete-help": "If you would to discard this item, select \"Delete\".  You will then be asked to confirm it.",
   "submission.workflow.generic.delete-help": "Se si desidera eliminare questo item, selezionare \"Elimina\".  Ti verrà quindi chiesto di confermarlo.",
 
   // "submission.workflow.generic.edit": "Edit",
@@ -7365,20 +6972,16 @@
 
 
   // "submission.workflow.generic.submit_select_reviewer": "Select Reviewer",
-  // TODO New key - Add a translation
-  "submission.workflow.generic.submit_select_reviewer": "Select Reviewer",
+  "submission.workflow.generic.submit_select_reviewer": "Seleziona revisore",
 
   // "submission.workflow.generic.submit_select_reviewer-help": "",
-  // TODO New key - Add a translation
   "submission.workflow.generic.submit_select_reviewer-help": "",
 
 
   // "submission.workflow.generic.submit_score": "Rate",
-  // TODO New key - Add a translation
-  "submission.workflow.generic.submit_score": "Rate",
+  "submission.workflow.generic.submit_score": "Valuta",
 
   // "submission.workflow.generic.submit_score-help": "",
-  // TODO New key - Add a translation
   "submission.workflow.generic.submit_score-help": "",
 
 
@@ -7395,11 +6998,9 @@
   "submission.workflow.tasks.claimed.edit_help": "Selezionare questa opzione per modificare i metadati dell'item.",
 
   // "submission.workflow.tasks.claimed.decline": "Decline",
-  // TODO New key - Add a translation
-  "submission.workflow.tasks.claimed.decline": "Decline",
+  "submission.workflow.tasks.claimed.decline": "Rifiuta",
 
   // "submission.workflow.tasks.claimed.decline_help": "",
-  // TODO New key - Add a translation
   "submission.workflow.tasks.claimed.decline_help": "",
 
   // "submission.workflow.tasks.claimed.reject.reason.info": "Please enter your reason for rejecting the submission into the box below, indicating whether the submitter may fix a problem and resubmit.",
@@ -7490,72 +7091,55 @@
   "subscriptions.frequency.W": "Settimanale",
 
   // "subscriptions.tooltip": "Subscribe",
-  // TODO New key - Add a translation
-  "subscriptions.tooltip": "Subscribe",
+  "subscriptions.tooltip": "Sottoscrivi",
 
   // "subscriptions.modal.title": "Subscriptions",
-  // TODO New key - Add a translation
-  "subscriptions.modal.title": "Subscriptions",
+  "subscriptions.modal.title": "Sottoscrizioni",
 
   // "subscriptions.modal.type-frequency": "Type and frequency",
-  // TODO New key - Add a translation
-  "subscriptions.modal.type-frequency": "Type and frequency",
+  "subscriptions.modal.type-frequency": "Tipo e frequenza",
 
   // "subscriptions.modal.close": "Close",
-  // TODO New key - Add a translation
-  "subscriptions.modal.close": "Close",
+  "subscriptions.modal.close": "Chiudi",
 
   // "subscriptions.modal.delete-info": "To remove this subscription, please visit the \"Subscriptions\" page under your user profile",
-  // TODO New key - Add a translation
-  "subscriptions.modal.delete-info": "To remove this subscription, please visit the \"Subscriptions\" page under your user profile",
+  "subscriptions.modal.delete-info": "Per rimuovere questa sottoscrizione si prega di visitare la pagina \"Sottoscrizioni\" nel proprio profilo utente",
 
   // "subscriptions.modal.new-subscription-form.type.content": "Content",
-  // TODO New key - Add a translation
-  "subscriptions.modal.new-subscription-form.type.content": "Content",
+  "subscriptions.modal.new-subscription-form.type.content": "Contenuto",
 
   // "subscriptions.modal.new-subscription-form.frequency.D": "Daily",
-  // TODO New key - Add a translation
-  "subscriptions.modal.new-subscription-form.frequency.D": "Daily",
+  "subscriptions.modal.new-subscription-form.frequency.D": "Giornaliero",
 
   // "subscriptions.modal.new-subscription-form.frequency.W": "Weekly",
-  // TODO New key - Add a translation
-  "subscriptions.modal.new-subscription-form.frequency.W": "Weekly",
+  "subscriptions.modal.new-subscription-form.frequency.W": "Settimanale",
 
   // "subscriptions.modal.new-subscription-form.frequency.M": "Monthly",
-  // TODO New key - Add a translation
-  "subscriptions.modal.new-subscription-form.frequency.M": "Monthly",
+  "subscriptions.modal.new-subscription-form.frequency.M": "Mensile",
 
   // "subscriptions.modal.new-subscription-form.submit": "Submit",
-  // TODO New key - Add a translation
-  "subscriptions.modal.new-subscription-form.submit": "Submit",
+  "subscriptions.modal.new-subscription-form.submit": "Invia",
 
   // "subscriptions.modal.new-subscription-form.processing": "Processing...",
-  // TODO New key - Add a translation
-  "subscriptions.modal.new-subscription-form.processing": "Processing...",
+  "subscriptions.modal.new-subscription-form.processing": "Elaborazione...",
 
   // "subscriptions.modal.create.success": "Subscribed to {{ type }} successfully.",
-  // TODO New key - Add a translation
-  "subscriptions.modal.create.success": "Subscribed to {{ type }} successfully.",
+  "subscriptions.modal.create.success": "Sottoscrzione a {{ type }} avvenuta con successo.",
 
   // "subscriptions.modal.delete.success": "Subscription deleted successfully",
-  // TODO New key - Add a translation
-  "subscriptions.modal.delete.success": "Subscription deleted successfully",
+  "subscriptions.modal.delete.success": "Sottoscrizione eliminata con successo",
 
   // "subscriptions.modal.update.success": "Subscription to {{ type }} updated successfully",
-  // TODO New key - Add a translation
-  "subscriptions.modal.update.success": "Subscription to {{ type }} updated successfully",
+  "subscriptions.modal.update.success": "Sottoscrizione a {{ type }} aggiornata con successo",
 
   // "subscriptions.modal.create.error": "An error occurs during the subscription creation",
-  // TODO New key - Add a translation
-  "subscriptions.modal.create.error": "An error occurs during the subscription creation",
+  "subscriptions.modal.create.error": "Si è verificato un errore durante la creazione della sottoscrizione",
 
   // "subscriptions.modal.delete.error": "An error occurs during the subscription delete",
-  // TODO New key - Add a translation
-  "subscriptions.modal.delete.error": "An error occurs during the subscription delete",
+  "subscriptions.modal.delete.error": "Si è verificato un errore durante l'eliminazione della sottoscrizione",
 
   // "subscriptions.modal.update.error": "An error occurs during the subscription update",
-  // TODO New key - Add a translation
-  "subscriptions.modal.update.error": "An error occurs during the subscription update",
+  "subscriptions.modal.update.error": "Si è verificato un errore durante l'aggiornamento della sottoscrizione",
 
   // "subscriptions.table.dso": "Subject",
   "subscriptions.table.dso": "Oggetto",
@@ -7570,24 +7154,19 @@
   "subscriptions.table.action": "Azione",
 
   // "subscriptions.table.edit": "Edit",
-  // TODO New key - Add a translation
-  "subscriptions.table.edit": "Edit",
+  "subscriptions.table.edit": "Modifica",
 
   // "subscriptions.table.delete": "Delete",
-  // TODO New key - Add a translation
-  "subscriptions.table.delete": "Delete",
+  "subscriptions.table.delete": "Elimina",
 
   // "subscriptions.table.not-available": "Not available",
-  // TODO New key - Add a translation
-  "subscriptions.table.not-available": "Not available",
+  "subscriptions.table.not-available": "Non disponibile",
 
   // "subscriptions.table.not-available-message": "The subscribed item has been deleted, or you don't currently have the permission to view it",
-  // TODO New key - Add a translation
-  "subscriptions.table.not-available-message": "The subscribed item has been deleted, or you don't currently have the permission to view it",
+  "subscriptions.table.not-available-message": "L'elemento sottoscritto è stato cancellato o non si ha l'autorizzazione per visualizzarlo.",
 
   // "subscriptions.table.empty.message": "You do not have any subscriptions at this time. To subscribe to email updates for a Community or Collection, use the subscription button on the object's page.",
-  // TODO Source message changed - Revise the translation
-  "subscriptions.table.empty.message": "Non hai ancora sottoscritto alcuna notifica. Per sottoscrivere la notifica relativa a un oggetto, usa il menu contestuale nella pagina di dettaglio dell'oggetto",
+  "subscriptions.table.empty.message": "Al momento non ci sono sottoscrizioni. Per ricevere aggiornamenti via e-mail di una Community o di una Collection, utilizzare il pulsante di sottoscrizione sulla pagina dell'oggetto",
 
 
   // "thumbnail.default.alt": "Thumbnail Image",
@@ -7643,8 +7222,7 @@
   "vocabulary-treeview.tree.description.srsc": "Categorie di argomenti di ricerca",
 
   // "vocabulary-treeview.info": "Select a subject to add as search filter",
-  // TODO New key - Add a translation
-  "vocabulary-treeview.info": "Select a subject to add as search filter",
+  "vocabulary-treeview.info": "Seleziona un soggetto da aggiungere come filtro di ricerca",
 
   // "uploader.browse": "browse",
   "uploader.browse": "sfoglia",
@@ -7659,8 +7237,7 @@
   "uploader.or": ", oppure ",
 
   // "uploader.processing": "Processing uploaded file(s)... (it's now safe to close this page)",
-  // TODO Source message changed - Revise the translation
-  "uploader.processing": "Elaborazione",
+  "uploader.processing": "Elaborazione dei file caricati... (è ora possibile chiudere questa pagina)",
 
   // "uploader.queue-length": "Queue length",
   "uploader.queue-length": "Lunghezza coda",
@@ -7677,8 +7254,7 @@
 
 
   // "supervisedWorkspace.search.results.head": "Supervised Items",
-  // TODO New key - Add a translation
-  "supervisedWorkspace.search.results.head": "Supervised Items",
+  "supervisedWorkspace.search.results.head": "Item supervisionati",
 
   // "workspace.search.results.head": "Your submissions",
   "workspace.search.results.head": "I tuoi invii",
@@ -7690,8 +7266,7 @@
   "workflow.search.results.head": "Task del workflow",
 
   // "supervision.search.results.head": "Workflow and Workspace tasks",
-  // TODO New key - Add a translation
-  "supervision.search.results.head": "Workflow and Workspace tasks",
+  "supervision.search.results.head": "Task del workflow e del workspace",
 
 
 
@@ -7761,74 +7336,57 @@
 
 
   // "workflow-item.advanced.title": "Advanced workflow",
-  // TODO New key - Add a translation
-  "workflow-item.advanced.title": "Advanced workflow",
+  "workflow-item.advanced.title": "Workflow avanzato",
 
 
   // "workflow-item.selectrevieweraction.notification.success.title": "Selected reviewer",
-  // TODO New key - Add a translation
-  "workflow-item.selectrevieweraction.notification.success.title": "Selected reviewer",
+  "workflow-item.selectrevieweraction.notification.success.title": "Revisore selezionato",
 
   // "workflow-item.selectrevieweraction.notification.success.content": "The reviewer for this workflow item has been successfully selected",
-  // TODO New key - Add a translation
-  "workflow-item.selectrevieweraction.notification.success.content": "The reviewer for this workflow item has been successfully selected",
+  "workflow-item.selectrevieweraction.notification.success.content": "Il revisore per questo item nel workflow è stato selezionato con successo",
 
   // "workflow-item.selectrevieweraction.notification.error.title": "Something went wrong",
-  // TODO New key - Add a translation
-  "workflow-item.selectrevieweraction.notification.error.title": "Something went wrong",
+  "workflow-item.selectrevieweraction.notification.error.title": "Qualcosa è andato storto",
 
   // "workflow-item.selectrevieweraction.notification.error.content": "Couldn't select the reviewer for this workflow item",
-  // TODO New key - Add a translation
-  "workflow-item.selectrevieweraction.notification.error.content": "Couldn't select the reviewer for this workflow item",
+  "workflow-item.selectrevieweraction.notification.error.content": "Non è stato possibile selezionare il revisore per questo item nel workflow",
 
   // "workflow-item.selectrevieweraction.title": "Select Reviewer",
-  // TODO New key - Add a translation
-  "workflow-item.selectrevieweraction.title": "Select Reviewer",
+  "workflow-item.selectrevieweraction.title": "Seleziona revisore",
 
   // "workflow-item.selectrevieweraction.header": "Select Reviewer",
-  // TODO New key - Add a translation
-  "workflow-item.selectrevieweraction.header": "Select Reviewer",
+  "workflow-item.selectrevieweraction.header": "Seleziona revisore",
 
   // "workflow-item.selectrevieweraction.button.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "workflow-item.selectrevieweraction.button.cancel": "Cancel",
+  "workflow-item.selectrevieweraction.button.cancel": "Annulla",
 
   // "workflow-item.selectrevieweraction.button.confirm": "Confirm",
-  // TODO New key - Add a translation
-  "workflow-item.selectrevieweraction.button.confirm": "Confirm",
+  "workflow-item.selectrevieweraction.button.confirm": "Conferma",
 
 
   // "workflow-item.scorereviewaction.notification.success.title": "Rating review",
-  // TODO New key - Add a translation
-  "workflow-item.scorereviewaction.notification.success.title": "Rating review",
+  "workflow-item.scorereviewaction.notification.success.title": "Valuta revisione",
 
   // "workflow-item.scorereviewaction.notification.success.content": "The rating for this item workflow item has been successfully submitted",
-  // TODO New key - Add a translation
-  "workflow-item.scorereviewaction.notification.success.content": "The rating for this item workflow item has been successfully submitted",
+  "workflow-item.scorereviewaction.notification.success.content": "La valutazione per il workflow di questo item è stata inserita con successo",
 
   // "workflow-item.scorereviewaction.notification.error.title": "Something went wrong",
-  // TODO New key - Add a translation
-  "workflow-item.scorereviewaction.notification.error.title": "Something went wrong",
+  "workflow-item.scorereviewaction.notification.error.title": "Qualcosa è andato storto",
 
   // "workflow-item.scorereviewaction.notification.error.content": "Couldn't rate this item",
-  // TODO New key - Add a translation
-  "workflow-item.scorereviewaction.notification.error.content": "Couldn't rate this item",
+  "workflow-item.scorereviewaction.notification.error.content": "Non è stato possibile valutare questo item",
 
   // "workflow-item.scorereviewaction.title": "Rate this item",
-  // TODO New key - Add a translation
-  "workflow-item.scorereviewaction.title": "Rate this item",
+  "workflow-item.scorereviewaction.title": "Valuta questo item",
 
   // "workflow-item.scorereviewaction.header": "Rate this item",
-  // TODO New key - Add a translation
-  "workflow-item.scorereviewaction.header": "Rate this item",
+  "workflow-item.scorereviewaction.header": "Valuta questo item",
 
   // "workflow-item.scorereviewaction.button.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "workflow-item.scorereviewaction.button.cancel": "Cancel",
+  "workflow-item.scorereviewaction.button.cancel": "Annulla",
 
   // "workflow-item.scorereviewaction.button.confirm": "Confirm",
-  // TODO New key - Add a translation
-  "workflow-item.scorereviewaction.button.confirm": "Confirm",
+  "workflow-item.scorereviewaction.button.confirm": "Conferma",
 
   // "idle-modal.header": "Session will expire soon",
   "idle-modal.header": "La sessione scadrà presto",
@@ -7843,7 +7401,6 @@
   "idle-modal.extend-session": "Estendi sessione",
 
   // "researcher.profile.action.processing": "Processing...",
-  // TODO Source message changed - Revise the translation
   "researcher.profile.action.processing": "Elaborazione...",
 
   // "researcher.profile.associated": "Researcher profile associated",
@@ -7877,11 +7434,9 @@
   "researcher.profile.view": "Visualizza",
 
   // "researcher.profile.private.visibility": "PRIVATE",
-  // TODO Source message changed - Revise the translation
   "researcher.profile.private.visibility": "PRIVATO",
 
   // "researcher.profile.public.visibility": "PUBLIC",
-  // TODO Source message changed - Revise the translation
   "researcher.profile.public.visibility": "PUBBLICO",
 
   // "researcher.profile.status": "Status:",
@@ -7891,19 +7446,15 @@
   "researcherprofile.claim.not-authorized": "Non sei autorizzato a richiedere questo item. Per maggiori dettagli contattare l'amministratore/i",
 
   // "researcherprofile.error.claim.body": "An error occurred while claiming the profile, please try again later",
-  // TODO Source message changed - Revise the translation
   "researcherprofile.error.claim.body": "Si è verificato un errore durante l'associazione del profilo, prova più tardi",
 
   // "researcherprofile.error.claim.title": "Error",
-  // TODO Source message changed - Revise the translation
   "researcherprofile.error.claim.title": "Errore",
 
   // "researcherprofile.success.claim.body": "Profile claimed with success",
-  // TODO Source message changed - Revise the translation
   "researcherprofile.success.claim.body": "Profilo associato con successo",
 
   // "researcherprofile.success.claim.title": "Success",
-  // TODO Source message changed - Revise the translation
   "researcherprofile.success.claim.title": "Successo",
 
   // "person.page.orcid.create": "Create an ORCID ID",
@@ -7913,7 +7464,6 @@
   "person.page.orcid.granted-authorizations": "Autorizzazioni concesse",
 
   // "person.page.orcid.grant-authorizations": "Grant authorizations",
-  // TODO Source message changed - Revise the translation
   "person.page.orcid.grant-authorizations": "Concedere autorizzazioni",
 
   // "person.page.orcid.link": "Connect to ORCID ID",
@@ -7962,55 +7512,42 @@
   "person.page.orcid.save.preference.changes": "Impostazioni di aggiornamento",
 
   // "person.page.orcid.sync-profile.affiliation": "Affiliation",
-  // TODO Source message changed - Revise the translation
   "person.page.orcid.sync-profile.affiliation": "Affiliazione",
 
   // "person.page.orcid.sync-profile.biographical": "Biographical data",
-  // TODO Source message changed - Revise the translation
   "person.page.orcid.sync-profile.biographical": "Riferimenti biografici",
 
   // "person.page.orcid.sync-profile.education": "Education",
-  // TODO Source message changed - Revise the translation
   "person.page.orcid.sync-profile.education": "Educazione",
 
   // "person.page.orcid.sync-profile.identifiers": "Identifiers",
-  // TODO Source message changed - Revise the translation
   "person.page.orcid.sync-profile.identifiers": "Identificativi",
 
   // "person.page.orcid.sync-fundings.all": "All fundings",
-  // TODO Source message changed - Revise the translation
   "person.page.orcid.sync-fundings.all": "Tutti i finanziamenti",
 
   // "person.page.orcid.sync-fundings.mine": "My fundings",
-  // TODO Source message changed - Revise the translation
   "person.page.orcid.sync-fundings.mine": "I miei finanziamenti",
 
   // "person.page.orcid.sync-fundings.my_selected": "Selected fundings",
-  // TODO Source message changed - Revise the translation
   "person.page.orcid.sync-fundings.my_selected": "Finanziamenti selezionati",
 
   // "person.page.orcid.sync-fundings.disabled": "Disabled",
-  // TODO Source message changed - Revise the translation
   "person.page.orcid.sync-fundings.disabled": "Disabilitato",
 
   // "person.page.orcid.sync-publications.all": "All publications",
-  // TODO Source message changed - Revise the translation
   "person.page.orcid.sync-publications.all": "Tutte le pubblicazioni",
 
   // "person.page.orcid.sync-publications.mine": "My publications",
-  // TODO Source message changed - Revise the translation
   "person.page.orcid.sync-publications.mine": "Le mie pubblicazioni",
 
   // "person.page.orcid.sync-publications.my_selected": "Selected publications",
-  // TODO Source message changed - Revise the translation
   "person.page.orcid.sync-publications.my_selected": "Pubblicazioni selezionate",
 
   // "person.page.orcid.sync-publications.disabled": "Disabled",
-  // TODO Source message changed - Revise the translation
   "person.page.orcid.sync-publications.disabled": "Disabilitato",
 
   // "person.page.orcid.sync-queue.discard": "Discard the change and do not synchronize with the ORCID registry",
-  // TODO Source message changed - Revise the translation
   "person.page.orcid.sync-queue.discard": "Scarta la modifica e non sincronizzarla con il registro ORCID.",
 
   // "person.page.orcid.sync-queue.discard.error": "The discarding of the ORCID queue record failed",
@@ -8023,15 +7560,12 @@
   "person.page.orcid.sync-queue.empty-message": "Il Registro di sistema della coda ORCID è vuoto",
 
   // "person.page.orcid.sync-queue.table.header.type": "Type",
-  // TODO Source message changed - Revise the translation
   "person.page.orcid.sync-queue.table.header.type": "Tipo",
 
   // "person.page.orcid.sync-queue.table.header.description": "Description",
-  // TODO Source message changed - Revise the translation
   "person.page.orcid.sync-queue.table.header.description": "Descrizione",
 
   // "person.page.orcid.sync-queue.table.header.action": "Action",
-  // TODO Source message changed - Revise the translation
   "person.page.orcid.sync-queue.table.header.action": "Azione",
 
   // "person.page.orcid.sync-queue.description.affiliation": "Affiliations",
@@ -8098,7 +7632,6 @@
   "person.page.orcid.sync-queue.tooltip.researcher_urls": "URL ricercatore",
 
   // "person.page.orcid.sync-queue.send": "Synchronize with ORCID registry",
-  // TODO Source message changed - Revise the translation
   "person.page.orcid.sync-queue.send": "Sincronizza con il registro ORCID",
 
   // "person.page.orcid.sync-queue.send.unauthorized-error.title": "The submission to ORCID failed for missing authorizations.",
@@ -8135,7 +7668,6 @@
   "person.page.orcid.sync-queue.send.validation-error.title.required": "Il titolo è obbligatorio",
 
   // "person.page.orcid.sync-queue.send.validation-error.type.required": "The dc.type is required",
-  // TODO Source message changed - Revise the translation
   "person.page.orcid.sync-queue.send.validation-error.type.required": "Il tipo è obbligatorio",
 
   // "person.page.orcid.sync-queue.send.validation-error.start-date.required": "The start date is required",
@@ -8154,7 +7686,6 @@
   "person.page.orcid.sync-queue.send.validation-error.organization.name-required": "Il nome dell'organizzazione è obbligatorio",
 
   // "person.page.orcid.sync-queue.send.validation-error.publication.date-invalid": "The publication date must be one year after 1900",
-  // TODO Source message changed - Revise the translation
   "person.page.orcid.sync-queue.send.validation-error.publication.date-invalid": "La data di pubblicazione deve partire dal 1900",
 
   // "person.page.orcid.sync-queue.send.validation-error.organization.address-required": "The organization to be sent requires an address",
@@ -8164,7 +7695,6 @@
   "person.page.orcid.sync-queue.send.validation-error.organization.city-required": "L'indirizzo dell'organizzazione da inviare richiede una città",
 
   // "person.page.orcid.sync-queue.send.validation-error.organization.country-required": "The address of the organization to be sent requires a valid 2 digits ISO 3166 country",
-  // TODO Source message changed - Revise the translation
   "person.page.orcid.sync-queue.send.validation-error.organization.country-required": "L'indirizzo dell'organizzazione da inviare richiede un paese (inserire 2 cifre secondo l'ISO 3166)",
 
   // "person.page.orcid.sync-queue.send.validation-error.disambiguated-organization.required": "An identifier to disambiguate organizations is required. Supported ids are GRID, Ringgold, Legal Entity identifiers (LEIs) and Crossref Funder Registry identifiers",
@@ -8189,8 +7719,7 @@
   "person.page.orcid.synchronization-mode.label": "Sincronizzazione",
 
   // "person.page.orcid.synchronization-mode-message": "Please select how you would like synchronization to ORCID to occur. The options include \"Manual\" (you must send your data to ORCID manually), or \"Batch\" (the system will send your data to ORCID via a scheduled script).",
-  // TODO Source message changed - Revise the translation
-  "person.page.orcid.synchronization-mode-message": "Abilitare la modalità di sincronizzazione \"manuale\" per disabilitare la sincronizzazione batch in modo da dover inviare manualmente i dati al Registro ORCID",
+  "person.page.orcid.synchronization-mode-message": "Selezionare la modalità di sincronizzazione con ORCID. Le opzioni includono 'Manuale' (sarà necessario inviare i dati a ORCID manualmente) o 'Batch' (il sistema invierà i dati a ORCID tramite uno script programmato).",
 
   // "person.page.orcid.synchronization-mode-funding-message": "Select whether to send your linked Project entities to your ORCID record's list of funding information.",
   "person.page.orcid.synchronization-mode-funding-message": "Scegli se sincronizzare i tuoi Progetti con la lista delle informazioni dei progetti sul profilo ORCID.",
@@ -8237,107 +7766,80 @@
   // "person.orcid.registry.auth": "ORCID Authorizations",
   "person.orcid.registry.auth": "Autorizzazioni ORCID",
   // "home.recent-submissions.head": "Recent Submissions",
-  // TODO New key - Add a translation
-  "home.recent-submissions.head": "Recent Submissions",
+  "home.recent-submissions.head": "Immissioni recenti",
 
   // "listable-notification-object.default-message": "This object couldn't be retrieved",
-  // TODO New key - Add a translation
-  "listable-notification-object.default-message": "This object couldn't be retrieved",
+  "listable-notification-object.default-message": "Questo oggetto non può essere recuperato",
 
 
   // "system-wide-alert-banner.retrieval.error": "Something went wrong retrieving the system-wide alert banner",
-  // TODO New key - Add a translation
-  "system-wide-alert-banner.retrieval.error": "Something went wrong retrieving the system-wide alert banner",
+  "system-wide-alert-banner.retrieval.error": "Qualcosa è andato storto nel recupero del banner di allarme di sistema",
 
   // "system-wide-alert-banner.countdown.prefix": "In",
-  // TODO New key - Add a translation
-  "system-wide-alert-banner.countdown.prefix": "In",
+  "system-wide-alert-banner.countdown.prefix": "Tra",
 
   // "system-wide-alert-banner.countdown.days": "{{days}} day(s),",
-  // TODO New key - Add a translation
-  "system-wide-alert-banner.countdown.days": "{{days}} day(s),",
+  "system-wide-alert-banner.countdown.days": "{{days}} giorni,",
 
   // "system-wide-alert-banner.countdown.hours": "{{hours}} hour(s) and",
-  // TODO New key - Add a translation
-  "system-wide-alert-banner.countdown.hours": "{{hours}} hour(s) and",
+  "system-wide-alert-banner.countdown.hours": "{{hours}} ore e",
 
   // "system-wide-alert-banner.countdown.minutes": "{{minutes}} minute(s):",
-  // TODO New key - Add a translation
-  "system-wide-alert-banner.countdown.minutes": "{{minutes}} minute(s):",
-
-
+  "system-wide-alert-banner.countdown.minutes": "{{minutes}} minuti:",
 
   // "menu.section.system-wide-alert": "System-wide Alert",
-  // TODO New key - Add a translation
-  "menu.section.system-wide-alert": "System-wide Alert",
+  "menu.section.system-wide-alert": "Allarme di sistema",
 
   // "system-wide-alert.form.header": "System-wide Alert",
-  // TODO New key - Add a translation
-  "system-wide-alert.form.header": "System-wide Alert",
+  "system-wide-alert.form.header": "Allarme di sistema",
 
   // "system-wide-alert-form.retrieval.error": "Something went wrong retrieving the system-wide alert",
-  // TODO New key - Add a translation
-  "system-wide-alert-form.retrieval.error": "Something went wrong retrieving the system-wide alert",
+  "system-wide-alert-form.retrieval.error": "Qualcosa è andato storto nel recupero dell'allarme di sistema",
 
   // "system-wide-alert.form.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "system-wide-alert.form.cancel": "Cancel",
+  "system-wide-alert.form.cancel": "Annulla",
 
   // "system-wide-alert.form.save": "Save",
-  // TODO New key - Add a translation
-  "system-wide-alert.form.save": "Save",
+  "system-wide-alert.form.save": "Salva",
 
   // "system-wide-alert.form.label.active": "ACTIVE",
-  // TODO New key - Add a translation
-  "system-wide-alert.form.label.active": "ACTIVE",
+  "system-wide-alert.form.label.active": "ATTIVO",
 
   // "system-wide-alert.form.label.inactive": "INACTIVE",
-  // TODO New key - Add a translation
-  "system-wide-alert.form.label.inactive": "INACTIVE",
+  "system-wide-alert.form.label.inactive": "DISATTIVO",
 
   // "system-wide-alert.form.error.message": "The system wide alert must have a message",
-  // TODO New key - Add a translation
-  "system-wide-alert.form.error.message": "The system wide alert must have a message",
+  "system-wide-alert.form.error.message": "L'allarme di sistema deve avere un messaggio",
 
   // "system-wide-alert.form.label.message": "Alert message",
-  // TODO New key - Add a translation
-  "system-wide-alert.form.label.message": "Alert message",
+  "system-wide-alert.form.label.message": "Messaggio di allarme",
 
   // "system-wide-alert.form.label.countdownTo.enable": "Enable a countdown timer",
-  // TODO New key - Add a translation
-  "system-wide-alert.form.label.countdownTo.enable": "Enable a countdown timer",
+  "system-wide-alert.form.label.countdownTo.enable": "Attiva un conto alla rovescia",
 
   // "system-wide-alert.form.label.countdownTo.hint": "Hint: Set a countdown timer. When enabled, a date can be set in the future and the system-wide alert banner will perform a countdown to the set date. When this timer ends, it will disappear from the alert. The server will NOT be automatically stopped.",
-  // TODO New key - Add a translation
-  "system-wide-alert.form.label.countdownTo.hint": "Hint: Set a countdown timer. When enabled, a date can be set in the future and the system-wide alert banner will perform a countdown to the set date. When this timer ends, it will disappear from the alert. The server will NOT be automatically stopped.",
+  "system-wide-alert.form.label.countdownTo.hint": "Suggerimento: Imposta un conto alla rovescia. Se abilitato, è possibile impostare una data futura e il banner di allarme di sistema eseguirà un conto alla rovescia fino alla data impostata. Quando il timer terminerà, l'avviso scomparirà. Il server NON verrà arrestato automaticamente.",
 
   // "system-wide-alert.form.label.preview": "System-wide alert preview",
-  // TODO New key - Add a translation
-  "system-wide-alert.form.label.preview": "System-wide alert preview",
+  "system-wide-alert.form.label.preview": "Anteprima dell'allarme di sistema",
 
   // "system-wide-alert.form.update.success": "The system-wide alert was successfully updated",
-  // TODO New key - Add a translation
-  "system-wide-alert.form.update.success": "The system-wide alert was successfully updated",
+  "system-wide-alert.form.update.success": "L'allarme di sistema è stato aggiornato con successo",
 
   // "system-wide-alert.form.update.error": "Something went wrong when updating the system-wide alert",
-  // TODO New key - Add a translation
-  "system-wide-alert.form.update.error": "Something went wrong when updating the system-wide alert",
+  "system-wide-alert.form.update.error": "Qualcosa è andato storto durante l'aggiornamento dell'allarme di sistema",
 
   // "system-wide-alert.form.create.success": "The system-wide alert was successfully created",
-  // TODO New key - Add a translation
-  "system-wide-alert.form.create.success": "The system-wide alert was successfully created",
+  "system-wide-alert.form.create.success": "L'allarme di sistema è stato creato con successo",
 
   // "system-wide-alert.form.create.error": "Something went wrong when creating the system-wide alert",
-  // TODO New key - Add a translation
-  "system-wide-alert.form.create.error": "Something went wrong when creating the system-wide alert",
+  "system-wide-alert.form.create.error": "Qualcosa è andato storto nella creazione dell'allarme di sistema",
 
   // "admin.system-wide-alert.breadcrumbs": "System-wide Alerts",
-  // TODO New key - Add a translation
-  "admin.system-wide-alert.breadcrumbs": "System-wide Alerts",
+  "admin.system-wide-alert.breadcrumbs": "Allarmi di sistema",
 
   // "admin.system-wide-alert.title": "System-wide Alerts",
-  // TODO New key - Add a translation
-  "admin.system-wide-alert.title": "System-wide Alerts",
+  "admin.system-wide-alert.title": "Allarmi di sistema",
 
 
 }
diff --git a/src/assets/i18n/ja.json5 b/src/assets/i18n/ja.json5
index 94dfc9aa98..e9eea2af0d 100644
--- a/src/assets/i18n/ja.json5
+++ b/src/assets/i18n/ja.json5
@@ -4276,25 +4276,25 @@
   // TODO New key - Add a translation
   "mydspace.show.workspace": "Your Submissions",
 
-  // "mydspace.status.archived": "Archived",
+  // "mydspace.status.mydspaceArchived": "Archived",
   // TODO New key - Add a translation
-  "mydspace.status.archived": "Archived",
+  "mydspace.status.mydspaceArchived": "Archived",
 
-  // "mydspace.status.validation": "Validation",
+  // "mydspace.status.mydspaceValidation": "Validation",
   // TODO New key - Add a translation
-  "mydspace.status.validation": "Validation",
+  "mydspace.status.mydspaceValidation": "Validation",
 
-  // "mydspace.status.waiting-for-controller": "Waiting for controller",
+  // "mydspace.status.mydspaceWaitingController": "Waiting for reviewer",
   // TODO New key - Add a translation
-  "mydspace.status.waiting-for-controller": "Waiting for controller",
+  "mydspace.status.mydspaceWaitingController": "Waiting for reviewer",
 
-  // "mydspace.status.workflow": "Workflow",
+  // "mydspace.status.mydspaceWorkflow": "Workflow",
   // TODO New key - Add a translation
-  "mydspace.status.workflow": "Workflow",
+  "mydspace.status.mydspaceWorkflow": "Workflow",
 
-  // "mydspace.status.workspace": "Workspace",
+  // "mydspace.status.mydspaceWorkspace": "Workspace",
   // TODO New key - Add a translation
-  "mydspace.status.workspace": "Workspace",
+  "mydspace.status.mydspaceWorkspace": "Workspace",
 
   // "mydspace.title": "MyDSpace",
   // TODO New key - Add a translation
@@ -5193,6 +5193,10 @@
   // TODO New key - Add a translation
   "resource-policies.form.name.label": "Name",
 
+  //"resource-policies.form.name.hint": "Max 30 characters",
+  // TODO New key - Add a translation
+  "resource-policies.form.name.hint": "Max 30 characters",
+
   // "resource-policies.form.policy-type.label": "Select the policy type",
   // TODO New key - Add a translation
   "resource-policies.form.policy-type.label": "Select the policy type",
diff --git a/src/assets/i18n/kk.json5 b/src/assets/i18n/kk.json5
index 354eb1104a..1a3829847f 100644
--- a/src/assets/i18n/kk.json5
+++ b/src/assets/i18n/kk.json5
@@ -3321,7 +3321,7 @@
   // "item.page.version.create": "Create new version",
   "item.page.version.create": "Жаңа нұсқасын жасау",
 
-  // "item.page.version.hasDraft": "A new version cannot be created because there is an inprogress submission in the version history",
+  // "item.page.version.hasDraft": "A new version cannot be created because there is an in-progress submission in the version history",
   "item.page.version.hasDraft": "Жаңа нұсқаны жасау мүмкін емес, өйткені нұсқа тарихында аяқталмаған жіберу бар",
 
   // "item.page.claim.button": "Claim",
@@ -3481,7 +3481,7 @@
   // "item.version.history.table.action.deleteVersion": "Delete version",
   "item.version.history.table.action.deleteVersion": "Нұсқаны өшіру",
 
-  // "item.version.history.table.action.hasDraft": "A new version cannot be created because there is an inprogress submission in the version history",
+  // "item.version.history.table.action.hasDraft": "A new version cannot be created because there is an in-progress submission in the version history",
   "item.version.history.table.action.hasDraft": "Жаңа нұсқаны жасау мүмкін емес, өйткені нұсқа тарихында аяқталмаған бағынымдар бар",
 
 
@@ -3528,7 +3528,7 @@
   // "item.version.create.notification.failure" : "New version has not been created",
   "item.version.create.notification.failure": "Жаңа нұсқа жасалмады",
 
-  // "item.version.create.notification.inProgress" : "A new version cannot be created because there is an inprogress submission in the version history",
+  // "item.version.create.notification.inProgress" : "A new version cannot be created because there is an in-progress submission in the version history",
   "item.version.create.notification.inProgress": "Жаңа нұсқаны жасау мүмкін емес, өйткені нұсқа тарихында аяқталмаған жіберу бар",
 
 
@@ -4139,20 +4139,20 @@
   // "mydspace.show.workspace": "Your Submissions",
   "mydspace.show.workspace": "Сіздің өтініштеріңіз",
 
-  // "mydspace.status.archived": "Archived",
-  "mydspace.status.archived": "Мұрағатталған",
+  // "mydspace.status.mydspaceArchived": "Archived",
+  "mydspace.status.mydspaceArchived": "Мұрағатталған",
 
-  // "mydspace.status.validation": "Validation",
-  "mydspace.status.validation": "Валидация",
+  // "mydspace.status.mydspaceValidation": "Validation",
+  "mydspace.status.mydspaceValidation": "Валидация",
 
-  // "mydspace.status.waiting-for-controller": "Waiting for controller",
-  "mydspace.status.waiting-for-controller": "Контроллерді күтуде",
+  // "mydspace.status.mydspaceWaitingController": "Waiting for reviewer",
+  "mydspace.status.mydspaceWaitingController": "Контроллерді күтуде",
 
-  // "mydspace.status.workflow": "Workflow",
-  "mydspace.status.workflow": "Жұмыс барысы",
+  // "mydspace.status.mydspaceWorkflow": "Workflow",
+  "mydspace.status.mydspaceWorkflow": "Жұмыс барысы",
 
-  // "mydspace.status.workspace": "Workspace",
-  "mydspace.status.workspace": "Жұмыс кеңістігі",
+  // "mydspace.status.mydspaceWorkspace": "Workspace",
+  "mydspace.status.mydspaceWorkspace": "Жұмыс кеңістігі",
 
   // "mydspace.title": "MyDSpace",
   "mydspace.title": "MyDSpace",
@@ -4966,6 +4966,14 @@
   // "resource-policies.form.name.label": "Name",
   "resource-policies.form.name.label": "Аты",
 
+  //"resource-policies.form.name.hint": "Max 30 characters",
+  // TODO New key - Add a translation
+  "resource-policies.form.name.hint": "Max 30 characters",
+
+  //"resource-policies.form.name.hint": "Max 30 characters",
+  // TODO New key - Add a translation
+  "resource-policies.form.name.hint": "Max 30 characters",
+
   // "resource-policies.form.policy-type.label": "Select the policy type",
   "resource-policies.form.policy-type.label": "Саясат түрін таңдаңыз",
 
@@ -5575,8 +5583,8 @@
   // "submission.import-external.source.cinii": "CiNii",
   "submission.import-external.source.cinii": "CiNii",
 
-  // "submission.import-external.source.crossref": "CrossRef",
-  "submission.import-external.source.crossref": "CrossRef",
+  // "submission.import-external.source.crossref": "Crossref",
+  "submission.import-external.source.crossref": "Crossref",
 
   // "submission.import-external.source.scielo": "SciELO",
   "submission.import-external.source.scielo": "SciELO",
diff --git a/src/assets/i18n/lv.json5 b/src/assets/i18n/lv.json5
index 9b4058a3e6..be9eda79e9 100644
--- a/src/assets/i18n/lv.json5
+++ b/src/assets/i18n/lv.json5
@@ -3492,20 +3492,20 @@
   // "mydspace.show.workspace": "Your Submissions",
   "mydspace.show.workspace": "Jūsu Iesniegumi",
 
-  // "mydspace.status.archived": "Archived",
-  "mydspace.status.archived": "Arhivēts",
+  // "mydspace.status.mydspaceArchived": "Archived",
+  "mydspace.status.mydspaceArchived": "Arhivēts",
 
-  // "mydspace.status.validation": "Validation",
-  "mydspace.status.validation": "Validācija",
+  // "mydspace.status.mydspaceValidation": "Validation",
+  "mydspace.status.mydspaceValidation": "Validācija",
 
-  // "mydspace.status.waiting-for-controller": "Waiting for controller",
-  "mydspace.status.waiting-for-controller": "Gaida kontrolieri",
+  // "mydspace.status.mydspaceWaitingController": "Waiting for reviewer",
+  "mydspace.status.mydspaceWaitingController": "Gaida kontrolieri",
 
-  // "mydspace.status.workflow": "Workflow",
-  "mydspace.status.workflow": "Darba plūsma",
+  // "mydspace.status.mydspaceWorkflow": "Workflow",
+  "mydspace.status.mydspaceWorkflow": "Darba plūsma",
 
-  // "mydspace.status.workspace": "Workspace",
-  "mydspace.status.workspace": "Darbavieta",
+  // "mydspace.status.mydspaceWorkspace": "Workspace",
+  "mydspace.status.mydspaceWorkspace": "Darbavieta",
 
   // "mydspace.title": "MyDSpace",
   "mydspace.title": "Mans DSpace",
@@ -4307,6 +4307,10 @@
   // TODO New key - Add a translation
   "resource-policies.form.name.label": "Name",
 
+  //"resource-policies.form.name.hint": "Max 30 characters",
+  // TODO New key - Add a translation
+  "resource-policies.form.name.hint": "Max 30 characters",
+
   // "resource-policies.form.policy-type.label": "Select the policy type",
   // TODO New key - Add a translation
   "resource-policies.form.policy-type.label": "Select the policy type",
diff --git a/src/assets/i18n/nl.json5 b/src/assets/i18n/nl.json5
index 520a8ca427..7c20a083b0 100644
--- a/src/assets/i18n/nl.json5
+++ b/src/assets/i18n/nl.json5
@@ -3764,20 +3764,20 @@
   // "mydspace.show.workspace": "Your Submissions",
   "mydspace.show.workspace": "Uw Submissions",
 
-  // "mydspace.status.archived": "Archived",
-  "mydspace.status.archived": "Opgeslagen",
+  // "mydspace.status.mydspaceArchived": "Archived",
+  "mydspace.status.mydspaceArchived": "Opgeslagen",
 
-  // "mydspace.status.validation": "Validation",
-  "mydspace.status.validation": "Validatie",
+  // "mydspace.status.mydspaceValidation": "Validation",
+  "mydspace.status.mydspaceValidation": "Validatie",
 
-  // "mydspace.status.waiting-for-controller": "Waiting for controller",
-  "mydspace.status.waiting-for-controller": "Wachten op controlleur",
+  // "mydspace.status.mydspaceWaitingController": "Waiting for reviewer",
+  "mydspace.status.mydspaceWaitingController": "Wachten op controlleur",
 
-  // "mydspace.status.workflow": "Workflow",
-  "mydspace.status.workflow": "Workflow",
+  // "mydspace.status.mydspaceWorkflow": "Workflow",
+  "mydspace.status.mydspaceWorkflow": "Workflow",
 
-  // "mydspace.status.workspace": "Workspace",
-  "mydspace.status.workspace": "Workspace",
+  // "mydspace.status.mydspaceWorkspace": "Workspace",
+  "mydspace.status.mydspaceWorkspace": "Workspace",
 
   // "mydspace.title": "MyDSpace",
   "mydspace.title": "MyDSpace",
@@ -4610,6 +4610,10 @@
   // TODO New key - Add a translation
   "resource-policies.form.name.label": "Name",
 
+  //"resource-policies.form.name.hint": "Max 30 characters",
+  // TODO New key - Add a translation
+  "resource-policies.form.name.hint": "Max 30 characters",
+
   // "resource-policies.form.policy-type.label": "Select the policy type",
   // TODO New key - Add a translation
   "resource-policies.form.policy-type.label": "Select the policy type",
diff --git a/src/assets/i18n/pl.json5 b/src/assets/i18n/pl.json5
index d748b94888..12ffae66bb 100644
--- a/src/assets/i18n/pl.json5
+++ b/src/assets/i18n/pl.json5
@@ -57,7 +57,7 @@
   "admin.registries.bitstream-formats.table.supportLevel.head": "Obsługiwany format",
   "admin.registries.bitstream-formats.title": "Rejestr formatów plików",
   "admin.registries.metadata.breadcrumbs": "Rejestr metadanych",
-  "admin.registries.metadata.description": "W rejestrze metadanych przechowywana jest lista wszystkich pól metadanych dostępnych w repozytorium. Przechowywane pola są  przechowywane w kilku rejestrach. DSpace wymaga kwalifikowanego rejestru metadanych Dublin Core.",
+  "admin.registries.metadata.description": "W rejestrze metadanych przechowywana jest lista wszystkich pól metadanych dostępnych w repozytorium. Przechowywane pola są przechowywane w kilku rejestrach. DSpace wymaga kwalifikowanego rejestru metadanych Dublin Core.",
   "admin.registries.metadata.form.create": "Utwórz schemat metadanych",
   "admin.registries.metadata.form.edit": "Edytuj schemat metadanych",
   "admin.registries.metadata.form.name": "Nazwa",
@@ -885,7 +885,7 @@
   "item.edit.tabs.curate.head": "Administruj",
   "item.edit.tabs.curate.title": "Edytowanie pozycji - administruj",
   "item.edit.tabs.metadata.head": "Metadane",
-  "item.edit.tabs.metadata.title": "Edycja pozycji -  metadane",
+  "item.edit.tabs.metadata.title": "Edycja pozycji - metadane",
   "item.edit.tabs.relationships.head": "Relacje",
   "item.edit.tabs.relationships.title": "Edycja pozycja - relacje",
   "item.edit.tabs.status.buttons.authorizations.button": "Dostępy...",
@@ -911,12 +911,12 @@
   "item.edit.tabs.status.labels.id": "ID pozycji",
   "item.edit.tabs.status.labels.itemPage": "Strona pozycji",
   "item.edit.tabs.status.labels.lastModified": "Ostatnia modyfikacja",
-  "item.edit.tabs.status.title": "Edycja pozycji -  Status",
+  "item.edit.tabs.status.title": "Edycja pozycji - Status",
   "item.edit.tabs.versionhistory.head": "Historia wersji",
   "item.edit.tabs.versionhistory.title": "Edycja pozycji - historia wersji",
   "item.edit.tabs.versionhistory.under-construction": "Edytowanie lub dodawanie nowych wersji jest niedostępne w tego poziomu interfejsu.",
   "item.edit.tabs.view.head": "Widok pozycji",
-  "item.edit.tabs.view.title": "Edycja pozycji -  widok",
+  "item.edit.tabs.view.title": "Edycja pozycji - widok",
   "item.edit.withdraw.cancel": "Anuluj",
   "item.edit.withdraw.confirm": "Wycofaj",
   "item.edit.withdraw.description": "Czy na pewno chcesz wycofać pozycję?",
@@ -1207,11 +1207,11 @@
   "mydspace.search-form.placeholder": "Wyszukaj w mydspace...",
   "mydspace.show.workflow": "Wszystkie zadania",
   "mydspace.show.workspace": "Twoje zadania",
-  "mydspace.status.archived": "Zarchiwizowano",
-  "mydspace.status.validation": "Walidacja",
-  "mydspace.status.waiting-for-controller": "Oczekiwanie na redaktora",
-  "mydspace.status.workflow": "Workflow",
-  "mydspace.status.workspace": "Wersja robocza",
+  "mydspace.status.mydspaceArchived": "Zarchiwizowano",
+  "mydspace.status.mydspaceValidation": "Walidacja",
+  "mydspace.status.mydspaceWaitingController": "Oczekiwanie na redaktora",
+  "mydspace.status.mydspaceWorkflow": "Workflow",
+  "mydspace.status.mydspaceWorkspace": "Wersja robocza",
   "mydspace.title": "Mój DSpace",
   "mydspace.upload.upload-failed": "Bład podczas tworzenia nowej wersji roboczej. Sprawdź poprawność plików i spróbuj ponownie.",
   "mydspace.upload.upload-failed-manyentries": "Plik jest niemożliwy do przetworzenia. Wykryto wiele wejść, a dopuszczalne jest tylko jedno dla jednego pliku.",
@@ -1535,6 +1535,9 @@
   "resource-policies.form.date.start.label": "Data rozpoczęcia",
   "resource-policies.form.description.label": "Opis",
   "resource-policies.form.name.label": "Nazwa",
+  //"resource-policies.form.name.hint": "Max 30 characters",
+  // TODO New key - Add a translation
+  "resource-policies.form.name.hint": "Max 30 characters",
   "resource-policies.form.policy-type.label": "Wybierz typ polityki",
   "resource-policies.form.policy-type.required": "Musisz wybrać typ polityki zasobu.",
   "resource-policies.table.headers.action": "Akcja",
@@ -1723,7 +1726,7 @@
   "submission.import-external.source.ads": "NASA/ADS",
   "submission.import-external.source.arxiv": "arXiv",
   "submission.import-external.source.cinii": "CiNii",
-  "submission.import-external.source.crossref": "CrossRef",
+  "submission.import-external.source.crossref": "Crossref",
   "submission.import-external.source.loading": "ładowanie...",
   "submission.import-external.source.sherpaJournal": "Czasopisma w SHERPA",
   "submission.import-external.source.sherpaJournalIssn": "Czasopisma w SHERPA wg ISSN",
@@ -1953,7 +1956,7 @@
   "submission.submit.breadcrumbs": "Nowe zgłoszenie",
   "submission.submit.title": "Nowe zgłoszenie",
   "submission.workflow.generic.delete": "Usuń",
-  "submission.workflow.generic.delete-help": "Jeśli chcesz odrzucić tę pozycję, wybierz \"Delete\".  Będzie wymagane potwierdzenie tej decyzji.",
+  "submission.workflow.generic.delete-help": "Jeśli chcesz odrzucić tę pozycję, wybierz \"Delete\". Będzie wymagane potwierdzenie tej decyzji.",
   "submission.workflow.generic.edit": "Edytuj",
   "submission.workflow.generic.edit-help": "Wybierz tę opcję, aby zmienić metadane pozycji.",
   "submission.workflow.generic.view": "Podgląd",
@@ -1967,7 +1970,7 @@
   "submission.workflow.tasks.claimed.reject.reason.submit": "Odrzuć pozycję",
   "submission.workflow.tasks.claimed.reject.reason.title": "Powód",
   "submission.workflow.tasks.claimed.reject.submit": "Odrzuć",
-  "submission.workflow.tasks.claimed.reject_help": "Jeśli po przejrzeniu pozycji stwierdzono, że nie nadaje się ona do włączenia do kolekcji, wybierz opcję \"Reject\".  Zostaniesz wtedy poproszony o określenie powodu odrzucenia, i wskazanie czy zgłaszający powinien wprowadzić zmiany i przesłać ponownie pozycję.",
+  "submission.workflow.tasks.claimed.reject_help": "Jeśli po przejrzeniu pozycji stwierdzono, że nie nadaje się ona do włączenia do kolekcji, wybierz opcję \"Reject\". Zostaniesz wtedy poproszony o określenie powodu odrzucenia, i wskazanie czy zgłaszający powinien wprowadzić zmiany i przesłać ponownie pozycję.",
   "submission.workflow.tasks.claimed.return": "Cofnij do puli zadań",
   "submission.workflow.tasks.claimed.return_help": "Cofnij zadanie do puli, aby inny użytkownik mógł się go podjąć.",
   "submission.workflow.tasks.generic.error": "Podczas działania wystąpił błąd...",
@@ -2296,4 +2299,326 @@
   "submission.sections.license.required": "Najpierw musisz zaakceptować licencję",
   "confirmation-modal.export-batch.confirm": "Eksportuj",
   "confirmation-modal.export-batch.cancel": "Anuluj",
+  "admin.access-control.bulk-access.breadcrumbs": "Zbiorcza edycja dostępu do osiągnięć",
+  "administrativeBulkAccess.search.results.head": "Wyniki wyszukiwania",
+  "admin.access-control.bulk-access": "Zbiorcza edycja dostępu do osiągnięć",
+  "admin.access-control.bulk-access.title": "Zbiorcza edycja dostępu do osiągnięć",
+  "admin.access-control.bulk-access-browse.header": "Krok 1: Wybierz pozycje",
+  "admin.access-control.bulk-access-browse.search.header": "Wyszukaj",
+  "admin.access-control.bulk-access-browse.selected.header": "Obecny wybór({{number}})",
+  "admin.access-control.bulk-access-settings.header": "Krok 2: Działanie do wykonania",
+  "admin.access-control.groups.form.tooltip.editGroupPage": "Na tej stronie można edytować opcje grupy i przypisane do niej osoby. W górnej sekcji można edytować nazwę i opis grupy, chyba że jest to grupa administratorów dla zbioru i kolekcji. W tym przypadku nazwa i opis grupy są generowane automatycznie i nie można ich edytować. W kolejnych sekcjach można edytować przypisanie użytkowników do grupy. Szczegóły na [stronie](https://wiki.lyrasis.org/display/DSDOC7x/Create+or+manage+a+user+group).",
+  "admin.access-control.groups.form.tooltip.editGroup.addEpeople": "Aby dodać lub usunąć użytkownika do/z tej grupy, kliknij przycisk 'Przeglądaj wszystko' lub użyj paska wyszukiwania poniżej, aby wyszukać użytkowników (użyj listy rozwijanej po lewej stronie paska wyszukiwania, aby wybrać, czy chcesz wyszukiwać według imienia i nazwiska, czy według adresu e-mail). Następnie kliknij ikonę plusa przy każdym użytkowniku, którego chcesz dodać do poniższej listy, lub ikonę kosza przy każdym użytkowniku, którego chcesz usunąć. Poniższa lista może mieć kilka stron: użyj strzałek pod listą, aby przejść do kolejnych stron. Gdy wszystkie zmiany zostaną wprowadzone, zapisz je, klikając przycisk 'Zapisz' w górnej sekcji.",
+  "admin.access-control.groups.form.tooltip.editGroup.addSubgroups": "Aby dodać lub usunąć podgrupę do/z tej grupy, kliknij przycisk 'Przeglądaj wszystko' lub użyj wyszukiwarki poniżej, aby wyszukać użytkowników. Następnie kliknij ikonę plusa przy każdym użytkowniku, którego chcesz dodać do poniższej listy, lub ikonę kosza przy każdym użytkowniku, którego chcesz usunąć. Poniższa lista może składać się z kilku stron: użyj przycisków pod listą, aby przejść do kolejnych stron. Gdy wszystkie zmiany zostaną wprowadzone, zapisz je, klikając przycisk 'Zapisz' w górnej sekcji.",
+  "admin.workflow.item.workspace": "Przestrzeń robocza",
+  "admin.workflow.item.policies": "Polityki",
+  "admin.workflow.item.supervision": "Recenzja",
+  "admin.batch-import.page.toggle.help": "It is possible to perform import either with file upload or via URL, use above toggle to set the input source",
+  "admin.metadata-import.page.error.addFileUrl": "Najpierw wpisz URL pliku!",
+  "admin.metadata-import.page.toggle.upload": "Prześlij",
+  "admin.metadata-import.page.toggle.url": "URL",
+  "admin.metadata-import.page.urlMsg": "Wpisz URL pliku ZIP, aby wykonać import masowy",
+  "advanced-workflow-action.rating.form.rating.label": "Ocena",
+  "advanced-workflow-action.rating.form.rating.error": "Ta pozycja musi zostać oceniona",
+  "advanced-workflow-action.rating.form.review.label": "Recenzja",
+  "advanced-workflow-action.rating.form.review.error": "Musisz wpisać tekst recenzji",
+  "advanced-workflow-action.rating.description": "Wybierz ocenę poniżej",
+  "advanced-workflow-action.rating.description-requiredDescription": "Wybierz ocenę poniżej i wpisz uzasadnienie",
+  "advanced-workflow-action.select-reviewer.description-single": "Wybierz recenzenta przed zdeponowaniem pozycji",
+  "advanced-workflow-action.select-reviewer.description-multiple": "Wybierz jednego lub więcej recenzentów przed zdeponowaniem pozycji",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.head": "Użytkownicy",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.head": "Dodaj użytkownika",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.button.see-all": "Przeglądaj wszystko",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.headMembers": "Aktualni użytkownicy",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.scope.metadata": "Metadane",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.scope.email": "Adres e-mail (dokładny)",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.button": "Wyszukaj",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.id": "ID",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.name": "Nazwa",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.identity": "Tożsamość",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.email": "Adres e-mail",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.netid": "NetID",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.edit": "Usuń / Dodaj",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.edit.buttons.remove": "Usuń użytkownika z nazwę \"{{name}}\"",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.success.addMember": "Dodano użytkownika o nazwie: \"{{name}}\"",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.failure.addMember": "Nie dodano użytkownika: \"{{name}}\"",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.success.deleteMember": "Usunięto użytkownika: \"{{name}}\"",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.failure.deleteMember": "Nie usunięto użytkownika: \"{{name}}\"",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.edit.buttons.add": "Dodano użytkownika \"{{name}}\"",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.failure.noActiveGroup": "Brak aktywnej grupy, najpierw wpisz nazwę.",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.no-members-yet": "W tej grupie nie ma użytkowników, wyszukaj ich i dodaj.",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.no-items": "Nie znaleziono żadnych użytkowników",
+  "advanced-workflow-action.select-reviewer.no-reviewer-selected.error": "Recenzent nie jest wybrany.",
+  "bitstream.edit.notifications.error.primaryBitstream.title": "Wystąpił błąd podczas zapisu pliku.",
+  "browse.comcol.by.srsc": "Wg słów kluczowych",
+  "browse.metadata.srsc.breadcrumbs": "Przeglądaj wg słów kluczowych",
+  "browse.startsWith.input": "Filtr",
+  "browse.taxonomy.button": "Przeglądaj",
+  "search.browse.item-back": "Powrót do wyników wyszukiwania",
+  "claimed-approved-search-result-list-element.title": "Zaakceptowano",
+  "claimed-declined-search-result-list-element.title": "Odrzucono i przesłano do deponującego",
+  "claimed-declined-task-search-result-list-element.title": "Odrzucono i przesłano do recenzenta",
+  "collection.edit.tabs.access-control.head": "Dostępy",
+  "collection.edit.tabs.access-control.title": "Edycja kolekcji - dostępy",
+  "collection.listelement.badge": "Kolekcja",
+  "community.edit.tabs.access-control.head": "Dostępy",
+  "community.edit.tabs.access-control.title": "Edycja zbioru - dostępy",
+  "comcol-role.edit.scorereviewers.name": "Ocena recenzenta",
+  "comcol-role.edit.scorereviewers.description": "Recenzenci mogą oceniać zdeponowane pozycje, co określi, czy pozycja zostanie przyjęta lub odrzucona.",
+  "curation-task.task.register-doi.label": "Rejestracja DOI",
+  "dso.name.unnamed": "Bez nazwy",
+  "dso-selector.create.community.or-divider": "lub",
+  "dso-selector.set-scope.community.or-divider": "lub",
+  "dso-selector.results-could-not-be-retrieved": "Wystąpił błąd, proszę odświeżyć stronę",
+  "supervision-group-selector.header": "Wybór grupy recenzenckiej",
+  "supervision-group-selector.select.type-of-order.label": "Wybierz typ funkcji",
+  "supervision-group-selector.select.type-of-order.option.none": "BRAK",
+  "supervision-group-selector.select.type-of-order.option.editor": "REDAKTOR",
+  "supervision-group-selector.select.type-of-order.option.observer": "OBSERWATOR",
+  "supervision-group-selector.select.group.label": "Wybierz grupę",
+  "supervision-group-selector.button.cancel": "Anuluj",
+  "supervision-group-selector.button.save": "Zapisz",
+  "supervision-group-selector.select.type-of-order.error": "Wybierz typ funkcji",
+  "supervision-group-selector.select.group.error": "Wybierz grupę",
+  "supervision-group-selector.notification.create.success.title": "Grupa recenzencka został dodana dla grupy {{ name }}",
+  "supervision-group-selector.notification.create.failure.title": "Błąd",
+  "supervision-group-selector.notification.create.already-existing": "Funkcja recenzenta już jest przypisana do tej grupy",
+  "confirmation-modal.delete-subscription.header": "Usuń subksrypcje",
+  "confirmation-modal.delete-subscription.info": "Czy na pewno chcesz usunąć subskrypcję: \"{{ dsoName }}\"",
+  "confirmation-modal.delete-subscription.cancel": "Anuluj",
+  "confirmation-modal.delete-subscription.confirm": "Usuń",
+  "error.validation.metadata.name.invalid-pattern": "To pole nie może zawierać kropek, przecinków i spacji. Zamiast tego This field cannot contain dots, commas or spaces. Zamiast tego może użyć pól z notacji SNEQ",
+  "error.validation.metadata.name.max-length": "To pole nie może zawierać więcej niż 32 znaki",
+  "error.validation.metadata.namespace.max-length": "To pole nie może zawierać więcej niż 256 znaków",
+  "error.validation.metadata.element.invalid-pattern": "To pole nie może zawierać kropek, przecinków i spacji. Zamiast tego This field cannot contain dots, commas or spaces. Zamiast tego może użyć pól z notacji SNEQ",
+  "error.validation.metadata.element.max-length": "To pole nie może zawierać więcej niż 64 znaki",
+  "error.validation.metadata.qualifier.invalid-pattern": "To pole nie może zawierać kropek, przecinków i spacji",
+  "error.validation.metadata.qualifier.max-length": "To pole nie może zawierać więcej niż 64 znaki",
+  "forgot-email.form.email.error.not-email-form": "Wpisz prawidłowy adres e-mail",
+  "form.other-information.email": "Adres e-mail",
+  "form.other-information.first-name": "Imię",
+  "form.other-information.insolr": "Solr Index",
+  "form.other-information.institution": "Instytucja",
+  "form.other-information.last-name": "Nazwisko",
+  "form.other-information.orcid": "ORCID",
+  "form.create": "Utwórz",
+  "info.end-user-agreement.hosting-country": "Stany Zjednoczone",
+  "item.edit.identifiers.doi.status.UNKNOWN": "Nieznane",
+  "item.edit.identifiers.doi.status.TO_BE_REGISTERED": "W kolejce do rejestracji",
+  "item.edit.identifiers.doi.status.TO_BE_RESERVED": "W kolejce do rezerwacji",
+  "item.edit.identifiers.doi.status.IS_REGISTERED": "Zarejestrowane",
+  "item.edit.identifiers.doi.status.IS_RESERVED": "Zarezerwowane",
+  "item.edit.identifiers.doi.status.UPDATE_RESERVED": "Zarezerwowane (aktualizacja w kolejce)",
+  "item.edit.identifiers.doi.status.UPDATE_REGISTERED": "Zarejestrowane (aktualizacja w kolejce)",
+  "item.edit.identifiers.doi.status.UPDATE_BEFORE_REGISTRATION": "W kolejce do aktualizacji i rejestracji",
+  "item.edit.identifiers.doi.status.TO_BE_DELETED": "Zakolejkowane do usunięcia",
+  "item.edit.identifiers.doi.status.DELETED": "Usunięte",
+  "item.edit.identifiers.doi.status.PENDING": "Oczekujące (niezarejestrowane)",
+  "item.edit.identifiers.doi.status.MINTED": "Rezerwowanie nazwy (niezarejestrowane)",
+  "item.edit.tabs.status.buttons.register-doi.label": "Zarejestruj nowe lub oczekujące DOI",
+  "item.edit.tabs.status.buttons.register-doi.button": "Rejestruj DOI...",
+  "item.edit.register-doi.header": "Zarejestruj nowe lub oczekujące DOI",
+  "item.edit.register-doi.description": "Zweryfikuj poniższe identyfikatory i metadane pozycji i rozpocznij rejestrację DOI lub anuluj",
+  "item.edit.register-doi.confirm": "Zatwierdź",
+  "item.edit.register-doi.cancel": "Anuluj",
+  "item.edit.register-doi.success": "DOI jest w kolejce do rejestracji.",
+  "item.edit.register-doi.error": "Wystąpił błąd poczas rejestracji DOI",
+  "item.edit.register-doi.to-update": "To DOI zostało zarezerwowane i będzie znajdować się w kolejce do rejestracji",
+  "item.edit.metadata.edit.buttons.confirm": "Zatwierdź",
+  "item.edit.metadata.edit.buttons.drag": "Przeciągnij, aby zmienić kolejność",
+  "item.edit.metadata.edit.buttons.virtual": "To pole przechowuje wirutalne wartości metadanych, np. wartość pobraną z encji, z którą jest połączona ta pozycja. Dodaj lub usuń relację w zakładce 'Relacje' ",
+  "item.edit.metadata.metadatafield.error": "Wystąpił błąd podczas walidcji pól metadanych",
+  "item.edit.metadata.reset-order-button": "Cofnij zamianę kolejności",
+  "item.edit.curate.title": "Zarządzaj pozycją: {{item}}",
+  "item.edit.tabs.access-control.head": "Dostęp",
+  "item.edit.tabs.access-control.title": "Edycja pozycji - dostęp",
+  "workflow-item.search.result.delete-supervision.modal.header": "Usuń zadanie dla recenzenta",
+  "workflow-item.search.result.delete-supervision.modal.info": "Czy na pewno usunąć zadanie dla recenzenta",
+  "workflow-item.search.result.delete-supervision.modal.cancel": "Anuluj",
+  "workflow-item.search.result.delete-supervision.modal.confirm": "Usuń",
+  "workflow-item.search.result.notification.deleted.success": "Usunięto zadanie dla recenzenta \"{{name}}\"",
+  "workflow-item.search.result.notification.deleted.failure": "Nie usunięto zadania dla recenzenta \"{{name}}\"",
+  "workflow-item.search.result.list.element.supervised-by": "Recenzja:",
+  "workflow-item.search.result.list.element.supervised.remove-tooltip": "Usuń grupę recenzencką",
+  "item.preview.dc.subject": "Słowo kluczowe:",
+  "item.preview.dc.publisher": "Wydawca:",
+  "itemtemplate.edit.metadata.add-button": "Dodaj",
+  "itemtemplate.edit.metadata.discard-button": "Cofnij",
+  "itemtemplate.edit.metadata.edit.buttons.confirm": "Zatwierdź",
+  "itemtemplate.edit.metadata.edit.buttons.drag": "Przeciągnij, aby zmienić kolejność",
+  "itemtemplate.edit.metadata.edit.buttons.edit": "Edytuj",
+  "itemtemplate.edit.metadata.edit.buttons.remove": "Usuń",
+  "itemtemplate.edit.metadata.edit.buttons.undo": "Cofnij zmiany",
+  "itemtemplate.edit.metadata.edit.buttons.unedit": "Nie edytuj",
+  "itemtemplate.edit.metadata.empty": "To pozycja nie zawiera żadnych metadanych. Wybierz Dodaj, aby je wprowadzić.",
+  "itemtemplate.edit.metadata.headers.edit": "Edytuj",
+  "itemtemplate.edit.metadata.headers.field": "Pole",
+  "itemtemplate.edit.metadata.headers.language": "Język",
+  "itemtemplate.edit.metadata.headers.value": "Wartość",
+  "itemtemplate.edit.metadata.metadatafield.error": "Wystąpił błąd podczas walidowania pola metadanych",
+  "itemtemplate.edit.metadata.metadatafield.invalid": "Wybierz odpowiednie pole metadanych",
+  "itemtemplate.edit.metadata.notifications.discarded.content": "Twoje zmiany nie zostały zachowane. Aby spróbować wprowadzić je ponownie wybierz Cofnij",
+  "itemtemplate.edit.metadata.notifications.discarded.title": "Zmiany nie zostały zachowane",
+  "itemtemplate.edit.metadata.notifications.error.title": "Wystąpił błąd",
+  "itemtemplate.edit.metadata.notifications.invalid.content": "Twoje zmiany nie zostały zapisane. Upewnij się, że wszystkie pola zostały wypełnione prawidłowo.",
+  "itemtemplate.edit.metadata.notifications.invalid.title": "Nieprawidłowe metadan",
+  "itemtemplate.edit.metadata.notifications.outdated.content": "Wzór dla pozycji, na którą w tym momencie pracujesz, został zmodyfikowany przez innego użytkownika. Twoje zmiany zostały odrzucone, aby uniknąć konfliktów pomiędzy wersjami.",
+  "itemtemplate.edit.metadata.notifications.outdated.title": "Zmiany zostały odrzucone",
+  "itemtemplate.edit.metadata.notifications.saved.content": "Zmiany w metadanych wzoru pozycji zostały zapisane.",
+  "itemtemplate.edit.metadata.notifications.saved.title": "Metadane zostały zapisane",
+  "itemtemplate.edit.metadata.reinstate-button": "Cofnij",
+  "itemtemplate.edit.metadata.reset-order-button": "Cofnij zmianę kolejności",
+  "itemtemplate.edit.metadata.save-button": "Zapisz",
+  "menu.section.access_control_bulk": "Zbiorowe zarządzanie dostępem",
+  "menu.section.browse_global_by_srsc": "Wg słów kluczowych",
+  "mydspace.show.supervisedWorkspace": "Pozycje recenzowane",
+  "mydspace.status.mydspaceArchived": "Opublikowano",
+  "mydspace.status.mydspaceValidation": "Walidacja",
+  "mydspace.status.mydspaceWaitingController": "Oczekiwanie na redakctora",
+  "mydspace.status.mydspaceWorkflow": "Redakcja",
+  "mydspace.status.mydspaceWorkspace": "Przestrzeń robocza",
+  "nav.context-help-toggle": "Przełącz pomoc kontekstową",
+  "nav.search.button": "Wpisz wyszukiwaną frazę",
+  "nav.subscriptions": "Subksrypcje",
+  "process.new.notification.error.max-upload.content": "Plik jest większy niż maksymalny dozwolony rozmiar pliku",
+  "register-page.registration.email.error.not-email-form": "Wprowadź poprawny adres e-mail",
+  "register-page.registration.email.error.not-valid-domain": "Użyj adresu e-mail z domeny: {{ domains }}",
+  "register-page.registration.error.maildomain": "Tego adresu e-mail nie możesz zarejestrować, ponieważ nie ma go na liście domen. Dozwolone domeny to: {{ domains }}",
+  "register-page.registration.info.maildomain": "Konta mogą być założone dla adresów e-mail z domeną",
+  "repository.title": "Repozytorium DSpace",
+  "search.filters.applied.f.supervisedBy": "Recenzent",
+  "search.filters.filter.show-tree": "Przeglądaj {{ name }} strukturę recenzentów",
+  "search.filters.filter.supervisedBy.head": "Recenzent",
+  "search.filters.filter.supervisedBy.placeholder": "Recenzent",
+  "search.filters.filter.supervisedBy.label": "Wyszukaj recenzenta",
+  "statistics.table.no-name": "(nazwa obiektu nie może zostać załadowana)",
+  "submission.import-external.source.datacite": "DataCite",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isPublicationOfAuthor": "Publikacje autora",
+  "submission.sections.describe.relationship-lookup.title.isPublicationOfAuthor": "Publikacje",
+  "submission.sections.identifiers.info": "Te identyfikatory zostaną utworzone dla pozycji:",
+  "submission.sections.identifiers.no_handle": "Do tej pozycji nie zostały przypisane żadne Handle",
+  "submission.sections.identifiers.no_doi": "Do tej pozycji nie zostały przypisane żadne DOI",
+  "submission.sections.identifiers.handle_label": "Handle: ",
+  "submission.sections.identifiers.doi_label": "DOI: ",
+  "submission.sections.identifiers.otherIdentifiers_label": "Inne identyfikatory: ",
+  "submission.sections.submit.progressbar.identifiers": "Identyfikatory",
+  "submission.workflow.generic.submit_select_reviewer": "Wybierz recenzenta",
+  "submission.workflow.generic.submit_select_reviewer-help": "",
+  "submission.workflow.generic.submit_score": "Wynik",
+  "submission.workflow.generic.submit_score-help": "",
+  "submission.workflow.tasks.claimed.decline": "Odrzuć",
+  "submission.workflow.tasks.claimed.decline_help": "",
+  "submitter.empty": "n.d.",
+  "subscriptions.title": "Subskrypcje",
+  "subscriptions.item": "Subskrypcje pozycji",
+  "subscriptions.collection": "Subskrypcje kolekcji",
+  "subscriptions.community": "Subskrypcje zbiorów",
+  "subscriptions.subscription_type": "Typ subksrypcji",
+  "subscriptions.frequency": "Częstotliwość subskrypcji",
+  "subscriptions.frequency.D": "Codziennie",
+  "subscriptions.frequency.M": "Co miesiąc",
+  "subscriptions.frequency.W": "Co tydzień",
+  "subscriptions.tooltip": "Subskrybuj",
+  "subscriptions.modal.title": "Subksrypcje",
+  "subscriptions.modal.type-frequency": "Rodzaj i częstotliwość subksrypcji",
+  "subscriptions.modal.close": "Zamknij",
+  "subscriptions.modal.delete-info": "Aby usunąć tę subksrypcję przejdź do strony 'Subskrypcje', która znajduje się w profilu użytkownika",
+  "subscriptions.modal.new-subscription-form.type.content": "Zawartość",
+  "subscriptions.modal.new-subscription-form.frequency.D": "Codziennie",
+  "subscriptions.modal.new-subscription-form.frequency.W": "Co tydzień",
+  "subscriptions.modal.new-subscription-form.frequency.M": "Co miesiąc",
+  "subscriptions.modal.new-subscription-form.submit": "Zapisz",
+  "subscriptions.modal.new-subscription-form.processing": "Ładowanie...",
+  "subscriptions.modal.create.success": "Zasubskrybowano {{ type }}",
+  "subscriptions.modal.delete.success": "Subskrypcja została anulowana",
+  "subscriptions.modal.update.success": "Twoja subskrypcja {{ type }} została zaktualizowana",
+  "subscriptions.modal.create.error": "Wystąpił bład podczas tworzenia subskrypcji",
+  "subscriptions.modal.delete.error": "Wystąpił bład podczas usuwania subskrypcji",
+  "subscriptions.modal.update.error": "Wystąpił bład podczas aktualizacji subskrypcji",
+  "subscriptions.table.dso": "Słowo kluczowe",
+  "subscriptions.table.subscription_type": "Typ subskrypcji",
+  "subscriptions.table.subscription_frequency": "Częstotliwość subskrypcji",
+  "subscriptions.table.action": "Akcja",
+  "subscriptions.table.edit": "Edytuj",
+  "subscriptions.table.delete": "Usuń",
+  "subscriptions.table.not-available": "Niedostępne",
+  "subscriptions.table.not-available-message": "Ta pozycja została usunięta lun nie masz do niej dostępu, aby ją wyswietlić",
+  "subscriptions.table.empty.message": "Ta pozycja nie ma w tym momencie żadnych subksrypcji. Aby zasubkrybować i otrzymywać aktualizacje o tym zbiorze lub kolekcji, wybierz przycisk subskrypcji na stronie pozycji.",
+  "vocabulary-treeview.info": "Wybierz słowo kluczowe, aby dodać je do filtra",
+  "supervisedWorkspace.search.results.head": "Pozycje recenzowane",
+  "supervision.search.results.head": "Status zadań: Szkic i redakcja",
+  "workspace-item.delete.breadcrumbs": "Usunięto wersję roboczą",
+  "workspace-item.delete.header": "Usuń wersję roboczą",
+  "workspace-item.delete.button.confirm": "Usuń",
+  "workspace-item.delete.button.cancel": "Anuluj",
+  "workspace-item.delete.notification.success.title": "Usunięto",
+  "workspace-item.delete.title": "Wersja robocza została usunieta",
+  "workspace-item.delete.notification.error.title": "Coś poszło nie tak",
+  "workspace-item.delete.notification.error.content": "Wersja robocza nie może zostać usunieta",
+  "workflow-item.advanced.title": "Zaawansowane workflow",
+  "workflow-item.selectrevieweraction.notification.success.title": "Wybrany recenzent",
+  "workflow-item.selectrevieweraction.notification.success.content": "Recenzent został przypisany",
+  "workflow-item.selectrevieweraction.notification.error.title": "Coś poszło nie tak",
+  "workflow-item.selectrevieweraction.notification.error.content": "Nie udało się wybrać recenzenta dla pozycji",
+  "workflow-item.selectrevieweraction.title": "Wybierz recenzenta",
+  "workflow-item.selectrevieweraction.header": "Wybierz recenzenta",
+  "workflow-item.selectrevieweraction.button.cancel": "Anuluj",
+  "workflow-item.selectrevieweraction.button.confirm": "Zatwierdź",
+  "workflow-item.scorereviewaction.notification.success.title": "Ocena recenzji",
+  "workflow-item.scorereviewaction.notification.success.content": "Ocena tej pozycji została zapisana",
+  "workflow-item.scorereviewaction.notification.error.title": "Coś poszło nie tak",
+  "workflow-item.scorereviewaction.notification.error.content": "Nie można ocenić tej pozycji",
+  "workflow-item.scorereviewaction.title": "Oceń pozycję",
+  "workflow-item.scorereviewaction.header": "Oceń pozycję",
+  "workflow-item.scorereviewaction.button.cancel": "Anuluj",
+  "workflow-item.scorereviewaction.button.confirm": "Potwierdź",
+  "listable-notification-object.default-message": "Ta pozycja nie może być odzyskana",
+  "system-wide-alert-banner.retrieval.error": "Coś poszło nie tak podczas odzyskiwania alertu systemowego",
+  "system-wide-alert-banner.countdown.prefix": "W",
+  "system-wide-alert-banner.countdown.days": "{{days}} dni,",
+  "system-wide-alert-banner.countdown.hours": "{{hours}} godziny",
+  "system-wide-alert-banner.countdown.minutes": "{{minutes}} minut:",
+  "menu.section.system-wide-alert": "Alert systemowy",
+  "system-wide-alert.form.header": "Alert systemowy",
+  "system-wide-alert-form.retrieval.error": "Coś poszło nie tak podczas odzyskiwania alertu systemowego",
+  "system-wide-alert.form.cancel": "Anuluj",
+  "system-wide-alert.form.save": "Zapisz",
+  "system-wide-alert.form.label.active": "AKTYWNE",
+  "system-wide-alert.form.label.inactive": "NIEAKTYWNE",
+  "system-wide-alert.form.error.message": "Alert systemowy musi zawierać wiadomość",
+  "system-wide-alert.form.label.message": "Alert systemowy",
+  "system-wide-alert.form.label.countdownTo.enable": "Wprowadź licznik czasowy",
+  "system-wide-alert.form.label.countdownTo.hint": "Wskazówka: Wpisz wartość licznika czasu. Kiedy licznik jest włączony, alert systemowy zostanie wyświetlony o wybranym czasie. Kiedy odliczanie zostanie zakończone, alert systemowy zostanie wyłączony. Serwer NIE zostanie zatrzymany automatycznie.",
+  "system-wide-alert.form.label.preview": "Podgląd alertu systemowego",
+  "system-wide-alert.form.update.success": "Alert systemowy został zaktualizowany",
+  "system-wide-alert.form.update.error": "Coś poszło nie tak podczas aktualizacji alertu systemowego",
+  "system-wide-alert.form.create.success": "Alert systemowy został utworzony",
+  "system-wide-alert.form.create.error": "Coś poszło nie tak podczas tworzenia alertu systemowego",
+  "admin.system-wide-alert.breadcrumbs": "Alerty systemowe",
+  "admin.system-wide-alert.title": "Alerty systemowe",
+  "item-access-control-title": "Ta strona pozwala na zmianę dostępów metadanych pozycji i plików do nich dołączonych.",
+  "collection-access-control-title": "Ta strona pozwala na zmianę warunków dostępu dla wszystkich pozycji w tej kolekcji. Zmiany mogą być wykonywane zarówno na metadanych pozycji jak i plikach do nich dołączonych.",
+  "community-access-control-title": "Ta strona pozwala na zmianę warunków dostępu dla wszystkich pozycji w każdej kolekcji w tym zbiorze. Zmiany mogą być wykonywane zarówno na metadanych pozycji jak i plikach do nich dołączonych.",
+  "access-control-item-header-toggle": "Metadane pozycji",
+  "access-control-bitstream-header-toggle": "Pliki",
+  "access-control-mode": "Tryb",
+  "access-control-access-conditions": "Warunki dostępu",
+  "access-control-no-access-conditions-warning-message": "W tym momencie żadne warunki dostępu nie zostały określone. Jeśli zadanie zostanie rozpoczęte, obecne warunki dostępu zostaną zastąpione domyślnymi warunkami dostępu z nadrzędnej kolekcji.",
+  "access-control-replace-all": "Zastąp warunki dostępu",
+  "access-control-add-to-existing": "Dodaj do już istniejących",
+  "access-control-limit-to-specific": "Ogranicz zmiany do wybranych plików",
+  "access-control-process-all-bitstreams": "Zaktualizuj wszystkie pliki dla tej pozycji",
+  "access-control-bitstreams-selected": "wybrane pliki",
+  "access-control-cancel": "Anuluj",
+  "access-control-execute": "Wykonaj",
+  "access-control-add-more": "Dodaj więcej",
+  "access-control-select-bitstreams-modal.title": "Wybierz pliki",
+  "access-control-select-bitstreams-modal.no-items": "Brak pozycji do wyświetlenia.",
+  "access-control-select-bitstreams-modal.close": "Zamknij",
+  "access-control-option-label": "Typ warunków dostępu",
+  "access-control-option-note": "Wybierz warunki dostępu, które chcesz przypisać do zaznaczonych pozycji.",
+  "access-control-option-start-date": "Dostęp od",
+  "access-control-option-start-date-note": "Wybierz datę, kiedy wybrane warunki dostępu mają obowiązywać",
+  "access-control-option-end-date": "Dostęp do",
+  "access-control-option-end-date-note": "Wybierz datę, kiedy wybrane warunki dostępu mają obowiązywać",
 }
diff --git a/src/assets/i18n/pt-BR.json5 b/src/assets/i18n/pt-BR.json5
index 25f1e0fb7c..b4735c2d96 100644
--- a/src/assets/i18n/pt-BR.json5
+++ b/src/assets/i18n/pt-BR.json5
@@ -1,5 +1,4 @@
 {
-
   // "401.help": "You're not authorized to access this page. You can use the button below to get back to the home page.",
   "401.help": "Você não tem autorização para acessar esta página. Clique no botão abaixo para ir à página inicial.",
 
@@ -27,7 +26,6 @@
   // "500.link.home-page": "Take me to the home page",
   "500.link.home-page": "Ir à página inicial",
 
-
   // "404.help": "We can't find the page you're looking for. The page may have been moved or deleted. You can use the button below to get back to the home page. ",
   "404.help": "Não encontramos a página que você procura. A página pode ter sido movida ou apagada. Você pode utilizar o botão abaixo para voltar à página inicial. ",
 
@@ -193,7 +191,7 @@
   // "admin.registries.bitstream-formats.table.name": "Name",
   "admin.registries.bitstream-formats.table.name": "Nome",
 
-  // TODO New key - Add a translation
+  // "admin.registries.bitstream-formats.table.id": "ID",
   "admin.registries.bitstream-formats.table.id": "ID",
 
   // "admin.registries.bitstream-formats.table.return": "Back",
@@ -271,7 +269,7 @@
   // "admin.registries.schema.fields.table.field": "Field",
   "admin.registries.schema.fields.table.field": "Campo",
 
-  // TODO New key - Add a translation
+  // "admin.registries.schema.fields.table.id": "ID",
   "admin.registries.schema.fields.table.id": "ID",
 
   // "admin.registries.schema.fields.table.scopenote": "Scope Note",
@@ -331,6 +329,30 @@
   // "admin.registries.schema.title": "Metadata Schema Registry",
   "admin.registries.schema.title": "Registro de Esquema de Metadados",
 
+  // "admin.access-control.bulk-access.breadcrumbs": "Bulk Access Management", (Auto-Translated)
+  "admin.access-control.bulk-access.breadcrumbs": "Gerenciamento de acesso em massa",
+
+  // "administrativeBulkAccess.search.results.head": "Search Results", (Auto-Translated)
+  "administrativeBulkAccess.search.results.head": "Resultados da Busca",
+
+  // "admin.access-control.bulk-access": "Bulk Access Management", (Auto-Translated)
+  "admin.access-control.bulk-access": "Gerenciamento de acesso em massa",
+
+  // "admin.access-control.bulk-access.title": "Bulk Access Management", (Auto-Translated)
+  "admin.access-control.bulk-access.title": "Gerenciamento de acesso em massa",
+
+  // "admin.access-control.bulk-access-browse.header": "Step 1: Select Objects", (Auto-Translated)
+  "admin.access-control.bulk-access-browse.header": "Etapa 1: Selecione objetos",
+
+  // "admin.access-control.bulk-access-browse.search.header": "Search", (Auto-Translated)
+  "admin.access-control.bulk-access-browse.search.header": "Procurar",
+
+  // "admin.access-control.bulk-access-browse.selected.header": "Current selection({{number}})", (Auto-Translated)
+  "admin.access-control.bulk-access-browse.selected.header": "Seleção atual ({{number}})",
+
+  // "admin.access-control.bulk-access-settings.header": "Step 2: Operation to Perform", (Auto-Translated)
+  "admin.access-control.bulk-access-settings.header": "Etapa 2: Operação para executar",
+
   // "admin.access-control.epeople.actions.delete": "Delete EPerson",
   "admin.access-control.epeople.actions.delete": "Apagar EPerson",
 
@@ -355,7 +377,6 @@
   // "admin.access-control.epeople.search.head": "Search",
   "admin.access-control.epeople.search.head": "Procurar",
 
-
   // "admin.access-control.epeople.button.see-all": "Browse All",
   "admin.access-control.epeople.button.see-all": "Pesquisar Todos",
 
@@ -419,7 +440,6 @@
   // "admin.access-control.epeople.form.canLogIn": "Can log in",
   "admin.access-control.epeople.form.canLogIn": "Pode entrar",
 
-
   // "admin.access-control.epeople.form.requireCertificate": "Requires certificate",
   "admin.access-control.epeople.form.requireCertificate": "Requer certificado",
 
@@ -450,7 +470,6 @@
   // "admin.access-control.epeople.form.notification.deleted.failure": "Failed to delete EPerson \"{{name}}\"",
   "admin.access-control.epeople.form.notification.deleted.failure": "Falha ao apagar EPerson \"{{name}}\"",
 
-
   // "admin.access-control.epeople.form.groupsEPersonIsMemberOf": "Member of these groups:",
   "admin.access-control.epeople.form.groupsEPersonIsMemberOf": "Membro destes grupos:",
 
@@ -739,32 +758,14 @@
   // "admin.access-control.groups.form.return": "Back",
   "admin.access-control.groups.form.return": "Voltar",
 
-  //"admin.batch-import.breadcrumbs": "Import Batch",
-  "admin.batch-import.breadcrumbs": "Importar um Lote",
+  // "admin.access-control.groups.form.tooltip.editGroupPage": "On this page, you can modify the properties and members of a group. In the top section, you can edit the group name and description, unless this is an admin group for a collection or community, in which case the group name and description are auto-generated and cannot be edited. In the following sections, you can edit group membership. See [the wiki](https://wiki.lyrasis.org/display/DSDOC7x/Create+or+manage+a+user+group) for more details.", (Auto-Translated)
+  "admin.access-control.groups.form.tooltip.editGroupPage": "Nesta página, você pode modificar as propriedades e os membros de um grupo. Na seção superior, você pode editar o nome e a descrição do grupo, a menos que este seja um grupo de administração para uma coleção ou comunidade; nesse caso, o nome e a descrição do grupo são gerados automaticamente e não podem ser editados. Nas seções a seguir, você pode editar a associação ao grupo.Veja [o wiki] (https://wiki.lyrasis.org/display/DSDOC7x/Create+or+manage+a+user+group) para obter mais detalhes.",
 
-  //"admin.batch-import.title": "Import Batch",
-  "admin.batch-import.title": "Importar um Lote",
+  // "admin.access-control.groups.form.tooltip.editGroup.addEpeople": "To add or remove an EPerson to/from this group, either click the 'Browse All' button or use the search bar below to search for users (use the dropdown to the left of the search bar to choose whether to search by metadata or by email). Then click the plus icon for each user you wish to add in the list below, or the trash can icon for each user you wish to remove. The list below may have several pages: use the page controls below the list to navigate to the next pages.", (Auto-Translated)
+  "admin.access-control.groups.form.tooltip.editGroup.addEpeople": "Para adicionar ou remover uma EPerson para/deste grupo, clique no botão 'Navegar por tudo' ou use a barra de pesquisa abaixo para pesquisar usuários (use o dropdown à esquerda da barra de pesquisa para escolher se deve pesquisar por metadados ou por e-mail). Em seguida, clique no ícone mais para cada usuário que você deseja adicionar na lista abaixo, ou o ícone da lata de lixo para cada usuário que você deseja remover. A lista abaixo pode ter várias páginas: use os controles da página abaixo da lista para navegar até as próximas páginas.",
 
-  //"admin.batch-import.page.header": "Import Batch",
-  "admin.batch-import.page.header": "Importar um Lote",
-
-  //"admin.batch-import.page.help": "Select the Collection to import into. Then, drop or browse to a Simple Archive Format (SAF) zip file that includes the Items to import",
-  "admin.batch-import.page.help": "Selecione a Coleção para o qual deseja importar. Arraste ou selecione um arquivo zip no formato Simple Archive Format (SAF) que inclua os Items para importar",
-
-  //"admin.batch-import.page.dropMsg": "Drop a batch ZIP to import",
-  "admin.batch-import.page.dropMsg": "Arraste e solte um lote ZIP para importar",
-
-  //"admin.batch-import.page.dropMsgReplace": "Drop to replace the batch ZIP to import",
-  "admin.batch-import.page.dropMsgReplace": "Arraste e solte um lote ZIP para substituir o lote para importar",
-
-  //"admin.batch-import.page.error.addFile": "Select Zip file first!",
-  "admin.batch-import.page.error.addFile": "Selecione um arquivo ZIP primeiro!",
-
-  //"admin.batch-import.page.validateOnly.hint": "When selected, the uploaded ZIP will be validated. You will receive a report of detected changes, but no changes will be saved.",
-  "admin.batch-import.page.validateOnly.hint": "Quando selecionado , o ZIP enviado sera validado. Você receberá um relatório das alterações detectadas, mas nenhuma alteração será salva.",
-
-  //"admin.batch-import.page.remove": "remove",
-  "admin.batch-import.page.remove": "remover",
+  // "admin.access-control.groups.form.tooltip.editGroup.addSubgroups": "To add or remove a Subgroup to/from this group, either click the 'Browse All' button or use the search bar below to search for groups. Then click the plus icon for each group you wish to add in the list below, or the trash can icon for each group you wish to remove. The list below may have several pages: use the page controls below the list to navigate to the next pages.", (Auto-Translated)
+  "admin.access-control.groups.form.tooltip.editGroup.addSubgroups": "Para adicionar ou remover um subgrupo de/para este grupo, clique no botão 'Navegar por tudo' ou use a barra de pesquisa abaixo para pesquisar por grupos. Em seguida, clique no ícone mais para cada grupo que você deseja adicionar na lista abaixo, ou o ícone da lata de lixo para cada grupo que você deseja remover. A lista abaixo pode ter várias páginas: use os controles da página abaixo da lista para navegar até as próximas páginas.",
 
   // "admin.search.breadcrumbs": "Administrative Search",
   "admin.search.breadcrumbs": "Pesquisa Administrativa",
@@ -811,48 +812,192 @@
   // "admin.workflow.item.workflow": "Workflow",
   "admin.workflow.item.workflow": "Workflow",
 
+  // "admin.workflow.item.workspace": "Workspace", (Auto-Translated)
+  "admin.workflow.item.workspace": "Área de trabalho",
+
   // "admin.workflow.item.delete": "Delete",
   "admin.workflow.item.delete": "Apagar",
 
   // "admin.workflow.item.send-back": "Send back",
   "admin.workflow.item.send-back": "Devolver",
 
+  // "admin.workflow.item.policies": "Policies", (Auto-Translated)
+  "admin.workflow.item.policies": "Políticas",
+
+  // "admin.workflow.item.supervision": "Supervision", (Auto-Translated)
+  "admin.workflow.item.supervision": "Supervisão",
+
   // "admin.metadata-import.breadcrumbs": "Import Metadata",
   "admin.metadata-import.breadcrumbs": "Importar Metadados",
 
+  // "admin.batch-import.breadcrumbs": "Import Batch",
+  "admin.batch-import.breadcrumbs": "Importar um Lote",
+
   // "admin.metadata-import.title": "Import Metadata",
   "admin.metadata-import.title": "Importar Metadados",
 
+  // "admin.batch-import.title": "Import Batch",
+  "admin.batch-import.title": "Importar um Lote",
+
   // "admin.metadata-import.page.header": "Import Metadata",
   "admin.metadata-import.page.header": "Importar Metadados",
 
+  // "admin.batch-import.page.header": "Import Batch",
+  "admin.batch-import.page.header": "Importar um Lote",
+
   // "admin.metadata-import.page.help": "You can drop or browse CSV files that contain batch metadata operations on files here",
   "admin.metadata-import.page.help": "Você arrastar soltar ou procurar arquivos CSV que contêm operações de metadados em lote em arquivos aqui",
 
+  // "admin.batch-import.page.help": "Select the Collection to import into. Then, drop or browse to a Simple Archive Format (SAF) zip file that includes the Items to import",
+  "admin.batch-import.page.help": "Selecione a Coleção para o qual deseja importar. Arraste ou selecione um arquivo zip no formato Simple Archive Format (SAF) que inclua os Items para importar",
+
+  // "admin.batch-import.page.toggle.help": "It is possible to perform import either with file upload or via URL, use above toggle to set the input source", (Auto-Translated)
+  "admin.batch-import.page.toggle.help": "É possível executar a importação com o upload de arquivo ou via URL, use o controle acima para definir a fonte de entrada",
+
   // "admin.metadata-import.page.dropMsg": "Drop a metadata CSV to import",
   "admin.metadata-import.page.dropMsg": "Arraste um CSV de metadados para importar",
 
+  // "admin.batch-import.page.dropMsg": "Drop a batch ZIP to import",
+  "admin.batch-import.page.dropMsg": "Arraste e solte um lote ZIP para importar",
+
   // "admin.metadata-import.page.dropMsgReplace": "Drop to replace the metadata CSV to import",
   "admin.metadata-import.page.dropMsgReplace": "Solte para substituir o CSV de metadados a ser importado",
 
+  // "admin.batch-import.page.dropMsgReplace": "Drop to replace the batch ZIP to import",
+  "admin.batch-import.page.dropMsgReplace": "Arraste e solte um lote ZIP para substituir o lote para importar",
+
   // "admin.metadata-import.page.button.return": "Back",
   "admin.metadata-import.page.button.return": "Voltar",
 
   // "admin.metadata-import.page.button.proceed": "Proceed",
   "admin.metadata-import.page.button.proceed": "Continuar",
 
-  //"admin.metadata-import.page.button.select-collection": "Select Collection",
+  // "admin.metadata-import.page.button.select-collection": "Select Collection",
   "admin.metadata-import.page.button.select-collection": "Selecione a  Coleção",
 
   // "admin.metadata-import.page.error.addFile": "Select file first!",
   "admin.metadata-import.page.error.addFile": "Selecione o arquivo primeiro!",
 
+  // "admin.metadata-import.page.error.addFileUrl": "Insert file url first!", (Auto-Translated)
+  "admin.metadata-import.page.error.addFileUrl": "Insira o URL do arquivo primeiro!",
+
+  // "admin.batch-import.page.error.addFile": "Select Zip file first!",
+  "admin.batch-import.page.error.addFile": "Selecione um arquivo ZIP primeiro!",
+
+  // "admin.metadata-import.page.toggle.upload": "Upload", (Auto-Translated)
+  "admin.metadata-import.page.toggle.upload": "Carregar",
+
+  // "admin.metadata-import.page.toggle.url": "URL", (Auto-Translated)
+  "admin.metadata-import.page.toggle.url": "URL",
+
+  // "admin.metadata-import.page.urlMsg": "Insert the batch ZIP url to import", (Auto-Translated)
+  "admin.metadata-import.page.urlMsg": "Insira o URL do lote em ZIP para importar",
+
   // "admin.metadata-import.page.validateOnly": "Validate Only",
   "admin.metadata-import.page.validateOnly": "Validar Somente",
 
   // "admin.metadata-import.page.validateOnly.hint": "When selected, the uploaded CSV will be validated. You will receive a report of detected changes, but no changes will be saved.",
   "admin.metadata-import.page.validateOnly.hint": "Quando selecionado, o CSV carregado será validado. Você receberá um relatório das alterações detectadas, mas nenhuma alteração será salva.",
 
+  // "advanced-workflow-action.rating.form.rating.label": "Rating", (Auto-Translated)
+  "advanced-workflow-action.rating.form.rating.label": "Avaliação",
+
+  // "advanced-workflow-action.rating.form.rating.error": "You must rate the item", (Auto-Translated)
+  "advanced-workflow-action.rating.form.rating.error": "Você deve avaliar o item",
+
+  // "advanced-workflow-action.rating.form.review.label": "Review", (Auto-Translated)
+  "advanced-workflow-action.rating.form.review.label": "Análise",
+
+  // "advanced-workflow-action.rating.form.review.error": "You must enter a review to submit this rating", (Auto-Translated)
+  "advanced-workflow-action.rating.form.review.error": "Você deve inserir uma revisão para enviar esta classificação",
+
+  // "advanced-workflow-action.rating.description": "Please select a rating below", (Auto-Translated)
+  "advanced-workflow-action.rating.description": "Selecione uma classificação abaixo",
+
+  // "advanced-workflow-action.rating.description-requiredDescription": "Please select a rating below and also add a review", (Auto-Translated)
+  "advanced-workflow-action.rating.description-requiredDescription": "Selecione uma classificação abaixo e também adicione uma revisão",
+
+  // "advanced-workflow-action.select-reviewer.description-single": "Please select a single reviewer below before submitting", (Auto-Translated)
+  "advanced-workflow-action.select-reviewer.description-single": "Selecione um único revisor abaixo antes de enviar",
+
+  // "advanced-workflow-action.select-reviewer.description-multiple": "Please select one or more reviewers below before submitting", (Auto-Translated)
+  "advanced-workflow-action.select-reviewer.description-multiple": "Selecione um ou mais revisores abaixo antes de enviar",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.head": "EPeople", (Auto-Translated)
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.head": "EPeople",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.head": "Add EPeople", (Auto-Translated)
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.head": "Adicione EPeople",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.button.see-all": "Browse All", (Auto-Translated)
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.button.see-all": "Navegar por tudo",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.headMembers": "Current Members", (Auto-Translated)
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.headMembers": "Membros atuais",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.scope.metadata": "Metadata", (Auto-Translated)
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.scope.metadata": "Metadados",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.scope.email": "E-mail (exact)", (Auto-Translated)
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.scope.email": "E-mail (exato)",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.button": "Search", (Auto-Translated)
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.button": "Procurar",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.id": "ID", (Auto-Translated)
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.id": "ID",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.name": "Name", (Auto-Translated)
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.name": "Nome",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.identity": "Identity", (Auto-Translated)
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.identity": "Identidade",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.email": "Email", (Auto-Translated)
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.email": "E-mail",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.netid": "NetID", (Auto-Translated)
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.netid": "NetID",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.edit": "Remove / Add", (Auto-Translated)
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.edit": "Remover / adicionar",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.edit.buttons.remove": "Remove member with name \"{{name}}\"", (Auto-Translated)
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.edit.buttons.remove": "Remova o membro com o nome \"{{name}}\"",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.success.addMember": "Successfully added member: \"{{name}}\"", (Auto-Translated)
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.success.addMember": "Membro adicionado com sucesso: \"{{name}}\"",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.failure.addMember": "Failed to add member: \"{{name}}\"", (Auto-Translated)
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.failure.addMember": "Falha ao adicionar membro: \"{{name}}\"",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.success.deleteMember": "Successfully deleted member: \"{{name}}\"", (Auto-Translated)
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.success.deleteMember": "Membro excluído com sucesso: \"{{name}}\"",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.failure.deleteMember": "Failed to delete member: \"{{name}}\"", (Auto-Translated)
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.failure.deleteMember": "Falha ao excluir membro: \"{{name}}\"",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.edit.buttons.add": "Add member with name \"{{name}}\"", (Auto-Translated)
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.edit.buttons.add": "Adicionar membro com o nome \"{{name}}\"",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.failure.noActiveGroup": "No current active group, submit a name first.", (Auto-Translated)
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.failure.noActiveGroup": "Nenhum grupo ativo atual, envie um nome primeiro.",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.no-members-yet": "No members in group yet, search and add.", (Auto-Translated)
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.no-members-yet": "Ainda não há membros do grupo, procure e adicione.",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.no-items": "No EPeople found in that search", (Auto-Translated)
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.no-items": "Nenhuma EPeople encontrou nessa pesquisa",
+
+  // "advanced-workflow-action.select-reviewer.no-reviewer-selected.error": "No reviewer selected.", (Auto-Translated)
+  "advanced-workflow-action.select-reviewer.no-reviewer-selected.error": "Nenhum revisor selecionado.",
+
+  // "admin.batch-import.page.validateOnly.hint": "When selected, the uploaded ZIP will be validated. You will receive a report of detected changes, but no changes will be saved.",
+  "admin.batch-import.page.validateOnly.hint": "Quando selecionado , o ZIP enviado sera validado. Você receberá um relatório das alterações detectadas, mas nenhuma alteração será salva.",
+
+  // "admin.batch-import.page.remove": "remove",
+  "admin.batch-import.page.remove": "remover",
+
   // "auth.errors.invalid-user": "Invalid email address or password.",
   "auth.errors.invalid-user": "Endereço de email ou senha inválidos.",
 
@@ -862,12 +1007,11 @@
   // "auth.messages.token-refresh-failed": "Refreshing your session token failed. Please log in again.",
   "auth.messages.token-refresh-failed": "Falha ao atualizar seu token de sessão. Por favor faça login novamente.",
 
-  // "bitstream.download.page": "Now downloading {{bitstream}}..." ,
-  "bitstream.download.page": "Baixando {{bitstream}} agora ..." ,
-
-  // "bitstream.download.page.back": "Back" ,
-  "bitstream.download.page.back": "Voltar" ,
+  // "bitstream.download.page": "Now downloading {{bitstream}}...",
+  "bitstream.download.page": "Baixando {{bitstream}} agora ...",
 
+  // "bitstream.download.page.back": "Back",
+  "bitstream.download.page.back": "Voltar",
 
   // "bitstream.edit.authorizations.link": "Edit bitstream's Policies",
   "bitstream.edit.authorizations.link": "Editar as políticas do bitstream's",
@@ -887,7 +1031,7 @@
   // "bitstream.edit.form.description.label": "Description",
   "bitstream.edit.form.description.label": "Descrição",
 
-  // "bitstream.edit.form.embargo.hint": "The first day from which access is allowed. <b>This date cannot be modified on this form.</b> To set an embargo date for a bitstream, go to the <i>Item Status</i> tab, click <i>Autorizações...</i>, create or edit the bitstream's <i>READ</i> policy, and set the <i>Start Date</i> as desired.",
+  // "bitstream.edit.form.embargo.hint": "The first day from which access is allowed. <b>This date cannot be modified on this form.</b> To set an embargo date for a bitstream, go to the <i>Item Status</i> tab, click <i>Authorizations...</i>, create or edit the bitstream's <i>READ</i> policy, and set the <i>Start Date</i> as desired.",
   "bitstream.edit.form.embargo.hint": "O primeiro dia a partir do qual o acesso é permitido. <b>Esta data não pode ser modificada neste formulário.</b> Para definir uma data de embargo para este bitstream, vá para a guia <i>Status do Item</i>, clique em <i>Autorizações...</i >, crie ou edite a política <i>READ</i> do bitstream e defina a <i>Data de Início</i> conforme desejado.",
 
   // "bitstream.edit.form.embargo.label": "Embargo until specific date",
@@ -920,6 +1064,9 @@
   // "bitstream.edit.notifications.error.format.title": "An error occurred saving the bitstream's format",
   "bitstream.edit.notifications.error.format.title": "Um erro ocorreu salvando o formato do bitstream's",
 
+  // "bitstream.edit.notifications.error.primaryBitstream.title": "An error occurred saving the primary bitstream", (Auto-Translated)
+  "bitstream.edit.notifications.error.primaryBitstream.title": "Ocorreu um erro salvando o BitStream primário",
+
   // "bitstream.edit.form.iiifLabel.label": "IIIF Label",
   "bitstream.edit.form.iiifLabel.label": "Etiqueta IIIF",
 
@@ -944,7 +1091,6 @@
   // "bitstream.edit.form.iiifHeight.hint": "The canvas height should usually match the image height.",
   "bitstream.edit.form.iiifHeight.hint": "A altura da tela geralmente deve corresponder à altura da imagem.",
 
-
   // "bitstream.edit.notifications.saved.content": "Your changes to this bitstream were saved.",
   "bitstream.edit.notifications.saved.content": "Suas alterações neste bitstream foram salvas.",
 
@@ -968,6 +1114,7 @@
 
   // "bitstream-request-a-copy.intro.bitstream.one": "Requesting the following file: ",
   "bitstream-request-a-copy.intro.bitstream.one": "Solicitando o seguinte arquivo: ",
+
   // "bitstream-request-a-copy.intro.bitstream.all": "Requesting all files. ",
   "bitstream-request-a-copy.intro.bitstream.all": "Solicitando todos os arquivos. ",
 
@@ -1022,6 +1169,12 @@
   // "browse.comcol.by.subject": "By Subject",
   "browse.comcol.by.subject": "Por Assunto",
 
+  // "browse.comcol.by.srsc": "By Subject Category", (Auto-Translated)
+  "browse.comcol.by.srsc": "Por categoria de assunto",
+
+  // "browse.comcol.by.nsi": "By Norwegian Science Index", (Auto-Translated)
+  "browse.comcol.by.nsi": "Pelo Índice de Ciências Norueguesas",
+
   // "browse.comcol.by.title": "By Title",
   "browse.comcol.by.title": "Por Título",
 
@@ -1052,6 +1205,12 @@
   // "browse.metadata.subject.breadcrumbs": "Browse by Subject",
   "browse.metadata.subject.breadcrumbs": "Pesquisar por Assunto",
 
+  // "browse.metadata.srsc.breadcrumbs": "Browse by Subject Category", (Auto-Translated)
+  "browse.metadata.srsc.breadcrumbs": "Navegue por categoria de assunto",
+
+  // "browse.metadata.nsi.breadcrumbs": "Browse by Norwegian Science Index", (Auto-Translated)
+  "browse.metadata.nsi.breadcrumbs": "Navegue pelo Índice de Ciência Norueguês",
+
   // "browse.metadata.title.breadcrumbs": "Browse by Title",
   "browse.metadata.title.breadcrumbs": "Pesquisar por Título",
 
@@ -1131,17 +1290,35 @@
   "browse.startsWith.type_date.label": "Ou digite na data (year-month) e clique no botão de Ir",
 
   // "browse.startsWith.type_text": "Filter results by typing the first few letters",
-  "browse.startsWith.type_text": "Filtrar resultados informando as primeiras letras:",
+  "browse.startsWith.type_text": "Filtrar resultados informando as primeiras letras",
+
+  // "browse.startsWith.input": "Filter", (Auto-Translated)
+  "browse.startsWith.input": "Filtro",
+
+  // "browse.taxonomy.button": "Browse", (Auto-Translated)
+  "browse.taxonomy.button": "Navegar",
 
   // "browse.title": "Browsing {{ collection }} by {{ field }}{{ startsWith }} {{ value }}",
-  "browse.title": "Navegando {{ collection }} por {{ field }} {{ value }}",
+  "browse.title": "Navegando {{ collection }} por {{ field }}{{ startsWith }} {{ value }}",
 
   // "browse.title.page": "Browsing {{ collection }} by {{ field }} {{ value }}",
   "browse.title.page": "Navegando {{ collection }} por {{ field }} {{ value }}",
 
+  // "search.browse.item-back": "Back to Results", (Auto-Translated)
+  "search.browse.item-back": "De volta aos resultados",
+
   // "chips.remove": "Remove chip",
   "chips.remove": "Remover chip",
 
+  // "claimed-approved-search-result-list-element.title": "Approved", (Auto-Translated)
+  "claimed-approved-search-result-list-element.title": "Approved",
+
+  // "claimed-declined-search-result-list-element.title": "Rejected, sent back to submitter", (Auto-Translated)
+  "claimed-declined-search-result-list-element.title": "Rejeitado, enviado de volta ao submissor",
+
+  // "claimed-declined-task-search-result-list-element.title": "Declined, sent back to Review Manager's workflow", (Auto-Translated)
+  "claimed-declined-task-search-result-list-element.title": "Recusou, enviado de volta ao fluxo de trabalho do gerente de revisão",
+
   // "collection.create.head": "Create a Collection",
   "collection.create.head": "Criar uma coleção",
 
@@ -1235,8 +1412,8 @@
   // "collection.edit.item-mapper.remove": "Remove selected item mappings",
   "collection.edit.item-mapper.remove": "Remover mapeamentos selecionados",
 
-  // "collection.edit.item-mapper.search-form.placeholder": "Search Item to Map...",
-  "collection.edit.item-mapper.search-form.placeholder": "Pesquisar Item a Mapear...",
+  // "collection.edit.item-mapper.search-form.placeholder": "Search items...",
+  "collection.edit.item-mapper.search-form.placeholder": "Pesquisar Itens...",
 
   // "collection.edit.item-mapper.tabs.browse": "Browse mapped items",
   "collection.edit.item-mapper.tabs.browse": "Navegar por itens mapeados",
@@ -1274,9 +1451,15 @@
   // "collection.edit.notifications.success": "Successfully edited the Collection",
   "collection.edit.notifications.success": "Coleção editada com sucesso",
 
-  // "collection.edit.return": "Return",
+  // "collection.edit.return": "Back",
   "collection.edit.return": "Voltar",
 
+  // "collection.edit.tabs.access-control.head": "Access Control", (Auto-Translated)
+  "collection.edit.tabs.access-control.head": "Controle de acesso",
+
+  // "collection.edit.tabs.access-control.title": "Collection Edit - Access Control", (Auto-Translated)
+  "collection.edit.tabs.access-control.title": "Edição de coleção - Controle de acesso",
+
   // "collection.edit.tabs.curate.head": "Curate",
   "collection.edit.tabs.curate.head": "Curadoria",
 
@@ -1400,7 +1583,6 @@
   // "collection.edit.template.title": "Edit Template Item",
   "collection.edit.template.title": "Editar Template de Item",
 
-
   // "collection.form.abstract": "Short Description",
   "collection.form.abstract": "Descrição curta",
 
@@ -1460,48 +1642,70 @@
 
   // "collection.source.controls.head": "Harvest Controls",
   "collection.source.controls.head": "Controles de Colheita(Harvest)",
+
   // "collection.source.controls.test.submit.error": "Something went wrong with initiating the testing of the settings",
   "collection.source.controls.test.submit.error": "Alguma coisa errada durante a inicialização e teste das configurações",
+
   // "collection.source.controls.test.failed": "The script to test the settings has failed",
   "collection.source.controls.test.failed": "O script de teste das configurações falhou",
+
   // "collection.source.controls.test.completed": "The script to test the settings has successfully finished",
   "collection.source.controls.test.completed": "O script de teste das configurações terminou com sucesso",
+
   // "collection.source.controls.test.submit": "Test configuration",
   "collection.source.controls.test.submit": "Testar a configuração",
+
   // "collection.source.controls.test.running": "Testing configuration...",
   "collection.source.controls.test.running": "Testando a configuração...",
+
   // "collection.source.controls.import.submit.success": "The import has been successfully initiated",
   "collection.source.controls.import.submit.success": "A importação foi iniciada com sucesso",
+
   // "collection.source.controls.import.submit.error": "Something went wrong with initiating the import",
   "collection.source.controls.import.submit.error": "Alguma coisa errada durante a inicialização da importação",
+
   // "collection.source.controls.import.submit": "Import now",
   "collection.source.controls.import.submit": "Importar agora",
+
   // "collection.source.controls.import.running": "Importing...",
   "collection.source.controls.import.running": "Importando...",
+
   // "collection.source.controls.import.failed": "An error occurred during the import",
   "collection.source.controls.import.failed": "Um erro ocorreu durante a importação",
+
   // "collection.source.controls.import.completed": "The import completed",
   "collection.source.controls.import.completed": "A importação concluiu",
+
   // "collection.source.controls.reset.submit.success": "The reset and reimport has been successfully initiated",
   "collection.source.controls.reset.submit.success": "A redefinição e reimportação foram iniciadas com sucesso",
+
   // "collection.source.controls.reset.submit.error": "Something went wrong with initiating the reset and reimport",
   "collection.source.controls.reset.submit.error": "Alguma coisa errada durante a inicialização da redefinição e reimportação",
+
   // "collection.source.controls.reset.failed": "An error occurred during the reset and reimport",
   "collection.source.controls.reset.failed": "Um erro ocorreu durante a redifinição e reimportação",
+
   // "collection.source.controls.reset.completed": "The reset and reimport completed",
   "collection.source.controls.reset.completed": "Completou a redefinição e a reimportação",
+
   // "collection.source.controls.reset.submit": "Reset and reimport",
   "collection.source.controls.reset.submit": "Redefinir e reimportar",
+
   // "collection.source.controls.reset.running": "Resetting and reimporting...",
   "collection.source.controls.reset.running": "Redefinindo e importando...",
+
   // "collection.source.controls.harvest.status": "Harvest status:",
   "collection.source.controls.harvest.status": "Status da Colheita (Harvest):",
+
   // "collection.source.controls.harvest.start": "Harvest start time:",
   "collection.source.controls.harvest.start": "Hora de ínicio da Colheita(Harvest):",
+
   // "collection.source.controls.harvest.last": "Last time harvested:",
   "collection.source.controls.harvest.last": "Última hora de colhida:",
+
   // "collection.source.controls.harvest.message": "Harvest info:",
   "collection.source.controls.harvest.message": "Informação sobre Colheita (Harvest):",
+
   // "collection.source.controls.harvest.no-information": "N/A",
   "collection.source.controls.harvest.no-information": "N/D",
 
@@ -1610,6 +1814,12 @@
   // "community.edit.tabs.curate.title": "Community Edit - Curate",
   "community.edit.tabs.curate.title": "Editar Comunidade - Curador",
 
+  // "community.edit.tabs.access-control.head": "Access Control", (Auto-Translated)
+  "community.edit.tabs.access-control.head": "Controle de acesso",
+
+  // "community.edit.tabs.access-control.title": "Community Edit - Access Control", (Auto-Translated)
+  "community.edit.tabs.access-control.title": "Edição da comunidade - Controle de acesso",
+
   // "community.edit.tabs.metadata.head": "Edit Metadata",
   "community.edit.tabs.metadata.head": "Editar Metadado",
 
@@ -1676,7 +1886,6 @@
   // "comcol-role.edit.item_read.anonymous-group": "Default read for incoming items is currently set to Anonymous.",
   "comcol-role.edit.item_read.anonymous-group": "A leitura padrão para itens de entrada está atualmente definida como Anônima.",
 
-
   // "comcol-role.edit.bitstream_read.name": "Default bitstream read access",
   "comcol-role.edit.bitstream_read.name": "Acesso de leitura de bitstream padrão",
 
@@ -1686,27 +1895,29 @@
   // "comcol-role.edit.bitstream_read.anonymous-group": "Default read for incoming bitstreams is currently set to Anonymous.",
   "comcol-role.edit.bitstream_read.anonymous-group": "A leitura padrão para bitstreams de entrada está atualmente definida como Anônima.",
 
-
   // "comcol-role.edit.editor.name": "Editors",
   "comcol-role.edit.editor.name": "Editores",
 
   // "comcol-role.edit.editor.description": "Editors are able to edit the metadata of incoming submissions, and then accept or reject them.",
   "comcol-role.edit.editor.description": "Editores podem editar metadados de submissões de entrada, e  aceitar ou rejeitar elas.",
 
-
   // "comcol-role.edit.finaleditor.name": "Final editors",
   "comcol-role.edit.finaleditor.name": "Editores Finais",
 
   // "comcol-role.edit.finaleditor.description": "Final editors are able to edit the metadata of incoming submissions, but will not be able to reject them.",
   "comcol-role.edit.finaleditor.description": "Editores Finais podem editar os metadadods de submissões de entrada, mas não podem rejeitar elas.",
 
-
   // "comcol-role.edit.reviewer.name": "Reviewers",
   "comcol-role.edit.reviewer.name": "Revisores",
 
   // "comcol-role.edit.reviewer.description": "Reviewers are able to accept or reject incoming submissions. However, they are not able to edit the submission's metadata.",
   "comcol-role.edit.reviewer.description": "Revisores podem aceitar ou rejeitar submissões de entrada.. Entretanto, eles não podem editar os metadados da submissão.",
 
+  // "comcol-role.edit.scorereviewers.name": "Score Reviewers", (Auto-Translated)
+  "comcol-role.edit.scorereviewers.name": "Revisores de pontuação",
+
+  // "comcol-role.edit.scorereviewers.description": "Reviewers are able to give a score to incoming submissions, this will define whether the submission will be rejected or not.", (Auto-Translated)
+  "comcol-role.edit.scorereviewers.description": "Os revisores podem dar uma pontuação para os envios de entrada, isso definirá se o envio será rejeitado ou não.",
 
   // "community.form.abstract": "Short Description",
   "community.form.abstract": "Descrição curta",
@@ -1741,11 +1952,11 @@
   // "community.all-lists.head": "Subcommunities and Collections",
   "community.all-lists.head": "Sub-Comunidade e Coleções",
 
-  // "community.sub-collection-list.head": "Collections of this Community",
-  "community.sub-collection-list.head": "Coleções desta Comunidade",
+  // "community.sub-collection-list.head": "Collections in this Community",
+  "community.sub-collection-list.head": "Coleções nesta Comunidade",
 
-  // "community.sub-community-list.head": "Communities of this Community",
-  "community.sub-community-list.head": "Comunidades desta Comunidade",
+  // "community.sub-community-list.head": "Communities in this Community",
+  "community.sub-community-list.head": "Comunidades nesta Comunidade",
 
   // "cookies.consent.accept-all": "Accept all",
   "cookies.consent.accept-all": "Aceitar tudo",
@@ -1768,6 +1979,12 @@
   // "cookies.consent.app.required.title": "(always required)",
   "cookies.consent.app.required.title": "(sempre requerido)",
 
+  // "cookies.consent.app.disable-all.description": "Use this switch to enable or disable all services.", (Auto-Translated)
+  "cookies.consent.app.disable-all.description": "Use esse comutador para ativar ou desativar todos os serviços.",
+
+  // "cookies.consent.app.disable-all.title": "Enable or disable all services", (Auto-Translated)
+  "cookies.consent.app.disable-all.title": "Ativar ou desativar todos os serviços",
+
   // "cookies.consent.update": "There were changes since your last visit, please update your consent.",
   "cookies.consent.update": "Houve alterações desde sua última visita, atualize seu consentimento.",
 
@@ -1777,6 +1994,15 @@
   // "cookies.consent.decline": "Decline",
   "cookies.consent.decline": "Recusar",
 
+  // "cookies.consent.ok": "That's ok", (Auto-Translated)
+  "cookies.consent.ok": "Isso está ok",
+
+  // "cookies.consent.save": "Save", (Auto-Translated)
+  "cookies.consent.save": "Salvar",
+
+  // "cookies.consent.content-notice.title": "Cookie Consent", (Auto-Translated)
+  "cookies.consent.content-notice.title": "Consentimento de cookies",
+
   // "cookies.consent.content-notice.description": "We collect and process your personal information for the following purposes: <strong>Authentication, Preferences, Acknowledgement and Statistics</strong>. <br/> To learn more, please read our {privacyPolicy}.",
   "cookies.consent.content-notice.description": "Coletamos e processamos suas informações pessoais para os seguintes propósitos: <strong>Autenticação, Preferências, Reconhecimento e Estatísticas</strong>. <br/> Para aprender mais, por favor leia  nossa {privacyPolicy}.",
 
@@ -1798,6 +2024,12 @@
   // "cookies.consent.content-modal.title": "Information that we collect",
   "cookies.consent.content-modal.title": "Informações que coletamos",
 
+  // "cookies.consent.content-modal.services": "services", (Auto-Translated)
+  "cookies.consent.content-modal.services": "Serviços",
+
+  // "cookies.consent.content-modal.service": "service", (Auto-Translated)
+  "cookies.consent.content-modal.service": "serviço",
+
   // "cookies.consent.app.title.authentication": "Authentication",
   "cookies.consent.app.title.authentication": "Authenticação",
 
@@ -1822,16 +2054,28 @@
   // "cookies.consent.app.description.google-analytics": "Allows us to track statistical data",
   "cookies.consent.app.description.google-analytics": "Nos permite rastrear dados estatísticos",
 
+  // "cookies.consent.app.title.google-recaptcha": "Google reCaptcha", (Auto-Translated)
+  "cookies.consent.app.title.google-recaptcha": "Google reCAPTCHA",
+
+  // "cookies.consent.app.description.google-recaptcha": "We use google reCAPTCHA service during registration and password recovery", (Auto-Translated)
+  "cookies.consent.app.description.google-recaptcha": "Usamos o serviço Google reCAPTCHA durante o registro e recuperação de senha",
+
   // "cookies.consent.purpose.functional": "Functional",
   "cookies.consent.purpose.functional": "Funcional",
 
   // "cookies.consent.purpose.statistical": "Statistical",
   "cookies.consent.purpose.statistical": "Estatística",
 
-  // "curation-task.task.citationpage.label":  "Generate Citation Page",
+  // "cookies.consent.purpose.registration-password-recovery": "Registration and Password recovery", (Auto-Translated)
+  "cookies.consent.purpose.registration-password-recovery": "Registro e recuperação de senha",
+
+  // "cookies.consent.purpose.sharing": "Sharing", (Auto-Translated)
+  "cookies.consent.purpose.sharing": "Compartilhamento",
+
+  // "curation-task.task.citationpage.label": "Generate Citation Page",
   "curation-task.task.citationpage.label": "Gerar página de citação",
 
-  // "curation-task.task.checklinks.label":  "Check Links in Metadata",
+  // "curation-task.task.checklinks.label": "Check Links in Metadata",
   "curation-task.task.checklinks.label": "Verificar links em metadados",
 
   // "curation-task.task.noop.label": "NOOP",
@@ -1849,6 +2093,9 @@
   // "curation-task.task.vscan.label": "Virus Scan",
   "curation-task.task.vscan.label": "Escanear Virus",
 
+  // "curation-task.task.registerdoi.label": "Register DOI", (Auto-Translated)
+  "curation-task.task.registerdoi.label": "Registrar DOI",
+
   // "curation.form.task-select.label": "Task:",
   "curation.form.task-select.label": "Tarefa:",
 
@@ -1897,6 +2144,9 @@
   // "dso.name.untitled": "Untitled",
   "dso.name.untitled": "Sem título",
 
+  // "dso.name.unnamed": "Unnamed", (Auto-Translated)
+  "dso.name.unnamed": "Sem nome",
+
   // "dso-selector.create.collection.head": "New collection",
   "dso-selector.create.collection.head": "Nova coleção",
 
@@ -1906,6 +2156,9 @@
   // "dso-selector.create.community.head": "New community",
   "dso-selector.create.community.head": "Nova comunidade",
 
+  // "dso-selector.create.community.or-divider": "or", (Auto-Translated)
+  "dso-selector.create.community.or-divider": "ou",
+
   // "dso-selector.create.community.sub-level": "Create a new community in",
   "dso-selector.create.community.sub-level": "Criar uma nova coleção em",
 
@@ -1936,10 +2189,10 @@
   // "dso-selector.export-metadata.dspaceobject.head": "Export metadata from",
   "dso-selector.export-metadata.dspaceobject.head": "Exportar metadados de",
 
-  //"dso-selector.export-batch.dspaceobject.head": "Export Batch (ZIP) from",
+  // "dso-selector.export-batch.dspaceobject.head": "Export Batch (ZIP) from",
   "dso-selector.export-batch.dspaceobject.head": "Exportar Lote (ZIP) de",
 
-  //"dso-selector.import-batch.dspaceobject.head": "Import batch from",
+  // "dso-selector.import-batch.dspaceobject.head": "Import batch from",
   "dso-selector.import-batch.dspaceobject.head": "Importar lote de",
 
   // "dso-selector.no-results": "No {{ type }} found",
@@ -1957,6 +2210,9 @@
   // "dso-selector.set-scope.community.button": "Search all of DSpace",
   "dso-selector.set-scope.community.button": "Pesquisar em todo o DSpace",
 
+  // "dso-selector.set-scope.community.or-divider": "or", (Auto-Translated)
+  "dso-selector.set-scope.community.or-divider": "ou",
+
   // "dso-selector.set-scope.community.input-header": "Search for a community or collection",
   "dso-selector.set-scope.community.input-header": "Pesquisar uma comunidade ou coleção",
 
@@ -1972,6 +2228,48 @@
   // "dso-selector.claim.item.create-from-scratch": "Create a new one",
   "dso-selector.claim.item.create-from-scratch": "Criar um novo",
 
+  // "dso-selector.results-could-not-be-retrieved": "Something went wrong, please refresh again ↻", (Auto-Translated)
+  "dso-selector.results-could-not-be-retrieved": "Algo deu errado, por favor, recarregue novamente ↻",
+
+  // "supervision-group-selector.header": "Supervision Group Selector", (Auto-Translated)
+  "supervision-group-selector.header": "Seletor de grupo de supervisão",
+
+  // "supervision-group-selector.select.type-of-order.label": "Select a type of Order", (Auto-Translated)
+  "supervision-group-selector.select.type-of-order.label": "Selecione um tipo de pedido",
+
+  // "supervision-group-selector.select.type-of-order.option.none": "NONE", (Auto-Translated)
+  "supervision-group-selector.select.type-of-order.option.none": "NENHUM",
+
+  // "supervision-group-selector.select.type-of-order.option.editor": "EDITOR", (Auto-Translated)
+  "supervision-group-selector.select.type-of-order.option.editor": "EDITOR",
+
+  // "supervision-group-selector.select.type-of-order.option.observer": "OBSERVER", (Auto-Translated)
+  "supervision-group-selector.select.type-of-order.option.observer": "OBSERVADOR",
+
+  // "supervision-group-selector.select.group.label": "Select a Group", (Auto-Translated)
+  "supervision-group-selector.select.group.label": "Selecione um grupo",
+
+  // "supervision-group-selector.button.cancel": "Cancel", (Auto-Translated)
+  "supervision-group-selector.button.cancel": "Cancelar",
+
+  // "supervision-group-selector.button.save": "Save", (Auto-Translated)
+  "supervision-group-selector.button.save": "Salvar",
+
+  // "supervision-group-selector.select.type-of-order.error": "Please select a type of order", (Auto-Translated)
+  "supervision-group-selector.select.type-of-order.error": "Selecione um tipo de pedido",
+
+  // "supervision-group-selector.select.group.error": "Please select a group", (Auto-Translated)
+  "supervision-group-selector.select.group.error": "Selecione um grupo",
+
+  // "supervision-group-selector.notification.create.success.title": "Successfully created supervision order for group {{ name }}", (Auto-Translated)
+  "supervision-group-selector.notification.create.success.title": "Ordem de supervisão criada com sucesso para o grupo {{ name }}",
+
+  // "supervision-group-selector.notification.create.failure.title": "Error", (Auto-Translated)
+  "supervision-group-selector.notification.create.failure.title": "Erro",
+
+  // "supervision-group-selector.notification.create.already-existing": "A supervision order already exists on this item for selected group", (Auto-Translated)
+  "supervision-group-selector.notification.create.already-existing": "Já existe uma ordem de supervisão neste item para o grupo selecionado",
+
   // "confirmation-modal.export-metadata.header": "Export metadata for {{ dsoName }}",
   "confirmation-modal.export-metadata.header": "Exportar metadados para {{ dsoName }}",
 
@@ -1984,16 +2282,16 @@
   // "confirmation-modal.export-metadata.confirm": "Export",
   "confirmation-modal.export-metadata.confirm": "Exportar",
 
-  //"confirmation-modal.export-batch.header": "Export batch (ZIP) for {{ dsoName }}",
+  // "confirmation-modal.export-batch.header": "Export batch (ZIP) for {{ dsoName }}",
   "confirmation-modal.export-batch.header": "Exportar lote (ZIP) para {{ dsoName }}",
 
-  //"confirmation-modal.export-batch.info": "Are you sure you want to export batch (ZIP) for {{ dsoName }}",
+  // "confirmation-modal.export-batch.info": "Are you sure you want to export batch (ZIP) for {{ dsoName }}",
   "confirmation-modal.export-batch.info": "Você tem certeza que deseja exportar o lote (ZIP) para {{ dsoName }}",
 
-  //"confirmation-modal.export-batch.cancel": "Cancel",
+  // "confirmation-modal.export-batch.cancel": "Cancel",
   "confirmation-modal.export-batch.cancel": "Cancelar",
 
-  //"confirmation-modal.export-batch.confirm": "Export",
+  // "confirmation-modal.export-batch.confirm": "Export",
   "confirmation-modal.export-batch.confirm": "Exportar",
 
   // "confirmation-modal.delete-eperson.header": "Delete EPerson \"{{ dsoName }}\"",
@@ -2020,6 +2318,18 @@
   // "confirmation-modal.delete-profile.confirm": "Delete",
   "confirmation-modal.delete-profile.confirm": "Apagar",
 
+  // "confirmation-modal.delete-subscription.header": "Delete Subscription", (Auto-Translated)
+  "confirmation-modal.delete-subscription.header": "Excluir assinatura",
+
+  // "confirmation-modal.delete-subscription.info": "Are you sure you want to delete subscription for \"{{ dsoName }}\"", (Auto-Translated)
+  "confirmation-modal.delete-subscription.info": "Tem certeza de que deseja excluir a assinatura para \"{{ dsoName }}\"",
+
+  // "confirmation-modal.delete-subscription.cancel": "Cancel", (Auto-Translated)
+  "confirmation-modal.delete-subscription.cancel": "Cancelar",
+
+  // "confirmation-modal.delete-subscription.confirm": "Delete", (Auto-Translated)
+  "confirmation-modal.delete-subscription.confirm": "Excluir",
+
   // "error.bitstream": "Error fetching bitstream",
   "error.bitstream": "Erro ao carregar bitstream",
 
@@ -2092,6 +2402,27 @@
   // "error.validation.groupExists": "This group already exists",
   "error.validation.groupExists": "Este Grupo já existe",
 
+  // "error.validation.metadata.name.invalid-pattern": "This field cannot contain dots, commas or spaces. Please use the Element & Qualifier fields instead", (Auto-Translated)
+  "error.validation.metadata.name.invalid-pattern": "Este campo não pode conter pontos, vírgulas ou espaços. Ao invés, por favor, use os campos de Elemento e Qualificador",
+
+  // "error.validation.metadata.name.max-length": "This field may not contain more than 32 characters", (Auto-Translated)
+  "error.validation.metadata.name.max-length": "Este campo pode não conter mais de 32 caracteres",
+
+  // "error.validation.metadata.namespace.max-length": "This field may not contain more than 256 characters", (Auto-Translated)
+  "error.validation.metadata.namespace.max-length": "Este campo pode não conter mais de 256 caracteres",
+
+  // "error.validation.metadata.element.invalid-pattern": "This field cannot contain dots, commas or spaces. Please use the Qualifier field instead", (Auto-Translated)
+  "error.validation.metadata.element.invalid-pattern": "Este campo não pode conter pontos, vírgulas ou espaços. Por favor, use o campo Qualificador em vez disso",
+
+  // "error.validation.metadata.element.max-length": "This field may not contain more than 64 characters", (Auto-Translated)
+  "error.validation.metadata.element.max-length": "Este campo pode não conter mais de 64 caracteres",
+
+  // "error.validation.metadata.qualifier.invalid-pattern": "This field cannot contain dots, commas or spaces", (Auto-Translated)
+  "error.validation.metadata.qualifier.invalid-pattern": "Este campo não pode conter pontos, vírgulas ou espaços",
+
+  // "error.validation.metadata.qualifier.max-length": "This field may not contain more than 64 characters", (Auto-Translated)
+  "error.validation.metadata.qualifier.max-length": "Este campo pode não conter mais de 64 caracteres",
+
   // "feed.description": "Syndication feed",
   "feed.description": "Feed de distribuição",
 
@@ -2113,10 +2444,10 @@
   // "footer.link.privacy-policy": "Privacy policy",
   "footer.link.privacy-policy": "Política de Privacidade",
 
-  // "footer.link.end-user-agreement":"End User Agreement",
+  // "footer.link.end-user-agreement": "End User Agreement",
   "footer.link.end-user-agreement": "Termos de Uso",
 
-  // "footer.link.feedback":"Send Feedback",
+  // "footer.link.feedback": "Send Feedback",
   "footer.link.feedback": "Enviar uma Sugestão",
 
   // "forgot-email.form.header": "Forgot Password",
@@ -2131,8 +2462,8 @@
   // "forgot-email.form.email.error.required": "Please fill in an email address",
   "forgot-email.form.email.error.required": "Por favor preencha o endereço de email",
 
-  // "forgot-email.form.email.error.pattern": "Please fill in a valid email address",
-  "forgot-email.form.email.error.pattern": "Por favor preencha com um e-mail válido",
+  // "forgot-email.form.email.error.not-email-form": "Please fill in a valid email address", (Auto-Translated)
+  "forgot-email.form.email.error.not-email-form": "Por favor preencha com um endereço de email válido",
 
   // "forgot-email.form.email.hint": "An email will be sent to this address with a further instructions.",
   "forgot-email.form.email.hint": "Um e-mail será enviado para este endereço com mais instruções.",
@@ -2254,6 +2585,24 @@
   // "form.no-value": "No value entered",
   "form.no-value": "Nenhum valor informado",
 
+  // "form.other-information.email": "Email", (Auto-Translated)
+  "form.other-information.email": "E-mail",
+
+  // "form.other-information.first-name": "First Name", (Auto-Translated)
+  "form.other-information.first-name": "Primeiro nome",
+
+  // "form.other-information.insolr": "In Solr Index", (Auto-Translated)
+  "form.other-information.insolr": "No índice Solr",
+
+  // "form.other-information.institution": "Institution", (Auto-Translated)
+  "form.other-information.institution": "Instituição",
+
+  // "form.other-information.last-name": "Last Name", (Auto-Translated)
+  "form.other-information.last-name": "Sobrenome",
+
+  // "form.other-information.orcid": "ORCID", (Auto-Translated)
+  "form.other-information.orcid": "ORCID",
+
   // "form.remove": "Remove",
   "form.remove": "Apagar",
 
@@ -2272,6 +2621,9 @@
   // "form.submit": "Save",
   "form.submit": "Salvar",
 
+  // "form.create": "Create", (Auto-Translated)
+  "form.create": "Criar",
+
   // "form.repeatable.sort.tip": "Drop the item in the new position",
   "form.repeatable.sort.tip": "Solte o item na nova posição",
 
@@ -2281,8 +2633,8 @@
   // "grant-deny-request-copy.email.back": "Back",
   "grant-deny-request-copy.email.back": "Voltar",
 
-  // "grant-deny-request-copy.email.message": "Message",
-  "grant-deny-request-copy.email.message": "Mensagem",
+  // "grant-deny-request-copy.email.message": "Optional additional message",
+  "grant-deny-request-copy.email.message": "Mensagem adicional opcional",
 
   // "grant-deny-request-copy.email.message.empty": "Please enter a message",
   "grant-deny-request-copy.email.message.empty": "Por favor coloque uma mensagem",
@@ -2333,8 +2685,8 @@
   // "grant-request-copy.header": "Grant document copy request",
   "grant-request-copy.header": "Conceder solicitação de cópia do documento",
 
-  // "grant-request-copy.intro": "This message will be sent to the applicant of the request. The requested document(s) will be attached.",
-  "grant-request-copy.intro": "Esta mensagem será enviada ao requerente do pedido. O(s) documento(s) solicitado(s) será(ão) anexado(s).",
+  // "grant-request-copy.intro": "A message will be sent to the applicant of the request. The requested document(s) will be attached.",
+  "grant-request-copy.intro": "Uma mensagem será enviada ao requerente do pedido. O(s) documento(s) solicitado(s) será(ão) anexado(s).",
 
   // "grant-request-copy.success": "Successfully granted item request",
   "grant-request-copy.success": "Solicitação de item concedida com sucesso",
@@ -2342,13 +2694,13 @@
   // "health.breadcrumbs": "Health",
   "health.breadcrumbs": "Saúde",
 
-  // "health-page.heading" : "Health",
+  // "health-page.heading": "Health",
   "health-page.heading": "Saúde",
 
-  // "health-page.info-tab" : "Info",
+  // "health-page.info-tab": "Info",
   "health-page.info-tab": "Informação",
 
-  // "health-page.status-tab" : "Status",
+  // "health-page.status-tab": "Status",
   "health-page.status-tab": "Status",
 
   // "health-page.error.msg": "The health check service is temporarily unavailable",
@@ -2441,6 +2793,9 @@
   // "info.end-user-agreement.title": "End User Agreement",
   "info.end-user-agreement.title": "Contrato de Usuário Final",
 
+  // "info.end-user-agreement.hosting-country": "the United States", (Auto-Translated)
+  "info.end-user-agreement.hosting-country": "os Estados Unidos",
+
   // "info.privacy.breadcrumbs": "Privacy Statement",
   "info.privacy.breadcrumbs": "Política de privacidade",
 
@@ -2474,19 +2829,19 @@
   // "info.feedback.email-label": "Your Email",
   "info.feedback.email-label": "Seu Email",
 
-  // "info.feedback.create.success" : "Feedback Sent Successfully!",
+  // "info.feedback.create.success": "Feedback Sent Successfully!",
   "info.feedback.create.success": "Sugestão Enviada com Sucesso!",
 
-  // "info.feedback.error.email.required" : "A valid email address is required",
+  // "info.feedback.error.email.required": "A valid email address is required",
   "info.feedback.error.email.required": "Um endereço de email válido é requerido",
 
-  // "info.feedback.error.message.required" : "A comment is required",
+  // "info.feedback.error.message.required": "A comment is required",
   "info.feedback.error.message.required": "Um comentário é requerido",
 
-  // "info.feedback.page-label" : "Page",
+  // "info.feedback.page-label": "Page",
   "info.feedback.page-label": "Página",
 
-  // "info.feedback.page_help" : "Tha page related to your feedback",
+  // "info.feedback.page_help": "Tha page related to your feedback",
   "info.feedback.page_help": "A página relacionada a sua sugestão",
 
   // "item.alerts.private": "This item is non-discoverable",
@@ -2501,7 +2856,7 @@
   // "item.edit.authorizations.title": "Edit item's Policies",
   "item.edit.authorizations.title": "Editar Política de item",
 
-  // "item.badge.private": "Private",
+  // "item.badge.private": "Non-discoverable",
   "item.badge.private": "Privado",
 
   // "item.badge.withdrawn": "Withdrawn",
@@ -2657,13 +3012,75 @@
   // "item.edit.tabs.disabled.tooltip": "You're not authorized to access this tab",
   "item.edit.tabs.disabled.tooltip": "Você não está autorizado a acessar esta guia",
 
-
   // "item.edit.tabs.mapper.head": "Collection Mapper",
   "item.edit.tabs.mapper.head": "Mapeamento de Coleção",
 
   // "item.edit.tabs.item-mapper.title": "Item Edit - Collection Mapper",
   "item.edit.tabs.item-mapper.title": "Editar Item - Mapeamento de Coleção",
 
+  // "item.edit.identifiers.doi.status.UNKNOWN": "Unknown", (Auto-Translated)
+  "item.edit.identifiers.doi.status.UNKNOWN": "Desconhecido",
+
+  // "item.edit.identifiers.doi.status.TO_BE_REGISTERED": "Queued for registration", (Auto-Translated)
+  "item.edit.identifiers.doi.status.TO_BE_REGISTERED": "Fila para registro",
+
+  // "item.edit.identifiers.doi.status.TO_BE_RESERVED": "Queued for reservation", (Auto-Translated)
+  "item.edit.identifiers.doi.status.TO_BE_RESERVED": "Fila para reserva",
+
+  // "item.edit.identifiers.doi.status.IS_REGISTERED": "Registered", (Auto-Translated)
+  "item.edit.identifiers.doi.status.IS_REGISTERED": "Registrado",
+
+  // "item.edit.identifiers.doi.status.IS_RESERVED": "Reserved", (Auto-Translated)
+  "item.edit.identifiers.doi.status.IS_RESERVED": "Reservado",
+
+  // "item.edit.identifiers.doi.status.UPDATE_RESERVED": "Reserved (update queued)", (Auto-Translated)
+  "item.edit.identifiers.doi.status.UPDATE_RESERVED": "Reservado (atualiza a fila)",
+
+  // "item.edit.identifiers.doi.status.UPDATE_REGISTERED": "Registered (update queued)", (Auto-Translated)
+  "item.edit.identifiers.doi.status.UPDATE_REGISTERED": "Registrado (atualiza a fila)",
+
+  // "item.edit.identifiers.doi.status.UPDATE_BEFORE_REGISTRATION": "Queued for update and registration", (Auto-Translated)
+  "item.edit.identifiers.doi.status.UPDATE_BEFORE_REGISTRATION": "Fila para atualização e registro",
+
+  // "item.edit.identifiers.doi.status.TO_BE_DELETED": "Queued for deletion", (Auto-Translated)
+  "item.edit.identifiers.doi.status.TO_BE_DELETED": "Fila para exclusão",
+
+  // "item.edit.identifiers.doi.status.DELETED": "Deleted", (Auto-Translated)
+  "item.edit.identifiers.doi.status.DELETED": "Excluído",
+
+  // "item.edit.identifiers.doi.status.PENDING": "Pending (not registered)", (Auto-Translated)
+  "item.edit.identifiers.doi.status.PENDING": "Pendente (não registrado)",
+
+  // "item.edit.identifiers.doi.status.MINTED": "Minted (not registered)", (Auto-Translated)
+  "item.edit.identifiers.doi.status.MINTED": "Cunhado (não registrado)",
+
+  // "item.edit.tabs.status.buttons.register-doi.label": "Register a new or pending DOI", (Auto-Translated)
+  "item.edit.tabs.status.buttons.register-doi.label": "Registre um DOI novo ou pendente",
+
+  // "item.edit.tabs.status.buttons.register-doi.button": "Register DOI...", (Auto-Translated)
+  "item.edit.tabs.status.buttons.register-doi.button": "Registre DOI ...",
+
+  // "item.edit.register-doi.header": "Register a new or pending DOI", (Auto-Translated)
+  "item.edit.register-doi.header": "Registre um DOI novo ou pendente",
+
+  // "item.edit.register-doi.description": "Review any pending identifiers and item metadata below and click Confirm to proceed with DOI registration, or Cancel to back out", (Auto-Translated)
+  "item.edit.register-doi.description": "Revise todos os identificadores pendentes e metadados do item abaixo e clique em Confirmar para prosseguir com o registro do DOI ou cancelar para desistir",
+
+  // "item.edit.register-doi.confirm": "Confirm", (Auto-Translated)
+  "item.edit.register-doi.confirm": "Confirmar",
+
+  // "item.edit.register-doi.cancel": "Cancel", (Auto-Translated)
+  "item.edit.register-doi.cancel": "Cancelar",
+
+  // "item.edit.register-doi.success": "DOI queued for registration successfully.", (Auto-Translated)
+  "item.edit.register-doi.success": "DOI enfileirado para registro com sucesso.",
+
+  // "item.edit.register-doi.error": "Error registering DOI", (Auto-Translated)
+  "item.edit.register-doi.error": "Erro ao registrar DOI",
+
+  // "item.edit.register-doi.to-update": "The following DOI has already been minted and will be queued for registration online", (Auto-Translated)
+  "item.edit.register-doi.to-update": "O seguinte DOI já foi cunhado e será enfileirado para registro online",
+
   // "item.edit.item-mapper.buttons.add": "Map item to selected collections",
   "item.edit.item-mapper.buttons.add": "Mapear item na(s) coleção(ões) seleciona(s)",
 
@@ -2724,6 +3141,12 @@
   // "item.edit.metadata.discard-button": "Discard",
   "item.edit.metadata.discard-button": "Descartar",
 
+  // "item.edit.metadata.edit.buttons.confirm": "Confirm", (Auto-Translated)
+  "item.edit.metadata.edit.buttons.confirm": "Confirmar",
+
+  // "item.edit.metadata.edit.buttons.drag": "Drag to reorder", (Auto-Translated)
+  "item.edit.metadata.edit.buttons.drag": "Arraste para reordenar",
+
   // "item.edit.metadata.edit.buttons.edit": "Edit",
   "item.edit.metadata.edit.buttons.edit": "Editar",
 
@@ -2736,6 +3159,9 @@
   // "item.edit.metadata.edit.buttons.unedit": "Stop editing",
   "item.edit.metadata.edit.buttons.unedit": "Parar edição",
 
+  // "item.edit.metadata.edit.buttons.virtual": "This is a virtual metadata value, i.e. a value inherited from a related entity. It can’t be modified directly. Add or remove the corresponding relationship in the "Relationships" tab", (Auto-Translated)
+  "item.edit.metadata.edit.buttons.virtual": "Este é um valor de metadados virtuais, ou seja, um valor herdado de uma entidade relacionada. Não pode ser modificado diretamente. Adicione ou remova o relacionamento correspondente na guia \"Relacionamentos\"",
+
   // "item.edit.metadata.empty": "The item currently doesn't contain any metadata. Click Add to start adding a metadata value.",
   "item.edit.metadata.empty": "O item atualmente não contém metadados. Clique em Adicionar para começar a adicionar um valor de metadados.",
 
@@ -2751,6 +3177,9 @@
   // "item.edit.metadata.headers.value": "Value",
   "item.edit.metadata.headers.value": "Valor",
 
+  // "item.edit.metadata.metadatafield.error": "An error occurred validating the metadata field", (Auto-Translated)
+  "item.edit.metadata.metadatafield.error": "Ocorreu um erro ao validar o campo de metadados",
+
   // "item.edit.metadata.metadatafield.invalid": "Please choose a valid metadata field",
   "item.edit.metadata.metadatafield.invalid": "Por favor escolha um campo de metadados válido",
 
@@ -2784,6 +3213,9 @@
   // "item.edit.metadata.reinstate-button": "Undo",
   "item.edit.metadata.reinstate-button": "Desfazer",
 
+  // "item.edit.metadata.reset-order-button": "Undo reorder", (Auto-Translated)
+  "item.edit.metadata.reset-order-button": "Desfazer reordenar",
+
   // "item.edit.metadata.save-button": "Save",
   "item.edit.metadata.save-button": "Salvar",
 
@@ -2838,37 +3270,37 @@
   // "item.edit.private.cancel": "Cancel",
   "item.edit.private.cancel": "Cancelar",
 
-  // "item.edit.private.confirm": "Make it Private",
+  // "item.edit.private.confirm": "Make it non-discoverable",
   "item.edit.private.confirm": "Tornar Privado",
 
-  // "item.edit.private.description": "Are you sure this item should be made private in the archive?",
+  // "item.edit.private.description": "Are you sure this item should be made non-discoverable in the archive?",
   "item.edit.private.description": "Tem certeza de que este item deve ser tornado privado no arquivo?",
 
-  // "item.edit.private.error": "An error occurred while making the item private",
+  // "item.edit.private.error": "An error occurred while making the item non-discoverable",
   "item.edit.private.error": "Ocorreu um erro ao tornar o item privado",
 
-  // "item.edit.private.header": "Make item private: {{ id }}",
+  // "item.edit.private.header": "Make item non-discoverable: {{ id }}",
   "item.edit.private.header": "Tornar o item privado: {{ id }}",
 
-  // "item.edit.private.success": "The item is now private",
+  // "item.edit.private.success": "The item is now non-discoverable",
   "item.edit.private.success": "O item agora é privado",
 
   // "item.edit.public.cancel": "Cancel",
   "item.edit.public.cancel": "Cancelar",
 
-  // "item.edit.public.confirm": "Make it public",
+  // "item.edit.public.confirm": "Make it discoverable",
   "item.edit.public.confirm": "Tornar público",
 
-  // "item.edit.public.description": "Are you sure this item should be made public in the archive?",
+  // "item.edit.public.description": "Are you sure this item should be made discoverable in the archive?",
   "item.edit.public.description": "Você tem certeza que deseja tornar este item público no arquivo?",
 
-  // "item.edit.public.error": "An error occurred while making the item public",
+  // "item.edit.public.error": "An error occurred while making the item discoverable",
   "item.edit.public.error": "Ocorreu um erro ao tornar o item público",
 
-  // "item.edit.public.header": "Make item public: {{ id }}",
+  // "item.edit.public.header": "Make item discoverable: {{ id }}",
   "item.edit.public.header": "Tornar o item público: {{ id }}",
 
-  // "item.edit.public.success": "The item is now public",
+  // "item.edit.public.success": "The item is now discoverable",
   "item.edit.public.success": "O item agora é público",
 
   // "item.edit.reinstate.cancel": "Cancel",
@@ -2949,6 +3381,15 @@
   // "item.edit.tabs.curate.title": "Item Edit - Curate",
   "item.edit.tabs.curate.title": "Editar Item - Curadoria",
 
+  // "item.edit.curate.title": "Curate Item: {{item}}", (Auto-Translated)
+  "item.edit.curate.title": "Fazer curadoria do Item: {{item}}",
+
+  // "item.edit.tabs.access-control.head": "Access Control", (Auto-Translated)
+  "item.edit.tabs.access-control.head": "Controle de acesso",
+
+  // "item.edit.tabs.access-control.title": "Item Edit - Access Control", (Auto-Translated)
+  "item.edit.tabs.access-control.title": "Edição de item - Controle de acesso",
+
   // "item.edit.tabs.metadata.head": "Metadata",
   "item.edit.tabs.metadata.head": "Metadados",
 
@@ -3102,6 +3543,30 @@
   // "item.truncatable-part.show-less": "Collapse",
   "item.truncatable-part.show-less": "Fechar",
 
+  // "workflow-item.search.result.delete-supervision.modal.header": "Delete Supervision Order", (Auto-Translated)
+  "workflow-item.search.result.delete-supervision.modal.header": "Excluir ordem de supervisão",
+
+  // "workflow-item.search.result.delete-supervision.modal.info": "Are you sure you want to delete Supervision Order", (Auto-Translated)
+  "workflow-item.search.result.delete-supervision.modal.info": "Tem certeza que deseja excluir o pedido de supervisão",
+
+  // "workflow-item.search.result.delete-supervision.modal.cancel": "Cancel", (Auto-Translated)
+  "workflow-item.search.result.delete-supervision.modal.cancel": "Cancelar",
+
+  // "workflow-item.search.result.delete-supervision.modal.confirm": "Delete", (Auto-Translated)
+  "workflow-item.search.result.delete-supervision.modal.confirm": "Excluir",
+
+  // "workflow-item.search.result.notification.deleted.success": "Successfully deleted supervision order \"{{name}}\"", (Auto-Translated)
+  "workflow-item.search.result.notification.deleted.success": "Ordem de supervisão excluída com sucesso \"{{name}}\"",
+
+  // "workflow-item.search.result.notification.deleted.failure": "Failed to delete supervision order \"{{name}}\"", (Auto-Translated)
+  "workflow-item.search.result.notification.deleted.failure": "Falha ao excluir a ordem de supervisão \"{{name}}\"",
+
+  // "workflow-item.search.result.list.element.supervised-by": "Supervised by:", (Auto-Translated)
+  "workflow-item.search.result.list.element.supervised-by": "Supervisionado por:",
+
+  // "workflow-item.search.result.list.element.supervised.remove-tooltip": "Remove supervision group", (Auto-Translated)
+  "workflow-item.search.result.list.element.supervised.remove-tooltip": "Remover o grupo de supervisão",
+
   // "item.page.abstract": "Abstract",
   "item.page.abstract": "Resumo",
 
@@ -3192,10 +3657,10 @@
   // "item.page.bitstreams.collapse": "Collapse",
   "item.page.bitstreams.collapse": "Fechar",
 
-  // "item.page.filesection.original.bundle" : "Original bundle",
+  // "item.page.filesection.original.bundle": "Original bundle",
   "item.page.filesection.original.bundle": "Pacote Original",
 
-  // "item.page.filesection.license.bundle" : "License bundle",
+  // "item.page.filesection.license.bundle": "License bundle",
   "item.page.filesection.license.bundle": "Licença do Pacote",
 
   // "item.page.return": "Back",
@@ -3204,7 +3669,7 @@
   // "item.page.version.create": "Create new version",
   "item.page.version.create": "Criar nova versão",
 
-  // "item.page.version.hasDraft": "A new version cannot be created because there is an inprogress submission in the version history",
+  // "item.page.version.hasDraft": "A new version cannot be created because there is an in-progress submission in the version history",
   "item.page.version.hasDraft": "Não é possível criar uma nova versão porque há uma submissão em andamento no histórico de versões",
 
   // "item.page.claim.button": "Claim",
@@ -3240,27 +3705,30 @@
   // "item.preview.dc.type": "Type:",
   "item.preview.dc.type": "Tipo:",
 
-  // "item.preview.oaire.citation.issue" : "Issue",
+  // "item.preview.oaire.citation.issue": "Issue",
   "item.preview.oaire.citation.issue": "Questão",
 
-  // "item.preview.oaire.citation.volume" : "Volume",
+  // "item.preview.oaire.citation.volume": "Volume",
   "item.preview.oaire.citation.volume": "Volume",
 
-  // "item.preview.dc.relation.issn" : "ISSN",
+  // "item.preview.dc.relation.issn": "ISSN",
   "item.preview.dc.relation.issn": "ISSN",
 
-  // "item.preview.dc.identifier.isbn" : "ISBN",
+  // "item.preview.dc.identifier.isbn": "ISBN",
   "item.preview.dc.identifier.isbn": "ISBN",
 
   // "item.preview.dc.identifier": "Identifier:",
   "item.preview.dc.identifier": "Identificador:",
 
-  // "item.preview.dc.relation.ispartof" : "Journal or Serie",
-  "item.preview.dc.relation.ispartof": "Revista ou Série",
+  // "item.preview.dc.relation.ispartof": "Journal or Series",
+  "item.preview.dc.relation.ispartof": "Revista ou Séries",
 
-  // "item.preview.dc.identifier.doi" : "DOI",
+  // "item.preview.dc.identifier.doi": "DOI",
   "item.preview.dc.identifier.doi": "DOI",
 
+  // "item.preview.dc.publisher": "Publisher:", (Auto-Translated)
+  "item.preview.dc.publisher": "Editora:",
+
   // "item.preview.person.familyName": "Surname:",
   "item.preview.person.familyName": "Sobrenome:",
 
@@ -3360,7 +3828,7 @@
   // "item.version.history.table.action.deleteVersion": "Delete version",
   "item.version.history.table.action.deleteVersion": "Apagar versão",
 
-  // "item.version.history.table.action.hasDraft": "A new version cannot be created because there is an inprogress submission in the version history",
+  // "item.version.history.table.action.hasDraft": "A new version cannot be created because there is an in-progress submission in the version history",
   "item.version.history.table.action.hasDraft": "Não é possível criar uma nova versão porque há uma submissão em andamento no histórico de versões",
 
   // "item.version.notice": "This is not the latest version of this item. The latest version can be found <a href='{{destination}}'>here</a>.",
@@ -3399,13 +3867,13 @@
   // "item.version.create.modal.submitted.text": "The new version is being created. This may take some time if the item has a lot of relationships.",
   "item.version.create.modal.submitted.text": "A nova versão está sendo criada. Isso pode levar algum tempo se o item tiver muitos relacionamentos.",
 
-  // "item.version.create.notification.success" : "New version has been created with version number {{version}}",
+  // "item.version.create.notification.success": "New version has been created with version number {{version}}",
   "item.version.create.notification.success": "Uma nova versão foi criada com o número de versão {{version}}",
 
-  // "item.version.create.notification.failure" : "New version has not been created",
+  // "item.version.create.notification.failure": "New version has not been created",
   "item.version.create.notification.failure": "A nova versão não foi criada",
 
-  // "item.version.create.notification.inProgress" : "A new version cannot be created because there is an inprogress submission in the version history",
+  // "item.version.create.notification.inProgress": "A new version cannot be created because there is an in-progress submission in the version history",
   "item.version.create.notification.inProgress": "Não é possível criar uma nova versão porque há uma submissão em andamento no histórico de versões",
 
   // "item.version.delete.modal.header": "Delete version",
@@ -3426,18 +3894,99 @@
   // "item.version.delete.modal.button.cancel.tooltip": "Do not delete this version",
   "item.version.delete.modal.button.cancel.tooltip": "Não apague esta versão",
 
-  // "item.version.delete.notification.success" : "Version number {{version}} has been deleted",
+  // "item.version.delete.notification.success": "Version number {{version}} has been deleted",
   "item.version.delete.notification.success": "Versão número {{version}} foi apagada",
 
-  // "item.version.delete.notification.failure" : "Version number {{version}} has not been deleted",
+  // "item.version.delete.notification.failure": "Version number {{version}} has not been deleted",
   "item.version.delete.notification.failure": "Versão número {{version}} não foi apagada",
 
-  // "item.version.edit.notification.success" : "The summary of version number {{version}} has been changed",
+  // "item.version.edit.notification.success": "The summary of version number {{version}} has been changed",
   "item.version.edit.notification.success": "O resumo da versão número {{version}} foi alterado",
 
-  // "item.version.edit.notification.failure" : "The summary of version number {{version}} has not been changed",
+  // "item.version.edit.notification.failure": "The summary of version number {{version}} has not been changed",
   "item.version.edit.notification.failure": "O resumo da versão número {{version}} não foi alterado",
 
+  // "itemtemplate.edit.metadata.add-button": "Add", (Auto-Translated)
+  "itemtemplate.edit.metadata.add-button": "Adicionar",
+
+  // "itemtemplate.edit.metadata.discard-button": "Discard", (Auto-Translated)
+  "itemtemplate.edit.metadata.discard-button": "Descartar",
+
+  // "itemtemplate.edit.metadata.edit.buttons.confirm": "Confirm", (Auto-Translated)
+  "itemtemplate.edit.metadata.edit.buttons.confirm": "Confirmar",
+
+  // "itemtemplate.edit.metadata.edit.buttons.drag": "Drag to reorder", (Auto-Translated)
+  "itemtemplate.edit.metadata.edit.buttons.drag": "Arraste para reordenar",
+
+  // "itemtemplate.edit.metadata.edit.buttons.edit": "Edit", (Auto-Translated)
+  "itemtemplate.edit.metadata.edit.buttons.edit": "Editar",
+
+  // "itemtemplate.edit.metadata.edit.buttons.remove": "Remove", (Auto-Translated)
+  "itemtemplate.edit.metadata.edit.buttons.remove": "Remover",
+
+  // "itemtemplate.edit.metadata.edit.buttons.undo": "Undo changes", (Auto-Translated)
+  "itemtemplate.edit.metadata.edit.buttons.undo": "Desfazer mudanças",
+
+  // "itemtemplate.edit.metadata.edit.buttons.unedit": "Stop editing", (Auto-Translated)
+  "itemtemplate.edit.metadata.edit.buttons.unedit": "Parar de editar",
+
+  // "itemtemplate.edit.metadata.empty": "The item template currently doesn't contain any metadata. Click Add to start adding a metadata value.", (Auto-Translated)
+  "itemtemplate.edit.metadata.empty": "O modelo de item atualmente não contém metadados. Clique em Adicionar para começar a adicionar um valor de metadados.",
+
+  // "itemtemplate.edit.metadata.headers.edit": "Edit", (Auto-Translated)
+  "itemtemplate.edit.metadata.headers.edit": "Editar",
+
+  // "itemtemplate.edit.metadata.headers.field": "Field", (Auto-Translated)
+  "itemtemplate.edit.metadata.headers.field": "Campo",
+
+  // "itemtemplate.edit.metadata.headers.language": "Lang", (Auto-Translated)
+  "itemtemplate.edit.metadata.headers.language": "Idioma",
+
+  // "itemtemplate.edit.metadata.headers.value": "Value", (Auto-Translated)
+  "itemtemplate.edit.metadata.headers.value": "Valor",
+
+  // "itemtemplate.edit.metadata.metadatafield.error": "An error occurred validating the metadata field", (Auto-Translated)
+  "itemtemplate.edit.metadata.metadatafield.error": "Ocorreu um erro validando o campo de metadados",
+
+  // "itemtemplate.edit.metadata.metadatafield.invalid": "Please choose a valid metadata field", (Auto-Translated)
+  "itemtemplate.edit.metadata.metadatafield.invalid": "Escolha um campo de metadados válido",
+
+  // "itemtemplate.edit.metadata.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button", (Auto-Translated)
+  "itemtemplate.edit.metadata.notifications.discarded.content": "Suas mudanças foram descartadas. Para restabelecer suas alterações, clique no botão 'Desfazer'",
+
+  // "itemtemplate.edit.metadata.notifications.discarded.title": "Changes discarded", (Auto-Translated)
+  "itemtemplate.edit.metadata.notifications.discarded.title": "Mudanças descartadas",
+
+  // "itemtemplate.edit.metadata.notifications.error.title": "An error occurred", (Auto-Translated)
+  "itemtemplate.edit.metadata.notifications.error.title": "Um erro ocorreu",
+
+  // "itemtemplate.edit.metadata.notifications.invalid.content": "Your changes were not saved. Please make sure all fields are valid before you save.", (Auto-Translated)
+  "itemtemplate.edit.metadata.notifications.invalid.content": "Suas mudanças não foram salvas. Certifique-se de que todos os campos sejam válidos antes de salvar.",
+
+  // "itemtemplate.edit.metadata.notifications.invalid.title": "Metadata invalid", (Auto-Translated)
+  "itemtemplate.edit.metadata.notifications.invalid.title": "Metadados inválidos",
+
+  // "itemtemplate.edit.metadata.notifications.outdated.content": "The item template you're currently working on has been changed by another user. Your current changes are discarded to prevent conflicts", (Auto-Translated)
+  "itemtemplate.edit.metadata.notifications.outdated.content": "O modelo de item em que você está trabalhando atualmente foi alterado por outro usuário. Suas alterações atuais serão descartadas para evitar conflitos",
+
+  // "itemtemplate.edit.metadata.notifications.outdated.title": "Changes outdated", (Auto-Translated)
+  "itemtemplate.edit.metadata.notifications.outdated.title": "Mudanças desatualizadas",
+
+  // "itemtemplate.edit.metadata.notifications.saved.content": "Your changes to this item template's metadata were saved.", (Auto-Translated)
+  "itemtemplate.edit.metadata.notifications.saved.content": "Suas alterações nos metadados do modelo deste item foram salvas.",
+
+  // "itemtemplate.edit.metadata.notifications.saved.title": "Metadata saved", (Auto-Translated)
+  "itemtemplate.edit.metadata.notifications.saved.title": "Metadados salvos",
+
+  // "itemtemplate.edit.metadata.reinstate-button": "Undo", (Auto-Translated)
+  "itemtemplate.edit.metadata.reinstate-button": "Desfazer",
+
+  // "itemtemplate.edit.metadata.reset-order-button": "Undo reorder", (Auto-Translated)
+  "itemtemplate.edit.metadata.reset-order-button": "Desfazer reordenar",
+
+  // "itemtemplate.edit.metadata.save-button": "Save", (Auto-Translated)
+  "itemtemplate.edit.metadata.save-button": "Salvar",
+
   // "journal.listelement.badge": "Journal",
   "journal.listelement.badge": "Revista",
 
@@ -3523,8 +4072,7 @@
   "iiifsearchable.page.doi": "Link Permanente: ",
 
   // "iiifsearchable.page.issue": "Issue: ",
-  // TODO New key - Add a translation
-  "iiifsearchable.page.issue": "Issue: ",
+  "iiifsearchable.page.issue": "Edição: ",
 
   // "iiifsearchable.page.description": "Description: ",
   "iiifsearchable.page.description": "Descrição: ",
@@ -3542,8 +4090,7 @@
   "iiif.page.doi": "Link Permanente: ",
 
   // "iiif.page.issue": "Issue: ",
-  // TODO New key - Add a translation
-  "iiif.page.issue": "Issue: ",
+  "iiif.page.issue": "Edição: ",
 
   // "iiif.page.description": "Description: ",
   "iiif.page.description": "Descrição: ",
@@ -3614,9 +4161,6 @@
   // "login.form.new-user": "New user? Click here to register.",
   "login.form.new-user": "Novo usuário? Clique aqui para cadastrar.",
 
-  // "login.form.or-divider": "or",
-  "login.form.or-divider": "ou",
-
   // "login.form.oidc": "Log in with OIDC",
   "login.form.oidc": "Entrar com o OIDC",
 
@@ -3662,6 +4206,9 @@
   // "menu.section.access_control_authorizations": "Authorizations",
   "menu.section.access_control_authorizations": "Autorizações",
 
+  // "menu.section.access_control_bulk": "Bulk Access Management", (Auto-Translated)
+  "menu.section.access_control_bulk": "Gerenciamento de acesso em massa",
+
   // "menu.section.access_control_groups": "Groups",
   "menu.section.access_control_groups": "Grupos",
 
@@ -3695,6 +4242,12 @@
   // "menu.section.browse_global_by_subject": "By Subject",
   "menu.section.browse_global_by_subject": "Por Assunto",
 
+  // "menu.section.browse_global_by_srsc": "By Subject Category", (Auto-Translated)
+  "menu.section.browse_global_by_srsc": "Por categoria de assunto",
+
+  // "menu.section.browse_global_by_nsi": "By Norwegian Science Index", (Auto-Translated)
+  "menu.section.browse_global_by_nsi": "Pelo Índice de Ciências Norueguesas",
+
   // "menu.section.browse_global_by_title": "By Title",
   "menu.section.browse_global_by_title": "Por Título",
 
@@ -3734,6 +4287,9 @@
   // "menu.section.export_metadata": "Metadata",
   "menu.section.export_metadata": "Metadados",
 
+  // "menu.section.export_batch": "Batch Export (ZIP)",
+  "menu.section.export_batch": "Exportação em Lote (ZIP)",
+
   // "menu.section.icon.access_control": "Access Control menu section",
   "menu.section.icon.access_control": "Seção do menu Controle de Acesso",
 
@@ -3788,9 +4344,6 @@
   // "menu.section.import_batch": "Batch Import (ZIP)",
   "menu.section.import_batch": "Importação em Lote (ZIP)",
 
-  // "menu.section.export_batch": "Batch Export (ZIP)",
-  "menu.section.export_batch": "Exportação em Lote (ZIP)",
-
   // "menu.section.import_metadata": "Metadata",
   "menu.section.import_metadata": "Metadados",
 
@@ -3874,8 +4427,10 @@
 
   // "metadata-export-search.tooltip": "Export search results as CSV",
   "metadata-export-search.tooltip": "Exportar resultados de pesquisa como CSV",
+
   // "metadata-export-search.submit.success": "The export was started successfully",
   "metadata-export-search.submit.success": "A exportação foi iniciada com sucesso",
+
   // "metadata-export-search.submit.error": "Starting the export has failed",
   "metadata-export-search.submit.error": "Falha ao iniciar a exportação",
 
@@ -3885,9 +4440,6 @@
   // "mydspace.description": "",
   "mydspace.description": "",
 
-  // "mydspace.general.text-here": "here",
-  "mydspace.general.text-here": "aqui",
-
   // "mydspace.messages.controller-help": "Select this option to send a message to item's submitter.",
   "mydspace.messages.controller-help": "Selecione esta opção para enviar uma mensagem para o submetedor do item.",
 
@@ -3966,26 +4518,29 @@
   // "mydspace.search-form.placeholder": "Search in mydspace...",
   "mydspace.search-form.placeholder": "Procurar no meudspace...",
 
-  // "mydspace.show.workflow": "All tasks",
-  "mydspace.show.workflow": "Todas as tarefas",
+  // "mydspace.show.workflow": "Workflow tasks",
+  "mydspace.show.workflow": "Tarefas de fluxo de trabalho",
 
   // "mydspace.show.workspace": "Your Submissions",
   "mydspace.show.workspace": "Minhas Submissões",
 
-  // "mydspace.status.archived": "Archived",
-  "mydspace.status.archived": "Arquivado",
+  // "mydspace.show.supervisedWorkspace": "Supervised items", (Auto-Translated)
+  "mydspace.show.supervisedWorkspace": "Itens supervisionados",
 
-  // "mydspace.status.validation": "Validation",
-  "mydspace.status.validation": "Validação",
+  // "mydspace.status.mydspaceArchived": "Archived",
+  "mydspace.status.mydspaceArchived": "Arquivado",
 
-  // "mydspace.status.waiting-for-controller": "Waiting for controller",
-  "mydspace.status.waiting-for-controller": "Esperando pelo controlador",
+  // "mydspace.status.mydspaceValidation": "Validation",
+  "mydspace.status.mydspaceValidation": "Validação",
 
-  // "mydspace.status.workflow": "Workflow",
-  "mydspace.status.workflow": "Fluxo de trabalho",
+  // "mydspace.status.mydspaceWaitingController": "Waiting for reviewer",
+  "mydspace.status.mydspaceWaitingController": "Esperando pelo controlador",
 
-  // "mydspace.status.workspace": "Workspace",
-  "mydspace.status.workspace": "Espaço de trabalho",
+  // "mydspace.status.mydspaceWorkflow": "Workflow",
+  "mydspace.status.mydspaceWorkflow": "Fluxo de trabalho",
+
+  // "mydspace.status.mydspaceWorkspace": "Workspace",
+  "mydspace.status.mydspaceWorkspace": "Espaço de trabalho",
 
   // "mydspace.title": "MyDSpace",
   "mydspace.title": "MeuDSpace",
@@ -4014,14 +4569,20 @@
   // "nav.community-browse.header": "By Community",
   "nav.community-browse.header": "Por Comunidade",
 
+  // "nav.context-help-toggle": "Toggle context help", (Auto-Translated)
+  "nav.context-help-toggle": "Alternar a ajuda do contexto",
+
   // "nav.language": "Language switch",
   "nav.language": "Selecionar um idioma",
 
   // "nav.login": "Log In",
   "nav.login": "Entrar",
 
-  // "nav.logout": "User profile menu and Log Out",
-  "nav.logout": "Menu do Usuário e Sair",
+  // "nav.user-profile-menu-and-logout": "User profile menu and Log Out", (Auto-Translated)
+  "nav.user-profile-menu-and-logout": "Menu do perfil de usuário e Sair",
+
+  // "nav.logout": "Log Out",
+  "nav.logout": "Sair",
 
   // "nav.main.description": "Main navigation bar",
   "nav.main.description": "Barra de navegação principal",
@@ -4035,25 +4596,33 @@
   // "nav.search": "Search",
   "nav.search": "Buscar",
 
+  // "nav.search.button": "Submit search", (Auto-Translated)
+  "nav.search.button": "Enviar pesquisa",
+
   // "nav.statistics.header": "Statistics",
   "nav.statistics.header": "Estatísticas",
 
   // "nav.stop-impersonating": "Stop impersonating EPerson",
   "nav.stop-impersonating": "Deixar de assumir o papel do EPerson",
 
-  // "nav.toggle" : "Toggle navigation",
+  // "nav.subscriptions": "Subscriptions", (Auto-Translated)
+  "nav.subscriptions": "Assinaturas",
+
+  // "nav.toggle": "Toggle navigation",
   "nav.toggle": "Alternar navegação",
 
-  // "nav.user.description" : "User profile bar",
+  // "nav.user.description": "User profile bar",
   "nav.user.description": "Barra de perfil do usuário",
 
   // "none.listelement.badge": "Item",
   "none.listelement.badge": "Item",
 
-
   // "orgunit.listelement.badge": "Organizational Unit",
   "orgunit.listelement.badge": "Unidade Organizacional",
 
+  // "orgunit.listelement.no-title": "Untitled", (Auto-Translated)
+  "orgunit.listelement.no-title": "Sem título",
+
   // "orgunit.page.city": "City",
   "orgunit.page.city": "Cidade",
 
@@ -4186,6 +4755,9 @@
   // "process.new.notification.error.content": "An error occurred while creating this process",
   "process.new.notification.error.content": "Um erro ocorreu enquanto criava o processo",
 
+  // "process.new.notification.error.max-upload.content": "The file exceeds the maximum upload size", (Auto-Translated)
+  "process.new.notification.error.max-upload.content": "O arquivo excede o tamanho máximo de upload",
+
   // "process.new.header": "Create a new process",
   "process.new.header": "Criar novo processo",
 
@@ -4195,16 +4767,16 @@
   // "process.new.breadcrumbs": "Create a new process",
   "process.new.breadcrumbs": "Criar novo processo",
 
-  // "process.detail.arguments" : "Arguments",
+  // "process.detail.arguments": "Arguments",
   "process.detail.arguments": "Argumentos",
 
-  // "process.detail.arguments.empty" : "This process doesn't contain any arguments",
+  // "process.detail.arguments.empty": "This process doesn't contain any arguments",
   "process.detail.arguments.empty": "Este processo não contêm nenhum argumento",
 
-  // "process.detail.back" : "Back",
+  // "process.detail.back": "Back",
   "process.detail.back": "Voltar",
 
-  // "process.detail.output" : "Process Output",
+  // "process.detail.output": "Process Output",
   "process.detail.output": "Saída do Processo",
 
   // "process.detail.logs.button": "Retrieve process output",
@@ -4216,28 +4788,28 @@
   // "process.detail.logs.none": "This process has no output",
   "process.detail.logs.none": "Este processo não tem saída",
 
-  // "process.detail.output-files" : "Output Files",
+  // "process.detail.output-files": "Output Files",
   "process.detail.output-files": "Arquivos de saída",
 
-  // "process.detail.output-files.empty" : "This process doesn't contain any output files",
+  // "process.detail.output-files.empty": "This process doesn't contain any output files",
   "process.detail.output-files.empty": "Este processo não contém nenhum arquivo de saída",
 
-  // "process.detail.script" : "Script",
+  // "process.detail.script": "Script",
   "process.detail.script": "Script",
 
-  // "process.detail.title" : "Process: {{ id }} - {{ name }}",
+  // "process.detail.title": "Process: {{ id }} - {{ name }}",
   "process.detail.title": "Processo: {{ id }} - {{ name }}",
 
-  // "process.detail.start-time" : "Start time",
+  // "process.detail.start-time": "Start time",
   "process.detail.start-time": "Hora de Início",
 
-  // "process.detail.end-time" : "Finish time",
+  // "process.detail.end-time": "Finish time",
   "process.detail.end-time": "Hora de Fim",
 
-  // "process.detail.status" : "Status",
+  // "process.detail.status": "Status",
   "process.detail.status": "Status",
 
-  // "process.detail.create" : "Create similar process",
+  // "process.detail.create": "Create similar process",
   "process.detail.create": "Criar processo similar",
 
   // "process.detail.actions": "Actions",
@@ -4264,22 +4836,22 @@
   // "process.detail.delete.error": "Something went wrong when deleting the process",
   "process.detail.delete.error": "Algo deu errado ao excluir o processo",
 
-  // "process.overview.table.finish" : "Finish time (UTC)",
+  // "process.overview.table.finish": "Finish time (UTC)",
   "process.overview.table.finish": "Hora de Fim (UTC)",
 
-  // "process.overview.table.id" : "Process ID",
+  // "process.overview.table.id": "Process ID",
   "process.overview.table.id": "ID do Processo",
 
-  // "process.overview.table.name" : "Name",
+  // "process.overview.table.name": "Name",
   "process.overview.table.name": "Nome",
 
-  // "process.overview.table.start" : "Start time (UTC)",
+  // "process.overview.table.start": "Start time (UTC)",
   "process.overview.table.start": "Hora de Início (UTC)",
 
-  // "process.overview.table.status" : "Status",
+  // "process.overview.table.status": "Status",
   "process.overview.table.status": "Status",
 
-  // "process.overview.table.user" : "User",
+  // "process.overview.table.user": "User",
   "process.overview.table.user": "Usuário",
 
   // "process.overview.title": "Processes Overview",
@@ -4384,6 +4956,9 @@
   // "profile.security.form.label.passwordrepeat": "Retype to confirm",
   "profile.security.form.label.passwordrepeat": "Redigite para confirmar",
 
+  // "profile.security.form.label.current-password": "Current password", (Auto-Translated)
+  "profile.security.form.label.current-password": "Senha atual",
+
   // "profile.security.form.notifications.success.content": "Your changes to the password were saved.",
   "profile.security.form.notifications.success.content": "Suas alterações na senha foram salvas.",
 
@@ -4393,6 +4968,9 @@
   // "profile.security.form.notifications.error.title": "Error changing passwords",
   "profile.security.form.notifications.error.title": "Erro trocando a senha",
 
+  // "profile.security.form.notifications.error.change-failed": "An error occurred while trying to change the password. Please check if the current password is correct.", (Auto-Translated)
+  "profile.security.form.notifications.error.change-failed": "Ocorreu um erro ao tentar alterar a senha. Verifique se a senha atual está correta.",
+
   // "profile.security.form.notifications.error.not-same": "The provided passwords are not the same.",
   "profile.security.form.notifications.error.not-same": "As senhas fornecidas não são as mesmas.",
 
@@ -4558,8 +5136,11 @@
   // "register-page.registration.email.error.required": "Please fill in an email address",
   "register-page.registration.email.error.required": "Por favor preencha o endereço de email",
 
-  // "register-page.registration.email.error.pattern": "Please fill in a valid email address",
-  "register-page.registration.email.error.pattern": "Por favor preencha com um endereço válido de email",
+  // "register-page.registration.email.error.not-email-form": "Please fill in a valid email address.", (Auto-Translated)
+  "register-page.registration.email.error.not-email-form": "Por favor preencha com um endereço de email válido.",
+
+  // "register-page.registration.email.error.not-valid-domain": "Use email with allowed domains: {{ domains }}", (Auto-Translated)
+  "register-page.registration.email.error.not-valid-domain": "Use email com domínios permitidos: {{ domains }}",
 
   // "register-page.registration.email.hint": "This address will be verified and used as your login name.",
   "register-page.registration.email.hint": "Este endereço será verificado e usado como seu nome de login.",
@@ -4579,6 +5160,30 @@
   // "register-page.registration.error.content": "An error occured when registering the following email address: {{ email }}",
   "register-page.registration.error.content": "Um erro ocorreu enquanto registrava o seguinte endereço de email: {{ email }}",
 
+  // "register-page.registration.error.recaptcha": "Error when trying to authenticate with recaptcha", (Auto-Translated)
+  "register-page.registration.error.recaptcha": "Erro ao tentar autenticar com o reCAPTCHA",
+
+  // "register-page.registration.google-recaptcha.must-accept-cookies": "In order to register you must accept the <b>Registration and Password recovery</b> (Google reCaptcha) cookies.", (Auto-Translated)
+  "register-page.registration.google-recaptcha.must-accept-cookies": "Para se registrar, você deve aceitar os cookies de <b> Registro e Recuperação de Senha </b> (Google reCAPTCHA).",
+
+  // "register-page.registration.error.maildomain": "This email address is not on the list of domains who can register. Allowed domains are {{ domains }}", (Auto-Translated)
+  "register-page.registration.error.maildomain": "Este endereço de e-mail não está na lista de domínios que podem se registrar. Os domínios permitidos são {{ domains }}",
+
+  // "register-page.registration.google-recaptcha.open-cookie-settings": "Open cookie settings", (Auto-Translated)
+  "register-page.registration.google-recaptcha.open-cookie-settings": "Abra as configurações de cookies",
+
+  // "register-page.registration.google-recaptcha.notification.title": "Google reCaptcha", (Auto-Translated)
+  "register-page.registration.google-recaptcha.notification.title": "Google reCAPTCHA",
+
+  // "register-page.registration.google-recaptcha.notification.message.error": "An error occurred during reCaptcha verification", (Auto-Translated)
+  "register-page.registration.google-recaptcha.notification.message.error": "Ocorreu um erro durante a verificação de reCAPTCHA",
+
+  // "register-page.registration.google-recaptcha.notification.message.expired": "Verification expired. Please verify again.", (Auto-Translated)
+  "register-page.registration.google-recaptcha.notification.message.expired": "Verificação expirada. Por favor, verifique novamente.",
+
+  // "register-page.registration.info.maildomain": "Accounts can be registered for mail addresses of the domains", (Auto-Translated)
+  "register-page.registration.info.maildomain": "Contas podem ser registradas para endereços de correio dos domínios",
+
   // "relationships.add.error.relationship-type.content": "No suitable match could be found for relationship type {{ type }} between the two items",
   "relationships.add.error.relationship-type.content": "Nenhuma correspondência adequada foi encontrada para o tipo de relacionamento {{ type }} entre os dois itens",
 
@@ -4645,11 +5250,11 @@
   // "repository.image.logo": "Repository logo",
   "repository.image.logo": "Logo do Repositório",
 
-  // "repository.title.prefix": "DSpace Angular :: ",
-  "repository.title.prefix": "DSpace Angular :: ",
+  // "repository.title": "DSpace Repository", (Auto-Translated)
+  "repository.title": "Repositório DSpace",
 
-  // "repository.title.prefixDSpace": "DSpace Angular ::",
-  "repository.title.prefixDSpace": "DSpace Angular ::",
+  // "repository.title.prefix": "DSpace Repository :: ",
+  "repository.title.prefix": "Repositório DSpace :: ",
 
   // "resource-policies.add.button": "Add",
   "resource-policies.add.button": "Adicionar",
@@ -4768,6 +5373,10 @@
   // "resource-policies.form.name.label": "Name",
   "resource-policies.form.name.label": "Nome",
 
+  //"resource-policies.form.name.hint": "Max 30 characters",
+  // TODO New key - Add a translation
+  "resource-policies.form.name.hint": "Max 30 characters",
+
   // "resource-policies.form.policy-type.label": "Select the policy type",
   "resource-policies.form.policy-type.label": "Selecione o tipo política",
 
@@ -4879,6 +5488,9 @@
   // "search.filters.applied.f.birthDate.min": "Start birth date",
   "search.filters.applied.f.birthDate.min": "Início data de nascimento",
 
+  // "search.filters.applied.f.supervisedBy": "Supervised by", (Auto-Translated)
+  "search.filters.applied.f.supervisedBy": "Supervisionado por",
+
   // "search.filters.applied.f.withdrawn": "Withdrawn",
   "search.filters.applied.f.withdrawn": "Retirado",
 
@@ -4963,7 +5575,7 @@
   // "search.filters.filter.dateSubmitted.label": "Search date submitted",
   "search.filters.filter.dateSubmitted.label": "Procurar data de submissão",
 
-  // "search.filters.filter.discoverable.head": "Private",
+  // "search.filters.filter.discoverable.head": "Non-discoverable",
   "search.filters.filter.discoverable.head": "Privado",
 
   // "search.filters.filter.withdrawn.head": "Withdrawn",
@@ -5089,6 +5701,18 @@
   // "search.filters.filter.submitter.label": "Search submitter",
   "search.filters.filter.submitter.label": "Procurar submetedor",
 
+  // "search.filters.filter.show-tree": "Browse {{ name }} tree", (Auto-Translated)
+  "search.filters.filter.show-tree": "Navegar na árvore {{ name }}",
+
+  // "search.filters.filter.supervisedBy.head": "Supervised By", (Auto-Translated)
+  "search.filters.filter.supervisedBy.head": "Supervisionado por",
+
+  // "search.filters.filter.supervisedBy.placeholder": "Supervised By", (Auto-Translated)
+  "search.filters.filter.supervisedBy.placeholder": "Supervisionado por",
+
+  // "search.filters.filter.supervisedBy.label": "Search Supervised By", (Auto-Translated)
+  "search.filters.filter.supervisedBy.label": "Pesquisa supervisionada por",
+
   // "search.filters.entityType.JournalIssue": "Journal Issue",
   "search.filters.entityType.JournalIssue": "Número de Revista",
 
@@ -5110,6 +5734,21 @@
   // "search.filters.discoverable.false": "Yes",
   "search.filters.discoverable.false": "Sim",
 
+  // "search.filters.namedresourcetype.Archived": "Archived", (Auto-Translated)
+  "search.filters.namedresourcetype.Archived": "Arquivado",
+
+  // "search.filters.namedresourcetype.Validation": "Validation", (Auto-Translated)
+  "search.filters.namedresourcetype.Validation": "Validação",
+
+  // "search.filters.namedresourcetype.Waiting for Controller": "Waiting for Controller", (Auto-Translated)
+  "search.filters.namedresourcetype.Waiting for Controller": "Esperando por controlador",
+
+  // "search.filters.namedresourcetype.Workflow": "Workflow", (Auto-Translated)
+  "search.filters.namedresourcetype.Workflow": "Fluxo de trabalho",
+
+  // "search.filters.namedresourcetype.Workspace": "Workspace", (Auto-Translated)
+  "search.filters.namedresourcetype.Workspace": "Área de trabalho",
+
   // "search.filters.withdrawn.true": "Yes",
   "search.filters.withdrawn.true": "Sim",
 
@@ -5257,6 +5896,9 @@
   // "statistics.table.header.views": "Views",
   "statistics.table.header.views": "Visualizações",
 
+  // "statistics.table.no-name": "(object name could not be loaded)", (Auto-Translated)
+  "statistics.table.no-name": "(o nome do objeto não pôde ser carregado)",
+
   // "submission.edit.breadcrumbs": "Edit Submission",
   "submission.edit.breadcrumbs": "Editar Submissão",
 
@@ -5266,8 +5908,8 @@
   // "submission.general.cancel": "Cancel",
   "submission.general.cancel": "Cancelar",
 
-  // "submission.general.cannot_submit": "You have not the privilege to make a new submission.",
-  "submission.general.cannot_submit": "Você mão tem privilégios para fazer uma nova submissão.",
+  // "submission.general.cannot_submit": "You don't have permission to make a new submission.",
+  "submission.general.cannot_submit": "Você não tem privilégios para fazer uma nova submissão.",
 
   // "submission.general.deposit": "Deposit",
   "submission.general.deposit": "Depositar",
@@ -5309,8 +5951,7 @@
   "submission.import-external.title.Journal": "Importar uma revista de uma fonte externa",
 
   // "submission.import-external.title.JournalIssue": "Import a journal issue from an external source",
-  // TODO New key - Add a translation
-  "submission.import-external.title.JournalIssue": "Import a journal issue from an external source",
+  "submission.import-external.title.JournalIssue": "Importar uma edição de revista de uma fonte externa",
 
   // "submission.import-external.title.JournalVolume": "Import a journal volume from an external source",
   "submission.import-external.title.JournalVolume": "Importar um volume de revista de uma fonte externa",
@@ -5357,8 +5998,11 @@
   // "submission.import-external.source.cinii": "CiNii",
   "submission.import-external.source.cinii": "CiNii",
 
-  // "submission.import-external.source.crossref": "CrossRef",
-  "submission.import-external.source.crossref": "CrossRef",
+  // "submission.import-external.source.crossref": "Crossref",
+  "submission.import-external.source.crossref": "Crossref",
+
+  // "submission.import-external.source.datacite": "DataCite", (Auto-Translated)
+  "submission.import-external.source.datacite": "DataCite",
 
   // "submission.import-external.source.scielo": "SciELO",
   "submission.import-external.source.scielo": "SciELO",
@@ -5451,8 +6095,7 @@
   "submission.sections.describe.relationship-lookup.external-source.import-button-title.Journal": "Importar revista remota",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-button-title.Journal Issue": "Import remote journal issue",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Journal Issue": "Import remote journal issue",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Journal Issue": "Importar uma edição de jornal remota",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-button-title.Journal Volume": "Import remote journal volume",
   "submission.sections.describe.relationship-lookup.external-source.import-button-title.Journal Volume": "Importar volume de revista remoto",
@@ -5557,16 +6200,13 @@
   "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal.added.new-entity": "Revista Externa importada e adicionada com sucesso à seleção",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Issue.title": "Import Remote Journal Issue",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Issue.title": "Import Remote Journal Issue",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Issue.title": "Importar uma edição de jornal remota",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Issue.added.local-entity": "Successfully added local journal issue to the selection",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Issue.added.local-entity": "Successfully added local journal issue to the selection",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Issue.added.local-entity": "Edição de jornal local adicionada com sucesso à seleção",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Issue.added.new-entity": "Successfully imported and added external journal issue to the selection",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Issue.added.new-entity": "Successfully imported and added external journal issue to the selection",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Issue.added.new-entity": "Edição de jornal externo importada e adicionada com sucesso à seleção",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Volume.title": "Import Remote Journal Volume",
   "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Volume.title": "Importar Volume de Revista Remoto",
@@ -5612,6 +6252,7 @@
 
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalOfPublication": "Local Journals ({{ count }})",
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalOfPublication": "Revistas Locais ({{ count }})",
+
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.Project": "Local Projects ({{ count }})",
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.Project": "Projetos Locais ({{ count }})",
 
@@ -5635,11 +6276,13 @@
 
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalIssueOfPublication": "Local Journal Issues ({{ count }})",
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalIssueOfPublication": "Números de Revista Local ({{ count }})",
+
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.JournalIssue": "Local Journal Issues ({{ count }})",
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.JournalIssue": "Números de Revista Local ({{ count }})",
 
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalVolumeOfPublication": "Local Journal Volumes ({{ count }})",
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalVolumeOfPublication": "Volumes de Revista Local ({{ count }})",
+
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.JournalVolume": "Local Journal Volumes ({{ count }})",
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.JournalVolume": "Volumes de Revista Local ({{ count }})",
 
@@ -5679,6 +6322,9 @@
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingAgencyOfProject": "Funder of the Project",
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingAgencyOfProject": "Financiador do Projeto",
 
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isPublicationOfAuthor": "Publication of the Author", (Auto-Translated)
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isPublicationOfAuthor": "Publicação do Autor",
+
   // "submission.sections.describe.relationship-lookup.selection-tab.title.openAIREFunding": "Funding OpenAIRE API",
   "submission.sections.describe.relationship-lookup.selection-tab.title.openAIREFunding": "Financiamento da API OpenAIRE",
 
@@ -5699,11 +6345,13 @@
 
   // "submission.sections.describe.relationship-lookup.title.isJournalIssueOfPublication": "Journal Issues",
   "submission.sections.describe.relationship-lookup.title.isJournalIssueOfPublication": "Números de Revista",
+
   // "submission.sections.describe.relationship-lookup.title.JournalIssue": "Journal Issues",
   "submission.sections.describe.relationship-lookup.title.JournalIssue": "Números de Revista",
 
   // "submission.sections.describe.relationship-lookup.title.isJournalVolumeOfPublication": "Journal Volumes",
   "submission.sections.describe.relationship-lookup.title.isJournalVolumeOfPublication": "Volumes de Revista",
+
   // "submission.sections.describe.relationship-lookup.title.JournalVolume": "Journal Volumes",
   "submission.sections.describe.relationship-lookup.title.JournalVolume": "Volumes de Revista",
 
@@ -5715,6 +6363,7 @@
 
   // "submission.sections.describe.relationship-lookup.title.isFundingAgencyOfPublication": "Funding Agency",
   "submission.sections.describe.relationship-lookup.title.isFundingAgencyOfPublication": "Agências de Financiamento",
+
   // "submission.sections.describe.relationship-lookup.title.Project": "Projects",
   "submission.sections.describe.relationship-lookup.title.Project": "Projetos",
 
@@ -5742,6 +6391,9 @@
   // "submission.sections.describe.relationship-lookup.title.isChildOrgUnitOf": "Parent Organizational Unit",
   "submission.sections.describe.relationship-lookup.title.isChildOrgUnitOf": "Unidade organizacional principal",
 
+  // "submission.sections.describe.relationship-lookup.title.isPublicationOfAuthor": "Publication", (Auto-Translated)
+  "submission.sections.describe.relationship-lookup.title.isPublicationOfAuthor": "Publicação",
+
   // "submission.sections.describe.relationship-lookup.search-tab.toggle-dropdown": "Toggle dropdown",
   "submission.sections.describe.relationship-lookup.search-tab.toggle-dropdown": "Alternar menu suspenso",
 
@@ -5759,6 +6411,7 @@
 
   // "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalVolumeOfPublication": "Selected Journal Volume",
   "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalVolumeOfPublication": "Volume de Revista selecionados",
+
   // "submission.sections.describe.relationship-lookup.selection-tab.title.Project": "Selected Projects",
   "submission.sections.describe.relationship-lookup.selection-tab.title.Project": "Projetos Selecionados",
 
@@ -5782,6 +6435,7 @@
 
   // "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalIssueOfPublication": "Selected Issue",
   "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalIssueOfPublication": "Problema selecionado",
+
   // "submission.sections.describe.relationship-lookup.selection-tab.title.JournalVolume": "Selected Journal Volume",
   "submission.sections.describe.relationship-lookup.selection-tab.title.JournalVolume": "Volume de Revista selecionado",
 
@@ -5790,6 +6444,7 @@
 
   // "submission.sections.describe.relationship-lookup.selection-tab.title.isFundingOfPublication": "Selected Funding",
   "submission.sections.describe.relationship-lookup.selection-tab.title.isFundingOfPublication": "Financiamento selecionado",
+
   // "submission.sections.describe.relationship-lookup.selection-tab.title.JournalIssue": "Selected Issue",
   "submission.sections.describe.relationship-lookup.selection-tab.title.JournalIssue": "Problema selecionado",
 
@@ -5910,6 +6565,24 @@
   // "submission.sections.general.sections_not_valid": "There are incomplete sections.",
   "submission.sections.general.sections_not_valid": "Há seções incompletas.",
 
+  // "submission.sections.identifiers.info": "The following identifiers will be created for your item:", (Auto-Translated)
+  "submission.sections.identifiers.info": "Os seguintes identificadores serão criados para o seu item:",
+
+  // "submission.sections.identifiers.no_handle": "No handles have been minted for this item.", (Auto-Translated)
+  "submission.sections.identifiers.no_handle": "Nenhuma alça foi cunhada para este item.",
+
+  // "submission.sections.identifiers.no_doi": "No DOIs have been minted for this item.", (Auto-Translated)
+  "submission.sections.identifiers.no_doi": "Nenhum DOIs foi cunhado para este item.",
+
+  // "submission.sections.identifiers.handle_label": "Handle: ", (Auto-Translated)
+  "submission.sections.identifiers.handle_label": "Lidar:",
+
+  // "submission.sections.identifiers.doi_label": "DOI: ", (Auto-Translated)
+  "submission.sections.identifiers.doi_label": "DOI:",
+
+  // "submission.sections.identifiers.otherIdentifiers_label": "Other identifiers: ", (Auto-Translated)
+  "submission.sections.identifiers.otherIdentifiers_label": "Outros identificadores:",
+
   // "submission.sections.submit.progressbar.accessCondition": "Item access conditions",
   "submission.sections.submit.progressbar.accessCondition": "Condições de acesso ao Item",
 
@@ -5931,6 +6604,9 @@
   // "submission.sections.submit.progressbar.detect-duplicate": "Potential duplicates",
   "submission.sections.submit.progressbar.detect-duplicate": "Duplicados em potencial",
 
+  // "submission.sections.submit.progressbar.identifiers": "Identifiers", (Auto-Translated)
+  "submission.sections.submit.progressbar.identifiers": "Identificadores",
+
   // "submission.sections.submit.progressbar.license": "Deposit license",
   "submission.sections.submit.progressbar.license": "Depositar licença",
 
@@ -6076,8 +6752,7 @@
   "submission.sections.accesses.form.discoverable-description": "Quando marcado, este item poderá ser descoberto na pesquisa/navegação. Quando desmarcado, o item estará disponível apenas por meio de um link direto e nunca aparecerá na pesquisa/navegação.",
 
   // "submission.sections.accesses.form.discoverable-label": "Discoverable",
-  // TODO New key - Add a translation
-  "submission.sections.accesses.form.discoverable-label": "Discoverable",
+  "submission.sections.accesses.form.discoverable-label": "Público",
 
   // "submission.sections.accesses.form.access-condition-label": "Access condition type",
   "submission.sections.accesses.form.access-condition-label": "Tipo de condição de acesso",
@@ -6118,16 +6793,15 @@
   // "submission.sections.accesses.form.until-placeholder": "Until",
   "submission.sections.accesses.form.until-placeholder": "Até",
 
-  // "submission.sections.license.granted-label": "Confirmo a licença acima",
-  "submission.sections.license.granted-label": "I confirm the license above",
+  // "submission.sections.license.granted-label": "I confirm the license above",
+  "submission.sections.license.granted-label": "Confirmo a licença acima",
 
   // "submission.sections.license.required": "You must accept the license",
   "submission.sections.license.required": "Você deve aceitar a licença",
 
-  // "submission.sections.license.notgranted":  "You must accept the license",
+  // "submission.sections.license.notgranted": "You must accept the license",
   "submission.sections.license.notgranted": "Você deve aceitar a licença",
 
-
   // "submission.sections.sherpa.publication.information": "Publication information",
   "submission.sections.sherpa.publication.information": "Informações de publicação",
 
@@ -6215,8 +6889,8 @@
   // "submission.workflow.generic.delete": "Delete",
   "submission.workflow.generic.delete": "Apagar",
 
-  // "submission.workflow.generic.delete-help": "If you would to discard this item, select \"Delete\".  You will then be asked to confirm it.",
-  "submission.workflow.generic.delete-help": "Se você gostaria de descartar este item, selecione \"Apagar\".  Você será questionado para confirmar.",
+  // "submission.workflow.generic.delete-help": "Select this option to discard this item. You will then be asked to confirm it.",
+  "submission.workflow.generic.delete-help": "Selecione esta opção para descartar este item. Em seguida, será solicitada confirmção.",
 
   // "submission.workflow.generic.edit": "Edit",
   "submission.workflow.generic.edit": "Editar",
@@ -6230,6 +6904,18 @@
   // "submission.workflow.generic.view-help": "Select this option to view the item's metadata.",
   "submission.workflow.generic.view-help": "Selecione esta opção para ver o metadados do item.",
 
+  // "submission.workflow.generic.submit_select_reviewer": "Select Reviewer", (Auto-Translated)
+  "submission.workflow.generic.submit_select_reviewer": "Selecione Revisor",
+
+  // "submission.workflow.generic.submit_select_reviewer-help": "", (Auto-Translated)
+  "submission.workflow.generic.submit_select_reviewer-help": "",
+
+  // "submission.workflow.generic.submit_score": "Rate", (Auto-Translated)
+  "submission.workflow.generic.submit_score": "Avaliar",
+
+  // "submission.workflow.generic.submit_score-help": "", (Auto-Translated)
+  "submission.workflow.generic.submit_score-help": "",
+
   // "submission.workflow.tasks.claimed.approve": "Approve",
   "submission.workflow.tasks.claimed.approve": "Aprovar",
 
@@ -6242,6 +6928,12 @@
   // "submission.workflow.tasks.claimed.edit_help": "Select this option to change the item's metadata.",
   "submission.workflow.tasks.claimed.edit_help": "Selecione esta opção para modificar os metadados do item.",
 
+  // "submission.workflow.tasks.claimed.decline": "Decline", (Auto-Translated)
+  "submission.workflow.tasks.claimed.decline": "Recusar",
+
+  // "submission.workflow.tasks.claimed.decline_help": "", (Auto-Translated)
+  "submission.workflow.tasks.claimed.decline_help": "",
+
   // "submission.workflow.tasks.claimed.reject.reason.info": "Please enter your reason for rejecting the submission into the box below, indicating whether the submitter may fix a problem and resubmit.",
   "submission.workflow.tasks.claimed.reject.reason.info": "Por favor informe o motivo pela rejeição da submissão na caixa abaixo, indicando se o submetedor pode corrigir um problema e reenviar.",
 
@@ -6296,6 +6988,114 @@
   // "submission.workspace.generic.view-help": "Select this option to view the item's metadata.",
   "submission.workspace.generic.view-help": "Selecione esta opção para visualizar os metadados do item.",
 
+  // "submitter.empty": "N/A", (Auto-Translated)
+  "submitter.empty": "N/D",
+
+  // "subscriptions.title": "Subscriptions", (Auto-Translated)
+  "subscriptions.title": "Assinaturas",
+
+  // "subscriptions.item": "Subscriptions for items", (Auto-Translated)
+  "subscriptions.item": "Assinaturas para itens",
+
+  // "subscriptions.collection": "Subscriptions for collections", (Auto-Translated)
+  "subscriptions.collection": "Assinaturas para coleções",
+
+  // "subscriptions.community": "Subscriptions for communities", (Auto-Translated)
+  "subscriptions.community": "Assinaturas para comunidades",
+
+  // "subscriptions.subscription_type": "Subscription type", (Auto-Translated)
+  "subscriptions.subscription_type": "Tipo de assinatura",
+
+  // "subscriptions.frequency": "Subscription frequency", (Auto-Translated)
+  "subscriptions.frequency": "Frequência de assinatura",
+
+  // "subscriptions.frequency.D": "Daily", (Auto-Translated)
+  "subscriptions.frequency.D": "Diáriamente",
+
+  // "subscriptions.frequency.M": "Monthly", (Auto-Translated)
+  "subscriptions.frequency.M": "Mensalmente",
+
+  // "subscriptions.frequency.W": "Weekly", (Auto-Translated)
+  "subscriptions.frequency.W": "Semanalmente",
+
+  // "subscriptions.tooltip": "Subscribe", (Auto-Translated)
+  "subscriptions.tooltip": "Se inscrever",
+
+  // "subscriptions.modal.title": "Subscriptions", (Auto-Translated)
+  "subscriptions.modal.title": "Assinaturas",
+
+  // "subscriptions.modal.type-frequency": "Type and frequency", (Auto-Translated)
+  "subscriptions.modal.type-frequency": "Tipo e frequência",
+
+  // "subscriptions.modal.close": "Close", (Auto-Translated)
+  "subscriptions.modal.close": "Fechar",
+
+  // "subscriptions.modal.delete-info": "To remove this subscription, please visit the "Subscriptions" page under your user profile", (Auto-Translated)
+  "subscriptions.modal.delete-info": "Para remover esta assinatura, visite a página \"Assinaturas\" no seu perfil de usuário",
+
+  // "subscriptions.modal.new-subscription-form.type.content": "Content", (Auto-Translated)
+  "subscriptions.modal.new-subscription-form.type.content": "Conteúdo",
+
+  // "subscriptions.modal.new-subscription-form.frequency.D": "Daily", (Auto-Translated)
+  "subscriptions.modal.new-subscription-form.frequency.D": "Diáriamente",
+
+  // "subscriptions.modal.new-subscription-form.frequency.W": "Weekly", (Auto-Translated)
+  "subscriptions.modal.new-subscription-form.frequency.W": "Semanalmente",
+
+  // "subscriptions.modal.new-subscription-form.frequency.M": "Monthly", (Auto-Translated)
+  "subscriptions.modal.new-subscription-form.frequency.M": "Mensalmente",
+
+  // "subscriptions.modal.new-subscription-form.submit": "Submit", (Auto-Translated)
+  "subscriptions.modal.new-subscription-form.submit": "Enviar",
+
+  // "subscriptions.modal.new-subscription-form.processing": "Processing...", (Auto-Translated)
+  "subscriptions.modal.new-subscription-form.processing": "Em processamento...",
+
+  // "subscriptions.modal.create.success": "Subscribed to {{ type }} successfully.", (Auto-Translated)
+  "subscriptions.modal.create.success": "Inscrito em {{type}} com sucesso.",
+
+  // "subscriptions.modal.delete.success": "Subscription deleted successfully", (Auto-Translated)
+  "subscriptions.modal.delete.success": "Assinatura excluída com sucesso",
+
+  // "subscriptions.modal.update.success": "Subscription to {{ type }} updated successfully", (Auto-Translated)
+  "subscriptions.modal.update.success": "Assinatura para {{type}} atualizado com sucesso",
+
+  // "subscriptions.modal.create.error": "An error occurs during the subscription creation", (Auto-Translated)
+  "subscriptions.modal.create.error": "Um erro ocorre durante a criação de assinatura",
+
+  // "subscriptions.modal.delete.error": "An error occurs during the subscription delete", (Auto-Translated)
+  "subscriptions.modal.delete.error": "Um erro ocorre durante a exclusão de assinatura",
+
+  // "subscriptions.modal.update.error": "An error occurs during the subscription update", (Auto-Translated)
+  "subscriptions.modal.update.error": "Um erro ocorre durante a atualização da assinatura",
+
+  // "subscriptions.table.dso": "Subject", (Auto-Translated)
+  "subscriptions.table.dso": "Assunto",
+
+  // "subscriptions.table.subscription_type": "Subscription Type", (Auto-Translated)
+  "subscriptions.table.subscription_type": "Tipo de assinatura",
+
+  // "subscriptions.table.subscription_frequency": "Subscription Frequency", (Auto-Translated)
+  "subscriptions.table.subscription_frequency": "Frequência de assinatura",
+
+  // "subscriptions.table.action": "Action", (Auto-Translated)
+  "subscriptions.table.action": "Ação",
+
+  // "subscriptions.table.edit": "Edit", (Auto-Translated)
+  "subscriptions.table.edit": "Editar",
+
+  // "subscriptions.table.delete": "Delete", (Auto-Translated)
+  "subscriptions.table.delete": "Excluir",
+
+  // "subscriptions.table.not-available": "Not available", (Auto-Translated)
+  "subscriptions.table.not-available": "Não disponível",
+
+  // "subscriptions.table.not-available-message": "The subscribed item has been deleted, or you don't currently have the permission to view it", (Auto-Translated)
+  "subscriptions.table.not-available-message": "O item inscrito foi excluído, ou você não tem permissão para vê-lo",
+
+  // "subscriptions.table.empty.message": "You do not have any subscriptions at this time. To subscribe to email updates for a Community or Collection, use the subscription button on the object's page.", (Auto-Translated)
+  "subscriptions.table.empty.message": "Você não tem nenhuma assinatura no momento. Para se inscrever em atualizações por e-mail para uma comunidade ou coleção, use o botão de assinatura na página do objeto.",
+
   // "thumbnail.default.alt": "Thumbnail Image",
   "thumbnail.default.alt": "Imagem de Miniatura",
 
@@ -6344,6 +7144,9 @@
   // "vocabulary-treeview.tree.description.srsc": "Research Subject Categories",
   "vocabulary-treeview.tree.description.srsc": "Categorias de Assuntos de Pesquisa",
 
+  // "vocabulary-treeview.info": "Select a subject to add as search filter", (Auto-Translated)
+  "vocabulary-treeview.info": "Selecione um assunto para adicionar como filtro de pesquisa",
+
   // "uploader.browse": "browse",
   "uploader.browse": "Navegar",
 
@@ -6356,8 +7159,8 @@
   // "uploader.or": ", or ",
   "uploader.or": ", ou ",
 
-  // "uploader.processing": "Processing",
-  "uploader.processing": "Processando",
+  // "uploader.processing": "Processing uploaded file(s)... (it's now safe to close this page)",
+  "uploader.processing": "Processando arquivo(s) enviado(s)... (agora é seguro fechar esta página)",
 
   // "uploader.queue-length": "Queue length",
   "uploader.queue-length": "Tamanho da fila",
@@ -6371,6 +7174,9 @@
   // "virtual-metadata.delete-relationship.modal-head": "Select the items for which you want to save the virtual metadata as real metadata",
   "virtual-metadata.delete-relationship.modal-head": "Selecione os itens para os quais você deseja salvar os metadados virtuais como metadados reais",
 
+  // "supervisedWorkspace.search.results.head": "Supervised Items", (Auto-Translated)
+  "supervisedWorkspace.search.results.head": "Itens supervisionados",
+
   // "workspace.search.results.head": "Your submissions",
   "workspace.search.results.head": "Suas submissões",
 
@@ -6380,6 +7186,9 @@
   // "workflow.search.results.head": "Workflow tasks",
   "workflow.search.results.head": "Tarefas do Workflow",
 
+  // "supervision.search.results.head": "Workflow and Workspace tasks", (Auto-Translated)
+  "supervision.search.results.head": "Tarefas de fluxo de trabalho e espaço de trabalho",
+
   // "workflow-item.edit.breadcrumbs": "Edit workflowitem",
   "workflow-item.edit.breadcrumbs": "Editar item do workflow",
 
@@ -6443,6 +7252,81 @@
   // "workspace-item.view.title": "Workspace View",
   "workspace-item.view.title": "Visualização da Área de Trabalho (Workspace)",
 
+  // "workspace-item.delete.breadcrumbs": "Workspace Delete", (Auto-Translated)
+  "workspace-item.delete.breadcrumbs": "Excluir espaço de trabalho",
+
+  // "workspace-item.delete.header": "Delete workspace item", (Auto-Translated)
+  "workspace-item.delete.header": "Excluir item do espaço de trabalho",
+
+  // "workspace-item.delete.button.confirm": "Delete", (Auto-Translated)
+  "workspace-item.delete.button.confirm": "Excluir",
+
+  // "workspace-item.delete.button.cancel": "Cancel", (Auto-Translated)
+  "workspace-item.delete.button.cancel": "Cancelar",
+
+  // "workspace-item.delete.notification.success.title": "Deleted", (Auto-Translated)
+  "workspace-item.delete.notification.success.title": "Excluído",
+
+  // "workspace-item.delete.title": "This workspace item was successfully deleted", (Auto-Translated)
+  "workspace-item.delete.title": "Este item do espaço de trabalho foi excluído com sucesso",
+
+  // "workspace-item.delete.notification.error.title": "Something went wrong", (Auto-Translated)
+  "workspace-item.delete.notification.error.title": "Algo deu errado",
+
+  // "workspace-item.delete.notification.error.content": "The workspace item could not be deleted", (Auto-Translated)
+  "workspace-item.delete.notification.error.content": "O item do espaço de trabalho não pôde ser excluído",
+
+  // "workflow-item.advanced.title": "Advanced workflow", (Auto-Translated)
+  "workflow-item.advanced.title": "Fluxo de trabalho avançado",
+
+  // "workflow-item.selectrevieweraction.notification.success.title": "Selected reviewer", (Auto-Translated)
+  "workflow-item.selectrevieweraction.notification.success.title": "Revisor selecionado",
+
+  // "workflow-item.selectrevieweraction.notification.success.content": "The reviewer for this workflow item has been successfully selected", (Auto-Translated)
+  "workflow-item.selectrevieweraction.notification.success.content": "O revisor deste item de fluxo de trabalho foi selecionado com sucesso",
+
+  // "workflow-item.selectrevieweraction.notification.error.title": "Something went wrong", (Auto-Translated)
+  "workflow-item.selectrevieweraction.notification.error.title": "Algo deu errado",
+
+  // "workflow-item.selectrevieweraction.notification.error.content": "Couldn't select the reviewer for this workflow item", (Auto-Translated)
+  "workflow-item.selectrevieweraction.notification.error.content": "Não foi possível selecionar o revisor para este item de fluxo de trabalho",
+
+  // "workflow-item.selectrevieweraction.title": "Select Reviewer", (Auto-Translated)
+  "workflow-item.selectrevieweraction.title": "Selecione Revisor",
+
+  // "workflow-item.selectrevieweraction.header": "Select Reviewer", (Auto-Translated)
+  "workflow-item.selectrevieweraction.header": "Selecione Revisor",
+
+  // "workflow-item.selectrevieweraction.button.cancel": "Cancel", (Auto-Translated)
+  "workflow-item.selectrevieweraction.button.cancel": "Cancelar",
+
+  // "workflow-item.selectrevieweraction.button.confirm": "Confirm", (Auto-Translated)
+  "workflow-item.selectrevieweraction.button.confirm": "Confirmar",
+
+  // "workflow-item.scorereviewaction.notification.success.title": "Rating review", (Auto-Translated)
+  "workflow-item.scorereviewaction.notification.success.title": "Revisão de classificação",
+
+  // "workflow-item.scorereviewaction.notification.success.content": "The rating for this item workflow item has been successfully submitted", (Auto-Translated)
+  "workflow-item.scorereviewaction.notification.success.content": "A classificação para este item de fluxo de trabalho do item foi enviada com sucesso",
+
+  // "workflow-item.scorereviewaction.notification.error.title": "Something went wrong", (Auto-Translated)
+  "workflow-item.scorereviewaction.notification.error.title": "Algo deu errado",
+
+  // "workflow-item.scorereviewaction.notification.error.content": "Couldn't rate this item", (Auto-Translated)
+  "workflow-item.scorereviewaction.notification.error.content": "Não foi possível avaliar este item",
+
+  // "workflow-item.scorereviewaction.title": "Rate this item", (Auto-Translated)
+  "workflow-item.scorereviewaction.title": "Avaliar este item",
+
+  // "workflow-item.scorereviewaction.header": "Rate this item", (Auto-Translated)
+  "workflow-item.scorereviewaction.header": "Avaliar este item",
+
+  // "workflow-item.scorereviewaction.button.cancel": "Cancel", (Auto-Translated)
+  "workflow-item.scorereviewaction.button.cancel": "Cancelar",
+
+  // "workflow-item.scorereviewaction.button.confirm": "Confirm", (Auto-Translated)
+  "workflow-item.scorereviewaction.button.confirm": "Confirmar",
+
   // "idle-modal.header": "Session will expire soon",
   "idle-modal.header": "Sessão vai expirar em breve",
 
@@ -6455,7 +7339,7 @@
   // "idle-modal.extend-session": "Extend session",
   "idle-modal.extend-session": "Estender sessão",
 
-  // "researcher.profile.action.processing" : "Processing...",
+  // "researcher.profile.action.processing": "Processing...",
   "researcher.profile.action.processing": "Processando...",
 
   // "researcher.profile.associated": "Researcher profile associated",
@@ -6488,10 +7372,10 @@
   // "researcher.profile.view": "View",
   "researcher.profile.view": "Ver",
 
-  // "researcher.profile.private.visibility" : "PRIVATE",
+  // "researcher.profile.private.visibility": "PRIVATE",
   "researcher.profile.private.visibility": "PRIVADO",
 
-  // "researcher.profile.public.visibility" : "PUBLIC",
+  // "researcher.profile.public.visibility": "PUBLIC",
   "researcher.profile.public.visibility": "PÚBLICO",
 
   // "researcher.profile.status": "Status:",
@@ -6500,16 +7384,16 @@
   // "researcherprofile.claim.not-authorized": "You are not authorized to claim this item. For more details contact the administrator(s).",
   "researcherprofile.claim.not-authorized": "Você não está autorizado a reivindicar este item. Para mais detalhes, entre em contato com o(s) administrador(es)",
 
-  // "researcherprofile.error.claim.body" : "An error occurred while claiming the profile, please try again later",
+  // "researcherprofile.error.claim.body": "An error occurred while claiming the profile, please try again later",
   "researcherprofile.error.claim.body": "Ocorreu um erro ao reivindicar o perfil, tente novamente mais tarde",
 
-  // "researcherprofile.error.claim.title" : "Error",
+  // "researcherprofile.error.claim.title": "Error",
   "researcherprofile.error.claim.title": "Erro",
 
-  // "researcherprofile.success.claim.body" : "Profile claimed with success",
+  // "researcherprofile.success.claim.body": "Profile claimed with success",
   "researcherprofile.success.claim.body": "Perfil reivindicado com sucesso",
 
-  // "researcherprofile.success.claim.title" : "Success",
+  // "researcherprofile.success.claim.title": "Success",
   "researcherprofile.success.claim.title": "Successo",
 
   // "person.page.orcid.create": "Create an ORCID ID",
@@ -6518,7 +7402,7 @@
   // "person.page.orcid.granted-authorizations": "Granted authorizations",
   "person.page.orcid.granted-authorizations": "Autorizações concedidas",
 
-  // "person.page.orcid.grant-authorizations" : "Grant authorizations",
+  // "person.page.orcid.grant-authorizations": "Grant authorizations",
   "person.page.orcid.grant-authorizations": "Conceder autorizações",
 
   // "person.page.orcid.link": "Connect to ORCID ID",
@@ -6566,43 +7450,43 @@
   // "person.page.orcid.save.preference.changes": "Update settings",
   "person.page.orcid.save.preference.changes": "Atualizar configurações",
 
-  // "person.page.orcid.sync-profile.affiliation" : "Affiliation",
+  // "person.page.orcid.sync-profile.affiliation": "Affiliation",
   "person.page.orcid.sync-profile.affiliation": "Afiliação",
 
-  // "person.page.orcid.sync-profile.biographical" : "Biographical data",
+  // "person.page.orcid.sync-profile.biographical": "Biographical data",
   "person.page.orcid.sync-profile.biographical": "Dados biográficos",
 
-  // "person.page.orcid.sync-profile.education" : "Education",
+  // "person.page.orcid.sync-profile.education": "Education",
   "person.page.orcid.sync-profile.education": "Educação",
 
-  // "person.page.orcid.sync-profile.identifiers" : "Identifiers",
+  // "person.page.orcid.sync-profile.identifiers": "Identifiers",
   "person.page.orcid.sync-profile.identifiers": "Identificadores",
 
-  // "person.page.orcid.sync-fundings.all" : "All fundings",
+  // "person.page.orcid.sync-fundings.all": "All fundings",
   "person.page.orcid.sync-fundings.all": "Todos financiamentos",
 
-  // "person.page.orcid.sync-fundings.mine" : "My fundings",
+  // "person.page.orcid.sync-fundings.mine": "My fundings",
   "person.page.orcid.sync-fundings.mine": "Meus financiamentos",
 
-  // "person.page.orcid.sync-fundings.my_selected" : "Selected fundings",
+  // "person.page.orcid.sync-fundings.my_selected": "Selected fundings",
   "person.page.orcid.sync-fundings.my_selected": "Financiamentos selecionados",
 
-  // "person.page.orcid.sync-fundings.disabled" : "Disabled",
+  // "person.page.orcid.sync-fundings.disabled": "Disabled",
   "person.page.orcid.sync-fundings.disabled": "Desabilitado",
 
-  // "person.page.orcid.sync-publications.all" : "All publications",
+  // "person.page.orcid.sync-publications.all": "All publications",
   "person.page.orcid.sync-publications.all": "Todas publicações",
 
-  // "person.page.orcid.sync-publications.mine" : "My publications",
+  // "person.page.orcid.sync-publications.mine": "My publications",
   "person.page.orcid.sync-publications.mine": "Minhas publicações",
 
-  // "person.page.orcid.sync-publications.my_selected" : "Selected publications",
+  // "person.page.orcid.sync-publications.my_selected": "Selected publications",
   "person.page.orcid.sync-publications.my_selected": "Publicações selecionadas",
 
-  // "person.page.orcid.sync-publications.disabled" : "Disabled",
+  // "person.page.orcid.sync-publications.disabled": "Disabled",
   "person.page.orcid.sync-publications.disabled": "Desabilitado",
 
-  // "person.page.orcid.sync-queue.discard" : "Discard the change and do not synchronize with the ORCID registry",
+  // "person.page.orcid.sync-queue.discard": "Discard the change and do not synchronize with the ORCID registry",
   "person.page.orcid.sync-queue.discard": "Descarte a alteração e não sincronize com o registro ORCID",
 
   // "person.page.orcid.sync-queue.discard.error": "The discarding of the ORCID queue record failed",
@@ -6614,13 +7498,13 @@
   // "person.page.orcid.sync-queue.empty-message": "The ORCID queue registry is empty",
   "person.page.orcid.sync-queue.empty-message": "O registro da fila ORCID está vazio",
 
-  // "person.page.orcid.sync-queue.table.header.type" : "Type",
+  // "person.page.orcid.sync-queue.table.header.type": "Type",
   "person.page.orcid.sync-queue.table.header.type": "Tipo",
 
-  // "person.page.orcid.sync-queue.table.header.description" : "Description",
+  // "person.page.orcid.sync-queue.table.header.description": "Description",
   "person.page.orcid.sync-queue.table.header.description": "Descrição",
 
-  // "person.page.orcid.sync-queue.table.header.action" : "Action",
+  // "person.page.orcid.sync-queue.table.header.action": "Action",
   "person.page.orcid.sync-queue.table.header.action": "Ação",
 
   // "person.page.orcid.sync-queue.description.affiliation": "Affiliations",
@@ -6686,7 +7570,7 @@
   // "person.page.orcid.sync-queue.tooltip.researcher_urls": "Researcher url",
   "person.page.orcid.sync-queue.tooltip.researcher_urls": "URL do pesquisador",
 
-  // "person.page.orcid.sync-queue.send" : "Synchronize with ORCID registry",
+  // "person.page.orcid.sync-queue.send": "Synchronize with ORCID registry",
   "person.page.orcid.sync-queue.send": "Sincronize com o registro ORCID",
 
   // "person.page.orcid.sync-queue.send.unauthorized-error.title": "The submission to ORCID failed for missing authorizations.",
@@ -6740,7 +7624,7 @@
   // "person.page.orcid.sync-queue.send.validation-error.organization.name-required": "The organization's name is required",
   "person.page.orcid.sync-queue.send.validation-error.organization.name-required": "O nome da organização é obrigatório",
 
-  // "person.page.orcid.sync-queue.send.validation-error.publication.date-invalid" : "The publication date must be one year after 1900",
+  // "person.page.orcid.sync-queue.send.validation-error.publication.date-invalid": "The publication date must be one year after 1900",
   "person.page.orcid.sync-queue.send.validation-error.publication.date-invalid": "A data de publicação deve ser um ano após 1900",
 
   // "person.page.orcid.sync-queue.send.validation-error.organization.address-required": "The organization to be sent requires an address",
@@ -6818,10 +7702,171 @@
   // "person.orcid.registry.queue": "ORCID Registry Queue",
   "person.orcid.registry.queue": "ORCID Registro na Fila",
 
-  // "person.orcid.registry.auth": "ORCID Autorizações",
-  "person.orcid.registry.auth": "ORCID Autorizações",
+  // "person.orcid.registry.auth": "ORCID Authorizations",
+  "person.orcid.registry.auth": "Autorizações ORCID",
 
   // "home.recent-submissions.head": "Recent Submissions",
   "home.recent-submissions.head": "Submissões Recentes",
 
+  // "listable-notification-object.default-message": "This object couldn't be retrieved", (Auto-Translated)
+  "listable-notification-object.default-message": "Este objeto não pôde ser recuperado",
+
+  // "system-wide-alert-banner.retrieval.error": "Something went wrong retrieving the system-wide alert banner", (Auto-Translated)
+  "system-wide-alert-banner.retrieval.error": "Algo deu errado recuperar o banner de alerta em todo o sistema",
+
+  // "system-wide-alert-banner.countdown.prefix": "In", (Auto-Translated)
+  "system-wide-alert-banner.countdown.prefix": "Em",
+
+  // "system-wide-alert-banner.countdown.days": "{{days}} day(s),", (Auto-Translated)
+  "system-wide-alert-banner.countdown.days": "{{days}} dia (s),",
+
+  // "system-wide-alert-banner.countdown.hours": "{{hours}} hour(s) and", (Auto-Translated)
+  "system-wide-alert-banner.countdown.hours": "{{hours}} hora (s) e",
+
+  // "system-wide-alert-banner.countdown.minutes": "{{minutes}} minute(s):", (Auto-Translated)
+  "system-wide-alert-banner.countdown.minutes": "{{minutes}} minuto (s):",
+
+  // "menu.section.system-wide-alert": "System-wide Alert", (Auto-Translated)
+  "menu.section.system-wide-alert": "Alerta em todo o sistema",
+
+  // "system-wide-alert.form.header": "System-wide Alert", (Auto-Translated)
+  "system-wide-alert.form.header": "Alerta em todo o sistema",
+
+  // "system-wide-alert-form.retrieval.error": "Something went wrong retrieving the system-wide alert", (Auto-Translated)
+  "system-wide-alert-form.retrieval.error": "Algo deu errado recuperando o alerta em todo o sistema",
+
+  // "system-wide-alert.form.cancel": "Cancel", (Auto-Translated)
+  "system-wide-alert.form.cancel": "Cancelar",
+
+  // "system-wide-alert.form.save": "Save", (Auto-Translated)
+  "system-wide-alert.form.save": "Salvar",
+
+  // "system-wide-alert.form.label.active": "ACTIVE", (Auto-Translated)
+  "system-wide-alert.form.label.active": "ATIVO",
+
+  // "system-wide-alert.form.label.inactive": "INACTIVE", (Auto-Translated)
+  "system-wide-alert.form.label.inactive": "INATIVO",
+
+  // "system-wide-alert.form.error.message": "The system wide alert must have a message", (Auto-Translated)
+  "system-wide-alert.form.error.message": "O alerta amplo do sistema deve ter uma mensagem",
+
+  // "system-wide-alert.form.label.message": "Alert message", (Auto-Translated)
+  "system-wide-alert.form.label.message": "Mensagem de alerta",
+
+  // "system-wide-alert.form.label.countdownTo.enable": "Enable a countdown timer", (Auto-Translated)
+  "system-wide-alert.form.label.countdownTo.enable": "Ativar um cronômetro de contagem regressiva",
+
+  // "system-wide-alert.form.label.countdownTo.hint": "Hint: Set a countdown timer. When enabled, a date can be set in the future and the system-wide alert banner will perform a countdown to the set date. When this timer ends, it will disappear from the alert. The server will NOT be automatically stopped.", (Auto-Translated)
+  "system-wide-alert.form.label.countdownTo.hint": "Dica: defina um cronômetro de contagem regressiva. Quando ativado, uma data pode ser definida no futuro e o banner de alerta em todo o sistema executará uma contagem regressiva para a data definida. Quando esse timer terminar, ele desaparecerá do alerta. O servidor NÃO será interrompido automaticamente.",
+
+  // "system-wide-alert.form.label.preview": "System-wide alert preview", (Auto-Translated)
+  "system-wide-alert.form.label.preview": "Visualização de alerta em todo o sistema",
+
+  // "system-wide-alert.form.update.success": "The system-wide alert was successfully updated", (Auto-Translated)
+  "system-wide-alert.form.update.success": "O alerta em todo o sistema foi atualizado com sucesso",
+
+  // "system-wide-alert.form.update.error": "Something went wrong when updating the system-wide alert", (Auto-Translated)
+  "system-wide-alert.form.update.error": "Algo deu errado ao atualizar o alerta em todo o sistema",
+
+  // "system-wide-alert.form.create.success": "The system-wide alert was successfully created", (Auto-Translated)
+  "system-wide-alert.form.create.success": "O alerta em todo o sistema foi criado com sucesso",
+
+  // "system-wide-alert.form.create.error": "Something went wrong when creating the system-wide alert", (Auto-Translated)
+  "system-wide-alert.form.create.error": "Algo deu errado ao criar o alerta em todo o sistema",
+
+  // "admin.system-wide-alert.breadcrumbs": "System-wide Alerts", (Auto-Translated)
+  "admin.system-wide-alert.breadcrumbs": "Alertas em todo o sistema",
+
+  // "admin.system-wide-alert.title": "System-wide Alerts", (Auto-Translated)
+  "admin.system-wide-alert.title": "Alertas em todo o sistema",
+
+  // "item-access-control-title": "This form allows you to perform changes to the access conditions of the item's metadata or its bitstreams.", (Auto-Translated)
+  "item-access-control-title": "Este formulário permite que você execute alterações nas condições de acesso dos metadados do item ou seus bitstreams.",
+
+  // "collection-access-control-title": "This form allows you to perform changes to the access conditions of all the items owned by this collection. Changes may be performed to either all Item metadata or all content (bitstreams).", (Auto-Translated)
+  "collection-access-control-title": "Este formulário permite executar alterações nas condições de acesso de todos os itens de propriedade desta coleção. As alterações podem ser realizadas em todos os metadados do item ou em todo o conteúdo (BitStreams).",
+
+  // "community-access-control-title": "This form allows you to perform changes to the access conditions of all the items owned by any collection under this community. Changes may be performed to either all Item metadata or all content (bitstreams).", (Auto-Translated)
+  "community-access-control-title": "Este formulário permite executar alterações nas condições de acesso de todos os itens pertencentes a qualquer coleção nesta comunidade. As alterações podem ser realizadas em todos os metadados do item ou em todo o conteúdo (BitStreams).",
+
+  // "access-control-item-header-toggle": "Item's Metadata", (Auto-Translated)
+  "access-control-item-header-toggle": "Metadados do item",
+
+  // "access-control-bitstream-header-toggle": "Bitstreams", (Auto-Translated)
+  "access-control-bitstream-header-toggle": "BitStreams",
+
+  // "access-control-mode": "Mode", (Auto-Translated)
+  "access-control-mode": "Modo",
+
+  // "access-control-access-conditions": "Access conditions", (Auto-Translated)
+  "access-control-access-conditions": "Condições de acesso",
+
+  // "access-control-no-access-conditions-warning-message": "Currently, no access conditions are specified below. If executed, this will replace the current access conditions with the default access conditions inherited from the owning collection.", (Auto-Translated)
+  "access-control-no-access-conditions-warning-message": "Atualmente, nenhuma condição de acesso é especificada abaixo. Se executado, isso substituirá as condições de acesso atuais pelas condições de acesso padrão herdadas da coleção proprietária.",
+
+  // "access-control-replace-all": "Replace access conditions", (Auto-Translated)
+  "access-control-replace-all": "Substitua as condições de acesso",
+
+  // "access-control-add-to-existing": "Add to existing ones", (Auto-Translated)
+  "access-control-add-to-existing": "Adicione aos existentes",
+
+  // "access-control-limit-to-specific": "Limit the changes to specific bitstreams", (Auto-Translated)
+  "access-control-limit-to-specific": "Limitar as alterações em transmissões específicas",
+
+  // "access-control-process-all-bitstreams": "Update all the bitstreams in the item", (Auto-Translated)
+  "access-control-process-all-bitstreams": "Atualize todos os streams de bits no item",
+
+  // "access-control-bitstreams-selected": "bitstreams selected", (Auto-Translated)
+  "access-control-bitstreams-selected": "BitStreams selecionados",
+
+  // "access-control-cancel": "Cancel", (Auto-Translated)
+  "access-control-cancel": "Cancelar",
+
+  // "access-control-execute": "Execute", (Auto-Translated)
+  "access-control-execute": "Executar",
+
+  // "access-control-add-more": "Add more", (Auto-Translated)
+  "access-control-add-more": "Adicione mais",
+
+  // "access-control-select-bitstreams-modal.title": "Select bitstreams", (Auto-Translated)
+  "access-control-select-bitstreams-modal.title": "Selecione BitStreams",
+
+  // "access-control-select-bitstreams-modal.no-items": "No items to show.", (Auto-Translated)
+  "access-control-select-bitstreams-modal.no-items": "Sem itens para mostrar.",
+
+  // "access-control-select-bitstreams-modal.close": "Close", (Auto-Translated)
+  "access-control-select-bitstreams-modal.close": "Fechar",
+
+  // "access-control-option-label": "Access condition type", (Auto-Translated)
+  "access-control-option-label": "Tipo de condição de acesso",
+
+  // "access-control-option-note": "Choose an access condition to apply to selected objects.", (Auto-Translated)
+  "access-control-option-note": "Escolha uma condição de acesso para aplicar em objetos selecionados.",
+
+  // "access-control-option-start-date": "Grant access from", (Auto-Translated)
+  "access-control-option-start-date": "Conceder acesso de",
+
+  // "access-control-option-start-date-note": "Select the date from which the related access condition is applied", (Auto-Translated)
+  "access-control-option-start-date-note": "Selecione a data a partir da qual a condição de acesso relacionada é aplicada",
+
+  // "access-control-option-end-date": "Grant access until", (Auto-Translated)
+  "access-control-option-end-date": "Conceder acesso até",
+
+  // "access-control-option-end-date-note": "Select the date until which the related access condition is applied", (Auto-Translated)
+  "access-control-option-end-date-note": "Selecione a data até a qual a condição de acesso relacionada é aplicada",
+
+  //"browse.search-form.placeholder": "Search the repository",
+  "browse.search-form.placeholder": "Buscar no repositório",
+
+  // "file-download-link.download": "Download ",
+  "file-download-link.download": "Baixar ",
+
+  // "register-page.registration.aria.label": "Enter your e-mail address",
+  "register-page.registration.aria.label": "Digite seu e-mail",
+
+  // "forgot-email.form.aria.label": "Enter your e-mail address",
+  "forgot-email.form.aria.label": "Digite seu e-mail",
+
+  // "search-facet-option.update.announcement": "The page will be reloaded. Filter {{ filter }} is selected.",
+  "search-facet-option.update.announcement": "A página será recarregada. O filtro {{ filter }} foi selecionado.",
 }
diff --git a/src/assets/i18n/pt-PT.json5 b/src/assets/i18n/pt-PT.json5
index a187ff927c..f00e1142d2 100644
--- a/src/assets/i18n/pt-PT.json5
+++ b/src/assets/i18n/pt-PT.json5
@@ -1,6 +1,6 @@
 {
 
-  // Dspace v7.x > i18n pt-PT > last reviewed 16-06-2023
+  // Dspace v7.x > i18n pt-PT > last updated 14th of May 2024
 
   // "401.help": "You're not authorized to access this page. You can use the button below to get back to the home page.",
   "401.help": "Não está autorizado a aceder a esta página. Pode utilizar o botão em baixo para voltar à página de início.",
@@ -135,13 +135,13 @@
   "admin.registries.bitstream-formats.edit.extensions.placeholder": "Indique uma extenção de ficheiro sem o ponto",
 
   // "admin.registries.bitstream-formats.edit.failure.content": "An error occurred while editing the bitstream format.",
-  "admin.registries.bitstream-formats.edit.failure.content": "Ocorreu um erro ao editar o formato de bitstream.",
+  "admin.registries.bitstream-formats.edit.failure.content": "Ocorreu um erro ao editar o formato de ficheiro.",
 
   // "admin.registries.bitstream-formats.edit.failure.head": "Failure",
   "admin.registries.bitstream-formats.edit.failure.head": "Falha",
 
   // "admin.registries.bitstream-formats.edit.head": "Bitstream format: {{ format }}",
-  "admin.registries.bitstream-formats.edit.head": "Formato de bitstream: {{ format }}",
+  "admin.registries.bitstream-formats.edit.head": "Formato de ficheiro: {{ format }}",
 
   // "admin.registries.bitstream-formats.edit.internal.hint": "Formats marked as internal are hidden from the user, and used for administrative purposes.",
   "admin.registries.bitstream-formats.edit.internal.hint": "Formatos marcados como internos são ocultos para o utilizador, usados por motivos administrativos.",
@@ -162,7 +162,7 @@
   "admin.registries.bitstream-formats.edit.shortDescription.label": "Nome",
 
   // "admin.registries.bitstream-formats.edit.success.content": "The bitstream format was successfully edited.",
-  "admin.registries.bitstream-formats.edit.success.content": "O formato de bitstream foi editado com sucesso.",
+  "admin.registries.bitstream-formats.edit.success.content": "O formato de ficheiro foi editado com sucesso.",
 
   // "admin.registries.bitstream-formats.edit.success.head": "Success",
   "admin.registries.bitstream-formats.edit.success.head": "Sucesso",
@@ -177,7 +177,7 @@
   "admin.registries.bitstream-formats.head": "Registo de formatos de ficheiros",
 
   // "admin.registries.bitstream-formats.no-items": "No bitstream formats to show.",
-  "admin.registries.bitstream-formats.no-items": "Nenhum formato de bitstream para exibir.",
+  "admin.registries.bitstream-formats.no-items": "Nenhum formato de ficheiro para exibir.",
 
   // "admin.registries.bitstream-formats.table.delete": "Delete selected",
   "admin.registries.bitstream-formats.table.delete": "Apagar selecionado(s)",
@@ -215,6 +215,9 @@
   // "admin.registries.bitstream-formats.title": "Bitstream Format Registry",
   "admin.registries.bitstream-formats.title": "Registo de formatos de ficheiro",
 
+  // "admin.registries.bitstream-formats.select": "Select bitstream format",
+  "admin.registries.bitstream-formats.select": "Selecionar formato de ficheiro",
+
   // "admin.registries.metadata.breadcrumbs": "Metadata registry",
   "admin.registries.metadata.breadcrumbs": "Registo de metadados",
 
@@ -332,6 +335,30 @@
   // "admin.registries.schema.title": "Metadata Schema Registry",
   "admin.registries.schema.title": "Registo de esquemas de metadados",
 
+  // "admin.access-control.bulk-access.breadcrumbs": "Bulk Access Management",
+  "admin.access-control.bulk-access.breadcrumbs": "Gestão de permissões em lote",
+
+  // "administrativeBulkAccess.search.results.head": "Search Results",
+  "administrativeBulkAccess.search.results.head": "Resultados de pesquisa",
+
+  // "admin.access-control.bulk-access": "Bulk Access Management",
+  "admin.access-control.bulk-access": "Gestão de permissões em lote",
+
+  // "admin.access-control.bulk-access.title": "Bulk Access Management",
+  "admin.access-control.bulk-access.title": "Gestão de permissões em lote",
+
+  // "admin.access-control.bulk-access-browse.header": "Step 1: Select Objects",
+  "admin.access-control.bulk-access-browse.header": "Passo 1: Selecionar objectos",
+
+  // "admin.access-control.bulk-access-browse.search.header": "Search",
+  "admin.access-control.bulk-access-browse.search.header": "Pesquisa",
+
+  // "admin.access-control.bulk-access-browse.selected.header": "Current selection({{number}})",
+  "admin.access-control.bulk-access-browse.selected.header": "Selecção atual({{number}})",
+
+  // "admin.access-control.bulk-access-settings.header": "Step 2: Operation to Perform",
+  "admin.access-control.bulk-access-settings.header": "Passo 2: Operação a realizar",
+
   // "admin.access-control.epeople.actions.delete": "Delete EPerson",
   "admin.access-control.epeople.actions.delete": "Apagar utilizador",
 
@@ -350,6 +377,18 @@
   // "admin.access-control.epeople.title": "EPeople",
   "admin.access-control.epeople.title": "Utilizadores",
 
+  // "admin.access-control.epeople.edit.breadcrumbs": "New EPerson",
+  "admin.access-control.epeople.edit.breadcrumbs": "Nova 'EPessoa'",
+
+  // "admin.access-control.epeople.edit.title": "New EPerson",
+  "admin.access-control.epeople.edit.title": "Nova 'EPessoa'",
+
+  // "admin.access-control.epeople.add.breadcrumbs": "Add EPerson",
+  "admin.access-control.epeople.add.breadcrumbs": "Adicionar 'EPessoa'",
+
+  // "admin.access-control.epeople.add.title": "Add EPerson",
+  "admin.access-control.epeople.add.title": "Adicionar 'EPessoa'",
+
   // "admin.access-control.epeople.head": "EPeople",
   "admin.access-control.epeople.head": "Utilizadores",
 
@@ -467,8 +506,8 @@
   // "admin.access-control.epeople.form.goToGroups": "Add to groups",
   "admin.access-control.epeople.form.goToGroups": "Adicionar a grupos",
 
-  // "admin.access-control.epeople.notification.deleted.failure": "Failed to delete EPerson: \"{{name}}\"",
-  "admin.access-control.epeople.notification.deleted.failure": "Falha ao apagar utilizador: \"{{name}}\"",
+  // "admin.access-control.epeople.notification.deleted.failure": "Error occurred when trying to delete EPerson with id \"{{id}}\" with code: \"{{statusCode}}\" and message: \"{{restResponse.errorMessage}}\"",
+  "admin.access-control.epeople.notification.deleted.failure": "Ocorreu um erro ao tentar eliminar a 'EPessoa' com o id \"{{id}}\", com o código: \"{{statusCode}}\" e mensagem: \"{{restResponse.errorMessage}}\"",
 
   // "admin.access-control.epeople.notification.deleted.success": "Successfully deleted EPerson: \"{{name}}\"",
   "admin.access-control.epeople.notification.deleted.success": "Utilizador removido com sucesso: \"{{name}}\"",
@@ -740,11 +779,11 @@
   // "admin.access-control.groups.form.tooltip.editGroupPage": "On this page, you can modify the properties and members of a group. In the top section, you can edit the group name and description, unless this is an admin group for a collection or community, in which case the group name and description are auto-generated and cannot be edited. In the following sections, you can edit group membership. See [the wiki](https://wiki.lyrasis.org/display/DSDOC7x/Create+or+manage+a+user+group) for more details.",
   "admin.access-control.groups.form.tooltip.editGroupPage": "Nesta página, pode modificar as propriedades e os membros de um grupo. Na secção superior, pode editar o nome e a descrição do grupo, a menos que se trate de um grupo administrativo para uma coleção ou comunidade, em que o nome e a descrição do grupo são auto-gerados e não podem ser editados. Nas seções seguintes, pode editar o nome e a descrição do grupo. Ver [wiki](https://wiki.lyrasis.org/display/DSDOC7x/Create+ou+gerir+a+utilizador+grupo) para mais detalhes.",
 
-  // "admin.access-control.groups.form.tooltip.editGroup.addEpeople": "To add or remove an EPerson to/from this group, either click the 'Browse All' button or use the search bar below to search for users (use the dropdown to the left of the search bar to choose whether to search by metadata or by email). Then click the plus icon for each user you wish to add in the list below, or the trash can icon for each user you wish to remove. The list below may have several pages: use the page controls below the list to navigate to the next pages. Once you are ready, save your changes by clicking the 'Save' button in the top section.",
-  "admin.access-control.groups.form.tooltip.editGroup.addEpeople": "Para adicionar ou remover um utilizador de/para este grupo, clique no botão 'Procurar tudo' ou use a barra de pesquisa em baixo para procurar utilizadores (use o menu suspenso, à esquerda da barra de pesquisa, para escolher se pretende pesquisar por metadados ou por e-mail). Depois clique no ícone 'mais' para cada utilizador que deseja adicionar na lista em baixo, ou no ícone 'lixo' para cada utilizador que deseja remover. A lista pode conter várias páginas: utilize os controlos no final da lista para navegar para as páginas seguintes. Quando estiver pronto, guarde as suas alterações clicando no botão 'Guardar' na seção superior.",
+  // "admin.access-control.groups.form.tooltip.editGroup.addEpeople": "To add or remove an EPerson to/from this group, either click the 'Browse All' button or use the search bar below to search for users (use the dropdown to the left of the search bar to choose whether to search by metadata or by email). Then click the plus icon for each user you wish to add in the list below, or the trash can icon for each user you wish to remove. The list below may have several pages: use the page controls below the list to navigate to the next pages.",
+  "admin.access-control.groups.form.tooltip.editGroup.addEpeople": "Para adicionar ou remover um utilizador de/para este grupo, clique no botão 'Procurar tudo' ou use a barra de pesquisa em baixo para procurar utilizadores (use o menu suspenso, à esquerda da barra de pesquisa, para escolher se pretende pesquisar por metadados ou por e-mail). Depois clique no ícone 'mais' para cada utilizador que deseja adicionar na lista em baixo, ou no ícone 'lixo' para cada utilizador que deseja remover. A lista pode conter várias páginas: utilize os controlos no final da lista para navegar para as páginas seguintes.",
 
-  // "admin.access-control.groups.form.tooltip.editGroup.addSubgroups": "To add or remove a Subgroup to/from this group, either click the 'Browse All' button or use the search bar below to search for users. Then click the plus icon for each user you wish to add in the list below, or the trash can icon for each user you wish to remove. The list below may have several pages: use the page controls below the list to navigate to the next pages. Once you are ready, save your changes by clicking the 'Save' button in the top section.",
-  "admin.access-control.groups.form.tooltip.editGroup.addSubgroups": "Para adicionar ou remover um sub-grupo de/para grupo, clique no botão 'Procurar Tudo' ou use a barra de pesquisa em baixo para procurar utilizadores. Depois clique no ícone 'mais' para cada utilizador que deseja adicionar lista em baixo, ou no ícone 'lixo' para cada utilizador que deseja remover. A lista pode conter várias páginas: utilize os controlos de página no final da lista para navegar para as páginas seguintes. Quando estiver pronto, guarde as suas alterações clicando no botão 'Guardar' na seção superior.",
+  // "admin.access-control.groups.form.tooltip.editGroup.addSubgroups": "To add or remove a Subgroup to/from this group, either click the 'Browse All' button or use the search bar below to search for groups. Then click the plus icon for each group you wish to add in the list below, or the trash can icon for each group you wish to remove. The list below may have several pages: use the page controls below the list to navigate to the next pages.",
+  "admin.access-control.groups.form.tooltip.editGroup.addSubgroups": "Para adicionar ou remover um sub-grupo de/para grupo, clique no botão 'Procurar Tudo' ou use a barra de pesquisa em baixo para procurar grupos. Depois clique no ícone 'mais' para cada grupo que deseja adicionar lista em baixo, ou no ícone 'lixo' para cada grupo que deseja remover. A lista pode conter várias páginas: utilize os controlos de página no final da lista para navegar para as páginas seguintes.",
 
   // "admin.search.breadcrumbs": "Administrative Search",
   "admin.search.breadcrumbs": "Pesquisa administrativa",
@@ -993,10 +1032,10 @@
   "bitstream.download.page.back": "Voltar",
 
   // "bitstream.edit.authorizations.link": "Edit bitstream's Policies",
-  "bitstream.edit.authorizations.link": "Editar políticas dos bitstreams",
+  "bitstream.edit.authorizations.link": "Editar políticas dos ficheiros",
 
   // "bitstream.edit.authorizations.title": "Edit bitstream's Policies",
-  "bitstream.edit.authorizations.title": "Editar políticas dos bitstreams",
+  "bitstream.edit.authorizations.title": "Editar políticas dos ficheiros",
 
   // "bitstream.edit.return": "Back",
   "bitstream.edit.return": "Voltar",
@@ -1151,6 +1190,9 @@
   // "browse.comcol.by.srsc": "By Subject Category",
   "browse.comcol.by.srsc": "Por vocabulário controlado (SRSC)",
 
+  // "browse.comcol.by.nsi": "By Norwegian Science Index",
+  "browse.comcol.by.nsi": "Por 'Norwegian Science Index'",
+
   // "browse.comcol.by.title": "By Title",
   "browse.comcol.by.title": "Por título",
 
@@ -1158,7 +1200,7 @@
   "browse.comcol.head": "Navegar",
 
   // "browse.empty": "No items to show.",
-  "browse.empty": "Sem itens a exibir.",
+  "browse.empty": "Sem itens para exibir.",
 
   // "browse.metadata.author": "Author",
   "browse.metadata.author": "autor",
@@ -1182,7 +1224,10 @@
   "browse.metadata.subject.breadcrumbs": "Percorrer por assunto",
 
   // "browse.metadata.srsc.breadcrumbs": "Browse by Subject Category",
-  "browse.metadata.srsc.breadcrumbs": "Percorrer por vocabulário controlado (SRSC)",
+  "browse.metadata.srsc.breadcrumbs": "Percorrer por vocabulário controlado",
+
+  // "browse.metadata.nsi.breadcrumbs": "Browse by Norwegian Science Index",
+  "browse.metadata.nsi.breadcrumbs": "Percorrer por 'Norwegian Science Index'",
 
   // "browse.metadata.title.breadcrumbs": "Browse by Title",
   "browse.metadata.title.breadcrumbs": "Percorrer por título",
@@ -1268,6 +1313,9 @@
   // "browse.startsWith.input": "Filter",
   "browse.startsWith.input": "Filtrar",
 
+  // "browse.taxonomy_srsc.title": "Browsing by Subject Category",
+  "browse.taxonomy_srsc.title": "Percorrer por vocabulário controlado",
+
   // "browse.taxonomy.button": "Browse",
   "browse.taxonomy.button": "Pesquisar",
 
@@ -1427,6 +1475,12 @@
   // "collection.edit.return": "Back",
   "collection.edit.return": "Voltar",
 
+  // "collection.edit.tabs.access-control.head": "Access Control",
+  "collection.edit.tabs.access-control.head": "Controlo de acesso",
+
+  // "collection.edit.tabs.access-control.title": "Collection Edit - Access Control",
+  "collection.edit.tabs.access-control.title": "Editar coleção - Controlo de acesso",
+
   // "collection.edit.tabs.curate.head": "Curate",
   "collection.edit.tabs.curate.head": "Curadoria",
 
@@ -1446,7 +1500,7 @@
   "collection.edit.item.authorizations.load-more-button": "Carregar mais",
 
   // "collection.edit.item.authorizations.show-bitstreams-button": "Show bitstream policies for bundle",
-  "collection.edit.item.authorizations.show-bitstreams-button": "Mostrar as políticas do bitstream para o pacote",
+  "collection.edit.item.authorizations.show-bitstreams-button": "Mostrar as políticas do ficheiro para o pacote",
 
   // "collection.edit.tabs.metadata.head": "Edit Metadata",
   "collection.edit.tabs.metadata.head": "Editar metadados",
@@ -1604,6 +1658,12 @@
   // "collection.select.empty": "No collections to show",
   "collection.select.empty": "Nenhuma coleção a mostrar",
 
+  // "collection.select.table.select": "Select collection",
+  "collection.select.table.select": "Selecionar coleção",
+
+  // "collection.select.table.deselect": "Deselect collection",
+  "collection.select.table.deselect": "Desmarcar coleção",
+
   // "collection.select.table.title": "Title",
   "collection.select.table.title": "Título",
 
@@ -1692,7 +1752,7 @@
   "communityList.title": "Lista de comunidades",
 
   // "communityList.showMore": "Show More",
-  "communityList.showMore": "Mostrar mais",
+  "communityList.showMore": "Expandir",
 
   // "community.create.head": "Create a Community",
   "community.create.head": "Criar uma comunidade",
@@ -1781,6 +1841,12 @@
   // "community.edit.tabs.curate.title": "Community Edit - Curate",
   "community.edit.tabs.curate.title": "Editar comunidade - curadoria",
 
+  // "community.edit.tabs.access-control.head": "Access Control",
+  "community.edit.tabs.access-control.head": "Controlo de acesso",
+
+  // "community.edit.tabs.access-control.title": "Community Edit - Access Control",
+  "community.edit.tabs.access-control.title": "Editar comunidade - Controlo de acesso",
+
   // "community.edit.tabs.metadata.head": "Edit Metadata",
   "community.edit.tabs.metadata.head": "Editar metadados",
 
@@ -1850,6 +1916,9 @@
   // "comcol-role.edit.bitstream_read.name": "Default bitstream read access",
   "comcol-role.edit.bitstream_read.name": "Leitura predefinida de ficheiros (DEFAULT_BITSTREAM_READ)",
 
+  // "comcol-role.edit.bitstream_read.description": "E-People and Groups that can read new bitstreams submitted to this collection. Changes to this role are not retroactive. Existing bitstreams in the system will still be viewable by those who had read access at the time of their addition.",
+  "comcol-role.edit.bitstream_read.description": "E-Pessoas e grupos que podem ler novos ficheiros submetidos a esta coleção. As alterações feitas esta função não são retroactivas. Os ficheiros existentes no sistema continuarão a poder ser visualizados por quem tinha acesso de leitura no momento da sua adição.",
+
   // "comcol-role.edit.bitstream_read.description": "Community administrators can create sub-communities or collections, and manage or assign management for those sub-communities or collections. In addition, they decide who can submit items to any sub-collections, edit item metadata (after submission), and add (map) existing items from other collections (subject to authorization).",
   "comcol-role.edit.bitstream_read.description": "Os 'Administradores de comunidades' podem criar sub-comunidades e coleções, bem como gerir ou delegar a gestão dessas sub-comunidade ou coleções. Adicionalmente, decidem quem pode depositar itens em qualquer coleção, editar metadados (após depósito) e mapear itens de outras coleções (sujeito a autorização).",
 
@@ -1913,10 +1982,10 @@
   // "community.all-lists.head": "Subcommunities and Collections",
   "community.all-lists.head": "Sub-comunidade e coleções",
 
-  // "community.sub-collection-list.head": "Collections of this Community",
+  // "community.sub-collection-list.head": "Collections in this Community",
   "community.sub-collection-list.head": "Coleções desta comunidade",
 
-  // "community.sub-community-list.head": "Communities of this Community",
+  // "community.sub-community-list.head": "Communities in this Community",
   "community.sub-community-list.head": "Comunidades desta comunidade",
 
   // "cookies.consent.accept-all": "Accept all",
@@ -2054,8 +2123,8 @@
   // "curation-task.task.vscan.label": "Virus Scan",
   "curation-task.task.vscan.label": "Scan de vírus",
 
-  // "curation-task.task.register-doi.label": "Register DOI",
-  "curation-task.task.register-doi.label": "Registo DOI",
+  // "curation-task.task.registerdoi.label": "Register DOI",
+  "curation-task.task.registerdoi.label": "Registo DOI",
 
   // "curation.form.task-select.label": "Task:",
   "curation.form.task-select.label": "Tarefa:",
@@ -2259,7 +2328,7 @@
   "confirmation-modal.delete-eperson.header": "Apagar Utilizador \"{{ dsoName }}\"",
 
   // "confirmation-modal.delete-eperson.info": "Are you sure you want to delete EPerson \"{{ dsoName }}\"",
-  "confirmation-modal.delete-eperson.info": "Pretende apagar o utilizar \"{{ dsoName }}\"",
+  "confirmation-modal.delete-eperson.info": "Pretende apagar o utilizador \"{{ dsoName }}\"",
 
   // "confirmation-modal.delete-eperson.cancel": "Cancel",
   "confirmation-modal.delete-eperson.cancel": "Cancelar",
@@ -2386,6 +2455,9 @@
   // "feed.description": "Syndication feed",
   "feed.description": "Feed",
 
+  // "file-download-link.restricted": "Restricted bitstream",
+  "file-download-link.restricted": "'Bitstream' restrito",
+
   // "file-section.error.header": "Error obtaining files for this item",
   "file-section.error.header": "Erro na obteção de ficheiros para este item!",
 
@@ -2666,7 +2738,7 @@
   "health-page.property.status": "Código Estado",
 
   // "health-page.section.db.title": "Database",
-  "health-page.section.db.title": "Base Dados",
+  "health-page.section.db.title": "Base de Dados",
 
   // "health-page.section.geoIp.title": "GeoIp",
   "health-page.section.geoIp.title": "GeoIp",
@@ -3077,7 +3149,7 @@
   "item.edit.item-mapper.notifications.remove.error.head": "Erros de remoção de mapeamento",
 
   // "item.edit.item-mapper.notifications.remove.success.content": "Successfully removed mapping of item to {{amount}} collections.",
-  "item.edit.item-mapper.notifications.remove.success.content": "Successfully removed mapping of item to {{amount}} collections.",
+  "item.edit.item-mapper.notifications.remove.success.content": "Mapeamento do item removido com sucesso de {{amount}} coleção.",
 
   // "item.edit.item-mapper.notifications.remove.success.head": "Removal of mapping completed",
   "item.edit.item-mapper.notifications.remove.success.head": "Completou a remoção de mapeamento",
@@ -3097,6 +3169,12 @@
   // "item.edit.metadata.discard-button": "Discard",
   "item.edit.metadata.discard-button": "Cancelar",
 
+  // "item.edit.metadata.edit.language": "Edit language",
+  "item.edit.metadata.edit.language": "Editar idioma",
+
+  // "item.edit.metadata.edit.value": "Edit value",
+  "item.edit.metadata.edit.value": "Editar valor",
+
   // "item.edit.metadata.edit.buttons.confirm": "Confirm",
   "item.edit.metadata.edit.buttons.confirm": "Confirmar",
 
@@ -3208,6 +3286,9 @@
   // "item.edit.move.inheritpolicies.description": "Inherit the default policies of the destination collection",
   "item.edit.move.inheritpolicies.description": "Herdar as politicas padrões da coleção destino",
 
+  // "item.edit.move.inheritpolicies.tooltip": "Warning: When enabled, the read access policy for the item and any files associated with the item will be replaced by the default read access policy of the collection. This cannot be undone.",
+  "item.edit.move.inheritpolicies.tooltip": "Aviso: Quando activada, a política de acesso de leitura para o item e quaisquer ficheiros associados ao item, serão substituídos pela política de acesso de leitura predefinida da coleção. Isto não pode ser anulado.",
+
   // "item.edit.move.move": "Move",
   "item.edit.move.move": "Mover",
 
@@ -3340,17 +3421,23 @@
   // "item.edit.curate.title": "Curate Item: {{item}}",
   "item.edit.curate.title": "Curar item: {{item}}",
 
+  // "item.edit.tabs.access-control.head": "Access Control",
+  "item.edit.tabs.access-control.head": "Controlo de acesso",
+
+  // "item.edit.tabs.access-control.title": "Item Edit - Access Control",
+  "item.edit.tabs.access-control.title": "Editar item - Controlo de acesso",
+
   // "item.edit.tabs.metadata.head": "Metadata",
   "item.edit.tabs.metadata.head": "Metadados do item",
 
   // "item.edit.tabs.metadata.title": "Item Edit -  Metadata",
-  "item.edit.tabs.metadata.title": "Editar Item -  Metadados",
+  "item.edit.tabs.metadata.title": "Editar item -  Metadados",
 
   // "item.edit.tabs.relationships.head": "Relationships",
   "item.edit.tabs.relationships.head": "Relações do item",
 
   // "item.edit.tabs.relationships.title": "Item Edit - Relationships",
-  "item.edit.tabs.relationships.title": "Editar Item - Relacionamentos",
+  "item.edit.tabs.relationships.title": "Editar item - Relacionamentos",
 
   // "item.edit.tabs.status.buttons.authorizations.button": "Authorizations...",
   "item.edit.tabs.status.buttons.authorizations.button": "Permissões...",
@@ -3404,7 +3491,7 @@
   "item.edit.tabs.status.buttons.withdraw.label": "Retirar item da vista pública do repositório",
 
   // "item.edit.tabs.status.description": "Welcome to the item management page. From here you can withdraw, reinstate, move or delete the item. You may also update or add new metadata / bitstreams on the other tabs.",
-  "item.edit.tabs.status.description": "Bem-vindo à página de gestão de itens. Nesta área, pode retirar, restabelecer, mover ou apagar definitivamente o item. Adicionalmente, também pode atualizar ou adicionar novos metadados / bitstreams percorrendo pelas outras abas.",
+  "item.edit.tabs.status.description": "Bem-vindo à página de gestão de itens. Nesta área, pode retirar, restabelecer, mover ou apagar definitivamente o item. Adicionalmente, também pode atualizar ou adicionar novos metadados / ficheiros percorrendo pelas outras abas.",
 
   // "item.edit.tabs.status.head": "Status",
   "item.edit.tabs.status.head": "Estado do item",
@@ -3479,7 +3566,7 @@
   "item.page.titleprefix": "Item: ",
 
   // "item.page.volume-title": "Volume Title",
-  "item.page.volume-title": "Título do Volume",
+  "item.page.volume-title": "Título do volume",
 
   // "item.search.results.head": "Item Search Results",
   "item.search.results.head": "Resultados da pesquisa de item",
@@ -3488,7 +3575,7 @@
   "item.search.title": "Pesquisa de item",
 
   // "item.truncatable-part.show-more": "Show more",
-  "item.truncatable-part.show-more": "Mostrar mais",
+  "item.truncatable-part.show-more": "Expandir",
 
   // "item.truncatable-part.show-less": "Collapse",
   "item.truncatable-part.show-less": "Colapsar",
@@ -3619,7 +3706,7 @@
   // "item.page.version.create": "Create new version",
   "item.page.version.create": "Criar nova versão",
 
-  // "item.page.version.hasDraft": "A new version cannot be created because there is an inprogress submission in the version history",
+  // "item.page.version.hasDraft": "A new version cannot be created because there is an in-progress submission in the version history",
   "item.page.version.hasDraft": "Um nova versão não pode ser criada porque já se encontra uma submisão em curso no histórico de versões.",
 
   // "item.page.claim.button": "Claim",
@@ -3663,12 +3750,14 @@
 
   // "item.preview.dc.relation.issn": "ISSN",
   "item.preview.dc.relation.issn": "ISSN",
+
   // "item.preview.dc.identifier.isbn": "ISBN",
   "item.preview.dc.identifier.isbn": "ISBN",
+
   // "item.preview.dc.identifier": "Identifier:",
   "itemm.preview.dc.identifier": "Identificador:",
 
-  // "item.preview.dc.relation.ispartof": "Journal or Serie",
+  // "item.preview.dc.relation.ispartof": "Journal or Series",
   "item.preview.dc.relation.ispartof": "Revista ou Série",
 
   // "item.preview.dc.identifier.doi": "DOI",
@@ -3710,6 +3799,12 @@
   // "item.select.empty": "No items to show",
   "item.select.empty": "Nenhum item para mostrar.",
 
+  // "item.select.table.select": "Select item",
+  "item.select.table.select": "Selecionar item",
+
+  // "item.select.table.deselect": "Deselect item",
+  "item.select.table.deselect": "Desmarcar item",
+
   // "item.select.table.author": "Author",
   "item.select.table.author": "Autor",
 
@@ -3776,7 +3871,7 @@
   // "item.version.history.table.action.deleteVersion": "Delete version",
   "item.version.history.table.action.deleteVersion": "Remover versão",
 
-  // "item.version.history.table.action.hasDraft": "A new version cannot be created because there is an inprogress submission in the version history",
+  // "item.version.history.table.action.hasDraft": "A new version cannot be created because there is an in-progress submission in the version history",
   "item.version.history.table.action.hasDraft": "Uma nova versão não pode ser criada porque se encontra um depósito em curso no histórico de versões",
 
   // "item.version.notice": "This is not the latest version of this item. The latest version can be found <a href='{{destination}}'>here</a>.",
@@ -3821,7 +3916,7 @@
   // "item.version.create.notification.failure": "New version has not been created",
   "item.version.create.notification.failure": "Nova versão não foi criada",
 
-  // "item.version.create.notification.inProgress": "A new version cannot be created because there is an inprogress submission in the version history",
+  // "item.version.create.notification.inProgress": "A new version cannot be created because there is an in-progress submission in the version history",
   "item.version.create.notification.inProgress": "Uma nova versão não pode ser criada porque se encontra um depósito em curso no histórico de versões",
 
   // "item.version.delete.modal.header": "Delete version",
@@ -3860,6 +3955,12 @@
   // "itemtemplate.edit.metadata.discard-button": "Discard",
   "itemtemplate.edit.metadata.discard-button": "Rejeitar",
 
+  // "itemtemplate.edit.metadata.edit.language": "Edit language",
+  "itemtemplate.edit.metadata.edit.language": "Editar lidioma",
+
+  // "itemtemplate.edit.metadata.edit.value": "Edit value",
+  "itemtemplate.edit.metadata.edit.value": "Editar valor",
+
   // "itemtemplate.edit.metadata.edit.buttons.confirm": "Confirm",
   "itemtemplate.edit.metadata.edit.buttons.confirm": "Confirmar",
 
@@ -4157,6 +4258,9 @@
   // "menu.section.access_control_authorizations": "Authorizations",
   "menu.section.access_control_authorizations": "Autorizações",
 
+  // "menu.section.access_control_bulk": "Bulk Access Management",
+  "menu.section.access_control_bulk": "Gestão de permissões em lote",
+
   // "menu.section.access_control_groups": "Groups",
   "menu.section.access_control_groups": "Grupos",
 
@@ -4191,7 +4295,10 @@
   "menu.section.browse_global_by_subject": "Por assunto",
 
   // "menu.section.browse_global_by_srsc": "By Subject Category",
-  "menu.section.browse_global_by_srsc": "Por vocabulário controlado (SRSC)",
+  "menu.section.browse_global_by_srsc": "Por vocabulário controlado",
+
+  // "menu.section.browse_global_by_nsi": "By Norwegian Science Index",
+  "menu.section.browse_global_by_nsi": "Por 'Norwegian Science Index'",
 
   // "menu.section.browse_global_by_title": "By Title",
   "menu.section.browse_global_by_title": "Por título",
@@ -4233,7 +4340,7 @@
   "menu.section.export_metadata": "Metadados",
 
   // "menu.section.export_batch": "Batch Export (ZIP)",
-  "menu.section.export_batch": "Importação em lote (ZIP)",
+  "menu.section.export_batch": "Exportação em lote (ZIP)",
 
   // "menu.section.icon.access_control": "Access Control menu section",
   "menu.section.icon.access_control": "Secção do menu controle de acesso",
@@ -4473,12 +4580,12 @@
   "mydspace.show.supervisedWorkspace": "Itens supervisionados",
 
   // "mydspace.status.mydspaceArchived": "Archived",
-  "mydspace.status.mydspaceArchived": "Depósito aceite",
+  "mydspace.status.mydspaceArchived": "Depositado",
 
   // "mydspace.status.mydspaceValidation": "Validation",
   "mydspace.status.mydspaceValidation": "Em validação",
 
-  // "mydspace.status.mydspaceWaitingController": "Waiting for controller",
+  // "mydspace.status.mydspaceWaitingController": "Waiting for reviewer",
   "mydspace.status.mydspaceWaitingController": "Aguarda validador",
 
   // "mydspace.status.mydspaceWorkflow": "Workflow",
@@ -4652,6 +4759,18 @@
   // "process.new.select-parameters": "Parameters",
   "process.new.select-parameters": "Parâmetros",
 
+  // "process.new.select-parameter": "Select parameter",
+  "process.new.select-parameter": "Selecionar parâmetro",
+
+  // "process.new.add-parameter": "Add a parameter...",
+  "process.new.add-parameter": "Adicionar um parâmetro...",
+
+  // "process.new.delete-parameter": "Delete parameter",
+  "process.new.delete-parameter": "Apagar parâmetro",
+
+  // "process.new.parameter.label": "Parameter value",
+  "process.new.parameter.label": "Valor do parâmetro",
+
   // "process.new.cancel": "Cancel",
   "process.new.cancel": "Cancelar",
 
@@ -4809,28 +4928,31 @@
   "process.overview.table.actions": "Ações",
 
   // "process.overview.delete": "Delete {{count}} processes",
-  "process.overview.delete": "Remover {{count}} processos",
+  "process.overview.delete": "Apagar {{count}} processos",
+
+  // "process.overview.delete-process": "Delete process",
+  "process.overview.delete-process": "Apagar processo",
 
   // "process.overview.delete.clear": "Clear delete selection",
-  "process.overview.delete.clear": "Limpar selecção a remover",
+  "process.overview.delete.clear": "Limpar selecção a apagar",
 
   // "process.overview.delete.processing": "{{count}} process(es) are being deleted. Please wait for the deletion to fully complete. Note that this can take a while.",
-  "process.overview.delete.processing": "{{count}} processo(s) estão a ser removidos. Por favor aguarde pela remoção completa. Notar que esta operação pode demorar algum tempo.",
+  "process.overview.delete.processing": "{{count}} processo(s) estão a ser apagados. Por favor aguarde pela remoção completa. Notar que esta operação pode demorar algum tempo.",
 
   // "process.overview.delete.body": "Are you sure you want to delete {{count}} process(es)?",
-  "process.overview.delete.body": "Tem a certeza de que quer remover o(s) processo(s) {{count}}?",
+  "process.overview.delete.body": "Tem a certeza que quer apagar o(s) processo(s) {{count}}?",
 
   // "process.overview.delete.header": "Delete processes",
-  "process.overview.delete.header": "Remover processos",
+  "process.overview.delete.header": "Apagar processos",
 
   // "process.bulk.delete.error.head": "Error on deleteing process",
-  "process.bulk.delete.error.head": "Ocorreu um erro ao remover os processos",
+  "process.bulk.delete.error.head": "Ocorreu um erro ao apagar os processos",
 
   // "process.bulk.delete.error.body": "The process with ID {{processId}} could not be deleted. The remaining processes will continue being deleted. ",
   "process.bulk.delete.error.body": "O processo com  o ID {{{processId}} não pôde ser removido. Os restantes processos continuarão a ser removidos.",
 
   // "process.bulk.delete.success": "{{count}} process(es) have been succesfully deleted",
-  "process.bulk.delete.success": "{{count}} processso(s) foram removidos com sucesso",
+  "process.bulk.delete.success": "{{count}} processso(s) foram apagados com sucesso",
 
   // "profile.breadcrumbs": "Update Profile",
   "profile.breadcrumbs": "Atualizar perfil",
@@ -5315,6 +5437,10 @@
   // "resource-policies.form.name.label": "Name",
   "resource-policies.form.name.label": "Nome",
 
+  //"resource-policies.form.name.hint": "Max 30 characters",
+  // TODO New key - Add a translation
+  "resource-policies.form.name.hint": "Max 30 characters",
+
   // "resource-policies.form.policy-type.label": "Select the policy type",
   "resource-policies.form.policy-type.label": "Selecione o tipo de política",
 
@@ -5345,6 +5471,18 @@
   // "resource-policies.table.headers.group": "Group",
   "resource-policies.table.headers.group": "Grupo",
 
+  // "resource-policies.table.headers.select-all": "Select all",
+  "resource-policies.table.headers.select-all": "Selecionar tudo",
+
+  // "resource-policies.table.headers.deselect-all": "Deselect all",
+  "resource-policies.table.headers.deselect-all": "Desmarcar tudo",
+
+  // "resource-policies.table.headers.select": "Select",
+  "resource-policies.table.headers.select": "Selecionar",
+
+  // "resource-policies.table.headers.deselect": "Deselect",
+  "resource-policies.table.headers.deselect": "Desmarcar",
+
   // "resource-policies.table.headers.id": "ID",
   "resource-policies.table.headers.id": "ID",
 
@@ -5369,6 +5507,9 @@
   // "resource-policies.table.headers.title.for.collection": "Policies for Collection",
   "resource-policies.table.headers.title.for.collection": "Políticas para coleção",
 
+  // "root.skip-to-content": "Skip to main content",
+  "root.skip-to-content": "Ir para o conteúdo principal",
+
   // "search.description": "",
   "search.description": "",
 
@@ -5384,6 +5525,9 @@
   // "search.search-form.placeholder": "Search the repository ...",
   "search.search-form.placeholder": "Pesquisar no repositório...",
 
+  // "search.filters.remove": "Remove filter of type {{ type }} with value {{ value }}",
+  "search.filters.remove": "Remover filtro de tipo {{ type }} com valor {{ value }}",
+
   // "search.filters.applied.f.author": "Author",
   "search.filters.applied.f.author": "Autor",
 
@@ -5616,10 +5760,10 @@
   "search.filters.filter.scope.label": "Filtro do âmbito da pesquisa",
 
   // "search.filters.filter.show-less": "Collapse",
-  "search.filters.filter.show-less": "Mostrar menos",
+  "search.filters.filter.show-less": "Colapsar",
 
   // "search.filters.filter.show-more": "Show more",
-  "search.filters.filter.show-more": "Mostrar mais",
+  "search.filters.filter.show-more": "Expandir",
 
   // "search.filters.filter.subject.head": "Subject",
   "search.filters.filter.subject.head": "Assunto",
@@ -5672,6 +5816,21 @@
   // "search.filters.discoverable.false": "Yes",
   "search.filters.discoverable.false": "Sim",
 
+  // "search.filters.namedresourcetype.Archived": "Archived",
+  "search.filters.namedresourcetype.Archived": "Depositado",
+
+  // "search.filters.namedresourcetype.Validation": "Validation",
+  "search.filters.namedresourcetype.Validation": "Em validação",
+
+  // "search.filters.namedresourcetype.waitingforcontroller": "Waiting for Controller",
+  "search.filters.namedresourcetype.waitingforcontroller": "Aguarda validador",
+
+  // "search.filters.namedresourcetype.Workflow": "Workflow",
+  "search.filters.namedresourcetype.Workflow": "Em fluxo de trabalho",
+
+  // "search.filters.namedresourcetype.Workspace": "Workspace",
+  "search.filters.namedresourcetype.Workspace": "Por terminar",
+
   // "search.filters.withdrawn.true": "Yes",
   "search.filters.withdrawn.true": "Sim",
 
@@ -5750,6 +5909,12 @@
   // "search.view-switch.show-list": "Show as list",
   "search.view-switch.show-list": "Mostrar como lista",
 
+  // "selectable-list-item-control.deselect": "Deselect item",
+  "selectable-list-item-control.deselect": "Desmarcar item",
+
+  // "selectable-list-item-control.select": "Select item",
+  "selectable-list-item-control.select": "Selecionar item",
+
   // "sorting.ASC": "Ascending",
   "sorting.ASC": "Ascendente",
 
@@ -5921,8 +6086,8 @@
   // "submission.import-external.source.cinii": "CiNii",
   "submission.import-external.source.cinii": "CiNii",
 
-  // "submission.import-external.source.crossref": "CrossRef",
-  "submission.import-external.source.crossref": "CrossRef",
+  // "submission.import-external.source.crossref": "Crossref",
+  "submission.import-external.source.crossref": "Crossref",
 
   // "submission.import-external.source.datacite": "DataCite",
   "submission.import-external.source.datacite": "DataCite",
@@ -6447,7 +6612,7 @@
   "submission.sections.general.add-more": "Adicionar mais",
 
   // "submission.sections.general.cannot_deposit": "Deposit cannot be completed due to errors in the form.<br>Please fill out all required fields to complete the deposit.",
-  "submission.sections.general.cannot_deposit": "O depósito não pode ser preenchido devido a erros no formulário.<br>Por favor preencha todos os campos necessários para completar o depósito.",
+  "submission.sections.general.cannot_deposit": "O depósito não pode ser concluído devido a erros ou falhas de preenchimento em campos obrigatórios do formulário.<br>Por favor preencha todos os campos necessários para completar o depósito!",
 
   // "submission.sections.general.collection": "Collection",
   "submission.sections.general.collection": "Coleção",
@@ -6843,7 +7008,7 @@
   "submission.workflow.tasks.claimed.approve": "Aprovar",
 
   // "submission.workflow.tasks.claimed.approve_help": "If you have reviewed the item and it is suitable for inclusion in the collection, select \"Approve\".",
-  "submission.workflow.tasks.claimed.approve_help": "Se reviu o item e está conformidade para inclusão na coleção, selecione 'Aprovar'.",
+  "submission.workflow.tasks.claimed.approve_help": "Se reviu o item e está em conformidade para entrada na coleção, selecione 'Aprovar'.",
 
   // "submission.workflow.tasks.claimed.edit": "Edit",
   "submission.workflow.tasks.claimed.edit": "Editar",
@@ -7058,11 +7223,14 @@
   // "vocabulary-treeview.search.form.search": "Search",
   "vocabulary-treeview.search.form.search": "pesquisar",
 
+  // "vocabulary-treeview.search.form.search-placeholder": "Filter results by typing the first few letters",
+  "vocabulary-treeview.search.form.search-placeholder": "Filtrar resultados inserindo as primeiras letras",
+
   // "vocabulary-treeview.search.no-result": "There were no items to show",
   "vocabulary-treeview.search.no-result": "Não existem itens para mostrar",
 
   // "vocabulary-treeview.tree.description.nsi": "The Norwegian Science Index",
-  "vocabulary-treeview.tree.description.nsi": "O Norwegian Science Index",
+  "vocabulary-treeview.tree.description.nsi": "O 'Norwegian Science Index'",
 
   // "vocabulary-treeview.tree.description.srsc": "Research Subject Categories",
   "vocabulary-treeview.tree.description.srsc": "Categorias de Assuntos de Investigação",
@@ -7560,7 +7728,7 @@
   "person.page.orcid.sync-queue.send.validation-error.organization.country-required": "O endereço da organização a enviar requer um país ISO 3166 válido de 2 dígitos",
 
   // "person.page.orcid.sync-queue.send.validation-error.disambiguated-organization.required": "An identifier to disambiguate organizations is required. Supported ids are GRID, Ringgold, Legal Entity identifiers (LEIs) and Crossref Funder Registry identifiers",
-  "person.page.orcid.sync-queue.send.validation-error.disambiguated-organization.required": "É necessário um identificador para desambiguar as organizações. Os identificadores suportados são os identificadores GRID, RINGGOLD, Legal Entity Identity (LEIs) e Crossref Funder Registry (CrossRef)",
+  "person.page.orcid.sync-queue.send.validation-error.disambiguated-organization.required": "É necessário um identificador para desambiguar as organizações. Os identificadores suportados são os identificadores GRID, RINGGOLD, Legal Entity Identity (LEIs) e Crossref Funder Registry (Crossref)",
 
   // "person.page.orcid.sync-queue.send.validation-error.disambiguated-organization.value-required": "The organization's identifiers requires a value",
   "person.page.orcid.sync-queue.send.validation-error.disambiguated-organization.value-required": "Os identificadores da organização requerem um valor",
@@ -7682,6 +7850,9 @@
   // "system-wide-alert.form.label.countdownTo.hint": "Hint: Set a countdown timer. When enabled, a date can be set in the future and the system-wide alert banner will perform a countdown to the set date. When this timer ends, it will disappear from the alert. The server will NOT be automatically stopped.",
   "system-wide-alert.form.label.countdownTo.hint": "Dica: Defina um temporizador de contagem decrescente. Quando ativado, pode ser definida uma data no futuro e o 'banner' de alerta geral do sistema irá realizar uma contagem decrescente para a data definida. Quando este temporizador terminar, desaparecerá do alerta. O servidor NÃO pára automaticamente.",
 
+  // "system-wide-alert-form.select-date-by-calendar": "Select date using calendar",
+  "system-wide-alert-form.select-date-by-calendar": "Selecionar data utilizando o calendário",
+
   // "system-wide-alert.form.label.preview": "System-wide alert preview",
   "system-wide-alert.form.label.preview": "Pré-visualização de alerta geral do sistema",
 
@@ -7703,45 +7874,109 @@
   // "admin.system-wide-alert.title": "System-wide Alerts",
   "admin.system-wide-alert.title": "Alertas gerais do sistema",
 
+  // "item-access-control-title": "This form allows you to perform changes to the access conditions of the item's metadata or its bitstreams.",
+  "item-access-control-title": "Este formulário permite-lhe efetuar alterações às condições de acesso dos metadados do item ou dos seus ficheiros.",
 
+  // "collection-access-control-title": "This form allows you to perform changes to the access conditions of all the items owned by this collection. Changes may be performed to either all Item metadata or all content (bitstreams).",
+  "collection-access-control-title": "Este formulário permite-lhe efetuar alterações às condições de acesso de todos os itens pertencentes a esta coleção. As alterações podem ser efectuadas quer nos metadados do item, quer em todo o conteúdo (ficheiros).",
+
+  // "community-access-control-title": "This form allows you to perform changes to the access conditions of all the items owned by any collection under this community. Changes may be performed to either all Item metadata or all content (bitstreams).",
+  "community-access-control-title": "Este formulário permite-lhe efetuar alterações às condições de acesso de todos os itens pertencentes a qualquer coleção desta comunidade. As alterações podem ser efectuadas quer nos metadados do item, quer em todo o conteúdo (ficheiros).",
+
+  // "access-control-item-header-toggle": "Item's Metadata",
+  "access-control-item-header-toggle": "Metadados do item",
+
+  // "access-control-item-toggle.enable": "Enable option to perform changes on the item's metadata",
+  "access-control-item-toggle.enable": "Ativar a opção para efetuar alterações nos metadados do item",
+
+  // "access-control-item-toggle.disable": "Disable option to perform changes on the item's metadata",
+  "access-control-item-toggle.disable": "Desativar a opção para efetuar alterações nos metadados do itema",
+
+  // "access-control-bitstream-header-toggle": "Bitstreams",
+  "access-control-bitstream-header-toggle": "Ficheiros",
+
+  // "access-control-bitstream-toggle.enable": "Enable option to perform changes on the bitstreams",
+  "access-control-bitstream-toggle.enable": "Ativar a opção para efetuar alterações nos ficheiros",
+
+  // "access-control-bitstream-toggle.disable": "Disable option to perform changes on the bitstreams",
+  "access-control-bitstream-toggle.disable": "Desativar a opção para efetuar alterações nos ficheiros",
+
+  // "access-control-mode": "Mode",
+  "access-control-mode": "Modo",
+
+  // "access-control-access-conditions": "Access conditions",
+  "access-control-access-conditions": "Condições de acesso",
+
+  // "access-control-no-access-conditions-warning-message": "Currently, no access conditions are specified below. If executed, this will replace the current access conditions with the default access conditions inherited from the owning collection.",
+  "access-control-no-access-conditions-warning-message": "Atualmente, não estão especificadas condições de acesso em baixo. Se for executado, esta operação substituirá as condições de acesso actuais pelas condições predefinidas herdadas da coleção proprietária.",
+
+  // "access-control-replace-all": "Replace access conditions",
+  "access-control-replace-all": "Substituir as condições de acesso",
+
+  // "access-control-add-to-existing": "Add to existing ones",
+  "access-control-add-to-existing": "Adicionar aos existentes",
+
+  // "access-control-limit-to-specific": "Limit the changes to specific bitstreams",
+  "access-control-limit-to-specific": "Limitar as alterações a ficheiros específicos",
+
+  // "access-control-process-all-bitstreams": "Update all the bitstreams in the item",
+  "access-control-process-all-bitstreams": "Atualizar todos os ficheiros no item",
+
+  // "access-control-bitstreams-selected": "bitstreams selected",
+  "access-control-bitstreams-selected": "ficheiros selecionados",
+
+  // "access-control-bitstreams-select": "Select bitstreams",
+  "access-control-bitstreams-select": "Selecionar ficheiros",
+
+  // "access-control-cancel": "Cancel",
+  "access-control-cancel": "Cancelar",
+
+  // "access-control-execute": "Execute",
+  "access-control-execute": "Executar",
+
+  // "access-control-add-more": "Add more",
+  "access-control-add-more": "Adicionar mais",
+
+  // "access-control-remove": "Remove access condition",
+  "access-control-remove": "Remover condição de acesso",
+
+  // "access-control-select-bitstreams-modal.title": "Select bitstreams",
+  "access-control-select-bitstreams-modal.title": "Selecionar ficheiros",
+
+  // "access-control-select-bitstreams-modal.no-items": "No items to show.",
+  "access-control-select-bitstreams-modal.no-items": "Sem itens para mostrar.",
+
+  // "access-control-select-bitstreams-modal.close": "Close",
+  "access-control-select-bitstreams-modal.close": "Fechar",
+
+  // "access-control-option-label": "Access condition type",
+  "access-control-option-label": "Tipo de condição de acesso",
+
+  // "access-control-option-note": "Choose an access condition to apply to selected objects.",
+  "access-control-option-note": "Selecionar uma condição de acesso a aplicar ao(s) 'ficheiro(s)' seleccionados.",
+
+  // "access-control-option-start-date": "Grant access from",
+  "access-control-option-start-date": "Conceder acesso a partir de",
+
+  // "access-control-option-start-date-note": "Select the date from which the related access condition is applied",
+  "access-control-option-start-date-note": "Selecionar a data a partir da qual a condição de acesso é aplicada",
+
+  // "access-control-option-end-date": "Grant access until",
+  "access-control-option-end-date": "Conceder acesso até",
+
+  // "access-control-option-end-date-note": "Select the date until which the related access condition is applied",
+  "access-control-option-end-date-note": "Selecionar a data até à qual a condição de acesso é aplicada",
+
+  // "vocabulary-treeview.search.form.add": "Add",
+  "vocabulary-treeview.search.form.add": "Adicionar",
 
   // Other strings...
   // Missing, Duplicate or Redundant ???
 
-  // NOT FOUND 16-06-2023
+  // NOT FOUND 08-12-2023
 
   // "browse.metadata.srsc": "Subject Category",
-  "browse.metadata.srsc": "vocabulário controlado (SRSC)",
-
-  // "mydspace.status.archived": "Archived",
-  "mydspace.status.archived": "Depositado",
-
-  // "mydspace.status.validation": "Validation",
-  "mydspace.status.validation": "Em validação",
-
-  // "mydspace.status.waiting-for-controller": "Waiting for Controller",
-  "mydspace.status.waiting-for-controller": "Aguarda validador",
-
-  // "mydspace.status.workflow": "Workflow",
-  "mydspace.status.workflow": "Em fluxo de trabalho",
-
-  // "mydspace.status.workspace": "Workspace",
-  "mydspace.status.workspace": "Depósito por terminar",
-
-  // "search.filters.namedresourcetype.Archived": "Archived",
-  "search.filters.namedresourcetype.Archived": "Depositado",
-
-  // "search.filters.namedresourcetype.Validation": "Validation",
-  "search.filters.namedresourcetype.Validation": "Em validação",
-
-  // "search.filters.namedresourcetype.waitingforcontroller": "Waiting for Controller",
-  "search.filters.namedresourcetype.waitingforcontroller": "Aguarda validador",
-
-  // "search.filters.namedresourcetype.Workflow": "Workflow",
-  "search.filters.namedresourcetype.Workflow": "Em fluxo de trabalho",
-
-  // "search.filters.namedresourcetype.Workspace": "Workspace",
-  "search.filters.namedresourcetype.Workspace": "Por terminar",
+  "browse.metadata.srsc": "Vocabulário controlado (SRSC)",
 
   // "datafile.listelement.badge": "Data file",
   "datafile.listelement.badge": "Ficheiro de dados",
@@ -7755,9 +7990,6 @@
   // "browse.previous.button": "Previous",
   "browse.previous.button": "Anterior",
 
-  // "curation-task.task.registerdoi.label": "DOI check",
-  "curation-task.task.registerdoi.label": "Verificação de DOIs",
-
   // "mydspace.general.text-here": "here",
   "mydspace.general.text-here": "aqui",
 
diff --git a/src/assets/i18n/sr-cyr.json5 b/src/assets/i18n/sr-cyr.json5
new file mode 100644
index 0000000000..548343ed61
--- /dev/null
+++ b/src/assets/i18n/sr-cyr.json5
@@ -0,0 +1,2619 @@
+{
+  // Initial version provided by University of Kragujevac, Serbia 2023.
+  "401.help": "Нисте овлашћени да приступите овој страници. Можете користити дугме испод да се вратите на почетну страницу.",
+  "401.link.home-page": "Одведи ме на почетну страницу",
+  "401.unauthorized": "Неовлашћен приступ",
+  "403.help": "Немате дозволу да приступите овој страници. Можете користити дугме испод да се вратите на почетну страницу.",
+  "403.link.home-page": "Одведи ме на почетну страницу",
+  "403.forbidden": "Забрањен приступ",
+  "500.page-internal-server-error": "Услуга није доступна",
+  "500.help": "Сервер привремено није у могућности да сервисира ваш захтев због застоја у одржавању или проблема са капацитетом. Покушајте поново касније.",
+  "500.link.home-page": "Одведи ме на почетну страницу",
+  "404.help": "Не можемо да пронађемо страницу коју тражите. Страница је можда премештена или избрисана. Можете користити дугме испод да се вратите на почетну страницу.",
+  "404.link.home-page": "Одведи ме на почетну страницу",
+  "404.page-not-found": "Страница није пронађена",
+  "error-page.description.401": "Неовлашћен приступ",
+  "error-page.description.403": "Забрањен приступ",
+  "error-page.description.500": "Услуга није доступна",
+  "error-page.description.404": "Страница није пронађена",
+  "error-page.orcid.generic-error": "Дошло је до грешке приликом пријављивања преко ORCID-а. Уверите се да сте поделили имејл адресу свог ORCID налога са DSpace-ом. Ако грешка и даље постоји, контактирајте администратора",
+  "access-status.embargo.listelement.badge": "Ембарго",
+  "access-status.metadata.only.listelement.badge": "Само метаподаци",
+  "access-status.open.access.listelement.badge": "Отворен приступ",
+  "access-status.restricted.listelement.badge": "Ограничен приступ",
+  "access-status.unknown.listelement.badge": "Непознато",
+  "admin.curation-tasks.breadcrumbs": "Задаци курирања система",
+  "admin.curation-tasks.title": "Задаци курирања система",
+  "admin.curation-tasks.header": "Задаци курирања система",
+  "admin.registries.bitstream-formats.breadcrumbs": "Форматирајте регистар",
+  "admin.registries.bitstream-formats.create.breadcrumbs": "Формат битстрим-а",
+  "admin.registries.bitstream-formats.create.failure.content": "Дошло је до грешке при креирању новог формата битстрим-а.",
+  "admin.registries.bitstream-formats.create.failure.head": "Неуспешно",
+  "admin.registries.bitstream-formats.create.head": "Креирајте формат битстрим-а",
+  "admin.registries.bitstream-formats.create.new": "Додајте нови формат битстрим-а",
+  "admin.registries.bitstream-formats.create.success.content": "Нови формат битстрим-а је успешно креиран.",
+  "admin.registries.bitstream-formats.create.success.head": "Успешно",
+  "admin.registries.bitstream-formats.delete.failure.amount": "Уклањање {{ amount }} формата није успело",
+  "admin.registries.bitstream-formats.delete.failure.head": "Неуспешно",
+  "admin.registries.bitstream-formats.delete.success.amount": "Успешно уклоњен {{ amount }} формат",
+  "admin.registries.bitstream-formats.delete.success.head": "Успешно",
+  "admin.registries.bitstream-formats.description": "Ова листа формата битстрим-а пружа информације о познатим форматима и нивоу њихове подршке.",
+  "admin.registries.bitstream-formats.edit.breadcrumbs": "Формат битстрим-а",
+  "admin.registries.bitstream-formats.edit.description.hint": "",
+  "admin.registries.bitstream-formats.edit.description.label": "Опис",
+  "admin.registries.bitstream-formats.edit.extensions.hint": "Екстензије су екстензије фајлова које се користе за аутоматску идентификацију формата отпремљених фајлова. Можете да унесете неколико екстензија за сваки формат.",
+  "admin.registries.bitstream-formats.edit.extensions.label": "Екстензије фајлова",
+  "admin.registries.bitstream-formats.edit.extensions.placeholder": "Унесите екстензију фајла без тачке",
+  "admin.registries.bitstream-formats.edit.failure.content": "Дошло је до грешке при уређивању формата битстрим-а",
+  "admin.registries.bitstream-formats.edit.failure.head": "Неуспешно",
+  "admin.registries.bitstream-formats.edit.head": "Формат битстрим-а: {{ format }}",
+  "admin.registries.bitstream-formats.edit.internal.hint": "Формати означени као интерни су скривени од корисника и користе се у административне сврхе.",
+  "admin.registries.bitstream-formats.edit.internal.label": "Унутрашње",
+  "admin.registries.bitstream-formats.edit.mimetype.hint": "MIME тип повезан са овим форматом не мора бити јединствен.",
+  "admin.registries.bitstream-formats.edit.mimetype.label": "MIME тип",
+  "admin.registries.bitstream-formats.edit.shortDescription.hint": "Јединствено име за овај формат, (нпр. Microsoft Word XP или Microsoft Word 2000)",
+  "admin.registries.bitstream-formats.edit.shortDescription.label": "Име",
+  "admin.registries.bitstream-formats.edit.success.content": "Формат битстрим-а је успешно измењен.",
+  "admin.registries.bitstream-formats.edit.success.head": "Успешно",
+  "admin.registries.bitstream-formats.edit.supportLevel.hint": "Ниво подршке коју ваша институција обећава за овај формат.",
+  "admin.registries.bitstream-formats.edit.supportLevel.label": "Ниво подршке",
+  "admin.registries.bitstream-formats.head": "Регистар формата битстрим-а",
+  "admin.registries.bitstream-formats.no-items": "Нема формата битова за приказ.",
+  "admin.registries.bitstream-formats.table.delete": "Избриши изабрано",
+  "admin.registries.bitstream-formats.table.deselect-all": "Поништите све",
+  "admin.registries.bitstream-formats.table.internal": "Унутрашње",
+  "admin.registries.bitstream-formats.table.mimetype": "MIME тип",
+  "admin.registries.bitstream-formats.table.name": "Име",
+  "admin.registries.bitstream-formats.table.id": "ID",
+  "admin.registries.bitstream-formats.table.return": "Назад",
+  "admin.registries.bitstream-formats.table.supportLevel.KNOWN": "Познато",
+  "admin.registries.bitstream-formats.table.supportLevel.SUPPORTED": "Подржано",
+  "admin.registries.bitstream-formats.table.supportLevel.UNKNOWN": "Непознато",
+  "admin.registries.bitstream-formats.table.supportLevel.head": "Ниво подршке",
+  "admin.registries.bitstream-formats.title": "Регистар формата битстрим-а",
+  "admin.registries.metadata.breadcrumbs": "Регистар метаподатака",
+  "admin.registries.metadata.description": "Регистар метаподатака одржава листу свих поља метаподатака доступних у спремишту. Ова поља могу бити подељена на више шема. Међутим, DSpace захтева квалификовану Dublin Core шему",
+  "admin.registries.metadata.form.create": "Креирајте шему метаподатака",
+  "admin.registries.metadata.form.edit": "Уредите шему метаподатака",
+  "admin.registries.metadata.form.name": "Име",
+  "admin.registries.metadata.form.namespace": "Простор имена",
+  "admin.registries.metadata.head": "Регистар метаподатака",
+  "admin.registries.metadata.schemas.no-items": "Нема шема метаподатака за приказ.",
+  "admin.registries.metadata.schemas.table.delete": "Избриши изабрано",
+  "admin.registries.metadata.schemas.table.id": "ID",
+  "admin.registries.metadata.schemas.table.name": "Име",
+  "admin.registries.metadata.schemas.table.namespace": "Простор имена",
+  "admin.registries.metadata.title": "Регистар метаподатака",
+  "admin.registries.schema.breadcrumbs": "Шема метаподатака",
+  "admin.registries.schema.description": "Ово је шема метаподатака за \"{{namespace}}\".",
+  "admin.registries.schema.fields.head": "Поља метаподатака шеме",
+  "admin.registries.schema.fields.no-items": "Нема поља метаподатака за приказ.",
+  "admin.registries.schema.fields.table.delete": "Избриши изабрано",
+  "admin.registries.schema.fields.table.field": "Поље",
+  "admin.registries.schema.fields.table.id": "ID",
+  "admin.registries.schema.fields.table.scopenote": "Сцопе напомена",
+  "admin.registries.schema.form.create": "Креирајте поље за метаподатке",
+  "admin.registries.schema.form.edit": "Измените поље за метаподатке",
+  "admin.registries.schema.form.element": "Елемент",
+  "admin.registries.schema.form.qualifier": "Квалификатор",
+  "admin.registries.schema.form.scopenote": "Сцопе напомена",
+  "admin.registries.schema.head": "Шема метаподатака",
+  "admin.registries.schema.notification.created": "Успешно креирана шема метаподатака \"{{prefix}}\"",
+  "admin.registries.schema.notification.deleted.failure": "Неуспешно брисање {{amount}} шема метаподатака",
+  "admin.registries.schema.notification.deleted.success": "Успешно избрисане {{amount}} шеме метаподатака",
+  "admin.registries.schema.notification.edited": "Успешно измењена шема метаподатака \"{{prefix}}\"",
+  "admin.registries.schema.notification.failure": "Грешка",
+  "admin.registries.schema.notification.field.created": "Успешно креирано поље метаподатака \"{{field}}\"",
+  "admin.registries.schema.notification.field.deleted.failure": "Неуспешно брисање {{amount}} поља метаподатака",
+  "admin.registries.schema.notification.field.deleted.success": "Успешно избрисана {{amount}} поља метаподатака",
+  "admin.registries.schema.notification.field.edited": "Успешно измењено поље метаподатака \"{{field}}\"",
+  "admin.registries.schema.notification.success": "Успешно",
+  "admin.registries.schema.return": "Назад",
+  "admin.registries.schema.title": "Регистар шеме метаподатака",
+  "admin.access-control.bulk-access.breadcrumbs": "Управљање масовним приступом",
+  "administrativeBulkAccess.search.results.head": "Резултати претраге",
+  "admin.access-control.bulk-access": "Управљање масовним приступом",
+  "admin.access-control.bulk-access.title": "Управљање масовним приступом",
+  "admin.access-control.bulk-access-browse.header": "Корак 1: Изаберите објекте",
+  "admin.access-control.bulk-access-browse.search.header": "Претрага",
+  "admin.access-control.bulk-access-browse.selected.header": "Тренутни избор ({{number}})",
+  "admin.access-control.bulk-access-settings.header": "Корак 2: Операција коју треба извршити",
+  "admin.access-control.epeople.actions.delete": "Избришите EPerson",
+  "admin.access-control.epeople.actions.impersonate": "Опонашати EPerson",
+  "admin.access-control.epeople.actions.reset": "Ресетујте шифру",
+  "admin.access-control.epeople.actions.stop-impersonating": "Заустави представљање као EPerson",
+  "admin.access-control.epeople.breadcrumbs": "EPeople",
+  "admin.access-control.epeople.title": "EPeople",
+  "admin.access-control.epeople.head": "EPeople",
+  "admin.access-control.epeople.search.head": "Претрага",
+  "admin.access-control.epeople.button.see-all": "Прегледајте све",
+  "admin.access-control.epeople.search.scope.metadata": "Метаподаци",
+  "admin.access-control.epeople.search.scope.email": "Е-мејл (тачно)",
+  "admin.access-control.epeople.search.button": "Претрага",
+  "admin.access-control.epeople.search.placeholder": "Претражите људе...",
+  "admin.access-control.epeople.button.add": "Додајте EPerson",
+  "admin.access-control.epeople.table.id": "ID",
+  "admin.access-control.epeople.table.name": "Име",
+  "admin.access-control.epeople.table.email": "Е-мејл (тачно)",
+  "admin.access-control.epeople.table.edit": "Измена",
+  "admin.access-control.epeople.table.edit.buttons.edit": "Измените \"{{name}}\"",
+  "admin.access-control.epeople.table.edit.buttons.edit-disabled": "Нисте овлашћени за уређивање ове групе",
+  "admin.access-control.epeople.table.edit.buttons.remove": "Избришите \"{{name}}\"",
+  "admin.access-control.epeople.no-items": "Нема EPeople за приказ.",
+  "admin.access-control.epeople.form.create": "Креирајте EPerson",
+  "admin.access-control.epeople.form.edit": "Измените EPerson",
+  "admin.access-control.epeople.form.firstName": "Име",
+  "admin.access-control.epeople.form.lastName": "Презиме",
+  "admin.access-control.epeople.form.email": "Е-мејл",
+  "admin.access-control.epeople.form.emailHint": "Мора бити важећа Е-мејл адреса",
+  "admin.access-control.epeople.form.canLogIn": "Може се пријавити",
+  "admin.access-control.epeople.form.requireCertificate": "Потребан је сертификат",
+  "admin.access-control.epeople.form.return": "Назад",
+  "admin.access-control.epeople.form.notification.created.success": "Успешно креиран EPerson \"{{name}}\"",
+  "admin.access-control.epeople.form.notification.created.failure": "Неуспешно креирање EPerson \"{{name}}\"",
+  "admin.access-control.epeople.form.notification.created.failure.emailInUse": "Неуспешно креирање EPerson \"{{name}}\", емаил \"{{email}}\" се већ користи.",
+  "admin.access-control.epeople.form.notification.edited.failure.emailInUse": "Неуспешна измена EPerson \"{{name}}\", емаил \"{{email}}\" се већ користи.",
+  "admin.access-control.epeople.form.notification.edited.success": "Успешно измењен EPerson \"{{name}}\"",
+  "admin.access-control.epeople.form.notification.edited.failure": "Неуспешна измена EPerson \"{{name}}\"",
+  "admin.access-control.epeople.form.notification.deleted.success": "Успешно избрисан EPerson \"{{name}}\"",
+  "admin.access-control.epeople.form.notification.deleted.failure": "Неуспешно брисање EPerson \"{{name}}\"",
+  "admin.access-control.epeople.form.groupsEPersonIsMemberOf": "Члан ових група:",
+  "admin.access-control.epeople.form.table.id": "ID",
+  "admin.access-control.epeople.form.table.name": "Име",
+  "admin.access-control.epeople.form.table.collectionOrCommunity": "Колекција/Заједница",
+  "admin.access-control.epeople.form.memberOfNoGroups": "Овај EPerson није члан ниједне групе",
+  "admin.access-control.epeople.form.goToGroups": "Додајте групама",
+  "admin.access-control.epeople.notification.deleted.failure": "Неуспешно брисање EPerson: \"{{name}}\"",
+  "admin.access-control.epeople.notification.deleted.success": "Успешно избрисан EPerson: \"{{name}}\"",
+  "admin.access-control.groups.title": "Групе",
+  "admin.access-control.groups.breadcrumbs": "Групе",
+  "admin.access-control.groups.singleGroup.breadcrumbs": "Измените групу",
+  "admin.access-control.groups.title.singleGroup": "Измените групу",
+  "admin.access-control.groups.title.addGroup": "Нова група",
+  "admin.access-control.groups.addGroup.breadcrumbs": "Нова група",
+  "admin.access-control.groups.head": "Групе",
+  "admin.access-control.groups.button.add": "Додајте групу",
+  "admin.access-control.groups.search.head": "Претрага група",
+  "admin.access-control.groups.button.see-all": "Прегледајте све",
+  "admin.access-control.groups.search.button": "Претрага",
+  "admin.access-control.groups.search.placeholder": "Претражите групе...",
+  "admin.access-control.groups.table.id": "ID",
+  "admin.access-control.groups.table.name": "Име",
+  "admin.access-control.groups.table.collectionOrCommunity": "Колекција/Заједница",
+  "admin.access-control.groups.table.members": "Чланови",
+  "admin.access-control.groups.table.edit": "Изменити",
+  "admin.access-control.groups.table.edit.buttons.edit": "Измените \"{{name}}\"",
+  "admin.access-control.groups.table.edit.buttons.remove": "Избришите \"{{name}}\"",
+  "admin.access-control.groups.no-items": "Није пронађена ниједна група са овим у свом имену или овим као UUID",
+  "admin.access-control.groups.notification.deleted.success": "Успешно избрисана група \"{{name}}\"",
+  "admin.access-control.groups.notification.deleted.failure.title": "Неуспешно брисање групе \"{{name}}\"",
+  "admin.access-control.groups.notification.deleted.failure.content": "Узрок: \"{{cause}}\"",
+  "admin.access-control.groups.form.alert.permanent": "Ова група је трајна, тако да се не може мењати или брисати. И даље можете да додајете и уклањате чланове групе користећи ову страницу.",
+  "admin.access-control.groups.form.alert.workflowGroup": "Ова група се не може изменити или избрисати јер одговара улози у процесу слања и тока посла у \"{{name}}\" {{comcol}}. Можете је избрисати са картице <a href='{{comcolEditRolesRoute}}'>\"додели улоге\"</a> на страници за уређивање {{comcol}}. И даље можете да додајете и уклањате чланове групе користећи ову страницу.",
+  "admin.access-control.groups.form.head.create": "Креирај групу",
+  "admin.access-control.groups.form.head.edit": "Измени групу",
+  "admin.access-control.groups.form.groupName": "Назив групе",
+  "admin.access-control.groups.form.groupCommunity": "Заједница или колекција",
+  "admin.access-control.groups.form.groupDescription": "Опис",
+  "admin.access-control.groups.form.notification.created.success": "Успешно креирана Група \"{{name}}\"",
+  "admin.access-control.groups.form.notification.created.failure": "Неуспешно креирање Групе \"{{name}}\"",
+  "admin.access-control.groups.form.notification.created.failure.groupNameInUse": "Неуспешно креирање Групе са именом: \"{{name}}\", проверите да име није већ употребљено.",
+  "admin.access-control.groups.form.notification.edited.failure": "Неуспешна измена Групе \"{{name}}\"",
+  "admin.access-control.groups.form.notification.edited.failure.groupNameInUse": "Назив \"{{name}}\" се већ користи!",
+  "admin.access-control.groups.form.notification.edited.success": "Група \"{{name}}\" је успешно измењена",
+  "admin.access-control.groups.form.actions.delete": "Избришите групу",
+  "admin.access-control.groups.form.delete-group.modal.header": "Избришите групу \"{{ dsoName}}\"",
+  "admin.access-control.groups.form.delete-group.modal.info": "Да ли сте сигурни да желите да избришете групу \"{{ dsoName }}\"",
+  "admin.access-control.groups.form.delete-group.modal.cancel": "Поништити, отказати",
+  "admin.access-control.groups.form.delete-group.modal.confirm": "Избришите",
+  "admin.access-control.groups.form.notification.deleted.success": "Група \"{{ name }}\" је успешно обрисана",
+  "admin.access-control.groups.form.notification.deleted.failure.title": "Брисање групе \"{{ name }}\" није успело",
+  "admin.access-control.groups.form.notification.deleted.failure.content": "Узрок: \"{{ cause }}\"",
+  "admin.access-control.groups.form.members-list.head": "EPeople",
+  "admin.access-control.groups.form.members-list.search.head": "Додајте EPeople",
+  "admin.access-control.groups.form.members-list.button.see-all": "Прегледајте све",
+  "admin.access-control.groups.form.members-list.headMembers": "Тренутни чланови",
+  "admin.access-control.groups.form.members-list.search.scope.metadata": "Метаподатак",
+  "admin.access-control.groups.form.members-list.search.scope.email": "Е-мејл (тачно)",
+  "admin.access-control.groups.form.members-list.search.button": "Претрага",
+  "admin.access-control.groups.form.members-list.table.id": "ID",
+  "admin.access-control.groups.form.members-list.table.name": "Име",
+  "admin.access-control.groups.form.members-list.table.identity": "Идентитет",
+  "admin.access-control.groups.form.members-list.table.email": "Email",
+  "admin.access-control.groups.form.members-list.table.netid": "NetID",
+  "admin.access-control.groups.form.members-list.table.edit": "Уклони / Додај",
+  "admin.access-control.groups.form.members-list.table.edit.buttons.remove": "Уклоните члана са именом \"{{name}}\"",
+  "admin.access-control.groups.form.members-list.notification.success.addMember": "Члан је успешно додат: \"{{name}}\"",
+  "admin.access-control.groups.form.members-list.notification.failure.addMember": "Додавање члана није успело: \"{{name}}\"",
+  "admin.access-control.groups.form.members-list.notification.success.deleteMember": "Успешно обрисан члан: \"{{name}}\"",
+  "admin.access-control.groups.form.members-list.notification.failure.deleteMember": "Брисање члана није успело: \"{{name}}\"",
+  "admin.access-control.groups.form.members-list.table.edit.buttons.add": "Додај члана са именом \"{{name}}\"",
+  "admin.access-control.groups.form.members-list.notification.failure.noActiveGroup": "Нема тренутно активне групе, прво пошаљите име.",
+  "admin.access-control.groups.form.members-list.no-members-yet": "Још нема чланова у групи, претражите и додајте.",
+  "admin.access-control.groups.form.members-list.no-items": "Ниједан EPeople није пронађен у тој претрази",
+  "admin.access-control.groups.form.subgroups-list.notification.failure": "Нешто није у реду: \"{{cause}}\"",
+  "admin.access-control.groups.form.subgroups-list.head": "Групе",
+  "admin.access-control.groups.form.subgroups-list.search.head": "Додајте подгрупу",
+  "admin.access-control.groups.form.subgroups-list.button.see-all": "Прегледајте све",
+  "admin.access-control.groups.form.subgroups-list.headSubgroups": "Тренутне подгрупе",
+  "admin.access-control.groups.form.subgroups-list.search.button": "Претрага",
+  "admin.access-control.groups.form.subgroups-list.table.id": "ID",
+  "admin.access-control.groups.form.subgroups-list.table.name": "Име",
+  "admin.access-control.groups.form.subgroups-list.table.collectionOrCommunity": "Колекција/Заједница",
+  "admin.access-control.groups.form.subgroups-list.table.edit": "Уклони / Додај",
+  "admin.access-control.groups.form.subgroups-list.table.edit.buttons.remove": "Уклоните подгрупу са именом \"{{name}}\"",
+  "admin.access-control.groups.form.subgroups-list.table.edit.buttons.add": "Додајте подгрупу са именом \"{{name}}\"",
+  "admin.access-control.groups.form.subgroups-list.table.edit.currentGroup": "Тренутна група",
+  "admin.access-control.groups.form.subgroups-list.notification.success.addSubgroup": "Подгрупа је успешно додата: \"{{name}}\"",
+  "admin.access-control.groups.form.subgroups-list.notification.failure.addSubgroup": "Додавање подгрупе није успело: \"{{name}}\"",
+  "admin.access-control.groups.form.subgroups-list.notification.success.deleteSubgroup": "Успешно обрисана подгрупа: \"{{name}}\"",
+  "admin.access-control.groups.form.subgroups-list.notification.failure.deleteSubgroup": "Брисање подгрупе није успело: \"{{name}}\"",
+  "admin.access-control.groups.form.subgroups-list.notification.failure.noActiveGroup": "Нема тренутно активне групе, прво пошаљите име.",
+  "admin.access-control.groups.form.subgroups-list.notification.failure.subgroupToAddIsActiveGroup": "Ово је тренутна група, не може се додати.",
+  "admin.access-control.groups.form.subgroups-list.no-items": "Није пронађена ниједна група са овим у свом имену или овим као UUID",
+  "admin.access-control.groups.form.subgroups-list.no-subgroups-yet": "Још нема подгрупа у групи.",
+  "admin.access-control.groups.form.return": "Назад",
+  "admin.access-control.groups.form.tooltip.editGroupPage": "На овој страници можете да мењате својства и чланове групе. У горњем одељку можете да измените име и опис групе, осим ако је ово администраторска група за колекцију или заједницу, у ком случају се име и опис групе аутоматски генеришу и не могу се мењати. У следећим одељцима можете да мењате чланство у групи. Погледајте [wiki](https://wiki.lyrasis.org/display/DSDOC7x/Create+or+manage+a+user+group) за више детаља.",
+  "admin.access-control.groups.form.tooltip.editGroup.addEpeople": "Да бисте додали или уклонили EPerson-у/из ове групе, или кликните на дугме 'Прегледај све' или користите траку за претрагу испод да бисте претражили кориснике (користите падајући мени са леве стране траке за претрагу да бисте изабрали да ли ћете претраживати према метаподацима или према е-маилу). Затим кликните на икону плус за сваког корисника којег желите да додате на листу испод или на икону корпе за смеће за сваког корисника којег желите да уклоните. Листа у наставку може имати неколико страница: користите контроле странице испод листе да бисте прешли на следеће странице. Када будете спремни, сачувајте промене кликом на дугме \"Сачувај\" у горњем делу.",
+  "admin.access-control.groups.form.tooltip.editGroup.addSubgroups": "Да бисте додали или уклонили подгрупу у/из ове групе, кликните на дугме 'Прегледај све' или користите траку за претрагу испод да бисте претражили кориснике. Затим кликните на икону плус за сваког корисника којег желите да додате на листу испод или на икону корпе за смеће за сваког корисника којег желите да уклоните. Листа у наставку може имати неколико страница: користите контроле странице испод листе да бисте прешли на следеће странице. Када будете спремни, сачувајте промене кликом на дугме \"Сачувај\" у горњем делу.",
+  "admin.search.breadcrumbs": "Административна претрага",
+  "admin.search.collection.edit": "Уредите",
+  "admin.search.community.edit": "Уредите",
+  "admin.search.item.delete": "Избришите",
+  "admin.search.item.edit": "Уредите",
+  "admin.search.item.make-private": "Учините невидљивим",
+  "admin.search.item.make-public": "Учините видљивим",
+  "admin.search.item.move": "Померите",
+  "admin.search.item.reinstate": "Реинстате",
+  "admin.search.item.withdraw": "Одустати",
+  "admin.search.title": "Административна претрага",
+  "administrativeView.search.results.head": "Административна претрага",
+  "admin.workflow.breadcrumbs": "Администрирање радног процеса",
+  "admin.workflow.title": "Администрирање радног процеса",
+  "admin.workflow.item.workflow": "Процес рада",
+  "admin.workflow.item.workspace": "Радни простор",
+  "admin.workflow.item.delete": "Избришите",
+  "admin.workflow.item.send-back": "Вратите",
+  "admin.workflow.item.policies": "Политике",
+  "admin.workflow.item.supervision": "Надзор",
+  "admin.metadata-import.breadcrumbs": "Увези метаподатке",
+  "admin.batch-import.breadcrumbs": "Увези Batch",
+  "admin.metadata-import.title": "Увези метаподатке",
+  "admin.batch-import.title": "Увези Batch",
+  "admin.metadata-import.page.header": "Увезите метаподатке",
+  "admin.batch-import.page.header": "Увези Batch",
+  "admin.metadata-import.page.help": "Овде можете да превучете или прегледате CSV фајлове који садрже Batch операције метаподатака за фајлове",
+  "admin.batch-import.page.help": "Изаберите колекцију у коју желите да увезете. Затим превуците или потражите ZIP фајл једноставног архивског формата (SAF) која укључује ставке за увоз",
+  "admin.batch-import.page.toggle.help": "Могуће је извршити увоз било са отпремањем фајла или преко URL-а, користите горњи прекидач да бисте подесили извор уноса",
+  "admin.metadata-import.page.dropMsg": "Превуците CSV са метаподацима за увоз",
+  "admin.batch-import.page.dropMsg": "Превуците Batch ZIP за увоз",
+  "admin.metadata-import.page.dropMsgReplace": "Превуците да замените CSV са метаподацима за увоз",
+  "admin.batch-import.page.dropMsgReplace": "Превуците да замените Batch ZIP за увоз",
+  "admin.metadata-import.page.button.return": "Назад",
+  "admin.metadata-import.page.button.proceed": "Наставите",
+  "admin.metadata-import.page.button.select-collection": "Изаберите колекцију",
+  "admin.metadata-import.page.error.addFile": "Прво изаберите фајл!",
+  "admin.metadata-import.page.error.addFileUrl": "Прво унесите URL фајл!",
+  "admin.batch-import.page.error.addFile": "Прво изаберите ZIP фајл!",
+  "admin.metadata-import.page.toggle.upload": "Отпремите",
+  "admin.metadata-import.page.toggle.url": "URL",
+  "admin.metadata-import.page.urlMsg": "Уметните Batch ZIP URL за увоз",
+  "admin.metadata-import.page.validateOnly": "Само валидирај",
+  "admin.metadata-import.page.validateOnly.hint": "Када се изабере, отпремљени CSV ће бити потврђен. Добићете извештај о утврђеним променама, али промене неће бити сачуване.",
+  "advanced-workflow-action.rating.form.rating.label": "Оцена",
+  "advanced-workflow-action.rating.form.rating.error": "Морате оценити ставку",
+  "advanced-workflow-action.rating.form.review.label": "Преглед",
+  "advanced-workflow-action.rating.form.review.error": "Морате унети рецензију да бисте послали ову оцену",
+  "advanced-workflow-action.rating.description": "Молимо изаберите оцену испод",
+  "advanced-workflow-action.rating.description-requiredDescription": "Молимо изаберите оцену испод и додајте рецензију",
+  "advanced-workflow-action.select-reviewer.description-single": "Молимо изаберите једног рецензента испод пре слања",
+  "advanced-workflow-action.select-reviewer.description-multiple": "Молимо изаберите једног или више рецензената испод пре слања",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.head": "EPeople",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.head": "Додајте EPeople",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.button.see-all": "Прегледајте све",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.headMembers": "Тренутни чланови",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.scope.metadata": "Метаподаци",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.scope.email": "Е-мејл (тачно)",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.button": "Претрага",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.id": "ID",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.name": "Име",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.identity": "Идентитет",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.email": "Email",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.netid": "NetID",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.edit": "Уклоните / Додајте",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.edit.buttons.remove": "Уклоните члана са именом \"{{name}}\"",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.success.addMember": "Успешно додат члан: \"{{name}}\"",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.failure.addMember": "Неуспешно додавање члана: \"{{name}}\"",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.success.deleteMember": "Успешно избрисан члан: \"{{name}}\"",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.failure.deleteMember": "Неуспешно брисање члана: \"{{name}}\"",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.edit.buttons.add": "Додајте члана са именом \"{{name}}\"",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.failure.noActiveGroup": "Тренутно нема активне групе, прво унесите име.",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.no-members-yet": "Још нема чланова у групи, претражите и додајте.",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.no-items": "Ниједан EPeople није пронађен у тој претрази",
+  "advanced-workflow-action.select-reviewer.no-reviewer-selected.error": "Није изабран рецензент.",
+  "admin.batch-import.page.validateOnly.hint": "Када се изабере, отпремљени ZIP ће бити потврђен. Добићете извештај о утврђеним променама, али промене неће бити сачуване.",
+  "admin.batch-import.page.remove": "уклонити",
+  "auth.errors.invalid-user": "Погрешна Е-мејл адреса или лозинка.",
+  "auth.messages.expired": "Ваша сесија је истекла. Молимо пријавите се поново.",
+  "auth.messages.token-refresh-failed": "Освежавање токена сесије није успело. Молимо пријавите се поново.",
+  "bitstream.download.page": "Тренутно се преузима {{bitstream}}...",
+  "bitstream.download.page.back": "Назад",
+  "bitstream.edit.authorizations.link": "Измените полисе битстрим-а",
+  "bitstream.edit.authorizations.title": "Измените полисе битстрим-а",
+  "bitstream.edit.return": "Назад",
+  "bitstream.edit.bitstream": "битстрим:",
+  "bitstream.edit.form.description.hint": "Опционо, наведите кратак опис фајла, на пример \"<i>Главни чланак</i>\" или \"<i>Очитавања података експеримента</i>\".",
+  "bitstream.edit.form.description.label": "Опис",
+  "bitstream.edit.form.embargo.hint": "Први дан од којег је приступ дозвољен. <b>Овај датум се не може изменити у овом обрасцу.</b> Да бисте поставили датум забране за битстрим, идите на картицу <i>Статус ставке</i>, кликните на <i>Овлашћења...</i >, креирајте или измените политику битстрим-ова<i>ПРОЧИТАЈТЕ</i> и поставите <i>Датум почетка</i> по жељи.",
+  "bitstream.edit.form.embargo.label": "Забрана до одређеног датума",
+  "bitstream.edit.form.fileName.hint": "Промените име фајла за битстрим. Имајте на уму да ће се овим променити приказани битстрим URL, али ће се стари линкови и даље разрешити све док се ID секвенце не промени.",
+  "bitstream.edit.form.fileName.label": "Име фајла",
+  "bitstream.edit.form.newFormat.label": "Опишите нови формат",
+  "bitstream.edit.form.newFormat.hint": "Апликација коју сте користили за креирање фајла, и број верзије (на пример, \"<i>ACMESoft SuperApp верзија 1.5</i>\").",
+  "bitstream.edit.form.primaryBitstream.label": "Примарни битстрим",
+  "bitstream.edit.form.selectedFormat.hint": "Ако формат није на горњој листи, <b>изаберите \"формат није на листи\" изнад</b> и опишите га под \"Опишите нови формат\".",
+  "bitstream.edit.form.selectedFormat.label": "Изабрани формат",
+  "bitstream.edit.form.selectedFormat.unknown": "Формат није на листи",
+  "bitstream.edit.notifications.error.format.title": "Дошло је до грешке приликом чувања битстрим формата",
+  "bitstream.edit.notifications.error.primaryBitstream.title": "Дошло је до грешке приликом чувања примарног битстрим-а",
+  "bitstream.edit.form.iiifLabel.label": "IIIF ознака",
+  "bitstream.edit.form.iiifLabel.hint": "Ознака canvas-а за ову слику. Ако није дата, користиће се подразумевана ознака.",
+  "bitstream.edit.form.iiifToc.label": "IIIF Преглед садржаја",
+  "bitstream.edit.form.iiifToc.hint": "Додавање текста овде, чини ово место почетком новог опсега садржаја.",
+  "bitstream.edit.form.iiifWidth.label": "IIIF ширина canvas-а",
+  "bitstream.edit.form.iiifWidth.hint": "Ширина платна обично треба да одговара ширини слике.",
+  "bitstream.edit.form.iiifHeight.label": "IIIF висина canvas-a",
+  "bitstream.edit.form.iiifHeight.hint": "Висина canvas-а обично треба да одговара висини слике.",
+  "bitstream.edit.notifications.saved.content": "Ваше промене у овом битстрим-у су сачуване.",
+  "bitstream.edit.notifications.saved.title": "битстрим је сачуван",
+  "bitstream.edit.title": "Измените битстрим",
+  "bitstream-request-a-copy.alert.canDownload1": "Већ имате приступ овом фајлу. Ако желите да преузмете фајл, кликните",
+  "bitstream-request-a-copy.alert.canDownload2": "овде",
+  "bitstream-request-a-copy.header": "Затражите копију фајла",
+  "bitstream-request-a-copy.intro": "Унесите следеће информације да бисте затражили копију следеће ставке:",
+  "bitstream-request-a-copy.intro.bitstream.one": "Захтева се следећи фајл:",
+  "bitstream-request-a-copy.intro.bitstream.all": "Захтевају се сви фајлови.",
+  "bitstream-request-a-copy.name.label": "име *",
+  "bitstream-request-a-copy.name.error": "Име је обавезно",
+  "bitstream-request-a-copy.email.label": "Ваша емаил адреса *",
+  "bitstream-request-a-copy.email.hint": "Ова Е-мејл адреса се користи за слање фајла.",
+  "bitstream-request-a-copy.email.error": "Молим Вас унесите исправну Е-мејл адресу.",
+  "bitstream-request-a-copy.allfiles.label": "Фајлови",
+  "bitstream-request-a-copy.files-all-false.label": "Само тражени фајл",
+  "bitstream-request-a-copy.files-all-true.label": "Све фајлови (ове ставке) у ограниченом приступу",
+  "bitstream-request-a-copy.message.label": "Порука",
+  "bitstream-request-a-copy.return": "Назад",
+  "bitstream-request-a-copy.submit": "Захтевај копију",
+  "bitstream-request-a-copy.submit.success": "Захтев за ставку је успешно достављен.",
+  "bitstream-request-a-copy.submit.error": "Нешто није у реду са слањем захтева за ставку.",
+  "browse.back.all-results": "Сви резултати прегледа",
+  "browse.comcol.by.author": "По аутору",
+  "browse.comcol.by.dateissued": "По датуму издања",
+  "browse.comcol.by.subject": "По предмету",
+  "browse.comcol.by.srsc": "По категорији предмета",
+  "browse.comcol.by.title": "По наслову",
+  "browse.comcol.head": "Прегледајте",
+  "browse.empty": "Нема ставки за приказ.",
+  "browse.metadata.author": "Аутору",
+  "browse.metadata.dateissued": "Датуму издања",
+  "browse.metadata.subject": "Предмету",
+  "browse.metadata.title": "Наслову",
+  "browse.metadata.author.breadcrumbs": "Преглед по аутору",
+  "browse.metadata.dateissued.breadcrumbs": "Преглед по датуму",
+  "browse.metadata.subject.breadcrumbs": "Преглед по предмету",
+  "browse.metadata.srsc.breadcrumbs": "Преглед по категорији предмета",
+  "browse.metadata.title.breadcrumbs": "Преглед по наслову",
+  "pagination.next.button": "Следеће",
+  "pagination.previous.button": "Претходно",
+  "pagination.next.button.disabled.tooltip": "Нема више страница са резултатима",
+  "browse.startsWith": ", почевши од {{ startsWith }}",
+  "browse.startsWith.choose_start": "(Изаберите почетак)",
+  "browse.startsWith.choose_year": "(Изаберите годину)",
+  "browse.startsWith.choose_year.label": "Изаберите годину издања",
+  "browse.startsWith.jump": "Филтрирајте резултате по години или месецу",
+  "browse.startsWith.months.april": "Април",
+  "browse.startsWith.months.august": "Август",
+  "browse.startsWith.months.december": "Децембар",
+  "browse.startsWith.months.february": "Фебруар",
+  "browse.startsWith.months.january": "Јануар",
+  "browse.startsWith.months.july": "Јул",
+  "browse.startsWith.months.june": "Јун",
+  "browse.startsWith.months.march": "Март",
+  "browse.startsWith.months.may": "Мај",
+  "browse.startsWith.months.none": "(Изаберите месец)",
+  "browse.startsWith.months.none.label": "Изаберите месец издања",
+  "browse.startsWith.months.november": "Новембар",
+  "browse.startsWith.months.october": "Октобар",
+  "browse.startsWith.months.september": "Септембар",
+  "browse.startsWith.submit": "Прегледај",
+  "browse.startsWith.type_date": "Филтрирајте резултате по датуму",
+  "browse.startsWith.type_date.label": "Или унесите датум (година-месец) и кликните на дугме Прегледај",
+  "browse.startsWith.type_text": "Филтрирајте резултате уписивањем првих неколико слова",
+  "browse.startsWith.input": "Филтер",
+  "browse.taxonomy.button": "Прегледај",
+  "browse.title": "Прегледање {{ collection }} према {{ field }}{{ startsWith }} {{ value }}",
+  "browse.title.page": "Прегледање {{ collection }} према {{ field }} {{ value }}",
+  "search.browse.item-back": "Назад на резултате",
+  "chips.remove": "Уклоните чип",
+  "claimed-approved-search-result-list-element.title": "Одобрено",
+  "claimed-declined-search-result-list-element.title": "Одбијено, враћено подносиоцу",
+  "claimed-declined-task-search-result-list-element.title": "Одбијено, враћено менаджеру за преглед",
+  "collection.create.head": "Направите колекцију",
+  "collection.create.notifications.success": "Колекција је успешно направљена",
+  "collection.create.sub-head": "Направите колекцију за заједницу {{ parent }}",
+  "collection.curate.header": "Сачувај колекцију: {{collection}}",
+  "collection.delete.cancel": "Поништити, отказати",
+  "collection.delete.confirm": "Потврди",
+  "collection.delete.processing": "Брисање",
+  "collection.delete.head": "Избришите колекцију",
+  "collection.delete.notification.fail": "Колекција се не може избрисати",
+  "collection.delete.notification.success": "Колекција је успешно избрисана",
+  "collection.delete.text": "Да ли сте сигурни да желите да избришете колекцију \"{{ dso }}\"",
+  "collection.edit.delete": "Избришите ову колекцију",
+  "collection.edit.head": "Уредите колекцију",
+  "collection.edit.breadcrumbs": "Уредите колекцију",
+  "collection.edit.tabs.mapper.head": "Мапирање ставки",
+  "collection.edit.tabs.item-mapper.title": "Уређивање колекције - мапирање ставки",
+  "collection.edit.item-mapper.cancel": "Поништити, отказати",
+  "collection.edit.item-mapper.collection": "Колекција: \"<b>{{name}}</b>\"",
+  "collection.edit.item-mapper.confirm": "Мапирајте изабране ставке",
+  "collection.edit.item-mapper.description": "Ово је алатка за мапирање ставки која омогућава администраторима колекције да мапирају ставке из других колекција у ову колекцију. Можете тражити ставке из других колекција и мапирати их или прегледати листу тренутно мапираних ставки.",
+  "collection.edit.item-mapper.head": "Мапирање ставки - мапа ставки из других колекција",
+  "collection.edit.item-mapper.no-search": "Унесите упит за претрагу",
+  "collection.edit.item-mapper.notifications.map.error.content": "Дошло је до грешака за мапирање {{amount}} ставки.",
+  "collection.edit.item-mapper.notifications.map.error.head": "Грешке у мапирању",
+  "collection.edit.item-mapper.notifications.map.success.content": "Успешно мапиране {{amount}} ставке.",
+  "collection.edit.item-mapper.notifications.map.success.head": "Мапирање је завршено",
+  "collection.edit.item-mapper.notifications.unmap.error.content": "Дошло је до грешака при уклањању мапирања ставки {{amount}}.",
+  "collection.edit.item-mapper.notifications.unmap.error.head": "Уклоните грешке мапирања",
+  "collection.edit.item-mapper.notifications.unmap.success.content": "Успешно су уклоњена мапирања {{amount}} ставки.",
+  "collection.edit.item-mapper.notifications.unmap.success.head": "Уклањање мапирања је завршено",
+  "collection.edit.item-mapper.remove": "Уклањање мапирања изабраних ставки",
+  "collection.edit.item-mapper.search-form.placeholder": "Претражи ставке...",
+  "collection.edit.item-mapper.tabs.browse": "Прегледајте мапиране ставке",
+  "collection.edit.item-mapper.tabs.map": "Мапирајте нове ставке",
+  "collection.edit.logo.delete.title": "Избришите лого",
+  "collection.edit.logo.delete-undo.title": "Опозови брисање",
+  "collection.edit.logo.label": "Лого колекције",
+  "collection.edit.logo.notifications.add.error": "Отпремање лога колекције није успело. Проверите садржај пре поновног покушаја.",
+  "collection.edit.logo.notifications.add.success": "Отпремање лога колекције је успешно.",
+  "collection.edit.logo.notifications.delete.success.title": "Лого је избрисан",
+  "collection.edit.logo.notifications.delete.success.content": "Успешно је обрисан лого колекције",
+  "collection.edit.logo.notifications.delete.error.title": "Грешка при брисању лога",
+  "collection.edit.logo.upload": "Превуците логотип колекције за отпремање",
+  "collection.edit.notifications.success": "Успешно уређена колекција",
+  "collection.edit.return": "Назад",
+  "collection.edit.tabs.access-control.head": "Контрола приступа",
+  "collection.edit.tabs.access-control.title": "Уређивање колекције - Контрола приступа",
+  "collection.edit.tabs.curate.head": "Curate",
+  "collection.edit.tabs.curate.title": "Уређивање колекције - Curate",
+  "collection.edit.tabs.authorizations.head": "Овлашћења",
+  "collection.edit.tabs.authorizations.title": "Уређивање колекције - овлашћења",
+  "collection.edit.item.authorizations.load-bundle-button": "Учитајте још пакета",
+  "collection.edit.item.authorizations.load-more-button": "Учитај више",
+  "collection.edit.item.authorizations.show-bitstreams-button": "Прикажи битстрим смернице за пакет",
+  "collection.edit.tabs.metadata.head": "Уреди метаподатке",
+  "collection.edit.tabs.metadata.title": "Уређивање колекције - Метаподаци",
+  "collection.edit.tabs.roles.head": "Додели улоге",
+  "collection.edit.tabs.roles.title": "Уређивање колекције - Улоге",
+  "collection.edit.tabs.source.external": "Ова колекција прикупља свој садржај из спољашњег извора",
+  "collection.edit.tabs.source.form.errors.oaiSource.required": "Морате да обезбедите сет ID циљне колекције.",
+  "collection.edit.tabs.source.form.harvestType": "Садржај се прикупља",
+  "collection.edit.tabs.source.form.head": "Конфигуришите спољни извор",
+  "collection.edit.tabs.source.form.metadataConfigId": "Формат метаподатака",
+  "collection.edit.tabs.source.form.oaiSetId": "ID специфичног скупа за OAI",
+  "collection.edit.tabs.source.form.oaiSource": "OAI провајдер",
+  "collection.edit.tabs.source.form.options.harvestType.METADATA_AND_BITSTREAMS": "Сакупите метаподатке и битстрим-ове (захтева ORE подршку)",
+  "collection.edit.tabs.source.form.options.harvestType.METADATA_AND_REF": "Сакупите метаподатке и референце на битстрим-ове (захтева ORE подршку)",
+  "collection.edit.tabs.source.form.options.harvestType.METADATA_ONLY": "Само прикупљени метаподаци",
+  "collection.edit.tabs.source.head": "Извор садржаја",
+  "collection.edit.tabs.source.notifications.discarded.content": "Ваше промене су одбачене. Да бисте поново поставили своје промене, кликните на дугме \"Опозови\".",
+  "collection.edit.tabs.source.notifications.discarded.title": "Промене су одбачене",
+  "collection.edit.tabs.source.notifications.invalid.content": "Ваше промене нису сачуване. Проверите да ли су сва поља исправна пре него што сачувате.",
+  "collection.edit.tabs.source.notifications.invalid.title": "Метаподаци су неважећи",
+  "collection.edit.tabs.source.notifications.saved.content": "Ваше промене извора садржаја ове колекције су сачуване.",
+  "collection.edit.tabs.source.notifications.saved.title": "Извор садржаја је сачуван",
+  "collection.edit.tabs.source.title": "Уређивање колекције – Извор садржаја",
+  "collection.edit.template.add-button": "Додати",
+  "collection.edit.template.breadcrumbs": "Шаблон ставке",
+  "collection.edit.template.cancel": "Отказати",
+  "collection.edit.template.delete-button": "Избришите",
+  "collection.edit.template.edit-button": "Измените",
+  "collection.edit.template.error": "Дошло је до грешке при преузимању ставке шаблона",
+  "collection.edit.template.head": "Измените ставку шаблона за колекцију \"{{ collection }}\"",
+  "collection.edit.template.label": "Ставка шаблона",
+  "collection.edit.template.loading": "Учитава се ставка шаблона...",
+  "collection.edit.template.notifications.delete.error": "Неуспешно брисање шаблона ставке",
+  "collection.edit.template.notifications.delete.success": "Успешно обрисан шаблон ставке",
+  "collection.edit.template.title": "Измените ставку шаблона",
+  "collection.form.abstract": "Кратак опис",
+  "collection.form.description": "Уводни текст (HTML)",
+  "collection.form.errors.title.required": "Молимо унесите име колекције",
+  "collection.form.license": "Лиценца",
+  "collection.form.provenance": "Порекло",
+  "collection.form.rights": "Ауторски текст (HTML)",
+  "collection.form.tableofcontents": "Вести (HTML)",
+  "collection.form.title": "Име",
+  "collection.form.entityType": "Тип ентитета",
+  "collection.listelement.badge": "Колекција",
+  "collection.page.browse.recent.head": "Недавни поднесци",
+  "collection.page.browse.recent.empty": "Нема ставки за приказ",
+  "collection.page.edit": "Измените ову колекцију",
+  "collection.page.handle": "Трајни URI за ову колекцију",
+  "collection.page.license": "Лиценца",
+  "collection.page.news": "Вести",
+  "collection.select.confirm": "Потврдите изабрано",
+  "collection.select.empty": "Нема колекција за приказ",
+  "collection.select.table.title": "Наслов",
+  "collection.source.controls.head": "Контрола прикупљања",
+  "collection.source.controls.test.submit.error": "Нешто није у реду са покретањем тестирања подешавања",
+  "collection.source.controls.test.failed": "Скрипта за тестирање подешавања није успела",
+  "collection.source.controls.test.completed": "Скрипта за тестирање подешавања је успешно завршена",
+  "collection.source.controls.test.submit": "Тестна конфигурација",
+  "collection.source.controls.test.running": "Тестирање конфигурације...",
+  "collection.source.controls.import.submit.success": "Увоз је успешно покренут",
+  "collection.source.controls.import.submit.error": "Нешто није у реду са покретањем увоза",
+  "collection.source.controls.import.submit": "Увезите сада",
+  "collection.source.controls.import.running": "Увоз...",
+  "collection.source.controls.import.failed": "Дошло је до грешке током увоза",
+  "collection.source.controls.import.completed": "Увоз је завршен",
+  "collection.source.controls.reset.submit.success": "Ресетовање и поновни увоз су успешно покренути",
+  "collection.source.controls.reset.submit.error": "Нешто није у реду са покретањем ресетовања и поновног увоза",
+  "collection.source.controls.reset.failed": "Дошло је до грешке током ресетовања и поновног увоза",
+  "collection.source.controls.reset.completed": "Ресетовање и поновни увоз су завршени",
+  "collection.source.controls.reset.submit": "Ресетујте и поново увезите",
+  "collection.source.controls.reset.running": "Ресетовање и поновни увоз...",
+  "collection.source.controls.harvest.status": "Статус прикупљаања:",
+  "collection.source.controls.harvest.start": "Време почетка прикупљања:",
+  "collection.source.controls.harvest.last": "Време почетка прикупљања:",
+  "collection.source.controls.harvest.message": "Информације о прикупљању:",
+  "collection.source.controls.harvest.no-information": "N/A",
+  "collection.source.update.notifications.error.content": "Наведена подешавања су тестирана и нису функционисала.",
+  "collection.source.update.notifications.error.title": "Грешка на серверу",
+  "communityList.breadcrumbs": "Листа заједнице",
+  "communityList.tabTitle": "Лист заједнице",
+  "communityList.title": "Листа заједница",
+  "communityList.showMore": "Прикажи више",
+  "community.create.head": "Креирајте заједницу",
+  "community.create.notifications.success": "Заједница је успешно креирана",
+  "community.create.sub-head": "Креирајте подзаједницу за заједницу {{ parent }}",
+  "community.curate.header": "Уредник заједнице: {{community}}",
+  "community.delete.cancel": "Отказати",
+  "community.delete.confirm": "Потврдите",
+  "community.delete.processing": "Брисање...",
+  "community.delete.head": "Избришите заједницу",
+  "community.delete.notification.fail": "Није могуће избрисати заједницу",
+  "community.delete.notification.success": "Успешно избрисана заједница",
+  "community.delete.text": "Да ли сте сигурни да желите да избришете заједницу \"{{ dso }}\"",
+  "community.edit.delete": "Избришите ову заједницу",
+  "community.edit.head": "Измените заједницу",
+  "community.edit.breadcrumbs": "Измените заједницу",
+  "community.edit.logo.delete.title": "Избришите лого",
+  "community.edit.logo.delete-undo.title": "Поништите брисање",
+  "community.edit.logo.label": "Лого заједнице",
+  "community.edit.logo.notifications.add.error": "Отпремање логоа заједнице није успело. Молимо проверите садржај пре поновног покушаја.",
+  "community.edit.logo.notifications.add.success": "Успешно отпремање логоа заједнице.",
+  "community.edit.logo.notifications.delete.success.title": "Лого је избрисан",
+  "community.edit.logo.notifications.delete.success.content": "Успешно избрисан лого заједнице",
+  "community.edit.logo.notifications.delete.error.title": "Грешка при брисању логоа",
+  "community.edit.logo.upload": "Унесите лого заједнице да бисте га отпремили",
+  "community.edit.notifications.success": "Успешно је измењена заједница",
+  "community.edit.notifications.unauthorized": "Немате овлашћење да извршите ову промену",
+  "community.edit.notifications.error": "Дошло је до грешке при уређивању заједнице",
+  "community.edit.return": "Назад",
+  "community.edit.tabs.curate.head": "Curate",
+  "community.edit.tabs.curate.title": "Уређивање заједнице - Curate",
+  "community.edit.tabs.access-control.head": "Контрола приступа",
+  "community.edit.tabs.access-control.title": "Уређивање заједнице - Контрола приступа",
+  "community.edit.tabs.metadata.head": "Уреди метаподатке",
+  "community.edit.tabs.metadata.title": "Уређивање заједнице – Метаподаци",
+  "community.edit.tabs.roles.head": "Додели улоге",
+  "community.edit.tabs.roles.title": "Уређивање заједнице - Улоге",
+  "community.edit.tabs.authorizations.head": "Овлашћења",
+  "community.edit.tabs.authorizations.title": "Уређивање заједнице - овлашћења",
+  "community.listelement.badge": "Заједница",
+  "comcol-role.edit.no-group": "Ниједан",
+  "comcol-role.edit.create": "Креирајте",
+  "comcol-role.edit.create.error.title": "Прављење групе за улогу \"{{ role }}\" није успело",
+  "comcol-role.edit.restrict": "Ограничити",
+  "comcol-role.edit.delete": "Избришите",
+  "comcol-role.edit.delete.error.title": "Брисање групе улога \"{{ role }}\" није успело",
+  "comcol-role.edit.community-admin.name": "Администратори",
+  "comcol-role.edit.collection-admin.name": "Администратори",
+  "comcol-role.edit.community-admin.description": "Администратори заједнице могу да креирају подзаједнице или колекције и да управљају тим подзаједницама или збиркама или да им додељују управљање. Поред тога, они одлучују ко може да поднесе ставке у било коју подзбирку, уређују метаподатке ставки (након подношења) и додају (мапирају) постојеће ставке из других колекција (предмет овлашћења).",
+  "comcol-role.edit.collection-admin.description": "Администратори колекције одлучују ко може да шаље ставке у колекцију, уређују метаподатке ставки (након слања) и додају (мапирају) постојеће ставке из других колекција у ову колекцију (предмет овлашћења за ту колекцију).",
+  "comcol-role.edit.submitters.name": "Подносиоци",
+  "comcol-role.edit.submitters.description": "Е-људи и групе које имају дозволу да подносе нове ставке у ову колекцију.",
+  "comcol-role.edit.item_read.name": "Подразумевани приступ за читање ставке",
+  "comcol-role.edit.item_read.description": "Е-Људи и групе које могу да читају нове ставке послате у ову колекцију. Промене ове улоге нису ретроактивне. Постојеће ставке у систему ће и даље моћи да виде они који су имали приступ за читање у време њиховог додавања.",
+  "comcol-role.edit.item_read.anonymous-group": "Подразумевано читање за долазне ставке је тренутно постављено на Анонимно.",
+  "comcol-role.edit.bitstream_read.name": "Подразумевани приступ за читање битстреамова",
+  "comcol-role.edit.bitstream_read.description": "Администратори заједнице могу да креирају подзаједнице или колекције и да управљају тим подзаједницама или збиркама или да им додељују управљање. Поред тога, они одлучују ко може да поднесе ставке у било коју подзбирку, уређују метаподатке ставки (након подношења) и додају (мапирају) постојеће ставке из других колекција (предмет овлашћења).",
+  "comcol-role.edit.bitstream_read.anonymous-group": "Подразумевано читање за долазне битстреамове је тренутно подешено на Анонимно.",
+  "comcol-role.edit.editor.name": "Уредници",
+  "comcol-role.edit.editor.description": "Уредници могу да уређују метаподатке долазних поднесака, а затим да их прихвате или одбију.",
+  "comcol-role.edit.finaleditor.name": "Коначни уредници",
+  "comcol-role.edit.finaleditor.description": "Коначни уредници могу да уређују метаподатке долазних поднесака, али неће моћи да их одбију.",
+  "comcol-role.edit.reviewer.name": "Рецензенти",
+  "comcol-role.edit.reviewer.description": "Рецензенти могу да прихвате или одбију долазне поднеске. Међутим, они не могу да уређују метаподатке поднеска.",
+  "comcol-role.edit.scorereviewers.name": "Резултат рецензената",
+  "comcol-role.edit.scorereviewers.description": "Рецензенти могу да дају оцену долазним поднесцима, што ће дефинисати да ли ће поднесак бити одбијен или не.",
+  "community.form.abstract": "Кратак опис",
+  "community.form.description": "Уводни текст (HTML)",
+  "community.form.errors.title.required": "Унесите назив заједнице",
+  "community.form.rights": "Текст ауторских права (HTML)",
+  "community.form.tableofcontents": "Вести (HTML)",
+  "community.form.title": "Име",
+  "community.page.edit": "Уредите ову заједницу",
+  "community.page.handle": "Стални URI за ову заједницу",
+  "community.page.license": "Лиценца",
+  "community.page.news": "Вести",
+  "community.all-lists.head": "Подзаједнице и колекције",
+  "community.sub-collection-list.head": "Колекције у овој заједници",
+  "community.sub-community-list.head": "Заједнице у овој заједници",
+  "cookies.consent.accept-all": "Прихватите све",
+  "cookies.consent.accept-selected": "Прихватите изабрано",
+  "cookies.consent.app.opt-out.description": "Ова апликација се подразумевано учитава (али можете да одустанете)",
+  "cookies.consent.app.opt-out.title": "(одустати)",
+  "cookies.consent.app.purpose": "Сврха",
+  "cookies.consent.app.required.description": "Ова апликација је увек потребна",
+  "cookies.consent.app.required.title": "(увек потребно)",
+  "cookies.consent.app.disable-all.description": "Користите овај прекидач да омогућите или онемогућите све услуге.",
+  "cookies.consent.app.disable-all.title": "Омогућите или онемогућите све услуге",
+  "cookies.consent.update": "Било је промена од ваше последње посете, ажурирајте своју сагласност.",
+  "cookies.consent.close": "Затворити",
+  "cookies.consent.decline": "Одбити",
+  "cookies.consent.ok": "То је у реду",
+  "cookies.consent.save": "сачувати",
+  "cookies.consent.content-notice.title": "Сагласност за колачиће",
+  "cookies.consent.content-notice.description": "Прикупљамо и обрађујемо ваше личне податке у следеће сврхе: <strong>Провера аутентичности, подешавања, потврда и статистика</strong>. <br/> Да бисте сазнали више, прочитајте нашу {privacyPolicy}.",
+  "cookies.consent.content-notice.description.no-privacy": "Прикупљамо и обрађујемо ваше личне податке у следеће сврхе: <strong>Провера аутентичности, подешавања, потврда и статистика</strong>.",
+  "cookies.consent.content-notice.learnMore": "Прилагодити",
+  "cookies.consent.content-modal.description": "Овде можете видети и прилагодити информације које прикупљамо о вама.",
+  "cookies.consent.content-modal.privacy-policy.name": "Правила о приватности",
+  "cookies.consent.content-modal.privacy-policy.text": "Да сазнате више, прочитајте нашу {privacyPolicy}.",
+  "cookies.consent.content-modal.title": "Информације које прикупљамо",
+  "cookies.consent.content-modal.services": "Услуге",
+  "cookies.consent.content-modal.service": "Услуга",
+  "cookies.consent.app.title.authentication": "Провера",
+  "cookies.consent.app.description.authentication": "Потребно за пријављивање",
+  "cookies.consent.app.title.preferences": "Подешавања",
+  "cookies.consent.app.description.preferences": "Потребно за чување ваших подешавања",
+  "cookies.consent.app.title.acknowledgement": "Потврда",
+  "cookies.consent.app.description.acknowledgement": "Потребно за чување ваших потврда и сагласности",
+  "cookies.consent.app.title.google-analytics": "Гоогле аналитике",
+  "cookies.consent.app.description.google-analytics": "Омогућава нам да пратимо статистичке податке",
+  "cookies.consent.app.title.google-recaptcha": "Google reCaptcha",
+  "cookies.consent.app.description.google-recaptcha": "Користимо Google reCAPTCHA услугу током регистрације и опоравка лозинке",
+  "cookies.consent.purpose.functional": "Функционални",
+  "cookies.consent.purpose.statistical": "Статистички",
+  "cookies.consent.purpose.registration-password-recovery": "Регистрација и опоравак лозинке",
+  "cookies.consent.purpose.sharing": "Дељење",
+  "curation-task.task.citationpage.label": "Генеришите страницу са цитатима",
+  "curation-task.task.checklinks.label": "Проверите везе у метаподацима",
+  "curation-task.task.noop.label": "NOOP",
+  "curation-task.task.profileformats.label": "Профил Битстрим формати",
+  "curation-task.task.requiredmetadata.label": "Проверите потребне метаподатке",
+  "curation-task.task.translate.label": "Мицрософт преводилац",
+  "curation-task.task.vscan.label": "Претрага вируса",
+  "curation-task.task.register-doi.label": "Региструјте DOI",
+  "curation.form.task-select.label": "Задатак:",
+  "curation.form.submit": "Почетак",
+  "curation.form.submit.success.head": "Задато курирање је успешно покренуто",
+  "curation.form.submit.success.content": "Бићете преусмерени на одговарајућу страницу процеса.",
+  "curation.form.submit.error.head": "Неуспешно покретање задатог курирања",
+  "curation.form.submit.error.content": "Дошло је до грешке при покушају покретања задатог курирања.",
+  "curation.form.submit.error.invalid-handle": "Није могуће одредити handle за овај објекат",
+  "curation.form.handle.label": "Handle:",
+  "curation.form.handle.hint": "Савет: Унесите [your-handle-prefix]/0 да бисте покренули задатак на целом сајту (ову могућност не подржавају сви задаци)",
+  "deny-request-copy.email.message": "Поштовани {{ recipientName }}, \n Као одговор на ваш захтев, са жаљењем вас обавештавам да није могуће послати копију фајла коју сте тражили, у вези са документом: \"{{ itemUrl }}\" ({{ itemName }}), чији сам аутор. \n Срдачан поздрав, \n{{ authorName }} <{{ authorEmail }}>",
+  "deny-request-copy.email.subject": "Затражите копију документа",
+  "deny-request-copy.error": "Дошло је до грешке",
+  "deny-request-copy.header": "Одбијен захтев за копирање документа",
+  "deny-request-copy.intro": "Ова порука биће послата подносиоцу захтева",
+  "deny-request-copy.success": "Захтев за ставку је одбијен успешно",
+  "dso.name.untitled": "Без наслова",
+  "dso.name.unnamed": "Без имена",
+  "dso-selector.create.collection.head": "Нова колекција",
+  "dso-selector.create.collection.sub-level": "Креирајте нову колекцију у",
+  "dso-selector.create.community.head": "Нова заједница",
+  "dso-selector.create.community.or-divider": "или",
+  "dso-selector.create.community.sub-level": "Креирајте нову заједницу у",
+  "dso-selector.create.community.top-level": "Креирајте нову заједницу највишег нивоа",
+  "dso-selector.create.item.head": "Нова ставка",
+  "dso-selector.create.item.sub-level": "Креирајте нову ставку у",
+  "dso-selector.create.submission.head": "Нови поднесак",
+  "dso-selector.edit.collection.head": "Измените колекцију",
+  "dso-selector.edit.community.head": "Измените заједницу",
+  "dso-selector.edit.item.head": "Измените ставку",
+  "dso-selector.error.title": "Дошло је до грешке при претрази {{ type }}",
+  "dso-selector.export-metadata.dspaceobject.head": "Извезите метаподатке из",
+  "dso-selector.export-batch.dspaceobject.head": "Извезите пакет (ZIP) из",
+  "dso-selector.import-batch.dspaceobject.head": "Увезите пакет из",
+  "dso-selector.no-results": "Није пронађен {{ type }}",
+  "dso-selector.placeholder": "Претражите {{ type }}",
+  "dso-selector.select.collection.head": "Изаберите колекцију",
+  "dso-selector.set-scope.community.head": "Изаберите опсег претраге",
+  "dso-selector.set-scope.community.button": "Претражите читав репозиторијум",
+  "dso-selector.set-scope.community.or-divider": "или",
+  "dso-selector.set-scope.community.input-header": "Претражите заједницу или колекцију",
+  "dso-selector.claim.item.head": "Смернице за профил",
+  "dso-selector.claim.item.body": "Ово су постојећи профили који се можда односе на Вас. Ако се препознате у једном од ових профила, изаберите га и на страници са детаљима, међу опцијама, изаберите да га затражите. У супротном, можете креирати нови профил од нуле користећи дугме испод.",
+  "dso-selector.claim.item.not-mine-label": "Ниједан од ових није мој",
+  "dso-selector.claim.item.create-from-scratch": "Креирајте нови",
+  "dso-selector.results-could-not-be-retrieved": "Нешто није у реду, молимо освежите поново ↻",
+  "supervision-group-selector.header": "Селектор групе за надзор",
+  "supervision-group-selector.select.type-of-order.label": "Изаберите тип налога",
+  "supervision-group-selector.select.type-of-order.option.none": "НИЈЕДАН",
+  "supervision-group-selector.select.type-of-order.option.editor": "УРЕДНИК",
+  "supervision-group-selector.select.type-of-order.option.observer": "ПОСМАТРАЧ",
+  "supervision-group-selector.select.group.label": "Изаберите групу",
+  "supervision-group-selector.button.cancel": "Отказати",
+  "supervision-group-selector.button.save": "Сачувати",
+  "supervision-group-selector.select.type-of-order.error": "Молимо изаберите тип налога",
+  "supervision-group-selector.select.group.error": "Молимо изаберите групу",
+  "supervision-group-selector.notification.create.success.title": "Успешно је креиран налог надзора за групу {{ name}}",
+  "supervision-group-selector.notification.create.failure.title": "Грешка",
+  "supervision-group-selector.notification.create.already-existing": "Већ постоји налог за надзор за ову ставку изабране групе",
+  "confirmation-modal.export-metadata.header": "Извоз метаподатака за {{ dsoName }}",
+  "confirmation-modal.export-metadata.info": "Да ли сте сигурни да желите да извезете метаподатке за {{ dsoName }}",
+  "confirmation-modal.export-metadata.cancel": "Отказати",
+  "confirmation-modal.export-metadata.confirm": "Извоз",
+  "confirmation-modal.export-batch.header": "Извезите пакет (ZIP) за {{ dsoName }}",
+  "confirmation-modal.export-batch.info": "Да ли сте сигурни да желите да извезете пакет (ZIP) за {{ dsoName }}",
+  "confirmation-modal.export-batch.cancel": "Отказати",
+  "confirmation-modal.export-batch.confirm": "Извоз",
+  "confirmation-modal.delete-eperson.header": "Избришите EPerson \"{{ dsoName }}\"",
+  "confirmation-modal.delete-eperson.info": "Да ли сте сигурни да желите да избришете EPerson \"{{ dsoName }}\"",
+  "confirmation-modal.delete-eperson.cancel": "Отказати",
+  "confirmation-modal.delete-eperson.confirm": "Избрисати",
+  "confirmation-modal.delete-profile.header": "Избришите профил",
+  "confirmation-modal.delete-profile.info": "Да ли сте сигурни да желите да избришете свој профил",
+  "confirmation-modal.delete-profile.cancel": "Отказати",
+  "confirmation-modal.delete-profile.confirm": "Избрисати",
+  "confirmation-modal.delete-subscription.header": "Уклонити претплату",
+  "confirmation-modal.delete-subscription.info": "Да ли сте сигурни да желите да избришете претплату за \"{{ dsoName }}\"",
+  "confirmation-modal.delete-subscription.cancel": "Отказати",
+  "confirmation-modal.delete-subscription.confirm": "Избрисати",
+  "error.bitstream": "Грешка при преузимању битстрим-а",
+  "error.browse-by": "Грешка при преузимању ставки",
+  "error.collection": "Грешка при преузимању колекције",
+  "error.collections": "Грешка при преузимању колекција",
+  "error.community": "Грешка при преузимању заједнице",
+  "error.identifier": "Није пронађена ниједна ставка за идентификатор",
+  "error.default": "Грешка",
+  "error.item": "Грешка при преузимању ставке",
+  "error.items": "Грешка при преузимању ставки",
+  "error.objects": "Грешка при преузимању објеката",
+  "error.recent-submissions": "Грешка при преузимању недавних поднесака",
+  "error.search-results": "Грешка при преузимању резултата претраге",
+  "error.invalid-search-query": "Упит за претрагу није исправан. Проверите најбоља решења за <a href=\"https://solr.apache.org/guide/query-syntax-and-parsing.HTML\" target=\"_blank\">Solr синтаксу упита</a> за додатне информације о овој грешци.",
+  "error.sub-collections": "Грешка при преузимању подколекција",
+  "error.sub-communities": "Грешка при преузимању подзаједница",
+  "error.submission.sections.init-form-error": "Дошло је до грешке током иницијализације одељка, молимо проверите конфигурацију обрасца за унос. Детаљи су испод: <br> <br>",
+  "error.top-level-communities": "Грешка при преузимању заједница највишег нивоа",
+  "error.validation.license.notgranted": "Морате доделити ову лиценцу да бисте довршили свој поднесак. Ако у овом тренутку нисте у могућности да доделите ову лиценцу, можете да сачувате свој рад и вратите се касније или уклоните поднесак.",
+  "error.validation.pattern": "Овај унос је ограничен тренутним обрасцем: {{ pattern}}.",
+  "error.validation.filerequired": "Отпремање фајла је обавезно",
+  "error.validation.required": "Ово поље је обавезно",
+  "error.validation.NotValidEmail": "Овај Е-мејл није важећи Е-мејл",
+  "error.validation.emailTaken": "Ова Е-мејл адреса је већ заузета",
+  "error.validation.groupExists": "Ова група већ постоји",
+  "error.validation.metadata.name.invalid-pattern": "Ово поље не може да садржи тачке, зарезе или размаке. Уместо тога, користите поља Елемент и квалификатор",
+  "error.validation.metadata.name.max-length": "Ово поље не сме да садржи више од 32 знака",
+  "error.validation.metadata.namespace.max-length": "Ово поље не сме да садржи више од 256 знакова",
+  "error.validation.metadata.element.invalid-pattern": "Ово поље не може да садржи тачке, зарезе или размаке. Уместо тога, користите поље Квалификатор",
+  "error.validation.metadata.element.max-length": "Ово поље не сме да садржи више од 64 знака",
+  "error.validation.metadata.qualifier.invalid-pattern": "Ово поље не може да садржи тачке, зарезе или размаке",
+  "error.validation.metadata.qualifier.max-length": "Ово поље не сме да садржи више од 64 знака",
+  "feed.description": "Syndication feed",
+  "file-section.error.header": "Грешка при прибављању фајлова за ову ставку",
+  "footer.copyright": "ауторска права © 2002-{{ year}}",
+  "footer.link.dspace": "DSpace софтвер",
+  "footer.link.lyrasis": "LYRASIS",
+  "footer.link.cookies": "Подешавања колачића",
+  "footer.link.privacy-policy": "Правила о приватности",
+  "footer.link.end-user-agreement": "Уговор са крајњим корисником",
+  "footer.link.feedback": "Пошаљи повратне информације",
+  "forgot-email.form.header": "Заборавили сте лозинку",
+  "forgot-email.form.info": "Унесите Е-мејл адресу повезану са налогом.",
+  "forgot-email.form.email": "Е-мејл адреса *",
+  "forgot-email.form.email.error.required": "Унесите Е-мејл адресу",
+  "forgot-email.form.email.error.not-email-form": "Унесите важећу Е-мејл адресу",
+  "forgot-email.form.email.hint": "Е-мејл са даљим упутствима биће послат на ову адресу",
+  "forgot-email.form.submit": "Ресетујте лозинку",
+  "forgot-email.form.success.head": "Послат је Е-мејл за ресетовање лозинке",
+  "forgot-email.form.success.content": "Е-мејл који садржи посебну URL адресу и даља упутства биће послат на {{ email }}",
+  "forgot-email.form.error.head": "Грешка при покушају ресетовања лозинке",
+  "forgot-email.form.error.content": "Дошло је до грешке при покушају ресетовања лозинке за налог повезан са следећом адресом е-поште: {{ email }}",
+  "forgot-password.title": "Заборавили сте лозинку",
+  "forgot-password.form.head": "Заборавили сте лозинку",
+  "forgot-password.form.info": "Унесите нову лозинку у поље испод и потврдите је тако што ћете је поново укуцати у друго поље.",
+  "forgot-password.form.card.security": "Безбедност",
+  "forgot-password.form.identification.header": "Идентификовати",
+  "forgot-password.form.identification.email": "Е-мејл адреса:",
+  "forgot-password.form.label.password": "Лозинка",
+  "forgot-password.form.label.passwordrepeat": "Поново откуцајте да бисте потврдили",
+  "forgot-password.form.error.empty-password": "Унесите лозинку у поље испод.",
+  "forgot-password.form.error.matching-passwords": "Лозинке се не поклапају.",
+  "forgot-password.form.notification.error.title": "Грешка при покушају слања нове лозинке",
+  "forgot-password.form.notification.success.content": "Ресетовање лозинке је било успешно. Пријављени сте као креирани корисник.",
+  "forgot-password.form.notification.success.title": "Ресетовање лозинке је завршено",
+  "forgot-password.form.submit": "Пошаљи лозинку",
+  "form.add": "Додај још",
+  "form.add-help": "Кликните овде да додате тренутни унос и да додате још један",
+  "form.cancel": "Поништити, отказати",
+  "form.clear": "Јасно",
+  "form.clear-help": "Кликните овде да бисте уклонили изабрану вредност",
+  "form.discard": "Одбаците",
+  "form.drag": "Превуците",
+  "form.edit": "Уредите",
+  "form.edit-help": "Кликните овде да бисте изменили изабрану вредност",
+  "form.first-name": "Име",
+  "form.group-collapse": "Скупи",
+  "form.group-collapse-help": "Кликните овде за скупљање",
+  "form.group-expand": "Проширити",
+  "form.group-expand-help": "Кликните овде да бисте проширили и додали још елемената",
+  "form.last-name": "Презиме",
+  "form.loading": "Учитавање...",
+  "form.lookup": "Потражите",
+  "form.lookup-help": "Кликните овде да бисте потражили постојећу везу",
+  "form.no-results": "Нису пронађени резултати",
+  "form.no-value": "Није унета вредност",
+  "form.other-information.email": "Е-мејл",
+  "form.other-information.first-name": "Име",
+  "form.other-information.insolr": "У Solr индексу",
+  "form.other-information.institution": "Институција",
+  "form.other-information.last-name": "Презиме",
+  "form.other-information.orcid": "ORCID",
+  "form.remove": "Уклоните",
+  "form.save": "Сачувајте",
+  "form.save-help": "Сачувајте измене",
+  "form.search": "Претрага",
+  "form.search-help": "Кликните овде да бисте потражили постојећу преписку",
+  "form.submit": "Сачувајте",
+  "form.create": "Креирајте",
+  "form.repeatable.sort.tip": "Спустите ставку на нову позицију",
+  "grant-deny-request-copy.deny": "Не шаљи копију",
+  "grant-deny-request-copy.email.back": "Назад",
+  "grant-deny-request-copy.email.message": "Опциона додатна порука",
+  "grant-deny-request-copy.email.message.empty": "Унесите поруку",
+  "grant-deny-request-copy.email.permissions.info": "Можете искористити ову прилику да поново размотрите ограничења приступа документу, како бисте избегли да одговорите на ове захтеве. Ако желите да замолите администраторе спремишта да уклоне ова ограничења, означите поље испод.",
+  "grant-deny-request-copy.email.permissions.label": "Промените у отворени приступ",
+  "grant-deny-request-copy.email.send": "Пошаљите",
+  "grant-deny-request-copy.email.subject": "Предмет",
+  "grant-deny-request-copy.email.subject.empty": "Унесите тему",
+  "grant-deny-request-copy.grant": "Пошаљите копију",
+  "grant-deny-request-copy.header": "Захтев за копију документа",
+  "grant-deny-request-copy.home-page": "Врати ме на почетну страницу",
+  "grant-deny-request-copy.intro1": "Ако сте један од аутора документа <a href='{{ url }}'>{{ name }}</a>, онда користите једну од опција у наставку да одговорите на захтев корисника.",
+  "grant-deny-request-copy.intro2": "Након што одаберете опцију, биће вам представљен предложени одговор е-маила који можете да измените.",
+  "grant-deny-request-copy.processed": "Овај захтев је већ обрађен. Можете користити дугме испод да се вратите на почетну страницу.",
+  "grant-request-copy.email.subject": "Затражите копију документа",
+  "grant-request-copy.error": "Дошло је до грешке",
+  "grant-request-copy.header": "Одобрите захтев за копију документа",
+  "grant-request-copy.intro": "Подносиоцу захтева ће бити послата порука. Тражени документ(и) ће бити приложен.",
+  "grant-request-copy.success": "Захтев за ставку је успешно одобрен",
+  "health.breadcrumbs": "Здравље",
+  "health-page.heading": "Здравље",
+  "health-page.info-tab": "Информације",
+  "health-page.status-tab": "Статус",
+  "health-page.error.msg": "Услуга провере здравља је привремено недоступна",
+  "health-page.property.status": "Статусни код",
+  "health-page.section.db.title": "База података",
+  "health-page.section.geoIp.title": "GeoIP",
+  "health-page.section.solrAuthorityCore.title": "Solr: authority core",
+  "health-page.section.solrOaiCore.title": "Solr: OAI core",
+  "health-page.section.solrSearchCore.title": "Solr: search core",
+  "health-page.section.solrStatisticsCore.title": "Solr: statistics core",
+  "health-page.section-info.app.title": "Backend апликације",
+  "health-page.section-info.java.title": "Java",
+  "health-page.status": "Статус",
+  "health-page.status.ok.info": "Оперативни",
+  "health-page.status.error.info": "Откривени су проблеми",
+  "health-page.status.warning.info": "Откривени су могући проблеми",
+  "health-page.title": "Здравље",
+  "health-page.section.no-issues": "Нису откривени проблеми",
+  "home.description": "",
+  "home.breadcrumbs": "Home",
+  "home.search-form.placeholder": "Претражите репозиторијум...",
+  "home.title": "Home",
+  "home.top-level-communities.head": "Заједнице у DSpace-у",
+  "home.top-level-communities.help": "Изаберите заједницу да бисте прегледали њене колекције.",
+  "info.end-user-agreement.accept": "Прочитао сам и прихватам Уговором са крајњим корисником",
+  "info.end-user-agreement.accept.error": "Дошло је до грешке при прихватању Уговора са крајњим корисником",
+  "info.end-user-agreement.accept.success": "Успешно ажуриран Уговор са крајњим корисником",
+  "info.end-user-agreement.breadcrumbs": "Уговор са крајњим корисником",
+  "info.end-user-agreement.buttons.cancel": "Отказати",
+  "info.end-user-agreement.buttons.save": "Сачувати",
+  "info.end-user-agreement.head": "Уговор са крајњим корисником",
+  "info.end-user-agreement.title": "Уговор са крајњим корисником",
+  "info.end-user-agreement.hosting-country": "Сједињене Државе",
+  "info.privacy.breadcrumbs": "Изјава о заштити приватности",
+  "info.privacy.head": "Изјава о заштити приватности",
+  "info.privacy.title": "Изјава о заштити приватности",
+  "info.feedback.breadcrumbs": "Повратна информација",
+  "info.feedback.head": "Повратна информација",
+  "info.feedback.title": "Повратна информација",
+  "info.feedback.info": "Хвала Вам што сте поделили повратне информације о DSpace систему. Ценимо Ваше коментаре!",
+  "info.feedback.email_help": "Ова адреса ће бити коришћена за праћење ваших повратних информација.",
+  "info.feedback.send": "Пошаљите повратне информације",
+  "info.feedback.comments": "Коментари",
+  "info.feedback.email-label": "Ваш Email",
+  "info.feedback.create.success": "Повратне информације су успешно послате!",
+  "info.feedback.error.email.required": "Потребна је важећа Е-мејл адреса",
+  "info.feedback.error.message.required": "Коментар је обавезан",
+  "info.feedback.page-label": "Страна",
+  "info.feedback.page_help": "Страница је у вези са Вашим повратним информацијама",
+  "item.alerts.private": "Ова ставка се не може открити",
+  "item.alerts.withdrawn": "Ова ставка је повучена",
+  "item.edit.authorizations.heading": "Помоћу овог едитора можете да прегледате и мењате опције ставке, као и да мењате опције појединачних компоненти ставке: пакете и битстрим-ове. Укратко, ставка је контејнер пакета, а пакети су контејнери битстрим-ова. Контејнери обично имају опције ДОДАВАЊЕ/БРИСАЊЕ/ЧИТАЊЕ/ПИСАЊЕ, док битстрим-ови имају само опције ЧИТАЊЕ/ПИСАЊЕ.",
+  "item.edit.authorizations.title": "Измените опције ставке",
+  "item.badge.private": "Невидљив",
+  "item.badge.withdrawn": "Повучено",
+  "item.bitstreams.upload.bundle": "Пакет",
+  "item.bitstreams.upload.bundle.placeholder": "Изаберите пакет или унесите ново име пакета",
+  "item.bitstreams.upload.bundle.new": "Креирајте пакет",
+  "item.bitstreams.upload.bundles.empty": "Ова ставка не садржи пакете за отпремање битстрим-ова.",
+  "item.bitstreams.upload.cancel": "Отказати",
+  "item.bitstreams.upload.drop-message": "Унесите датотеку за отпремање",
+  "item.bitstreams.upload.item": "Ставка:",
+  "item.bitstreams.upload.notifications.bundle.created.content": "Успешно креиран нови пакет.",
+  "item.bitstreams.upload.notifications.bundle.created.title": "Креирани пакет",
+  "item.bitstreams.upload.notifications.upload.failed": "Отпремање неуспешно. Молимо Вас проверите садржај пре поновног покушаја.",
+  "item.bitstreams.upload.title": "Отпремање битстрим-а",
+  "item.edit.bitstreams.bundle.edit.buttons.upload": "Отпремити",
+  "item.edit.bitstreams.bundle.displaying": "Тренутно се приказује {{ amount }} битстрим-ова од {{ total }}.",
+  "item.edit.bitstreams.bundle.load.all": "Учитајте све ({{ total }})",
+  "item.edit.bitstreams.bundle.load.more": "Учитајте још",
+  "item.edit.bitstreams.bundle.name": "ПАКЕТ: {{ name }}",
+  "item.edit.bitstreams.discard-button": "Одбацити",
+  "item.edit.bitstreams.edit.buttons.download": "Преузимање",
+  "item.edit.bitstreams.edit.buttons.drag": "Превуците",
+  "item.edit.bitstreams.edit.buttons.edit": "Изменити",
+  "item.edit.bitstreams.edit.buttons.remove": "Уклонити",
+  "item.edit.bitstreams.edit.buttons.undo": "Поништити промене",
+  "item.edit.bitstreams.empty": "Ова ставка не садржи битстрим-ове. Кликните на дугме за отпремање да бисте га креирали.",
+  "item.edit.bitstreams.headers.actions": "Радње",
+  "item.edit.bitstreams.headers.bundle": "Пакет",
+  "item.edit.bitstreams.headers.description": "Опис",
+  "item.edit.bitstreams.headers.format": "Формат",
+  "item.edit.bitstreams.headers.name": "Име",
+  "item.edit.bitstreams.notifications.discarded.content": "Ваше промене су одбачене. Да бисте поново поставили своје промене, кликните на дугме \"Опозови\".",
+  "item.edit.bitstreams.notifications.discarded.title": "Промене су одбачене",
+  "item.edit.bitstreams.notifications.move.failed.title": "Грешка при покретању битстрим-ова",
+  "item.edit.bitstreams.notifications.move.saved.content": "Промене које сте покренули у битстрим-овима и пакетима ове ставке су сачуване.",
+  "item.edit.bitstreams.notifications.move.saved.title": "Покренуте промене су сачуване",
+  "item.edit.bitstreams.notifications.outdated.content": "Ставку на којој тренутно радите је променио други корисник. Ваше тренутне промене се одбацују да би се спречили конфликти",
+  "item.edit.bitstreams.notifications.outdated.title": "Застареле промене",
+  "item.edit.bitstreams.notifications.remove.failed.title": "Грешка при брисању битстрим-а",
+  "item.edit.bitstreams.notifications.remove.saved.content": "Ваше измене у вези са уклањањем битстрим-ова ове ставке су сачуване.",
+  "item.edit.bitstreams.notifications.remove.saved.title": "Промене уклањања су сачуване",
+  "item.edit.bitstreams.reinstate-button": "Поништити",
+  "item.edit.bitstreams.save-button": "Сачувати",
+  "item.edit.bitstreams.upload-button": "Отпремити",
+  "item.edit.delete.cancel": "Отказати",
+  "item.edit.delete.confirm": "Избрисати",
+  "item.edit.delete.description": "Да ли сте сигурни да ову ставку треба потпуно избрисати? Опрез: Тренутно не би остао ниједан обрисани запис.",
+  "item.edit.delete.error": "Дошло је до грешке приликом брисања ставке",
+  "item.edit.delete.header": "Избришите ставку: {{ id }}",
+  "item.edit.delete.success": "Ставка је избрисана",
+  "item.edit.head": "Уредите ставку",
+  "item.edit.breadcrumbs": "Уредите ставку",
+  "item.edit.tabs.disabled.tooltip": "Нисте овлашћени да приступите овој картици",
+  "item.edit.tabs.mapper.head": "Мапирање колекције",
+  "item.edit.tabs.item-mapper.title": "Уређивање ставке - мапирање колекције",
+  "item.edit.identifiers.doi.status.UNKNOWN": "Непознато",
+  "item.edit.identifiers.doi.status.TO_BE_REGISTERED": "На чекању за регистрацију",
+  "item.edit.identifiers.doi.status.TO_BE_RESERVED": "На чекању за резервацију",
+  "item.edit.identifiers.doi.status.IS_REGISTERED": "Регистровано",
+  "item.edit.identifiers.doi.status.IS_RESERVED": "Резервисано",
+  "item.edit.identifiers.doi.status.UPDATE_RESERVED": "Резервисано (на чекању за ажурирање)",
+  "item.edit.identifiers.doi.status.UPDATE_REGISTERED": "Регистровано (на чекању за ажурирање)",
+  "item.edit.identifiers.doi.status.UPDATE_BEFORE_REGISTRATION": "На чекању за ажурирање и регистрацију",
+  "item.edit.identifiers.doi.status.TO_BE_DELETED": "На чекању за брисање",
+  "item.edit.identifiers.doi.status.DELETED": "Избрисано",
+  "item.edit.identifiers.doi.status.PENDING": "На чекању (није регистровано)",
+  "item.edit.identifiers.doi.status.MINTED": "Минтед (није регистровано)",
+  "item.edit.tabs.status.buttons.register-doi.label": "Региструјте нови или DOI на чекању",
+  "item.edit.tabs.status.buttons.register-doi.button": "Региструјте DOI...",
+  "item.edit.register-doi.header": "Региструјте нови или DOI на чекању",
+  "item.edit.register-doi.description": "Прегледајте све идентификаторе и ставке метаподатака на чекању испод и кликните на Потврди да бисте наставили са DOI регистрацијом, или Откажи да бисте се повукли",
+  "item.edit.register-doi.confirm": "Потврдити",
+  "item.edit.register-doi.cancel": "Поништити, отказати",
+  "item.edit.register-doi.success": "DOI на чекању за регистрацију успешно.",
+  "item.edit.register-doi.error": "Грешка при регистрацији DOI",
+  "item.edit.register-doi.to-update": "Следећи DOI је већ минтед и биће на чекању за регистрацију на мрежи",
+  "item.edit.item-mapper.buttons.add": "Мапирајте ставку у изабране колекције",
+  "item.edit.item-mapper.buttons.remove": "Уклоните мапирање ставке за изабране колекције",
+  "item.edit.item-mapper.cancel": "Поништити, отказати",
+  "item.edit.item-mapper.description": "Ово је алатка за мапирање ставки која омогућава администраторима да мапирају ову ставку у друге колекције. Можете претражити колекције и мапирати их или прегледати листу колекција на које је ставка тренутно мапирана.",
+  "item.edit.item-mapper.head": "Мапирање ставке – мапирајте ставку у колекције",
+  "item.edit.item-mapper.item": "Ставка: \"<b>{{name}}</b>\"",
+  "item.edit.item-mapper.no-search": "Унесите упит за претрагу",
+  "item.edit.item-mapper.notifications.add.error.content": "Дошло је до грешака при мапирању ставке у {{amount}} колекције.",
+  "item.edit.item-mapper.notifications.add.error.head": "Грешке у мапирању",
+  "item.edit.item-mapper.notifications.add.success.content": "Ставка је успешно мапирана у {{amount}} колекције.",
+  "item.edit.item-mapper.notifications.add.success.head": "Мапирање је завршено",
+  "item.edit.item-mapper.notifications.remove.error.content": "Дошло је до грешака при уклањању мапирања на {{amount}} колекције.",
+  "item.edit.item-mapper.notifications.remove.error.head": "Уклањање грешака у мапирању",
+  "item.edit.item-mapper.notifications.remove.success.content": "Успешно је уклоњено мапирање ставке у {{amount}} колекције.",
+  "item.edit.item-mapper.notifications.remove.success.head": "Уклањање мапирања је завршено",
+  "item.edit.item-mapper.search-form.placeholder": "Претражи колекције...",
+  "item.edit.item-mapper.tabs.browse": "Прегледајте мапиране колекције",
+  "item.edit.item-mapper.tabs.map": "Мапирајте нове колекције",
+  "item.edit.metadata.add-button": "Додати",
+  "item.edit.metadata.discard-button": "Одбацити",
+  "item.edit.metadata.edit.buttons.confirm": "Потврдити",
+  "item.edit.metadata.edit.buttons.drag": "Превуците да бисте променили редослед",
+  "item.edit.metadata.edit.buttons.edit": "Уредити",
+  "item.edit.metadata.edit.buttons.remove": "Уклонити",
+  "item.edit.metadata.edit.buttons.undo": "Поништити промене",
+  "item.edit.metadata.edit.buttons.unedit": "Зауставити уређивање",
+  "item.edit.metadata.edit.buttons.virtual": "Ово је виртуелна вредност метаподатака, односно вредност наслеђена од повезаног ентитета. Не може се директно мењати. Додајте или уклоните одговарајући однос на картици \"Односи\".",
+  "item.edit.metadata.empty": "Ставка тренутно не садржи никакве метаподатке. Кликните на Додај да бисте почели да додајете вредност метаподатака.",
+  "item.edit.metadata.headers.edit": "Уредити",
+  "item.edit.metadata.headers.field": "Поље",
+  "item.edit.metadata.headers.language": "Језик",
+  "item.edit.metadata.headers.value": "Вредност",
+  "item.edit.metadata.metadatafield.error": "Дошло је до грешке при провери поља метаподатака",
+  "item.edit.metadata.metadatafield.invalid": "Изаберите важеће поље за метаподатке",
+  "item.edit.metadata.notifications.discarded.content": "Ваше промене су одбачене. Да бисте вратили своје промене, кликните на дугме \"Поништи\".",
+  "item.edit.metadata.notifications.discarded.title": "Промене су одбачене",
+  "item.edit.metadata.notifications.error.title": "Дошло је до грешке",
+  "item.edit.metadata.notifications.invalid.content": "Ваше промене нису сачуване. Уверите се да су сва поља важећа пре него што сачувате.",
+  "item.edit.metadata.notifications.invalid.title": "Метаподаци су неважећи",
+  "item.edit.metadata.notifications.outdated.content": "Ставку на којој тренутно радите је променио други корисник. Ваше тренутне промене се одбацују да би се спречили конфликти",
+  "item.edit.metadata.notifications.outdated.title": "Промене су застареле",
+  "item.edit.metadata.notifications.saved.content": "Ваше промене метаподатака ове ставке су сачуване.",
+  "item.edit.metadata.notifications.saved.title": "Метаподаци су сачувани",
+  "item.edit.metadata.reinstate-button": "Поништити",
+  "item.edit.metadata.reset-order-button": "Поништите промену редоследа",
+  "item.edit.metadata.save-button": "Сачувати",
+  "item.edit.modify.overview.field": "Поље",
+  "item.edit.modify.overview.language": "Језик",
+  "item.edit.modify.overview.value": "Вредност",
+  "item.edit.move.cancel": "Назад",
+  "item.edit.move.save-button": "Сачувати",
+  "item.edit.move.discard-button": "Одбацити",
+  "item.edit.move.description": "Изаберите колекцију у коју желите да преместите ову ставку. Да бисте сузили листу приказаних колекција, можете да унесете упит за претрагу у оквир.",
+  "item.edit.move.error": "Дошло је до грешке при покушају премештања ставке",
+  "item.edit.move.head": "Преместите ставку: {{id}}",
+  "item.edit.move.inheritpolicies.checkbox": "Смернице наслеђивања",
+  "item.edit.move.inheritpolicies.description": "Наследите подразумеване смернице одредишне колекције",
+  "item.edit.move.move": "Преместите",
+  "item.edit.move.processing": "Премештање...",
+  "item.edit.move.search.placeholder": "Унесите упит за претрагу да бисте потражили колекције",
+  "item.edit.move.success": "Ставка је успешно премештена",
+  "item.edit.move.title": "Преместите ставку",
+  "item.edit.private.cancel": "Поништити, отказати",
+  "item.edit.private.confirm": "Учините неприступачним",
+  "item.edit.private.description": "Да ли сте сигурни да ова ставка треба да буде неприступачна у архиви?",
+  "item.edit.private.error": "Дошло је до грешке при постављању неприступачне ставке",
+  "item.edit.private.header": "Учините ставку неприступачном: {{ id }}",
+  "item.edit.private.success": "Ставка је сада неприступачна",
+  "item.edit.public.cancel": "Поништити, отказати",
+  "item.edit.public.confirm": "Учините приступачним",
+  "item.edit.public.description": "Да ли сте сигурни да ова ставка треба да буде приступачна у архиви?",
+  "item.edit.public.error": "Дошло је до грешке при омогућавању видљивости ставке",
+  "item.edit.public.header": "Учините ставку видљивом: {{ id }}",
+  "item.edit.public.success": "Ставка је сада видљива",
+  "item.edit.reinstate.cancel": "Отказати",
+  "item.edit.reinstate.confirm": "Обновити",
+  "item.edit.reinstate.description": "Да ли сте сигурни да ову ставку треба вратити у архиву?",
+  "item.edit.reinstate.error": "Дошло је до грешке при враћању ставке",
+  "item.edit.reinstate.header": "Вратите ставку: {{ id }}",
+  "item.edit.reinstate.success": "Ставка је успешно враћена",
+  "item.edit.relationships.discard-button": "Одбацити",
+  "item.edit.relationships.edit.buttons.add": "Додати",
+  "item.edit.relationships.edit.buttons.remove": "Уклонити",
+  "item.edit.relationships.edit.buttons.undo": "Поништити промене",
+  "item.edit.relationships.no-relationships": "Нема релација",
+  "item.edit.relationships.notifications.discarded.content": "Ваше промене су одбачене. Да бисте вратили своје промене, кликните на дугме \"Поништити\".",
+  "item.edit.relationships.notifications.discarded.title": "Промене су одбачене",
+  "item.edit.relationships.notifications.failed.title": "Грешка при измени релација",
+  "item.edit.relationships.notifications.outdated.content": "Ставку на којој тренутно радите је променио други корисник. Ваше тренутне промене су одбачене да би се спречили конфликти",
+  "item.edit.relationships.notifications.outdated.title": "Застареле промене",
+  "item.edit.relationships.notifications.saved.content": "Ваше промене у релацијама ове ставке су сачуване.",
+  "item.edit.relationships.notifications.saved.title": "Релације су сачуване",
+  "item.edit.relationships.reinstate-button": "Поништи",
+  "item.edit.relationships.save-button": "Сачувати",
+  "item.edit.relationships.no-entity-type": "Додајте метаподатке \"DSpace.entity.type\" да бисте омогућили релације за ову ставку",
+  "item.edit.return": "Назад",
+  "item.edit.tabs.bitstreams.head": "битстрим-ови",
+  "item.edit.tabs.bitstreams.title": "Измена ставке - битстрим-ови",
+  "item.edit.tabs.curate.head": "Курирање",
+  "item.edit.tabs.curate.title": "Измена ставке - Курирање",
+  "item.edit.curate.title": "Курирање ставке: {{item}}",
+  "item.edit.tabs.access-control.head": "Контрола приступа",
+  "item.edit.tabs.access-control.title": "Измена ставке - Контрола приступа",
+  "item.edit.tabs.metadata.head": "Метаподаци",
+  "item.edit.tabs.metadata.title": "Измена ставке – Метаподаци",
+  "item.edit.tabs.relationships.head": "Релације",
+  "item.edit.tabs.relationships.title": "Измена ставке - Релације",
+  "item.edit.tabs.status.buttons.authorizations.button": "Овлашћења...",
+  "item.edit.tabs.status.buttons.authorizations.label": "Измените смернице овлашћења ставке",
+  "item.edit.tabs.status.buttons.delete.button": "Трајно избрисати",
+  "item.edit.tabs.status.buttons.delete.label": "Потпуно избрисати ставку",
+  "item.edit.tabs.status.buttons.mappedCollections.button": "Мапиране колекције",
+  "item.edit.tabs.status.buttons.mappedCollections.label": "Управљајте мапираним колекцијама",
+  "item.edit.tabs.status.buttons.move.button": "Премести ову ставку у другу колекцију",
+  "item.edit.tabs.status.buttons.move.label": "Премести ставку у другу колекцију",
+  "item.edit.tabs.status.buttons.private.button": "Поставите да буде невидљиво...",
+  "item.edit.tabs.status.buttons.private.label": "Поставите ставку да буде невидљива",
+  "item.edit.tabs.status.buttons.public.button": "Поставите да буде видљиво...",
+  "item.edit.tabs.status.buttons.public.label": "Поставите ставку да буде видљива",
+  "item.edit.tabs.status.buttons.reinstate.button": "Поново поставите...",
+  "item.edit.tabs.status.buttons.reinstate.label": "Вратите ставку у репозиторијум",
+  "item.edit.tabs.status.buttons.unauthorized": "Нисте овлашћени да извршите ову радњу",
+  "item.edit.tabs.status.buttons.withdraw.button": "Повуците ову ставку",
+  "item.edit.tabs.status.buttons.withdraw.label": "Повуците ставку из репозиторијума",
+  "item.edit.tabs.status.description": "Добродошли на страницу за управљање ставкама. Одавде можете повући, вратити, преместити или избрисати ставку. Такође можете ажурирати или додати нове метаподатке / битстрим-ове на другим картицама.",
+  "item.edit.tabs.status.head": "Статус",
+  "item.edit.tabs.status.labels.handle": "Handle",
+  "item.edit.tabs.status.labels.id": "Интерни ID ставке",
+  "item.edit.tabs.status.labels.itemPage": "Страница ставке",
+  "item.edit.tabs.status.labels.lastModified": "Последња измена",
+  "item.edit.tabs.status.title": "Измена ставке - Статус",
+  "item.edit.tabs.versionhistory.head": "Историја верзија",
+  "item.edit.tabs.versionhistory.title": "Измена ставке - Историја верзија",
+  "item.edit.tabs.versionhistory.under-construction": "Измена или додавање нових верзија још увек није могуће у овом корисничком интерфејсу.",
+  "item.edit.tabs.view.head": "Прикажи ставку",
+  "item.edit.tabs.view.title": "Измени ставку - Прикажи",
+  "item.edit.withdraw.cancel": "Отказати",
+  "item.edit.withdraw.confirm": "Повуците",
+  "item.edit.withdraw.description": "Да ли сте сигурни да ову ставку треба повући из архиве?",
+  "item.edit.withdraw.error": "Дошло је до грешке при повлачењу ставке",
+  "item.edit.withdraw.header": "Повуците ставку: {{ id }}",
+  "item.edit.withdraw.success": "Ставка је успешно повучена",
+  "item.orcid.return": "Назад",
+  "item.listelement.badge": "Ставка",
+  "item.page.description": "Опис",
+  "item.page.journal-issn": "ISSN часописа",
+  "item.page.journal-title": "Наслов часописа",
+  "item.page.publisher": "Издавач",
+  "item.page.titleprefix": "Ставка:",
+  "item.page.volume-title": "Наслов свеске",
+  "item.search.results.head": "Резултати претраге ставки",
+  "item.search.title": "Претрага ставке",
+  "item.truncatable-part.show-more": "Прикажите још",
+  "item.truncatable-part.show-less": "Скупити",
+  "workflow-item.search.result.delete-supervision.modal.header": "Избришите налог за надзор",
+  "workflow-item.search.result.delete-supervision.modal.info": "Да ли сте сигурни да желите да избришете налог за надзор",
+  "workflow-item.search.result.delete-supervision.modal.cancel": "Отказати",
+  "workflow-item.search.result.delete-supervision.modal.confirm": "Избрисати",
+  "workflow-item.search.result.notification.deleted.success": "Успешно је избрисан налог за надзор \"{{name}}\"",
+  "workflow-item.search.result.notification.deleted.failure": "Неуспешно брисање налога за надзор \"{{name}}\"",
+  "workflow-item.search.result.list.element.supervised-by": "Прегледао:",
+  "workflow-item.search.result.list.element.supervised.remove-tooltip": "Уклонити групу за надзор",
+  "item.page.abstract": "Сажетак",
+  "item.page.author": "Аутори",
+  "item.page.citation": "Цитат",
+  "item.page.collections": "Колекције",
+  "item.page.collections.loading": "Учитавање...",
+  "item.page.collections.load-more": "Учитајте још",
+  "item.page.date": "Датум",
+  "item.page.edit": "Измените ову ставку",
+  "item.page.files": "Фајлови",
+  "item.page.filesection.description": "Опис:",
+  "item.page.filesection.download": "Преузимање",
+  "item.page.filesection.format": "Формат:",
+  "item.page.filesection.name": "име:",
+  "item.page.filesection.size": "Величина:",
+  "item.page.journal.search.title": "Чланци у овом часопису",
+  "item.page.link.full": "Пун запис ставке",
+  "item.page.link.simple": "Једноставан запис ставке",
+  "item.page.orcid.title": "ORCID",
+  "item.page.orcid.tooltip": "Отворите страницу за подешавање ORCID-а",
+  "item.page.person.search.title": "Чланци овог аутора",
+  "item.page.related-items.view-more": "Прикажи још {{ amount }}",
+  "item.page.related-items.view-less": "Сакриј последњи {{ amount }}",
+  "item.page.relationships.isAuthorOfPublication": "Публикације",
+  "item.page.relationships.isJournalOfPublication": "Публикације",
+  "item.page.relationships.isOrgUnitOfPerson": "Аутори",
+  "item.page.relationships.isOrgUnitOfProject": "Истраживачки пројекти",
+  "item.page.subject": "Кључне речи",
+  "item.page.uri": "URI",
+  "item.page.bitstreams.view-more": "Прикажи више",
+  "item.page.bitstreams.collapse": "Скупити",
+  "item.page.filesection.original.bundle": "Оригинални пакет",
+  "item.page.filesection.license.bundle": "Лиценцни пакет",
+  "item.page.return": "Назад",
+  "item.page.version.create": "Креирајте нову верзију",
+  "item.page.version.hasDraft": "Нова верзија се не може креирати зато што је у току подношење",
+  "item.page.claim.button": "Потврда",
+  "item.page.claim.tooltip": "Потврди ову ставку као профил",
+  "item.preview.dc.identifier.uri": "Идентификатор:",
+  "item.preview.dc.contributor.author": "Аутори:",
+  "item.preview.dc.date.issued": "Датум објављивања:",
+  "item.preview.dc.description.abstract": "Сажетак:",
+  "item.preview.dc.identifier.other": "Други идентификатор:",
+  "item.preview.dc.language.iso": "Језик:",
+  "item.preview.dc.subject": "Предмети:",
+  "item.preview.dc.title": "Наслов:",
+  "item.preview.dc.type": "Тип:",
+  "item.preview.oaire.citation.issue": "Издање",
+  "item.preview.oaire.citation.volume": "Опсег",
+  "item.preview.dc.relation.issn": "ISSN",
+  "item.preview.dc.identifier.isbn": "ISBN",
+  "item.preview.dc.identifier": "Идентификатор:",
+  "item.preview.dc.relation.ispartof": "Часопис или серија",
+  "item.preview.dc.identifier.doi": "DOI",
+  "item.preview.dc.publisher": "Издавач:",
+  "item.preview.person.familyName": "презиме:",
+  "item.preview.person.givenName": "Име:",
+  "item.preview.person.identifier.orcid": "ORCID:",
+  "item.preview.project.funder.name": "Финансијер:",
+  "item.preview.project.funder.identifier": "Идентификатор финансијера:",
+  "item.preview.oaire.awardNumber": "ID финансирања:",
+  "item.preview.dc.title.alternative": "Акроним:",
+  "item.preview.dc.coverage.spatial": "Јурисдикција:",
+  "item.preview.oaire.fundingStream": "Ток финансирања:",
+  "item.select.confirm": "Потврдите изабрано",
+  "item.select.empty": "Нема ставки за приказ",
+  "item.select.table.author": "Аутор",
+  "item.select.table.collection": "Колекција",
+  "item.select.table.title": "Наслов",
+  "item.version.history.empty": "Још увек нема других верзија за ову ставку.",
+  "item.version.history.head": "Историја верзија",
+  "item.version.history.return": "Назад",
+  "item.version.history.selected": "Изабрана верзија",
+  "item.version.history.selected.alert": "Тренутно гледате верзију {{version}} ставке.",
+  "item.version.history.table.version": "Верзија",
+  "item.version.history.table.item": "Ставка",
+  "item.version.history.table.editor": "Уредник",
+  "item.version.history.table.date": "Датум",
+  "item.version.history.table.summary": "Резиме",
+  "item.version.history.table.workspaceItem": "Ставка радног простора",
+  "item.version.history.table.workflowItem": "Ставка процеса рада",
+  "item.version.history.table.actions": "Поступак",
+  "item.version.history.table.action.editWorkspaceItem": "Уредите ставку радног простора",
+  "item.version.history.table.action.editSummary": "Уредите резиме",
+  "item.version.history.table.action.saveSummary": "Сачувајте измене резимеа",
+  "item.version.history.table.action.discardSummary": "Одбаците измене резимеа",
+  "item.version.history.table.action.newVersion": "Креирајте нову верзију од овог",
+  "item.version.history.table.action.deleteVersion": "Избришите верзију",
+  "item.version.history.table.action.hasDraft": "Нова верзија се не може креирати зато што је у току прихват у историји верзија",
+  "item.version.notice": "Ово није најновија верзија ове ставке. Најновију верзију можете пронаћи <a href='{{destination}}'>овде</a>.",
+  "item.version.create.modal.header": "Нова верзија",
+  "item.version.create.modal.text": "Направите нову верзију за ову ставку",
+  "item.version.create.modal.text.startingFrom": "почевши од верзије {{version}}",
+  "item.version.create.modal.button.confirm": "Креирајте",
+  "item.version.create.modal.button.confirm.tooltip": "Креирајте нову верзију",
+  "item.version.create.modal.button.cancel": "Поништити, отказати",
+  "item.version.create.modal.button.cancel.tooltip": "Не креирајте нову верзију",
+  "item.version.create.modal.form.summary.label": "Резиме",
+  "item.version.create.modal.form.summary.placeholder": "Убаците резиме за нову верзију",
+  "item.version.create.modal.submitted.header": "Креирање нове верзије...",
+  "item.version.create.modal.submitted.text": "Нова верзија је у изради. Ово може потрајати неко време ако ставка има много веза.",
+  "item.version.create.notification.success": "Нова верзија је направљена са бројем верзије {{version}}",
+  "item.version.create.notification.failure": "Нова верзија није креирана",
+  "item.version.create.notification.inProgress": "Нова верзија се не може креирати зато што је у току прихват у историји верзија",
+  "item.version.delete.modal.header": "Избришите верзију",
+  "item.version.delete.modal.text": "Да ли желите да избришете верзију {{version}}?",
+  "item.version.delete.modal.button.confirm": "Избришите",
+  "item.version.delete.modal.button.confirm.tooltip": "Избришите ову верзију",
+  "item.version.delete.modal.button.cancel": "Поништити, отказати",
+  "item.version.delete.modal.button.cancel.tooltip": "Немојте брисати ову верзију",
+  "item.version.delete.notification.success": "Верзија број {{version}} је избрисана",
+  "item.version.delete.notification.failure": "Верзија број {{version}} није избрисана",
+  "item.version.edit.notification.success": "Сажетак верзије број {{version}} је промењен",
+  "item.version.edit.notification.failure": "Сажетак верзије број {{version}} није промењен",
+  "itemtemplate.edit.metadata.add-button": "Додати",
+  "itemtemplate.edit.metadata.discard-button": "Одбацити",
+  "itemtemplate.edit.metadata.edit.buttons.confirm": "Потврдити",
+  "itemtemplate.edit.metadata.edit.buttons.drag": "Превуците да бисте променили редослед",
+  "itemtemplate.edit.metadata.edit.buttons.edit": "Изменити",
+  "itemtemplate.edit.metadata.edit.buttons.remove": "Уклонити",
+  "itemtemplate.edit.metadata.edit.buttons.undo": "Поништити промене",
+  "itemtemplate.edit.metadata.edit.buttons.unedit": "Зауставите измене",
+  "itemtemplate.edit.metadata.empty": "Шаблон ставке тренутно не садржи никакве метаподатке. Кликните на Додај да бисте започели додавање вредности метаподатака.",
+  "itemtemplate.edit.metadata.headers.edit": "Изменити",
+  "itemtemplate.edit.metadata.headers.field": "Поље",
+  "itemtemplate.edit.metadata.headers.language": "Језик",
+  "itemtemplate.edit.metadata.headers.value": "Вредност",
+  "itemtemplate.edit.metadata.metadatafield.error": "Дошло је до грешке приликом провере поља метаподатака",
+  "itemtemplate.edit.metadata.metadatafield.invalid": "Молимо изаберите важеће поље метаподатака",
+  "itemtemplate.edit.metadata.notifications.discarded.content": "Ваше промене су одбачене. Да бисте вратили своје промене, кликните на дугме \"Поништи\".",
+  "itemtemplate.edit.metadata.notifications.discarded.title": "Промене су одбачене",
+  "itemtemplate.edit.metadata.notifications.error.title": "Дошло је до грешке",
+  "itemtemplate.edit.metadata.notifications.invalid.content": "Ваше промене нису сачуване. Молимо проверите да ли су сва поља исправна пре него што сачувате.",
+  "itemtemplate.edit.metadata.notifications.invalid.title": "Метаподаци су неважећи",
+  "itemtemplate.edit.metadata.notifications.outdated.content": "Други корисник је променио шаблон ставке на коме тренутно радите. Ваше тренутне промене се одбацују да би се спречили конфликти",
+  "itemtemplate.edit.metadata.notifications.outdated.title": "Промене су застареле",
+  "itemtemplate.edit.metadata.notifications.saved.content": "Ваше промене метаподатака овог шаблона ставке су сачуване.",
+  "itemtemplate.edit.metadata.notifications.saved.title": "Метаподаци су сачувани",
+  "itemtemplate.edit.metadata.reinstate-button": "Поништити",
+  "itemtemplate.edit.metadata.reset-order-button": "Поништити промену редоследа",
+  "itemtemplate.edit.metadata.save-button": "Сачувати",
+  "journal.listelement.badge": "Часопис",
+  "journal.page.description": "Опис",
+  "journal.page.edit": "Уредите ову ставку",
+  "journal.page.editor": "Главни уредник",
+  "journal.page.issn": "ISSN",
+  "journal.page.publisher": "Издавач",
+  "journal.page.titleprefix": "Часопис:",
+  "journal.search.results.head": "Резултати претраге часописа",
+  "journal-relationships.search.results.head": "Резултати претраге часописа",
+  "journal.search.title": "Претрага часописа",
+  "journalissue.listelement.badge": "Издање часописа",
+  "journalissue.page.description": "Опис",
+  "journalissue.page.edit": "Измените ову ставку",
+  "journalissue.page.issuedate": "Датум издања",
+  "journalissue.page.journal-issn": "Часопис ISSN",
+  "journalissue.page.journal-title": "Наслов часописа",
+  "journalissue.page.keyword": "Кључне речи",
+  "journalissue.page.number": "Број",
+  "journalissue.page.titleprefix": "Издање часописа:",
+  "journalvolume.listelement.badge": "Свеска часописа",
+  "journalvolume.page.description": "Опис",
+  "journalvolume.page.edit": "Измените ову ставку",
+  "journalvolume.page.issuedate": "Датум издања",
+  "journalvolume.page.titleprefix": "Свеска часописа:",
+  "journalvolume.page.volume": "Свеска",
+  "iiifsearchable.listelement.badge": "Списак медија",
+  "iiifsearchable.page.titleprefix": "Документ:",
+  "iiifsearchable.page.doi": "Трајна веза:",
+  "iiifsearchable.page.issue": "Издање:",
+  "iiifsearchable.page.description": "Опис:",
+  "iiifviewer.fullscreen.notice": "Користите цео екран да боље видите.",
+  "iiif.listelement.badge": "Имаге Медиа",
+  "iiif.page.titleprefix": "Слика:",
+  "iiif.page.doi": "Трајна веза:",
+  "iiif.page.issue": "Издање:",
+  "iiif.page.description": "Опис:",
+  "loading.bitstream": "Учитавање битстрим-а...",
+  "loading.bitstreams": "Учитавање битстрим-ова...",
+  "loading.browse-by": "Учитавање ставки...",
+  "loading.browse-by-page": "Учитавање странице...",
+  "loading.collection": "Учитавање колекције...",
+  "loading.collections": "Учитавање колекција...",
+  "loading.content-source": "Учитавање извора садржаја...",
+  "loading.community": "Учитавање заједнице...",
+  "loading.default": "Учитавање...",
+  "loading.item": "Учитавање ставке...",
+  "loading.items": "Учитавање ставки...",
+  "loading.mydspace-results": "Учитавање ставки...",
+  "loading.objects": "Учитавање...",
+  "loading.recent-submissions": "Учитавање недавних поднесака...",
+  "loading.search-results": "Учитавање резултата претраге...",
+  "loading.sub-collections": "Учитавање потколекција...",
+  "loading.sub-communities": "Учитавање подзаједница...",
+  "loading.top-level-communities": "Учитавање заједница највишег нивоа...",
+  "login.form.email": "Емаил адреса",
+  "login.form.forgot-password": "Заборавили сте лозинку?",
+  "login.form.header": "Молимо пријавите се на DSpace",
+  "login.form.new-user": "Нови корисник? Кликните овде да се региструјете.",
+  "login.form.or-divider": "или",
+  "login.form.oidc": "Пријавите се са OIDC",
+  "login.form.orcid": "Пријавите се са ORCID-ом",
+  "login.form.password": "Лозинка",
+  "login.form.shibboleth": "Пријавите се са Shibboleth",
+  "login.form.submit": "Пријавите се",
+  "login.title": "Пријавите се",
+  "login.breadcrumbs": "Пријавите се",
+  "logout.form.header": "Одјавите се са DSpace-а",
+  "logout.form.submit": "Одјавите се",
+  "logout.title": "Одјавите се",
+  "menu.header.admin": "Менаџмент",
+  "menu.header.image.logo": "Лого репозиторијума",
+  "menu.header.admin.description": "Менаџмент мени",
+  "menu.section.access_control": "Контрола приступа",
+  "menu.section.access_control_authorizations": "Овлашћења",
+  "menu.section.access_control_bulk": "Управљање масовним приступом",
+  "menu.section.access_control_groups": "Групе",
+  "menu.section.access_control_people": "Људи",
+  "menu.section.admin_search": "Админ претрага",
+  "menu.section.browse_community": "Ова заједница",
+  "menu.section.browse_community_by_author": "По аутору",
+  "menu.section.browse_community_by_issue_date": "По датуму издања",
+  "menu.section.browse_community_by_title": "По наслову",
+  "menu.section.browse_global": "Читав репозиторијум",
+  "menu.section.browse_global_by_author": "По аутору",
+  "menu.section.browse_global_by_dateissued": "По датуму издања",
+  "menu.section.browse_global_by_subject": "По предмету",
+  "menu.section.browse_global_by_srsc": "По категорији предмета",
+  "menu.section.browse_global_by_title": "По наслову",
+  "menu.section.browse_global_communities_and_collections": "Заједнице и колекције",
+  "menu.section.control_panel": "Контролна табла",
+  "menu.section.curation_task": "Куративни задатак",
+  "menu.section.edit": "Уредити",
+  "menu.section.edit_collection": "Колекција",
+  "menu.section.edit_community": "Заједница",
+  "menu.section.edit_item": "Ставка",
+  "menu.section.export": "Извоз",
+  "menu.section.export_collection": "Колекција",
+  "menu.section.export_community": "Заједница",
+  "menu.section.export_item": "Ставка",
+  "menu.section.export_metadata": "Метаподаци",
+  "menu.section.export_batch": "Групни извоз (ZIP)",
+  "menu.section.icon.access_control": "Одељак менија Контрола приступа",
+  "menu.section.icon.admin_search": "Одељак менија за админ претрагу",
+  "menu.section.icon.control_panel": "Одељак менија контролне табле",
+  "menu.section.icon.curation_tasks": "Одељак менија Задатак курирања",
+  "menu.section.icon.edit": "Уредите одељак менија",
+  "menu.section.icon.export": "Извезите одељак менија",
+  "menu.section.icon.find": "Пронађите одељак менија",
+  "menu.section.icon.health": "Одељак менија за здравствену проверу",
+  "menu.section.icon.import": "Увезите одељак менија",
+  "menu.section.icon.new": "Нови одељак менија",
+  "menu.section.icon.pin": "Закачите бочну траку",
+  "menu.section.icon.processes": "Процеси провере здравља",
+  "menu.section.icon.registries": "Одељак менија Регистри",
+  "menu.section.icon.statistics_task": "Одељак менија Статистички задатак",
+  "menu.section.icon.workflow": "Одељак менија Администрација процеса рада",
+  "menu.section.icon.unpin": "Откачите бочну траку",
+  "menu.section.import": "Увоз",
+  "menu.section.import_batch": "Групни увоз (ZIP)",
+  "menu.section.import_metadata": "Метаподаци",
+  "menu.section.new": "Ново",
+  "menu.section.new_collection": "Колекција",
+  "menu.section.new_community": "Заједница",
+  "menu.section.new_item": "Ставка",
+  "menu.section.new_item_version": "Верзија ставке",
+  "menu.section.new_process": "Процес",
+  "menu.section.pin": "Закачите бочну траку",
+  "menu.section.unpin": "Откачите бочну траку",
+  "menu.section.processes": "Процеси",
+  "menu.section.health": "Здравље",
+  "menu.section.registries": "Регистри",
+  "menu.section.registries_format": "Формат",
+  "menu.section.registries_metadata": "Метаподаци",
+  "menu.section.statistics": "Статистика",
+  "menu.section.statistics_task": "Статистички задатак",
+  "menu.section.toggle.access_control": "Укључите одељак Контрола приступа",
+  "menu.section.toggle.control_panel": "Укључите одељак Контролна табла",
+  "menu.section.toggle.curation_task": "Укључи/искључи одељак Задатак курирања",
+  "menu.section.toggle.edit": "Укључите одељак Уреди",
+  "menu.section.toggle.export": "Укључите одељак Извези",
+  "menu.section.toggle.find": "Укључи одељак Пронађи",
+  "menu.section.toggle.import": "Укључите одељак Увези",
+  "menu.section.toggle.new": "Укључите нови одељак",
+  "menu.section.toggle.registries": "Укључите одељак Регистри",
+  "menu.section.toggle.statistics_task": "Укључи/искључи одељак статистички задатак",
+  "menu.section.workflow": "Администрација процеса рада",
+  "metadata-export-search.tooltip": "Извезите резултате претраге као CSV",
+  "metadata-export-search.submit.success": "Извоз је успешно започет",
+  "metadata-export-search.submit.error": "Покретање извоза није успело",
+  "mydspace.breadcrumbs": "Мој DSpace",
+  "mydspace.description": "",
+  "mydspace.messages.controller-help": "Изаберите ову опцију да бисте послали поруку подносиоцу ставке.",
+  "mydspace.messages.description-placeholder": "Унесите своју поруку овде...",
+  "mydspace.messages.hide-msg": "Сакријте поруку",
+  "mydspace.messages.mark-as-read": "Означите као прочитано",
+  "mydspace.messages.mark-as-unread": "Означите као непрочитану",
+  "mydspace.messages.no-content": "Без садржаја.",
+  "mydspace.messages.no-messages": "Још нема порука.",
+  "mydspace.messages.send-btn": "Пошаљи",
+  "mydspace.messages.show-msg": "Прикажи поруку",
+  "mydspace.messages.subject-placeholder": "Предмет...",
+  "mydspace.messages.submitter-help": "Изаберите ову опцију да бисте послали поруку контролору.",
+  "mydspace.messages.title": "Поруке",
+  "mydspace.messages.to": "До",
+  "mydspace.new-submission": "Нови поднесак",
+  "mydspace.new-submission-external": "Увезите метаподатке из спољног извора",
+  "mydspace.new-submission-external-short": "Увезите метаподатке",
+  "mydspace.results.head": "Ваши поднесци",
+  "mydspace.results.no-abstract": "Нема сажетка",
+  "mydspace.results.no-authors": "Нема аутора",
+  "mydspace.results.no-collections": "Нема колекција",
+  "mydspace.results.no-date": "Нема датума",
+  "mydspace.results.no-files": "Нема фајлова",
+  "mydspace.results.no-results": "Нема ставки за приказ",
+  "mydspace.results.no-title": "Без наслова",
+  "mydspace.results.no-uri": "Нема URI",
+  "mydspace.search-form.placeholder": "Претрага у MyDSpace...",
+  "mydspace.show.workflow": "Радни задаци",
+  "mydspace.show.workspace": "Ваши поднесци",
+  "mydspace.show.supervisedWorkspace": "Надзиране ставке",
+  "mydspace.status.mydspaceArchived": "Архивирано",
+  "mydspace.status.mydspaceValidation": "Валидација",
+  "mydspace.status.mydspaceWaitingController": "Чека се контролер",
+  "mydspace.status.mydspaceWorkflow": "Радни процес",
+  "mydspace.status.mydspaceWorkspace": "Радни простор",
+  "mydspace.title": "MyDSpace",
+  "mydspace.upload.upload-failed": "Грешка при креирању новог радног простора. Молимо проверите отпремљени садржај пре него што покушате поново.",
+  "mydspace.upload.upload-failed-manyentries": "Необрађен фајл. Откривено је превише уноса, али је дозвољен само за један фајл.",
+  "mydspace.upload.upload-failed-moreonefile": "Необрађен захтев. Дозвољен је само један фајл.",
+  "mydspace.upload.upload-multiple-successful": "{{qty}} нових ставки радног простора је креирано.",
+  "mydspace.view-btn": "Поглед",
+  "nav.browse.header": "Читав репозиторијум",
+  "nav.community-browse.header": "Од заједнице",
+  "nav.context-help-toggle": "Укључите додатну помоћ",
+  "nav.language": "Промена језика",
+  "nav.login": "Пријави се",
+  "nav.user-profile-menu-and-logout": "Мени корисничког профила и одјава",
+  "nav.logout": "Одјавити се",
+  "nav.main.description": "Главна навигациона трака",
+  "nav.mydspace": "MyDSpace",
+  "nav.profile": "Профил",
+  "nav.search": "Претрага",
+  "nav.search.button": "Пошаљите претрагу",
+  "nav.statistics.header": "Статистика",
+  "nav.stop-impersonating": "Престаните да се представљате као EPerson",
+  "nav.subscriptions": "Претплате",
+  "nav.toggle": "Укључивање навигације",
+  "nav.user.description": "Трака корисничког профила",
+  "none.listelement.badge": "Ставка",
+  "orgunit.listelement.badge": "Организациона јединица",
+  "orgunit.listelement.no-title": "Без наслова",
+  "orgunit.page.city": "Град",
+  "orgunit.page.country": "Држава",
+  "orgunit.page.dateestablished": "Датум постављања",
+  "orgunit.page.description": "Опис",
+  "orgunit.page.edit": "Изменити ову ставку",
+  "orgunit.page.id": "ID",
+  "orgunit.page.titleprefix": "Организациона јединица:",
+  "pagination.options.description": "Опције страничења",
+  "pagination.results-per-page": "Резултати по страници",
+  "pagination.showing.detail": "{{ range }} од {{ total }}",
+  "pagination.showing.label": "Приказује се ",
+  "pagination.sort-direction": "Опције сортирања",
+  "person.listelement.badge": "Особа",
+  "person.listelement.no-title": "Име није пронађено",
+  "person.page.birthdate": "Датум рођења",
+  "person.page.edit": "Изменити ову ставку",
+  "person.page.email": "Емаил адреса",
+  "person.page.firstname": "Име",
+  "person.page.jobtitle": "Звање",
+  "person.page.lastname": "Презиме",
+  "person.page.name": "Име",
+  "person.page.link.full": "Прикажи све метаподатке",
+  "person.page.orcid": "ORCID",
+  "person.page.staffid": "ID запослених",
+  "person.page.titleprefix": "Особа:",
+  "person.search.results.head": "Резултати претраге особа",
+  "person-relationships.search.results.head": "Резултати претраге особа",
+  "person.search.title": "Претрага особа",
+  "process.new.select-parameters": "Параметри",
+  "process.new.cancel": "Отказати",
+  "process.new.submit": "Сачувати",
+  "process.new.select-script": "Скрипта",
+  "process.new.select-script.placeholder": "Изаберите скрипту...",
+  "process.new.select-script.required": "Скрипта је обавезна",
+  "process.new.parameter.file.upload-button": "Изаберите фајл...",
+  "process.new.parameter.file.required": "Молимо изаберите фајл",
+  "process.new.parameter.string.required": "Вредност параметра је обавезна",
+  "process.new.parameter.type.value": "вредност",
+  "process.new.parameter.type.file": "фајл",
+  "process.new.parameter.required.missing": "Следећи параметри су обавезни, али још увек недостају:",
+  "process.new.notification.success.title": "Успех",
+  "process.new.notification.success.content": "Процес је успешно креиран",
+  "process.new.notification.error.title": "Грешка",
+  "process.new.notification.error.content": "Дошло је до грешке при креирању овог процеса",
+  "process.new.notification.error.max-upload.content": "Фајл превазилази максималну величину за отпремање",
+  "process.new.header": "Креирајте нови процес",
+  "process.new.title": "Креирајте нови процес",
+  "process.new.breadcrumbs": "Креирајте нови процес",
+  "process.detail.arguments": "Аргументи",
+  "process.detail.arguments.empty": "Овај процес не садржи аргументе",
+  "process.detail.back": "Назад",
+  "process.detail.output": "Излаз процеса",
+  "process.detail.logs.button": "Преузмите излаз процеса",
+  "process.detail.logs.loading": "Преузимање",
+  "process.detail.logs.none": "Овај процес нема излаз",
+  "process.detail.output-files": "Излазни фајлови",
+  "process.detail.output-files.empty": "Овај процес не садржи излазне фајлове",
+  "process.detail.script": "Скрипта",
+  "process.detail.title": "Процес: {{ id }} - {{ name }}",
+  "process.detail.start-time": "Време почетка",
+  "process.detail.end-time": "Време завршетка",
+  "process.detail.status": "Статус",
+  "process.detail.create": "Направите сличан процес",
+  "process.detail.actions": "Акције",
+  "process.detail.delete.button": "Избришите процес",
+  "process.detail.delete.header": "Избришите процес",
+  "process.detail.delete.body": "Да ли сте сигурни да желите да избришете тренутни процес?",
+  "process.detail.delete.cancel": "Поништити, отказати",
+  "process.detail.delete.confirm": "Избришите процес",
+  "process.detail.delete.success": "Процес је успешно обрисан.",
+  "process.detail.delete.error": "Нешто је пошло наопако приликом брисања процеса",
+  "process.overview.table.finish": "Време завршетка (UTC)",
+  "process.overview.table.id": "ID процеса",
+  "process.overview.table.name": "Име",
+  "process.overview.table.start": "Време почетка (UTC)",
+  "process.overview.table.status": "Статус",
+  "process.overview.table.user": "Корисник",
+  "process.overview.title": "Преглед процеса",
+  "process.overview.breadcrumbs": "Преглед процеса",
+  "process.overview.new": "Ново",
+  "process.overview.table.actions": "Акције",
+  "process.overview.delete": "Избришите {{count}} процеса",
+  "process.overview.delete.clear": "Очистите избор за брисање",
+  "process.overview.delete.processing": "Бришу се процеси ({{count}}). Сачекајте да се брисање у потпуности заврши. Имајте на уму да ово може потрајати.",
+  "process.overview.delete.body": "Да ли сте сигурни да желите да избришете {{count}} процес(е)?",
+  "process.overview.delete.header": "Избришите процесе",
+  "process.bulk.delete.error.head": "Грешка у процесу брисања",
+  "process.bulk.delete.error.body": "Није могуће избрисати процес са ID-ом {{processId}}. Преостали процеси ће наставити да се бришу.",
+  "process.bulk.delete.success": "Процеси ({{count}}) су успешно избрисани",
+  "profile.breadcrumbs": "Ажурирање профила",
+  "profile.card.identify": "Идентитет",
+  "profile.card.security": "Безбедност",
+  "profile.form.submit": "Сачувати",
+  "profile.groups.head": "Групе овлашћења којима припадате",
+  "profile.special.groups.head": "Ауторизација посебних група којима припадате",
+  "profile.head": "Ажурирање профил",
+  "profile.metadata.form.error.firstname.required": "Име је обавезно",
+  "profile.metadata.form.error.lastname.required": "Презиме је обавезно",
+  "profile.metadata.form.label.email": "Емаил адреса",
+  "profile.metadata.form.label.firstname": "Име",
+  "profile.metadata.form.label.language": "Језик",
+  "profile.metadata.form.label.lastname": "Презиме",
+  "profile.metadata.form.label.phone": "Контакт телефон",
+  "profile.metadata.form.notifications.success.content": "Ваше промене на профилу су сачуване.",
+  "profile.metadata.form.notifications.success.title": "Профил је сачуван",
+  "profile.notifications.warning.no-changes.content": "Нису направљене никакве промене на профилу.",
+  "profile.notifications.warning.no-changes.title": "Без промене",
+  "profile.security.form.error.matching-passwords": "Лозинке се не поклапају.",
+  "profile.security.form.info": "Опционо, можете да унесете нову лозинку у поље испод и потврдите је тако што ћете је поново укуцати у друго поље.",
+  "profile.security.form.label.password": "Лозинка",
+  "profile.security.form.label.passwordrepeat": "Поново откуцајте да бисте потврдили",
+  "profile.security.form.label.current-password": "Тренутна лозинка",
+  "profile.security.form.notifications.success.content": "Ваше промене лозинке су сачуване.",
+  "profile.security.form.notifications.success.title": "Лозинка је сачувана",
+  "profile.security.form.notifications.error.title": "Грешка при промени лозинки",
+  "profile.security.form.notifications.error.change-failed": "Дошло је до грешке при покушају промене лозинке. Проверите да ли је тренутна лозинка тачна.",
+  "profile.security.form.notifications.error.not-same": "Наведене лозинке нису исте.",
+  "profile.security.form.notifications.error.general": "Попуните обавезна поља безбедносног обрасца.",
+  "profile.title": "Ажурирање профила",
+  "profile.card.researcher": "Профил истраживача",
+  "project.listelement.badge": "Истраживачки пројекат",
+  "project.page.contributor": "Сарадници",
+  "project.page.description": "Опис",
+  "project.page.edit": "Уредите ову ставку",
+  "project.page.expectedcompletion": "Очекивани завршетак",
+  "project.page.funder": "финансијери",
+  "project.page.id": "ID",
+  "project.page.keyword": "Кључне речи",
+  "project.page.status": "Статус",
+  "project.page.titleprefix": "Истраживачки пројекат:",
+  "project.search.results.head": "Резултати претраге пројекта",
+  "project-relationships.search.results.head": "Резултати претраге пројекта",
+  "publication.listelement.badge": "Публикација",
+  "publication.page.description": "Опис",
+  "publication.page.edit": "Уредите ову ставку",
+  "publication.page.journal-issn": "Часопис ISSN",
+  "publication.page.journal-title": "Наслов часописа",
+  "publication.page.publisher": "Издавач",
+  "publication.page.titleprefix": "Публикација:",
+  "publication.page.volume-title": "Наслов свеске",
+  "publication.search.results.head": "Резултати претраге публикације",
+  "publication-relationships.search.results.head": "Резултати претраге публикације",
+  "publication.search.title": "Претрага публикација",
+  "media-viewer.next": "Следеће",
+  "media-viewer.previous": "Претходно",
+  "media-viewer.playlist": "Плаy листа",
+  "register-email.title": "Регистрација новог корисника",
+  "register-page.create-profile.header": "Направите профил",
+  "register-page.create-profile.identification.header": "Идентификовати",
+  "register-page.create-profile.identification.email": "Емаил адреса",
+  "register-page.create-profile.identification.first-name": "Име *",
+  "register-page.create-profile.identification.first-name.error": "Молимо унесите име",
+  "register-page.create-profile.identification.last-name": "Презиме *",
+  "register-page.create-profile.identification.last-name.error": "Молимо унесите презиме",
+  "register-page.create-profile.identification.contact": "Контакт телефон",
+  "register-page.create-profile.identification.language": "Језик",
+  "register-page.create-profile.security.header": "Безбедност",
+  "register-page.create-profile.security.info": "Молимо унесите лозинку у поље испод и потврдите је тако што ћете је поново унети у друго поље.",
+  "register-page.create-profile.security.label.password": "Лозинка *",
+  "register-page.create-profile.security.label.passwordrepeat": "Унесите поново да потврдите *",
+  "register-page.create-profile.security.error.empty-password": "Молимо унесите лозинку у поље испод.",
+  "register-page.create-profile.security.error.matching-passwords": "Лозинке се не поклапају.",
+  "register-page.create-profile.submit": "Завршите регистрацију",
+  "register-page.create-profile.submit.error.content": "Нешто није у реду приликом регистрације новог корисника.",
+  "register-page.create-profile.submit.error.head": "Неуспешна регистрација",
+  "register-page.create-profile.submit.success.content": "Регистрација је успешна. Пријављени сте као креирани корисник.",
+  "register-page.create-profile.submit.success.head": "Регистрација је завршена",
+  "register-page.registration.header": "Регистрација новог корисника",
+  "register-page.registration.info": "Региструјте налог да бисте се претплатили на колекције за ажурирања путем емаил-а и пошаљите нове ставке на DSpace.",
+  "register-page.registration.email": "Емаил адреса *",
+  "register-page.registration.email.error.required": "Молимо унесите емаил адресу",
+  "register-page.registration.email.error.not-email-form": "Молимо унесите важећу емаил адресу.",
+  "register-page.registration.email.error.not-valid-domain": "Користите емаил са дозвољеним доменима: {{ domains }}",
+  "register-page.registration.email.hint": "Ова адреса ће бити верификована и коришћена као ваше корисничко име.",
+  "register-page.registration.submit": "Регистровати",
+  "register-page.registration.success.head": "Верификациони емаил је послат",
+  "register-page.registration.success.content": "Емаил је послат на {{ email }} који садржи посебан URL и даља упутства.",
+  "register-page.registration.error.head": "Грешка при покушају регистрације емаил-а",
+  "register-page.registration.error.content": "Дошло је до грешке при регистрацији следеће емаил адресе: {{ email }}",
+  "register-page.registration.error.recaptcha": "Грешка при покушају аутентификације помоћу recaptcha",
+  "register-page.registration.google-recaptcha.must-accept-cookies": "Да бисте се регистровали, морате прихватити колачиће за <b>регистрацију и враћање лозинке</b> (Google reCaptcha).",
+  "register-page.registration.error.maildomain": "Ова емаил адреса није на листи домена који се могу регистровати. Дозвољени домени су {{ domains }}",
+  "register-page.registration.google-recaptcha.open-cookie-settings": "Отворите подешавања колачића",
+  "register-page.registration.google-recaptcha.notification.title": "Google reCaptcha",
+  "register-page.registration.google-recaptcha.notification.message.error": "Дошло је до грешке током reCaptcha верификације",
+  "register-page.registration.google-recaptcha.notification.message.expired": "Верификација је истекла. Молимо потврдите поново.",
+  "register-page.registration.info.maildomain": "Налози се могу регистровати за емаил адресе домена",
+  "relationships.add.error.relationship-type.content": "Није пронађено одговарајуће подударање за тип везе {{ type }} између две ставке",
+  "relationships.add.error.server.content": "Сервер је вратио грешку",
+  "relationships.add.error.title": "Није могуће додати везу",
+  "relationships.isAuthorOf": "Аутори",
+  "relationships.isAuthorOf.Person": "Аутори (особа)",
+  "relationships.isAuthorOf.OrgUnit": "Аутори (организационе јединице)",
+  "relationships.isIssueOf": "Издања часописа",
+  "relationships.isJournalIssueOf": "Издања часопса",
+  "relationships.isJournalOf": "Часописи",
+  "relationships.isOrgUnitOf": "Организационе јединице",
+  "relationships.isPersonOf": "Аутори",
+  "relationships.isProjectOf": "Истраживачки пројекти",
+  "relationships.isPublicationOf": "Издања",
+  "relationships.isPublicationOfJournalIssue": "Чланци",
+  "relationships.isSingleJournalOf": "Часопис",
+  "relationships.isSingleVolumeOf": "Свеска часописа",
+  "relationships.isVolumeOf": "Свеске часописа",
+  "relationships.isContributorOf": "Сарадници",
+  "relationships.isContributorOf.OrgUnit": "Сарадник (Организациона јединица)",
+  "relationships.isContributorOf.Person": "Сарадник",
+  "relationships.isFundingAgencyOf.OrgUnit": "Оснивач",
+  "repository.image.logo": "Лого репозиторијума",
+  "repository.title": "DSpace Репозиторијум",
+  "repository.title.prefix": "DSpace Репозиторијум ::",
+  "resource-policies.add.button": "Додати",
+  "resource-policies.add.for.": "Додајте нове смернице",
+  "resource-policies.add.for.bitstream": "Додајте нове битстрим смернице",
+  "resource-policies.add.for.bundle": "Додајте нове смернице пакета",
+  "resource-policies.add.for.item": "Додајте нове смернице ставки",
+  "resource-policies.add.for.community": "Додајте нове смернице заједнице",
+  "resource-policies.add.for.collection": "Додајте нове смернице колекција",
+  "resource-policies.create.page.heading": "Креирајте нове смернице ресурса за",
+  "resource-policies.create.page.failure.content": "Дошло је до грешке при креирању смерница ресурса.",
+  "resource-policies.create.page.success.content": "Операција успела",
+  "resource-policies.create.page.title": "Креирајте нове смернице ресурса",
+  "resource-policies.delete.btn": "Избришите изабрано",
+  "resource-policies.delete.btn.title": "Избришите изабране смернице ресурса",
+  "resource-policies.delete.failure.content": "Дошло је до грешке приликом брисања изабраних смерница ресурса.",
+  "resource-policies.delete.success.content": "Операција успела",
+  "resource-policies.edit.page.heading": "Измените смернице ресурса",
+  "resource-policies.edit.page.failure.content": "Дошло је до грешке приликом измене смерница ресурса.",
+  "resource-policies.edit.page.target-failure.content": "Дошло је до грешке приликом измене циља (EPerson или групе) смерница ресурса.",
+  "resource-policies.edit.page.other-failure.content": "Дошло је до грешке приликом измене смерница ресурса. Циљ (EPerson или група) је успешно ажуриран.",
+  "resource-policies.edit.page.success.content": "Операција успела",
+  "resource-policies.edit.page.title": "Измена смерница ресурса",
+  "resource-policies.form.action-type.label": "Изабрати врсту акције",
+  "resource-policies.form.action-type.required": "Морате да изаберете акцију полисе ресурса.",
+  "resource-policies.form.eperson-group-list.label": "EPerson или група која ће добити овлашћење",
+  "resource-policies.form.eperson-group-list.select.btn": "Изабрати",
+  "resource-policies.form.eperson-group-list.tab.eperson": "Потражите EPerson",
+  "resource-policies.form.eperson-group-list.tab.group": "Потражите групу",
+  "resource-policies.form.eperson-group-list.table.headers.action": "Поступак",
+  "resource-policies.form.eperson-group-list.table.headers.id": "ID",
+  "resource-policies.form.eperson-group-list.table.headers.name": "Име",
+  "resource-policies.form.eperson-group-list.modal.header": "Не може се променити тип",
+  "resource-policies.form.eperson-group-list.modal.text1.toGroup": "Није могуће заменити EPerson са групом.",
+  "resource-policies.form.eperson-group-list.modal.text1.toEPerson": "Није могуће заменити групу са EPerson.",
+  "resource-policies.form.eperson-group-list.modal.text2": "Избришите тренутне полисе ресурса и креирајте нове са жељеним типом.",
+  "resource-policies.form.eperson-group-list.modal.close": "Ок",
+  "resource-policies.form.date.end.label": "Датум завршетка",
+  "resource-policies.form.date.start.label": "Датум почетка",
+  "resource-policies.form.description.label": "Опис",
+  "resource-policies.form.name.label": "Име",
+  //"resource-policies.form.name.hint": "Max 30 characters",
+  // TODO New key - Add a translation
+  "resource-policies.form.name.hint": "Max 30 characters",
+  "resource-policies.form.policy-type.label": "Изаберите тип полисе",
+  "resource-policies.form.policy-type.required": "Морате да изаберете тип полисе ресурса.",
+  "resource-policies.table.headers.action": "Поступак",
+  "resource-policies.table.headers.date.end": "Датум завршетка",
+  "resource-policies.table.headers.date.start": "Датум почетка",
+  "resource-policies.table.headers.edit": "Изменити",
+  "resource-policies.table.headers.edit.group": "Изменити групу",
+  "resource-policies.table.headers.edit.policy": "Изменити смернице",
+  "resource-policies.table.headers.eperson": "EPerson",
+  "resource-policies.table.headers.group": "Група",
+  "resource-policies.table.headers.id": "ID",
+  "resource-policies.table.headers.name": "Име",
+  "resource-policies.table.headers.policyType": "тип",
+  "resource-policies.table.headers.title.for.bitstream": "Смернице за битстрим",
+  "resource-policies.table.headers.title.for.bundle": "Смернице за пакет",
+  "resource-policies.table.headers.title.for.item": "Смернице за ставку",
+  "resource-policies.table.headers.title.for.community": "Смернице за заједницу",
+  "resource-policies.table.headers.title.for.collection": "Смернице за колекцију",
+  "search.description": "",
+  "search.switch-configuration.title": "Прикажи",
+  "search.title": "Претрага",
+  "search.breadcrumbs": "Претрага",
+  "search.search-form.placeholder": "Претражите спремиште...",
+  "search.filters.applied.f.author": "Аутор",
+  "search.filters.applied.f.dateIssued.max": "Датум завршетка",
+  "search.filters.applied.f.dateIssued.min": "Датум почетка",
+  "search.filters.applied.f.dateSubmitted": "Датум прихватања",
+  "search.filters.applied.f.discoverable": "Није могуће открити",
+  "search.filters.applied.f.entityType": "Тип ставке",
+  "search.filters.applied.f.has_content_in_original_bundle": "Има фајлове",
+  "search.filters.applied.f.itemtype": "Тип",
+  "search.filters.applied.f.namedresourcetype": "Статус",
+  "search.filters.applied.f.subject": "Предмет",
+  "search.filters.applied.f.submitter": "Подносилац",
+  "search.filters.applied.f.jobTitle": "Звање",
+  "search.filters.applied.f.birthDate.max": "Рођење - крајњи датум",
+  "search.filters.applied.f.birthDate.min": "Рођење - почетни датум",
+  "search.filters.applied.f.supervisedBy": "Прегледао",
+  "search.filters.applied.f.withdrawn": "Повучен",
+  "search.filters.filter.author.head": "Аутор",
+  "search.filters.filter.author.placeholder": "Име аутора",
+  "search.filters.filter.author.label": "Претражите име аутора",
+  "search.filters.filter.birthDate.head": "Датум рођења",
+  "search.filters.filter.birthDate.placeholder": "Датум рођења",
+  "search.filters.filter.birthDate.label": "Претражите датум рођења",
+  "search.filters.filter.collapse": "Скупи филтер",
+  "search.filters.filter.creativeDatePublished.head": "Датум објављивања",
+  "search.filters.filter.creativeDatePublished.placeholder": "Датум објављивања",
+  "search.filters.filter.creativeDatePublished.label": "Претражите датум објављивања",
+  "search.filters.filter.creativeWorkEditor.head": "Едитор",
+  "search.filters.filter.creativeWorkEditor.placeholder": "Едитор",
+  "search.filters.filter.creativeWorkEditor.label": "Претрага уредника",
+  "search.filters.filter.creativeWorkKeywords.head": "Предмет",
+  "search.filters.filter.creativeWorkKeywords.placeholder": "Предмет",
+  "search.filters.filter.creativeWorkKeywords.label": "Предмет претраге",
+  "search.filters.filter.creativeWorkPublisher.head": "Издавач",
+  "search.filters.filter.creativeWorkPublisher.placeholder": "Издавач",
+  "search.filters.filter.creativeWorkPublisher.label": "Претрага издавача",
+  "search.filters.filter.dateIssued.head": "Датум",
+  "search.filters.filter.dateIssued.max.placeholder": "Максимални датум",
+  "search.filters.filter.dateIssued.max.label": "Крај",
+  "search.filters.filter.dateIssued.min.placeholder": "Минимални датум",
+  "search.filters.filter.dateIssued.min.label": "Почетак",
+  "search.filters.filter.dateSubmitted.head": "Датум прихватања",
+  "search.filters.filter.dateSubmitted.placeholder": "Датум прихватања",
+  "search.filters.filter.dateSubmitted.label": "Претрага датума прихватања",
+  "search.filters.filter.discoverable.head": "Није могуће открити",
+  "search.filters.filter.withdrawn.head": "Повучен",
+  "search.filters.filter.entityType.head": "Тип ставке",
+  "search.filters.filter.entityType.placeholder": "Тип ставке",
+  "search.filters.filter.entityType.label": "Претражите тип ставке",
+  "search.filters.filter.expand": "Прошири филтер",
+  "search.filters.filter.has_content_in_original_bundle.head": "Има фајлове",
+  "search.filters.filter.itemtype.head": "Тип",
+  "search.filters.filter.itemtype.placeholder": "Тип",
+  "search.filters.filter.itemtype.label": "Тип претраге",
+  "search.filters.filter.jobTitle.head": "Звање",
+  "search.filters.filter.jobTitle.placeholder": "Звање",
+  "search.filters.filter.jobTitle.label": "Претрага звања",
+  "search.filters.filter.knowsLanguage.head": "Познати језик",
+  "search.filters.filter.knowsLanguage.placeholder": "Познати језик",
+  "search.filters.filter.knowsLanguage.label": "Претражите познати језик",
+  "search.filters.filter.namedresourcetype.head": "Статус",
+  "search.filters.filter.namedresourcetype.placeholder": "Статус",
+  "search.filters.filter.namedresourcetype.label": "Статус претраге",
+  "search.filters.filter.objectpeople.head": "Људи",
+  "search.filters.filter.objectpeople.placeholder": "Људи",
+  "search.filters.filter.objectpeople.label": "Претражите људе",
+  "search.filters.filter.organizationAddressCountry.head": "Држава",
+  "search.filters.filter.organizationAddressCountry.placeholder": "Држава",
+  "search.filters.filter.organizationAddressCountry.label": "Претражите државу",
+  "search.filters.filter.organizationAddressLocality.head": "Град",
+  "search.filters.filter.organizationAddressLocality.placeholder": "Град",
+  "search.filters.filter.organizationAddressLocality.label": "Претражите град",
+  "search.filters.filter.organizationFoundingDate.head": "Датум оснивања",
+  "search.filters.filter.organizationFoundingDate.placeholder": "Датум оснивања",
+  "search.filters.filter.organizationFoundingDate.label": "Претражите датум оснивања",
+  "search.filters.filter.scope.head": "Опсег",
+  "search.filters.filter.scope.placeholder": "Филтер опсега",
+  "search.filters.filter.scope.label": "Претражите филтер опсега",
+  "search.filters.filter.show-less": "Скупити",
+  "search.filters.filter.show-more": "Прикажи више",
+  "search.filters.filter.subject.head": "Предмет",
+  "search.filters.filter.subject.placeholder": "Предмет",
+  "search.filters.filter.subject.label": "Предмет претраге",
+  "search.filters.filter.submitter.head": "Подносилац",
+  "search.filters.filter.submitter.placeholder": "Подносилац",
+  "search.filters.filter.submitter.label": "Подносилац претраге",
+  "search.filters.filter.show-tree": "Прегледајте стабло {{ name }}",
+  "search.filters.filter.supervisedBy.head": "Прегледао",
+  "search.filters.filter.supervisedBy.placeholder": "Прегледао",
+  "search.filters.filter.supervisedBy.label": "Претрагу надгледао",
+  "search.filters.entityType.JournalIssue": "Издања часописа",
+  "search.filters.entityType.JournalVolume": "Свеска часописа",
+  "search.filters.entityType.OrgUnit": "Организациона јединица",
+  "search.filters.has_content_in_original_bundle.true": "Да",
+  "search.filters.has_content_in_original_bundle.false": "Не",
+  "search.filters.discoverable.true": "Не",
+  "search.filters.discoverable.false": "Да",
+  "search.filters.namedresourcetype.Archived": "Архивирано",
+  "search.filters.namedresourcetype.Validation": "Исправност",
+  "search.filters.namedresourcetype.Waiting for Controller": "Чека се контролор",
+  "search.filters.namedresourcetype.Workflow": "Процес рада",
+  "search.filters.namedresourcetype.Workspace": "Радни простор",
+  "search.filters.withdrawn.true": "Да",
+  "search.filters.withdrawn.false": "Не",
+  "search.filters.head": "Филтери",
+  "search.filters.reset": "Ресетовање филтера",
+  "search.filters.search.submit": "Прихватите",
+  "search.form.search": "Претрага",
+  "search.form.search_dspace": "Сви репозиторијуми",
+  "search.form.scope.all": "Читав репозиторијум",
+  "search.results.head": "Резултати претраге",
+  "search.results.no-results": "Ваша претрага није дала резултате. Имате проблема са проналажењем онога што тражите? Покушајте да ставите",
+  "search.results.no-results-link": "наводнике око тога",
+  "search.results.empty": "Ваша претрага није дала резултате.",
+  "search.results.view-result": "Погледати",
+  "search.results.response.500": "Дошло је до грешке током извршавања упита, молимо покушајте поново касније",
+  "default.search.results.head": "Резултати претраге",
+  "default-relationships.search.results.head": "Резултати претраге",
+  "search.sidebar.close": "Повратак на резултате",
+  "search.sidebar.filters.title": "Филтери",
+  "search.sidebar.open": "Алати за претрагу",
+  "search.sidebar.results": "резултати",
+  "search.sidebar.settings.rpp": "Резултати по страни",
+  "search.sidebar.settings.sort-by": "Сортирати по",
+  "search.sidebar.settings.title": "Подешавања",
+  "search.view-switch.show-detail": "Приказати детаље",
+  "search.view-switch.show-grid": "Приказати као мрежу",
+  "search.view-switch.show-list": "Приказати као листу",
+  "sorting.ASC": "Растуће",
+  "sorting.DESC": "Опадајуће",
+  "sorting.dc.title.ASC": "Наслов растуће",
+  "sorting.dc.title.DESC": "Наслов опадајуће",
+  "sorting.score.ASC": "Најмање релевантно",
+  "sorting.score.DESC": "Најрелевантније",
+  "sorting.dc.date.issued.ASC": "Датум издања растуће",
+  "sorting.dc.date.issued.DESC": "Датум издања опадајуће",
+  "sorting.dc.date.accessioned.ASC": "Датум приступа растуће",
+  "sorting.dc.date.accessioned.DESC": "Датум приступа опадајуће",
+  "sorting.lastModified.ASC": "Последња измена растуће",
+  "sorting.lastModified.DESC": "Последња измена опадајуће",
+  "statistics.title": "Статистика",
+  "statistics.header": "Статистика за {{ scope }}",
+  "statistics.breadcrumbs": "Статистика",
+  "statistics.page.no-data": "Нема доступних података",
+  "statistics.table.no-data": "Нема доступних података",
+  "statistics.table.title.TotalVisits": "Укупно посета",
+  "statistics.table.title.TotalVisitsPerMonth": "Укупно посета месечно",
+  "statistics.table.title.TotalDownloads": "Посете фајловима",
+  "statistics.table.title.TopCountries": "Највише прегледа по државама",
+  "statistics.table.title.TopCities": "Највише прегледа по градовима",
+  "statistics.table.header.views": "Погледи",
+  "statistics.table.no-name": "(име објекта се не може учитати)",
+  "submission.edit.breadcrumbs": "Измена поднеска",
+  "submission.edit.title": "Измена поднеска",
+  "submission.general.cancel": "Отказати",
+  "submission.general.cannot_submit": "Немате дозволу да поднесете нову пријаву.",
+  "submission.general.deposit": "Депоновати",
+  "submission.general.discard.confirm.cancel": "Отказати",
+  "submission.general.discard.confirm.info": "Ова операција се не може опозвати. Да ли сте сигурни?",
+  "submission.general.discard.confirm.submit": "Да сигуран сам",
+  "submission.general.discard.confirm.title": "Одбаците поднесак",
+  "submission.general.discard.submit": "Одбацити",
+  "submission.general.info.saved": "Сачувано",
+  "submission.general.info.pending-changes": "Несачуване промене",
+  "submission.general.save": "Сачувати",
+  "submission.general.save-later": "Сачувати за касније",
+  "submission.import-external.page.title": "Увезите метаподатке из спољног извора",
+  "submission.import-external.title": "Увезите метаподатке из спољног извора",
+  "submission.import-external.title.Journal": "Увезите часопис из спољног извора",
+  "submission.import-external.title.JournalIssue": "Увезите издање часописа из спољног извора",
+  "submission.import-external.title.JournalVolume": "Увезите волуме часописа из спољног извора",
+  "submission.import-external.title.OrgUnit": "Увезите издавача из спољног извора",
+  "submission.import-external.title.Person": "Увезите особу из спољног извора",
+  "submission.import-external.title.Project": "Увезите пројекат из спољног извора",
+  "submission.import-external.title.Publication": "Увезите публикацију из спољног извора",
+  "submission.import-external.title.none": "Увезите метаподатке из спољног извора",
+  "submission.import-external.page.hint": "Унесите упит изнад да бисте пронашли ставке са веба за увоз у DSpace.",
+  "submission.import-external.back-to-my-dspace": "Назад на MyDSpace",
+  "submission.import-external.search.placeholder": "Претрага спољног извора",
+  "submission.import-external.search.button": "Претрага",
+  "submission.import-external.search.button.hint": "Напишите неколико речи за претрагу",
+  "submission.import-external.search.source.hint": "Изаберите спољни извор",
+  "submission.import-external.source.arxiv": "arXiv",
+  "submission.import-external.source.ads": "NASA/ADS",
+  "submission.import-external.source.cinii": "CiNii",
+  "submission.import-external.source.crossref": "Crossref",
+  "submission.import-external.source.datacite": "DataCite",
+  "submission.import-external.source.scielo": "SciELO",
+  "submission.import-external.source.scopus": "Scopus",
+  "submission.import-external.source.vufind": "VuFind",
+  "submission.import-external.source.wos": "Научна мрежа",
+  "submission.import-external.source.orcidWorks": "ORCID",
+  "submission.import-external.source.epo": "Европски завод за патенте (EPO)",
+  "submission.import-external.source.loading": "Учитавање...",
+  "submission.import-external.source.sherpaJournal": "SHERPA часописи",
+  "submission.import-external.source.sherpaJournalIssn": "SHERPA часописи од ISSN",
+  "submission.import-external.source.sherpaPublisher": "SHERPA Publishers",
+  "submission.import-external.source.openAIREFunding": "Финансирање OpenAIRE API-ја",
+  "submission.import-external.source.orcid": "ORCID",
+  "submission.import-external.source.pubmed": "Pubmed",
+  "submission.import-external.source.pubmedeu": "Pubmed Europe",
+  "submission.import-external.source.lcname": "Библиотека Конгресних имена",
+  "submission.import-external.preview.title": "Преглед ставке",
+  "submission.import-external.preview.title.Publication": "Преглед публикације",
+  "submission.import-external.preview.title.none": "Преглед ставке",
+  "submission.import-external.preview.title.Journal": "Преглед часописа",
+  "submission.import-external.preview.title.OrgUnit": "Преглед организационе јединице",
+  "submission.import-external.preview.title.Person": "Преглед особе",
+  "submission.import-external.preview.title.Project": "Преглед пројекта",
+  "submission.import-external.preview.subtitle": "Метаподаци у наставку су увезени из спољног извора. Биће унапред попуњен када започнете прихватање.",
+  "submission.import-external.preview.button.import": "Почните са прихватањем",
+  "submission.import-external.preview.error.import.title": "Грешка при прихватању",
+  "submission.import-external.preview.error.import.body": "Дошло је до грешке током улазног процеса увоза спољашњег извора.",
+  "submission.sections.describe.relationship-lookup.close": "Затвори",
+  "submission.sections.describe.relationship-lookup.external-source.added": "Успешно је додат локални улаз у избор",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.isAuthorOfPublication": "Увезите удаљеног аутора",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Journal": "Увезите удаљени дневник",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Journal Issue": "Увезите удаљено издање часописа",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Journal Volume": "Увезите удаљени опсег часописа",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.isProjectOfPublication": "Пројекат",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.none": "Увезите удаљену ставку",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Event": "Увезите удаљени догађај",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Product": "Увезите удаљени производ",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Equipment": "Увезите удаљену опрему",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.OrgUnit": "Увезите удаљену организациону јединицу",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Funding": "Увезите удаљени фонд",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Person": "Увезите удаљену особу",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Patent": "Увезите удаљени патент",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Project": "Увезите удаљени пројекат",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Publication": "Увезите удаљену публикацију",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.isProjectOfPublication.added.new-entity": "Додат је нови ентитет!",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.isProjectOfPublication.title": "Пројекат",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.openAIREFunding": "Финансирање OpenAIRE API-ја",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.isAuthorOfPublication.title": "Увези удаљеног аутора",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.isAuthorOfPublication.added.local-entity": "Локални аутор је успешно додат у избор",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.isAuthorOfPublication.added.new-entity": "Спољашњи аутор је успешно увезен и додат у избор",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.authority": "Управа",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.authority.new": "Увезите као нови улаз локалне управе",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.cancel": "Поништити, отказати",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.collection": "Изаберите колекцију у коју ћете увести нове улазе",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.entities": "Ентитети",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.entities.new": "Увезите као нови локални ентитет",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.lcname": "Увезите из LC имена",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.orcid": "Увезите из ORCID-а",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.sherpaJournal": "Увезите из часописа SHERPA",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.sherpaPublisher": "Увезите из SHERPA издавача",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.pubmed": "Увезите из PubMed-а",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.arxiv": "Увезите из arXiv",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.import": "Увоз",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal.title": "Увезите удаљени часопис",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal.added.local-entity": "Успешно додат локални часопис у избор",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal.added.new-entity": "Успешно увезен и додат спољашњи часопис у избор",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Issue.title": "Увезите удаљено издање часописа",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Issue.added.local-entity": "Успешно је додат локални број часописа у избор",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Issue.added.new-entity": "Успешно увезен и додат спољашњи број часописа у избор",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Volume.title": "Увезите удаљени опсег часописа",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Volume.added.local-entity": "Успешно је додат локални волумен часописа у избор",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Volume.added.new-entity": "Успешно увезен и додат спољашњи опсег часописа у избор",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.select": "Изаберите локално подударање:",
+  "submission.sections.describe.relationship-lookup.search-tab.deselect-all": "Поништите све",
+  "submission.sections.describe.relationship-lookup.search-tab.deselect-page": "Опозовите избор странице",
+  "submission.sections.describe.relationship-lookup.search-tab.loading": "Учитавање...",
+  "submission.sections.describe.relationship-lookup.search-tab.placeholder": "Упит за претрагу",
+  "submission.sections.describe.relationship-lookup.search-tab.search": "Иди",
+  "submission.sections.describe.relationship-lookup.search-tab.search-form.placeholder": "Претрага...",
+  "submission.sections.describe.relationship-lookup.search-tab.select-all": "Изабери све",
+  "submission.sections.describe.relationship-lookup.search-tab.select-page": "Изаберите страницу",
+  "submission.sections.describe.relationship-lookup.selected": "Изабране ставке {{ size }}",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isAuthorOfPublication": "Локални аутори ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalOfPublication": "Локални часописи ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.Project": "Локални пројекти ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.Publication": "Локалне публикације ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.Person": "Локални аутори ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.OrgUnit": "Локалне организационе јединице ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.DataPackage": "Локални пакети података ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.DataFile": "Локални фајлови података ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.Journal": "Локални часописи ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalIssueOfPublication": "Локална издања часописа ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.JournalIssue": "Локална издања часописа ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalVolumeOfPublication": "Локални опсег часописа ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.JournalVolume": "Локални опсег часописа ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaJournal": "SHERPA часописи ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaPublisher": "SHERPA издавачи({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.orcid": "ORCID ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.lcname": "LC имена ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.pubmed": "PubMed ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.arxiv": "arXiv ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingAgencyOfPublication": "Потражите финансијере",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingOfPublication": "Потражите средства",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isChildOrgUnitOf": "Потражите организационе јединице",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.openAIREFunding": "Финансирање OpenAIRE API-ја",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isProjectOfPublication": "Пројекти",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingAgencyOfProject": "Финансијер пројекта",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isPublicationOfAuthor": "Публикација аутора",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.openAIREFunding": "Финансирање OpenAIRE API-ја",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isProjectOfPublication": "Пројекат",
+  "submission.sections.describe.relationship-lookup.title.isProjectOfPublication": "Пројекти",
+  "submission.sections.describe.relationship-lookup.title.isFundingAgencyOfProject": "Финансијер пројекта",
+  "submission.sections.describe.relationship-lookup.selection-tab.search-form.placeholder": "Претрага...",
+  "submission.sections.describe.relationship-lookup.selection-tab.tab-title": "Тренутни избор ({{ count }})",
+  "submission.sections.describe.relationship-lookup.title.isJournalIssueOfPublication": "Издања часописа",
+  "submission.sections.describe.relationship-lookup.title.JournalIssue": "Издања часописа",
+  "submission.sections.describe.relationship-lookup.title.isJournalVolumeOfPublication": "Свеске часописа",
+  "submission.sections.describe.relationship-lookup.title.JournalVolume": "Свеске часописа",
+  "submission.sections.describe.relationship-lookup.title.isJournalOfPublication": "Часописи",
+  "submission.sections.describe.relationship-lookup.title.isAuthorOfPublication": "Аутори",
+  "submission.sections.describe.relationship-lookup.title.isFundingAgencyOfPublication": "Финансијска агенција",
+  "submission.sections.describe.relationship-lookup.title.Project": "Пројекти",
+  "submission.sections.describe.relationship-lookup.title.Publication": "Публикације",
+  "submission.sections.describe.relationship-lookup.title.Person": "Аутори",
+  "submission.sections.describe.relationship-lookup.title.OrgUnit": "Организационе јединице",
+  "submission.sections.describe.relationship-lookup.title.DataPackage": "Пакети података",
+  "submission.sections.describe.relationship-lookup.title.DataFile": "Фајлови са подацима",
+  "submission.sections.describe.relationship-lookup.title.Funding Agency": "Финансијска агенција",
+  "submission.sections.describe.relationship-lookup.title.isFundingOfPublication": "Финансирање",
+  "submission.sections.describe.relationship-lookup.title.isChildOrgUnitOf": "Матична организациона јединица",
+  "submission.sections.describe.relationship-lookup.title.isPublicationOfAuthor": "Публикација",
+  "submission.sections.describe.relationship-lookup.search-tab.toggle-dropdown": "Укључите падајући мени",
+  "submission.sections.describe.relationship-lookup.selection-tab.settings": "Подешавања",
+  "submission.sections.describe.relationship-lookup.selection-tab.no-selection": "Ваш избор је тренутно празан.",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isAuthorOfPublication": "Изабрани аутори",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalOfPublication": "Изабрани часописи",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalVolumeOfPublication": "Изабрана свеска часописа",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.Project": "Изабрани пројекти",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.Publication": "Изабране публикације",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.Person": "Изабрани аутори",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.OrgUnit": "Изабране организационе јединице",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.DataPackage": "Изабрани пакети података",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.DataFile": "Изабрани фајлови са подацима",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.Journal": "Изабрани часописи",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalIssueOfPublication": "Изабрано издање",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.JournalVolume": "Изабрана свеска часописа",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isFundingAgencyOfPublication": "Изабрана финансијска агенција",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isFundingOfPublication": "Изабрано финансирање",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.JournalIssue": "Изабрано издање",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isChildOrgUnitOf": "Изабрана организациона јединица",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaJournal": "Резултати претраге",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaPublisher": "Резултати претраге",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.orcid": "Резултати претраге",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.orcidv2": "Резултати претраге",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.lcname": "Резултати претраге",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.pubmed": "Резултати претраге",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.arxiv": "Резултати претраге",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.crossref": "Резултати претраге",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.epo": "Резултати претраге",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.scopus": "Резултати претраге",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.scielo": "Резултати претраге",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.wos": "Резултати претраге",
+  "submission.sections.describe.relationship-lookup.selection-tab.title": "Резултати претраге",
+  "submission.sections.describe.relationship-lookup.name-variant.notification.content": "Да ли желите да сачувате \"{{ value }}\" као варијанту имена за ову особу да бисте ви и други могли да га поново користите за будуће слање? Ако то не урадите, и даље можете да га користите за овај поднесак.",
+  "submission.sections.describe.relationship-lookup.name-variant.notification.confirm": "Сачувајте нову варијанту имена",
+  "submission.sections.describe.relationship-lookup.name-variant.notification.decline": "Користи се само за овај поднесак",
+  "submission.sections.ccLicense.type": "Тип лиценце",
+  "submission.sections.ccLicense.select": "Изаберите тип лиценце…",
+  "submission.sections.ccLicense.change": "Промените тип лиценце…",
+  "submission.sections.ccLicense.none": "Нема доступних лиценци",
+  "submission.sections.ccLicense.option.select": "Изаберите опцију…",
+  "submission.sections.ccLicense.link": "Изабрали сте следећу лиценцу:",
+  "submission.sections.ccLicense.confirmation": "Додељујем лиценцу изнад",
+  "submission.sections.general.add-more": "Додајте још",
+  "submission.sections.general.cannot_deposit": "Пријава се не може довршити због грешака у обрасцу.<br>Попуните сва обавезна поља да бисте довршили пријаву.",
+  "submission.sections.general.collection": "Колекција",
+  "submission.sections.general.deposit_error_notice": "Дошло је до проблема приликом слања ставке, молимо покушајте поново касније.",
+  "submission.sections.general.deposit_success_notice": "Пријава је успешно поднета.",
+  "submission.sections.general.discard_error_notice": "Дошло је до проблема при одбацивању ставке, молимо покушајте поново касније.",
+  "submission.sections.general.discard_success_notice": "Слање је успешно одбачено.",
+  "submission.sections.general.metadata-extracted": "Нови метаподаци су издвојени и додати у одељак <strong>{{sectionId}}</strong>.",
+  "submission.sections.general.metadata-extracted-new-section": "Нови одељак <strong>{{sectionId}}</strong> је додат у пријаву.",
+  "submission.sections.general.no-collection": "Није пронађена колекција",
+  "submission.sections.general.no-sections": "Нема доступних опција",
+  "submission.sections.general.save_error_notice": "Дошло је до проблема приликом чувања ставке, молимо покушајте поново касније.",
+  "submission.sections.general.save_success_notice": "Пријава је успешно сачувана.",
+  "submission.sections.general.search-collection": "Потражите колекцију",
+  "submission.sections.general.sections_not_valid": "Постоје непотпуни одељци.",
+  "submission.sections.identifiers.info": "Следећи идентификатори ће бити креирани за вашу ставку:",
+  "submission.sections.identifiers.no_handle": "За ову ставку није везан Handle.",
+  "submission.sections.identifiers.no_doi": "Ниједан DOIs није везан за ову ставку.",
+  "submission.sections.identifiers.handle_label": "Handle:",
+  "submission.sections.identifiers.doi_label": "DOI:",
+  "submission.sections.identifiers.otherIdentifiers_label": "Остали идентификатори:",
+  "submission.sections.submit.progressbar.accessCondition": "Услови приступања ставки",
+  "submission.sections.submit.progressbar.CClicense": "Creative Commons лиценца",
+  "submission.sections.submit.progressbar.describe.recycle": "Рециклажа",
+  "submission.sections.submit.progressbar.describe.stepcustom": "Описати",
+  "submission.sections.submit.progressbar.describe.stepone": "Описати",
+  "submission.sections.submit.progressbar.describe.steptwo": "Описати",
+  "submission.sections.submit.progressbar.detect-duplicate": "Потенцијални дупликати",
+  "submission.sections.submit.progressbar.identifiers": "Идентификатори",
+  "submission.sections.submit.progressbar.license": "Дозвола за депозит",
+  "submission.sections.submit.progressbar.sherpapolicy": "SHERPA прописи",
+  "submission.sections.submit.progressbar.upload": "Додај фајлове",
+  "submission.sections.submit.progressbar.sherpaPolicies": "Информације о политици отвореног приступа издавача",
+  "submission.sections.sherpa-policy.title-empty": "Нема доступних информација о смерницама за издаваче. Ако ваш рад има придружени ISSN, унесите га изнад да бисте видели све повезане смернице отвореног приступа за издаваче.",
+  "submission.sections.status.errors.title": "Грешке",
+  "submission.sections.status.valid.title": "Важеће",
+  "submission.sections.status.warnings.title": "Упозорења",
+  "submission.sections.status.errors.aria": "Има грешке",
+  "submission.sections.status.valid.aria": "Важеће је",
+  "submission.sections.status.warnings.aria": "Има упозорења",
+  "submission.sections.status.info.title": "Додатне Информације",
+  "submission.sections.status.info.aria": "Додатне Информације",
+  "submission.sections.toggle.open": "Отвори одељак",
+  "submission.sections.toggle.close": "Затвори одељак",
+  "submission.sections.toggle.aria.open": "Проширите {{sectionHeader}} одељак",
+  "submission.sections.toggle.aria.close": "Скупите {{sectionHeader}} одељак",
+  "submission.sections.upload.delete.confirm.cancel": "Поништити, отказати",
+  "submission.sections.upload.delete.confirm.info": "Ова операција се не може опозвати. Јесте ли сигурни?",
+  "submission.sections.upload.delete.confirm.submit": "Да, сигуран сам",
+  "submission.sections.upload.delete.confirm.title": "Избришите битстрим",
+  "submission.sections.upload.delete.submit": "Избришите",
+  "submission.sections.upload.download.title": "Преузмите битстрим",
+  "submission.sections.upload.drop-message": "Спустите фајлове да бисте их приложили ставци",
+  "submission.sections.upload.edit.title": "Уредите битстрим",
+  "submission.sections.upload.form.access-condition-label": "Тип услова приступа",
+  "submission.sections.upload.form.access-condition-hint": "Изаберите услов приступа који ћете применити на битстрим када се ставка депонује",
+  "submission.sections.upload.form.date-required": "Датум је обавезан.",
+  "submission.sections.upload.form.date-required-from": "Обавезно одобрење приступа од датума.",
+  "submission.sections.upload.form.date-required-until": "Обавезно одобрење приступа до датума.",
+  "submission.sections.upload.form.from-label": "Одобрење приступа од",
+  "submission.sections.upload.form.from-hint": "Изаберите датум од кога се примењује одговарајући услов приступа",
+  "submission.sections.upload.form.from-placeholder": "Од",
+  "submission.sections.upload.form.group-label": "Група",
+  "submission.sections.upload.form.group-required": "Група је обавезна.",
+  "submission.sections.upload.form.until-label": "Одобрење приступа до",
+  "submission.sections.upload.form.until-hint": "Изаберите датум до којег се примењује одговарајући услов приступа",
+  "submission.sections.upload.form.until-placeholder": "Све док",
+  "submission.sections.upload.header.policy.default.nolist": "Отпремљени фајлови у колекцији {{collectionName}} биће доступне према следећим групама:",
+  "submission.sections.upload.header.policy.default.withlist": "Имајте на уму да ће отпремљени фајлови у колекцији {{collectionName}} бити доступни, поред онога што је изричито одлучено за један фајл, са следећим групама:",
+  "submission.sections.upload.info": "Овде ћете пронаћи све фајлове који се тренутно налазе у ставци. Можете да ажурирате метаподатке фајла и услове приступа или <strong> отпремите додатне фајлове тако што ћете их превући и отпустити било где на страници.</strong>",
+  "submission.sections.upload.no-entry": "Не",
+  "submission.sections.upload.no-file-uploaded": "Још увек није отпремљен ниједан фајл.",
+  "submission.sections.upload.save-metadata": "Сачувај метаподатке",
+  "submission.sections.upload.undo": "Поништити, отказати",
+  "submission.sections.upload.upload-failed": "Отпремање није успело",
+  "submission.sections.upload.upload-successful": "Отпремање је успешно",
+  "submission.sections.accesses.form.discoverable-description": "Када је означено, ова ставка ће бити видљива у претрази/прегледу. Када није означено, ставка ће бити доступна само преко директне везе и никада се неће појавити у претрази/прегледу.",
+  "submission.sections.accesses.form.discoverable-label": "Откривање",
+  "submission.sections.accesses.form.access-condition-label": "Тип услова приступа",
+  "submission.sections.accesses.form.access-condition-hint": "Изаберите услов приступа који ћете применити на ставку када се депонује",
+  "submission.sections.accesses.form.date-required": "Датум је обавезан.",
+  "submission.sections.accesses.form.date-required-from": "Обавезно одобрење приступа од датума.",
+  "submission.sections.accesses.form.date-required-until": "Обавезно одобрење приступа до датума.",
+  "submission.sections.accesses.form.from-label": "Одобрење приступа од",
+  "submission.sections.accesses.form.from-hint": "Изаберите датум од кога се примењује одговарајући услов приступа",
+  "submission.sections.accesses.form.from-placeholder": "Од",
+  "submission.sections.accesses.form.group-label": "Група",
+  "submission.sections.accesses.form.group-required": "Група је обавезна.",
+  "submission.sections.accesses.form.until-label": "Одобрење приступа до",
+  "submission.sections.accesses.form.until-hint": "Изаберите датум до којег се примењује одговарајући услов приступа",
+  "submission.sections.accesses.form.until-placeholder": "Све док",
+  "submission.sections.license.granted-label": "Потврђујем горе наведену лиценцу",
+  "submission.sections.license.required": "Морате прихватити лиценцу",
+  "submission.sections.license.notgranted": "Морате прихватити лиценцу",
+  "submission.sections.sherpa.publication.information": "Информације о публикацији",
+  "submission.sections.sherpa.publication.information.title": "Наслов",
+  "submission.sections.sherpa.publication.information.issns": "ISSN-ови",
+  "submission.sections.sherpa.publication.information.url": "URL",
+  "submission.sections.sherpa.publication.information.publishers": "Издавач",
+  "submission.sections.sherpa.publication.information.romeoPub": "Romeo Pub",
+  "submission.sections.sherpa.publication.information.zetoPub": "Zeto Pub",
+  "submission.sections.sherpa.publisher.policy": "Пропис за издаваче",
+  "submission.sections.sherpa.publisher.policy.description": "Информације у наставку су пронађене преко SherpaRomea. На основу смерница вашег издавача, он пружа савете о томе да ли је ембарго можда неопходан и/или које датотеке можете да отпремите. Ако имате питања, контактирајте свог администратора сајта путем обрасца за повратне информације у подножју.",
+  "submission.sections.sherpa.publisher.policy.openaccess": "Путеви отвореног приступа дозвољени политиком овог часописа наведени су у наставку према верзији чланка. Кликните на путању за детаљнији приказ",
+  "submission.sections.sherpa.publisher.policy.more.information": "За више информација погледајте следеће линкове:",
+  "submission.sections.sherpa.publisher.policy.version": "Верзија",
+  "submission.sections.sherpa.publisher.policy.embargo": "Ембарго",
+  "submission.sections.sherpa.publisher.policy.noembargo": "Нема ембарга",
+  "submission.sections.sherpa.publisher.policy.nolocation": "Ниједан",
+  "submission.sections.sherpa.publisher.policy.license": "Лиценца",
+  "submission.sections.sherpa.publisher.policy.prerequisites": "Предуслови",
+  "submission.sections.sherpa.publisher.policy.location": "Локација",
+  "submission.sections.sherpa.publisher.policy.conditions": "Услови",
+  "submission.sections.sherpa.publisher.policy.refresh": "Освежите",
+  "submission.sections.sherpa.record.information": "Запишите информацију",
+  "submission.sections.sherpa.record.information.id": "ID",
+  "submission.sections.sherpa.record.information.date.created": "Датум креирања",
+  "submission.sections.sherpa.record.information.date.modified": "Последња измена",
+  "submission.sections.sherpa.record.information.uri": "URI",
+  "submission.sections.sherpa.error.message": "Дошло је до грешке при преузимању SHERPA информација",
+  "submission.submit.breadcrumbs": "Нови поднесак",
+  "submission.submit.title": "Нови поднесак",
+  "submission.workflow.generic.delete": "Избришите",
+  "submission.workflow.generic.delete-help": "Изаберите ову опцију да бисте одбацили ову ставку. Затим ће бити затражено да то потврдите.",
+  "submission.workflow.generic.edit": "Уредите",
+  "submission.workflow.generic.edit-help": "Изаберите ову опцију да бисте променили метаподатке ставке.",
+  "submission.workflow.generic.view": "Погледајте",
+  "submission.workflow.generic.view-help": "Изаберите ову опцију да бисте видели метаподатке ставке.",
+  "submission.workflow.generic.submit_select_reviewer": "Изаберите рецензента",
+  "submission.workflow.generic.submit_select_reviewer-help": "изаберите помоћ рецензента",
+  "submission.workflow.generic.submit_score": "Оцена",
+  "submission.workflow.generic.submit_score-help": "резултат-помоћ",
+  "submission.workflow.tasks.claimed.approve": "Одобрити",
+  "submission.workflow.tasks.claimed.approve_help": "Ако сте прегледали ставку и ако је погодна за придруживање колекцији, изаберите \"Одобрити\".",
+  "submission.workflow.tasks.claimed.edit": "Изменити",
+  "submission.workflow.tasks.claimed.edit_help": "Изаберите ову опцију да бисте променили метаподатке ставке.",
+  "submission.workflow.tasks.claimed.decline": "Одбити",
+  "submission.workflow.tasks.claimed.decline_help": "одбити помоћ",
+  "submission.workflow.tasks.claimed.reject.reason.info": "Унесите разлог за одбијање пријаве у поље испод, наводећи да ли подносилац може да реши проблем и поново пошаље.",
+  "submission.workflow.tasks.claimed.reject.reason.placeholder": "Опишите разлог одбијања",
+  "submission.workflow.tasks.claimed.reject.reason.submit": "Одбаците ставку",
+  "submission.workflow.tasks.claimed.reject.reason.title": "Разлог",
+  "submission.workflow.tasks.claimed.reject.submit": "Одбити",
+  "submission.workflow.tasks.claimed.reject_help": "Ако сте прегледали ставку и утврдили да <strong>није</strong> прикладна за придруживање колекцији, изаберите \"Одбиј\". Од вас ће се затим тражити да унесете поруку која наводи зашто је ставка неприкладна и да ли подносилац треба нешто да промени и поново пошаље.",
+  "submission.workflow.tasks.claimed.return": "Повратак у групу",
+  "submission.workflow.tasks.claimed.return_help": "Вратите задатак у групу тако да други корисник може да изврши задатак.",
+  "submission.workflow.tasks.generic.error": "Дошло је до грешке у раду...",
+  "submission.workflow.tasks.generic.processing": "Обрада...",
+  "submission.workflow.tasks.generic.submitter": "Подносилац",
+  "submission.workflow.tasks.generic.success": "Операција успела",
+  "submission.workflow.tasks.pool.claim": "Потраживање",
+  "submission.workflow.tasks.pool.claim_help": "Доделите овај задатак себи.",
+  "submission.workflow.tasks.pool.hide-detail": "Сакрити детаље",
+  "submission.workflow.tasks.pool.show-detail": "Приказати детаље",
+  "submission.workspace.generic.view": "Погледати",
+  "submission.workspace.generic.view-help": "Изаберите ову опцију да бисте видели метаподатке ставке.",
+  "submitter.empty": "N/A",
+  "subscriptions.title": "Претплате",
+  "subscriptions.item": "Претплате на ставке",
+  "subscriptions.collection": "Претплате на колекције",
+  "subscriptions.community": "Претплате за заједнице",
+  "subscriptions.subscription_type": "Врста претплате",
+  "subscriptions.frequency": "Учесталост претплате",
+  "subscriptions.frequency.D": "Дневно",
+  "subscriptions.frequency.M": "Месечно",
+  "subscriptions.frequency.W": "Недељно",
+  "subscriptions.tooltip": "Претплатити се",
+  "subscriptions.modal.title": "Претплате",
+  "subscriptions.modal.type-frequency": "Врста и учесталост",
+  "subscriptions.modal.close": "Затворити",
+  "subscriptions.modal.delete-info": "Да бисте уклонили ову претплату, молимо посетите страницу \"Претплате\" испод вашег корисничког профила",
+  "subscriptions.modal.new-subscription-form.type.content": "Садржај",
+  "subscriptions.modal.new-subscription-form.frequency.D": "Дневно",
+  "subscriptions.modal.new-subscription-form.frequency.W": "Недељно",
+  "subscriptions.modal.new-subscription-form.frequency.M": "Месечно",
+  "subscriptions.modal.new-subscription-form.submit": "Поднеси",
+  "subscriptions.modal.new-subscription-form.processing": "Обрада...",
+  "subscriptions.modal.create.success": "Успешно сте претплаћени на {{ type }}.",
+  "subscriptions.modal.delete.success": "Претплата је успешно избрисана",
+  "subscriptions.modal.update.success": "Претплата на {{ type }} је успешно ажурирана",
+  "subscriptions.modal.create.error": "Дошло је до грешке током креирања претплате",
+  "subscriptions.modal.delete.error": "Дошло је до грешке током брисања претплате",
+  "subscriptions.modal.update.error": "Дошло је до грешке током ажурирања претплате",
+  "subscriptions.table.dso": "Предмет",
+  "subscriptions.table.subscription_type": "Врста претплате",
+  "subscriptions.table.subscription_frequency": "Учесталост претплате",
+  "subscriptions.table.action": "Поступак",
+  "subscriptions.table.edit": "Изменити",
+  "subscriptions.table.delete": "Избрисати",
+  "subscriptions.table.not-available": "Није доступно",
+  "subscriptions.table.not-available-message": "Претплаћена ставка је избрисана или тренутно немате дозволу да је видите",
+  "subscriptions.table.empty.message": "Тренутно немате ниједну претплату. Да бисте се претплатили на ажурирања путем емаил-а за заједницу или колекцију, користите дугме за претплату на страници објекта.",
+  "thumbnail.default.alt": "Умањена слика",
+  "thumbnail.default.placeholder": "Нема доступних умањених слика",
+  "thumbnail.project.alt": "Лого пројекта",
+  "thumbnail.project.placeholder": "Слика референта пројекта",
+  "thumbnail.orgunit.alt": "Лого организационе јединице",
+  "thumbnail.orgunit.placeholder": "Слика референта организационе јединице",
+  "thumbnail.person.alt": "Профилна слика",
+  "thumbnail.person.placeholder": "Слика профила није доступна",
+  "title": "DSpace",
+  "vocabulary-treeview.header": "Приказ хијерархијског стабла",
+  "vocabulary-treeview.load-more": "Учитати још",
+  "vocabulary-treeview.search.form.reset": "Ресетовати",
+  "vocabulary-treeview.search.form.search": "Претрага",
+  "vocabulary-treeview.search.no-result": "Није било ставки за приказ",
+  "vocabulary-treeview.tree.description.nsi": "The Norwegian Science Index",
+  "vocabulary-treeview.tree.description.srsc": "Категорије предмета истраживања",
+  "vocabulary-treeview.info": "Изаберите тему коју желите да додате као филтер за претрагу",
+  "uploader.browse": "претражи",
+  "uploader.drag-message": "Превуците и ставите своје фајлове овде",
+  "uploader.delete.btn-title": "Обриши",
+  "uploader.or": ", или",
+  "uploader.processing": "Обрада отпремљених фајлова... (сада је безбедно затворити ову страницу)",
+  "uploader.queue-length": "Дужина реда",
+  "virtual-metadata.delete-item.info": "Изаберите типове за које желите да сачувате виртуелне метаподатке као стварне метаподатке",
+  "virtual-metadata.delete-item.modal-head": "Виртуелни метаподаци ове релације",
+  "virtual-metadata.delete-relationship.modal-head": "Изаберите ставке за које желите да сачувате виртуелне метаподатке као стварне метаподатке",
+  "supervisedWorkspace.search.results.head": "Надзиране ставке",
+  "workspace.search.results.head": "Ваши поднесци",
+  "workflowAdmin.search.results.head": "Управљање радним процесом",
+  "workflow.search.results.head": "Радни задаци",
+  "supervision.search.results.head": "Задаци радног процеса и радног простора",
+  "workflow-item.edit.breadcrumbs": "Измена ставке радног процеса",
+  "workflow-item.edit.title": "Измена ставке радног процеса",
+  "workflow-item.delete.notification.success.title": "Избрисано",
+  "workflow-item.delete.notification.success.content": "Ова ставка радног процеса је успешно избрисана",
+  "workflow-item.delete.notification.error.title": "Нешто није у реду",
+  "workflow-item.delete.notification.error.content": "Није могуће избрисати ставку процеса рада",
+  "workflow-item.delete.title": "Избришите ставку радног процеса",
+  "workflow-item.delete.header": "Избришите ставку радног процеса",
+  "workflow-item.delete.button.cancel": "Поништити, отказати",
+  "workflow-item.delete.button.confirm": "Избришите",
+  "workflow-item.send-back.notification.success.title": "Враћено подносиоцу",
+  "workflow-item.send-back.notification.success.content": "Ова ставка радног процеса је успешно враћена подносиоцу",
+  "workflow-item.send-back.notification.error.title": "Нешто није у реду",
+  "workflow-item.send-back.notification.error.content": "Ставка радног процеса није могла да се врати подносиоцу",
+  "workflow-item.send-back.title": "Вратите ставку радног процеса подносиоцу",
+  "workflow-item.send-back.header": "Вратите ставку радног процеса подносиоцу",
+  "workflow-item.send-back.button.cancel": "Поништити, отказати",
+  "workflow-item.send-back.button.confirm": "Вратити",
+  "workflow-item.view.breadcrumbs": "Приказ радног процеса",
+  "workspace-item.view.breadcrumbs": "Приказ радног простора",
+  "workspace-item.view.title": "Приказ радног простора",
+  "workspace-item.delete.breadcrumbs": "Избришите радни простор",
+  "workspace-item.delete.header": "Избришите ставку радног простора",
+  "workspace-item.delete.button.confirm": "Избришите",
+  "workspace-item.delete.button.cancel": "Поништити, отказати",
+  "workspace-item.delete.notification.success.title": "Избрисан",
+  "workspace-item.delete.title": "Ова ставка радног простора је успешно избрисана",
+  "workspace-item.delete.notification.error.title": "Нешто није у реду",
+  "workspace-item.delete.notification.error.content": "Није могуће избрисати ставку радног простора",
+  "workflow-item.advanced.title": "Напредни радни процес",
+  "workflow-item.selectrevieweraction.notification.success.title": "Изабрани рецензент",
+  "workflow-item.selectrevieweraction.notification.success.content": "Рецензент за ову ставку радног процеса је успешно изабран",
+  "workflow-item.selectrevieweraction.notification.error.title": "Нешто није у реду",
+  "workflow-item.selectrevieweraction.notification.error.content": "Није могуће изабрати рецензента за ову ставку радног процеса",
+  "workflow-item.selectrevieweraction.title": "Изаберите рецензента",
+  "workflow-item.selectrevieweraction.header": "Изаберите рецензента",
+  "workflow-item.selectrevieweraction.button.cancel": "Поништити, отказати",
+  "workflow-item.selectrevieweraction.button.confirm": "Потврдите",
+  "workflow-item.scorereviewaction.notification.success.title": "Оцена прегледа",
+  "workflow-item.scorereviewaction.notification.success.content": "Оцена за ову ставку радног процеса је успешно послата",
+  "workflow-item.scorereviewaction.notification.error.title": "Нешто није у реду",
+  "workflow-item.scorereviewaction.notification.error.content": "Није могуће оценити ову ставку",
+  "workflow-item.scorereviewaction.title": "Оцените ову ставку",
+  "workflow-item.scorereviewaction.header": "Оцените ову ставку",
+  "workflow-item.scorereviewaction.button.cancel": "Поништити, отказати",
+  "workflow-item.scorereviewaction.button.confirm": "Потврдите",
+  "idle-modal.header": "Сесија ускоро истиче",
+  "idle-modal.info": "Из безбедносних разлога, корисничке сесије истичу после {{ timeToExpire }} минута неактивности. Ваша сесија ускоро истиче. Да ли желите да продужите или да се одјавите?",
+  "idle-modal.log-out": "Одјавити се",
+  "idle-modal.extend-session": "Продужите сесију",
+  "researcher.profile.action.processing": "Обрада...",
+  "researcher.profile.associated": "Повезани профил истраживача",
+  "researcher.profile.change-visibility.fail": "Дошло је до неочекиване грешке приликом промене видљивости профила",
+  "researcher.profile.create.new": "Креирај нови",
+  "researcher.profile.create.success": "Профил истраживача је успешно креиран",
+  "researcher.profile.create.fail": "Дошло је до грешке током креирања профила истраживача",
+  "researcher.profile.delete": "Избришите",
+  "researcher.profile.expose": "Излагање",
+  "researcher.profile.hide": "Сакријте",
+  "researcher.profile.not.associated": "Профил истраживача још није повезан",
+  "researcher.profile.view": "Поглед",
+  "researcher.profile.private.visibility": "ПРИВАТНО",
+  "researcher.profile.public.visibility": "ЈАВНО",
+  "researcher.profile.status": "Статус:",
+  "researcherprofile.claim.not-authorized": "Нисте овлашћени да потврдите ову ставку. За више детаља контактирајте администратора(е).",
+  "researcherprofile.error.claim.body": "Дошло је до грешке при потврђивању профила, молимо вас покушајте поново касније",
+  "researcherprofile.error.claim.title": "Грешка",
+  "researcherprofile.success.claim.body": "Профил је успешно потврђен",
+  "researcherprofile.success.claim.title": "Успешно",
+  "person.page.orcid.create": "Креирајте ORCID ID",
+  "person.page.orcid.granted-authorizations": "Одобрена овлашћења",
+  "person.page.orcid.grant-authorizations": "Одобрите овлашћења",
+  "person.page.orcid.link": "Повежите се на ORCID ID",
+  "person.page.orcid.link.processing": "Повезивање профила са ORCID-ом...",
+  "person.page.orcid.link.error.message": "Нешто је пошло наопако при повезивању профила са ORCID-ом. Ако се проблем и даље јавља, контактирајте администратора.",
+  "person.page.orcid.orcid-not-linked-message": "ORCID ID овог профила ({{ orcid }}) још увек није повезан са налогом у ORCID регистру или је веза истекла.",
+  "person.page.orcid.unlink": "Прекините везу са ORCID-ом",
+  "person.page.orcid.unlink.processing": "Обрада...",
+  "person.page.orcid.missing-authorizations": "Недостају овлашћења",
+  "person.page.orcid.missing-authorizations-message": "Недостају следећа овлашћења:",
+  "person.page.orcid.no-missing-authorizations-message": "Дивно! Ово поље је празно, тако да сте одобрили сва права приступа за коришћење свих функција које нуди ваша институција.",
+  "person.page.orcid.no-orcid-message": "Још увек није повезан ORCID ID. Кликом на дугме испод могуће је повезати овај профил са ORCID налогом.",
+  "person.page.orcid.profile-preferences": "Приоритети профила",
+  "person.page.orcid.funding-preferences": "Приоритети финансирања",
+  "person.page.orcid.publications-preferences": "Приоритети публикације",
+  "person.page.orcid.remove-orcid-message": "Ако треба да уклоните свој ORCID, контактирајте администратора репозиторијума",
+  "person.page.orcid.save.preference.changes": "Подешавања ажурирања",
+  "person.page.orcid.sync-profile.affiliation": "Припадност",
+  "person.page.orcid.sync-profile.biographical": "Биографски подаци",
+  "person.page.orcid.sync-profile.education": "Образовање",
+  "person.page.orcid.sync-profile.identifiers": "Идентификатори",
+  "person.page.orcid.sync-fundings.all": "Сва средства",
+  "person.page.orcid.sync-fundings.mine": "Моја средства",
+  "person.page.orcid.sync-fundings.my_selected": "Одабрана средства",
+  "person.page.orcid.sync-fundings.disabled": "Онемогућено",
+  "person.page.orcid.sync-publications.all": "Све публикације",
+  "person.page.orcid.sync-publications.mine": "Моје публикације",
+  "person.page.orcid.sync-publications.my_selected": "Изабране публикације",
+  "person.page.orcid.sync-publications.disabled": "Онемогућено",
+  "person.page.orcid.sync-queue.discard": "Одбаците промену и немојте да се синхронизујете са ORCID регистром",
+  "person.page.orcid.sync-queue.discard.error": "Одбацивање записа ORCID реда није успело",
+  "person.page.orcid.sync-queue.discard.success": "Запис ORCID реда је успешно одбачен",
+  "person.page.orcid.sync-queue.empty-message": "Запис ORCID регистра је празан",
+  "person.page.orcid.sync-queue.table.header.type": "Тип",
+  "person.page.orcid.sync-queue.table.header.description": "Опис",
+  "person.page.orcid.sync-queue.table.header.action": "Поступак",
+  "person.page.orcid.sync-queue.description.affiliation": "Припадности",
+  "person.page.orcid.sync-queue.description.country": "Држава",
+  "person.page.orcid.sync-queue.description.education": "Образовања",
+  "person.page.orcid.sync-queue.description.external_ids": "Спољашњи ID",
+  "person.page.orcid.sync-queue.description.other_names": "Друга имена",
+  "person.page.orcid.sync-queue.description.qualification": "Квалификације",
+  "person.page.orcid.sync-queue.description.researcher_urls": "URL-ови истраживача",
+  "person.page.orcid.sync-queue.description.keywords": "Кључне речи",
+  "person.page.orcid.sync-queue.tooltip.insert": "Додајте нови унос у ORCID регистар",
+  "person.page.orcid.sync-queue.tooltip.update": "Ажурирајте овај унос у ORCID регистру",
+  "person.page.orcid.sync-queue.tooltip.delete": "Уклоните овај унос из ORCID регистра",
+  "person.page.orcid.sync-queue.tooltip.publication": "Публикација",
+  "person.page.orcid.sync-queue.tooltip.project": "Пројекат",
+  "person.page.orcid.sync-queue.tooltip.affiliation": "Припадност",
+  "person.page.orcid.sync-queue.tooltip.education": "Образовање",
+  "person.page.orcid.sync-queue.tooltip.qualification": "Квалификација",
+  "person.page.orcid.sync-queue.tooltip.other_names": "Друго име",
+  "person.page.orcid.sync-queue.tooltip.country": "Држава",
+  "person.page.orcid.sync-queue.tooltip.keywords": "Кључна реч",
+  "person.page.orcid.sync-queue.tooltip.external_ids": "Спољашњи идентификатор",
+  "person.page.orcid.sync-queue.tooltip.researcher_urls": "URL истраживача",
+  "person.page.orcid.sync-queue.send": "Синхронизација са ORCID регистром",
+  "person.page.orcid.sync-queue.send.unauthorized-error.title": "Приступање ORCID-у није успело због недостајућих овлашћења.",
+  "person.page.orcid.sync-queue.send.unauthorized-error.content": "Кликните <a href='{{orcid}}'>овде</a> да поново доделите потребне дозволе. Ако се проблем настави, контактирајте администратора",
+  "person.page.orcid.sync-queue.send.bad-request-error": "Слање ORCID-у није успело јер ресурс послат у ORCID регистар није важећи",
+  "person.page.orcid.sync-queue.send.error": "Слање ORCID-у није успело",
+  "person.page.orcid.sync-queue.send.conflict-error": "Слање ORCID-у није успело јер се ресурс већ налази у ORCID регистру",
+  "person.page.orcid.sync-queue.send.not-found-warning": "Ресурс се више не налази у ORCID регистру.",
+  "person.page.orcid.sync-queue.send.success": "Слање ORCID-у је успешно завршено",
+  "person.page.orcid.sync-queue.send.validation-error": "Подаци које желите да синхронизујете са ORCID-ом нису исправни",
+  "person.page.orcid.sync-queue.send.validation-error.amount-currency.required": "Валута је обавезна",
+  "person.page.orcid.sync-queue.send.validation-error.external-id.required": "Ресурс који се шаље захтева најмање један идентификатор",
+  "person.page.orcid.sync-queue.send.validation-error.title.required": "Наслов је обавезан",
+  "person.page.orcid.sync-queue.send.validation-error.type.required": "dc.type је обавезан",
+  "person.page.orcid.sync-queue.send.validation-error.start-date.required": "Датум почетка је обавезан",
+  "person.page.orcid.sync-queue.send.validation-error.funder.required": "Финансијер је неопходан",
+  "person.page.orcid.sync-queue.send.validation-error.country.invalid": "Неважеће 2 цифре ISO 3166 земља",
+  "person.page.orcid.sync-queue.send.validation-error.organization.required": "Потребна је организација",
+  "person.page.orcid.sync-queue.send.validation-error.organization.name-required": "Назив организације је обавезан",
+  "person.page.orcid.sync-queue.send.validation-error.publication.date-invalid": "Датум објављивања мора бити годину дана после 1900. године",
+  "person.page.orcid.sync-queue.send.validation-error.organization.address-required": "Организација захтева адресу",
+  "person.page.orcid.sync-queue.send.validation-error.organization.city-required": "Адреса организације која се шаље захтева град",
+  "person.page.orcid.sync-queue.send.validation-error.organization.country-required": "Адреса организације која се шаље захтева важеће 2 цифре ISO 3166 земље",
+  "person.page.orcid.sync-queue.send.validation-error.disambiguated-organization.required": "Потребан је идентификатор за недвосмисленост организација. Подржани ID-ови су GRID, Ringgold, Legal Entity identifiers (LEIs) и Crossref Funder Registry identifiers",
+  "person.page.orcid.sync-queue.send.validation-error.disambiguated-organization.value-required": "Идентификатори организације захтевају вредност",
+  "person.page.orcid.sync-queue.send.validation-error.disambiguation-source.required": "Идентификаторима организације је потребан извор",
+  "person.page.orcid.sync-queue.send.validation-error.disambiguation-source.invalid": "Извор једног од идентификатора организације је неважећи. Подржани извори су RINGGOLD, GRID, LEI и FUNDREF",
+  "person.page.orcid.synchronization-mode": "Начин синхронизације",
+  "person.page.orcid.synchronization-mode.batch": "Batch",
+  "person.page.orcid.synchronization-mode.label": "Начин синхронизације",
+  "person.page.orcid.synchronization-mode-message": "Молимо изаберите како желите да се синхронизација са ORCID-ом одвија. Опције укључују \"Manual\" (морате ручно да пошаљете своје податке ORCID-у) или \"Batch\" (систем ће послати ваше податке ORCID-у преко планиране скрипте).",
+  "person.page.orcid.synchronization-mode-funding-message": "Изаберите да ли желите да пошаљете ваше повезане ентитете пројекта на листу информација о финансирању вашег ORCID записа.",
+  "person.page.orcid.synchronization-mode-publication-message": "Изаберите да ли желите да пошаљете ваше повезане ентитете публикације на листу радова вашег ORCID записа.",
+  "person.page.orcid.synchronization-mode-profile-message": "Изаберите да ли желите да пошаљете ваше биографске податке или личне идентификаторе у ваш ORCID запис.",
+  "person.page.orcid.synchronization-settings-update.success": "Подешавања синхронизације су успешно ажурирана",
+  "person.page.orcid.synchronization-settings-update.error": "Ажурирање подешавања синхронизације није успело",
+  "person.page.orcid.synchronization-mode.manual": "Упутство",
+  "person.page.orcid.scope.authenticate": "Преузмите свој ORCID ID",
+  "person.page.orcid.scope.read-limited": "Читајте своје информације уз видљивост подешену на Поуздане стране",
+  "person.page.orcid.scope.activities-update": "Додајте/ажурирајте ваше истраживачке активности",
+  "person.page.orcid.scope.person-update": "Додајте/ажурирајте друге информације о себи",
+  "person.page.orcid.unlink.success": "Прекид везе између профила и ORCID регистра је био успешан",
+  "person.page.orcid.unlink.error": "Дошло је до грешке приликом прекида везе између профила и ORCID регистра. Покушајте поново",
+  "person.orcid.sync.setting": "ORCID подешавања синхронизације",
+  "person.orcid.registry.queue": "ORCID Registry Queue",
+  "person.orcid.registry.auth": "ORCID овлашћења",
+  "home.recent-submissions.head": "Недавни поднесци",
+  "listable-notification-object.default-message": "Није могуће преузети овај објекат",
+  "system-wide-alert-banner.retrieval.error": "Нешто није у реду при преузимању банера системског упозорења",
+  "system-wide-alert-banner.countdown.prefix": "У",
+  "system-wide-alert-banner.countdown.days": "{{days}} дан(и),",
+  "system-wide-alert-banner.countdown.hours": "{{hours}} сат(и) и",
+  "system-wide-alert-banner.countdown.minutes": "{{minutes}} минут(и):",
+  "menu.section.system-wide-alert": "Системско упозорење",
+  "system-wide-alert.form.header": "Системско упозорење",
+  "system-wide-alert-form.retrieval.error": "Нешто није у реду при преузимању системског упозорења",
+  "system-wide-alert.form.cancel": "Отказати",
+  "system-wide-alert.form.save": "Сачувати",
+  "system-wide-alert.form.label.active": "АКТИВНО",
+  "system-wide-alert.form.label.inactive": "НЕАКТИВНО",
+  "system-wide-alert.form.error.message": "Системско упозорење мора садржати поруку",
+  "system-wide-alert.form.label.message": "Порука упозорења",
+  "system-wide-alert.form.label.countdownTo.enable": "Укључите временско одбројавање",
+  "system-wide-alert.form.label.countdownTo.hint": "Савет: Подесите тајмер за одбројавање. Када је укључен, датум се може подесити у будућности и банер системског упозорења ће извршити одбројавање до постављеног датума. Када тајмер заврши, нестаће из упозорења. Сервер НЕЋЕ бити аутоматски заустављен.",
+  "system-wide-alert.form.label.preview": "Преглед системског упозорења",
+  "system-wide-alert.form.update.success": "Системско упозорење је успешно ажурирано",
+  "system-wide-alert.form.update.error": "Нешто није у реду са ажурирањем системског упозорења",
+  "system-wide-alert.form.create.success": "Системско упозорење је успешно креирано",
+  "system-wide-alert.form.create.error": "Нешто није у реду са креирањем системског упозорења",
+  "admin.system-wide-alert.breadcrumbs": "Системска упозорења",
+  "admin.system-wide-alert.title": "Системска упозорења",
+  "item-access-control-title": "Овај образац вам омогућава да извршите промене услова приступа метаподацима ставке или њеним битстрим-овима.",
+  "collection-access-control-title": "Овај образац вам омогућава да извршите измене услова приступа свим ставкама ове колекције. Промене могу да се изврше или на свим метаподацима ставке или на целом садржају (битстрим-ова).",
+  "community-access-control-title": "Овај образац вам омогућава да извршите промене услова приступа свим ставкама било које колекције у овој заједници. Промене могу да се изврше или на свим метаподацима ставке или на целом садржају (битстрим-ова).",
+  "access-control-item-header-toggle": "Метаподаци ставке",
+  "access-control-bitstream-header-toggle": "битстрим-ови",
+  "access-control-mode": "Начин",
+  "access-control-access-conditions": "Услови приступа",
+  "access-control-no-access-conditions-warning-message": "Тренутно нису наведени услови приступа испод. Ако се изврши, то ће заменити тренутне услове приступа подразумеваним условима приступа наслеђеним из власничке колекције.",
+  "access-control-replace-all": "Замена услова приступа",
+  "access-control-add-to-existing": "Додати постојећим",
+  "access-control-limit-to-specific": "Ограничите промене на одређене битстрим-ове",
+  "access-control-process-all-bitstreams": "Ажурирајте све битстрим-ове у ставци",
+  "access-control-bitstreams-selected": "изабрани битстрим-ови",
+  "access-control-cancel": "Отказати",
+  "access-control-execute": "Извршити",
+  "access-control-add-more": "Додати још",
+  "access-control-select-bitstreams-modal.title": "Изаберите битстрим-ове",
+  "access-control-select-bitstreams-modal.no-items": "Нема ставки за приказ.",
+  "access-control-select-bitstreams-modal.close": "Затворити",
+  "access-control-option-label": "Врста услова приступа",
+  "access-control-option-note": "Изаберите услов приступа који ћете применити на изабране објекте.",
+  "access-control-option-start-date": "Приступ одобрен од",
+  "access-control-option-start-date-note": "Изаберите датум од којег се примењује одговарајући услов приступа",
+  "access-control-option-end-date": "Приступ одобрен до",
+  "access-control-option-end-date-note": "Изаберите датум до којег се примењује одговарајући услов приступа",
+}
diff --git a/src/assets/i18n/sr-lat.json5 b/src/assets/i18n/sr-lat.json5
new file mode 100644
index 0000000000..38faa7aa18
--- /dev/null
+++ b/src/assets/i18n/sr-lat.json5
@@ -0,0 +1,2619 @@
+{
+  // Initial version provided by University of Kragujevac, Serbia 2023.
+  "401.help": "Niste ovlašćeni da pristupite ovoj stranici. Možete koristiti dugme ispod da se vratite na početnu stranicu.",
+  "401.link.home-page": "Odvedi me na početnu stranicu",
+  "401.unauthorized": "Neovlašćen pristup",
+  "403.help": "Nemate dozvolu da pristupite ovoj stranici. Možete koristiti dugme ispod da se vratite na početnu stranicu.",
+  "403.link.home-page": "Odvedi me na početnu stranicu",
+  "403.forbidden": "Zabranjen pristup",
+  "500.page-internal-server-error": "Usluga nije dostupna",
+  "500.help": "Server privremeno nije u mogućnosti da servisira vaš zahtev zbog zastoja u održavanju ili problema sa kapacitetom. Pokušajte ponovo kasnije.",
+  "500.link.home-page": "Odvedi me na početnu stranicu",
+  "404.help": "Ne možemo da pronađemo stranicu koju tražite. Stranica je možda premeštena ili izbrisana. Možete koristiti dugme ispod da se vratite na početnu stranicu.",
+  "404.link.home-page": "Odvedi me na početnu stranicu",
+  "404.page-not-found": "Stranica nije pronađena",
+  "error-page.description.401": "Neovlašćen pristup",
+  "error-page.description.403": "Zabranjen pristup",
+  "error-page.description.500": "Usluga nije dostupna",
+  "error-page.description.404": "Stranica nije pronađena",
+  "error-page.orcid.generic-error": "Došlo je do greške prilikom prijavljivanja preko ORCID-a. Uverite se da ste podelili imejl adresu svog ORCID naloga sa DSpace-om. Ako greška i dalje postoji, kontaktirajte administratora",
+  "access-status.embargo.listelement.badge": "Embargo",
+  "access-status.metadata.only.listelement.badge": "Samo metapodaci",
+  "access-status.open.access.listelement.badge": "Otvoren pristup",
+  "access-status.restricted.listelement.badge": "Ograničen pristup",
+  "access-status.unknown.listelement.badge": "Nepoznato",
+  "admin.curation-tasks.breadcrumbs": "Zadaci kuriranja sistema",
+  "admin.curation-tasks.title": "Zadaci kuriranja sistema",
+  "admin.curation-tasks.header": "Zadaci kuriranja sistema",
+  "admin.registries.bitstream-formats.breadcrumbs": "Formatirajte registar",
+  "admin.registries.bitstream-formats.create.breadcrumbs": "Format bitstream-a",
+  "admin.registries.bitstream-formats.create.failure.content": "Došlo je do greške pri kreiranju novog formata bitstream-a.",
+  "admin.registries.bitstream-formats.create.failure.head": "Neuspešno",
+  "admin.registries.bitstream-formats.create.head": "Kreirajte format bitstream-a",
+  "admin.registries.bitstream-formats.create.new": "Dodajte novi format bitstream-a",
+  "admin.registries.bitstream-formats.create.success.content": "Novi format bitstrim-a je uspešno kreiran.",
+  "admin.registries.bitstream-formats.create.success.head": "Uspešno",
+  "admin.registries.bitstream-formats.delete.failure.amount": "Uklanjanje {{ amount }} formata nije uspelo",
+  "admin.registries.bitstream-formats.delete.failure.head": "Neuspešno",
+  "admin.registries.bitstream-formats.delete.success.amount": "Uspešno uklonjen {{ amount }} format",
+  "admin.registries.bitstream-formats.delete.success.head": "Uspešno",
+  "admin.registries.bitstream-formats.description": "Ova lista formata bitstream-a pruža informacije o poznatim formatima i nivou njihove podrške.",
+  "admin.registries.bitstream-formats.edit.breadcrumbs": "Format bitstream-a",
+  "admin.registries.bitstream-formats.edit.description.hint": "",
+  "admin.registries.bitstream-formats.edit.description.label": "Opis",
+  "admin.registries.bitstream-formats.edit.extensions.hint": "Ekstenzije su ekstenzije fajlova koje se koriste za automatsku identifikaciju formata otpremljenih fajlova. Možete da unesete nekoliko ekstenzija za svaki format.",
+  "admin.registries.bitstream-formats.edit.extensions.label": "Ekstenzije fajlova",
+  "admin.registries.bitstream-formats.edit.extensions.placeholder": "Unesite ekstenziju fajla bez tačke",
+  "admin.registries.bitstream-formats.edit.failure.content": "Došlo je do greške pri uređivanju formata bitstream-a",
+  "admin.registries.bitstream-formats.edit.failure.head": "Neuspešno",
+  "admin.registries.bitstream-formats.edit.head": "Format bitstream-a: {{ format }}",
+  "admin.registries.bitstream-formats.edit.internal.hint": "Formati označeni kao interni su skriveni od korisnika i koriste se u administrativne svrhe.",
+  "admin.registries.bitstream-formats.edit.internal.label": "Unutrašnje",
+  "admin.registries.bitstream-formats.edit.mimetype.hint": "MIME tip povezan sa ovim formatom ne mora biti jedinstven.",
+  "admin.registries.bitstream-formats.edit.mimetype.label": "MIME tip",
+  "admin.registries.bitstream-formats.edit.shortDescription.hint": "Jedinstveno ime za ovaj format, (npr. Microsoft Word XP ili Microsoft Word 2000)",
+  "admin.registries.bitstream-formats.edit.shortDescription.label": "Ime",
+  "admin.registries.bitstream-formats.edit.success.content": "Format bitstream-a je uspešno izmenjen.",
+  "admin.registries.bitstream-formats.edit.success.head": "Uspešno",
+  "admin.registries.bitstream-formats.edit.supportLevel.hint": "Nivo podrške koju vaša institucija obećava za ovaj format.",
+  "admin.registries.bitstream-formats.edit.supportLevel.label": "Nivo podrške",
+  "admin.registries.bitstream-formats.head": "Registar formata bitstream-a",
+  "admin.registries.bitstream-formats.no-items": "Nema formata bitova za prikaz.",
+  "admin.registries.bitstream-formats.table.delete": "Izbriši izabrano",
+  "admin.registries.bitstream-formats.table.deselect-all": "Poništite sve",
+  "admin.registries.bitstream-formats.table.internal": "Unutrašnje",
+  "admin.registries.bitstream-formats.table.mimetype": "MIME tip",
+  "admin.registries.bitstream-formats.table.name": "Ime",
+  "admin.registries.bitstream-formats.table.id": "ID",
+  "admin.registries.bitstream-formats.table.return": "Nazad",
+  "admin.registries.bitstream-formats.table.supportLevel.KNOWN": "Poznato",
+  "admin.registries.bitstream-formats.table.supportLevel.SUPPORTED": "Podržano",
+  "admin.registries.bitstream-formats.table.supportLevel.UNKNOWN": "Nepoznato",
+  "admin.registries.bitstream-formats.table.supportLevel.head": "Nivo podrške",
+  "admin.registries.bitstream-formats.title": "Registar formata bitstream-a",
+  "admin.registries.metadata.breadcrumbs": "Registar metapodataka",
+  "admin.registries.metadata.description": "Registar metapodataka održava listu svih polja metapodataka dostupnih u spremištu. Ova polja mogu biti podeljena na više šema. Međutim, DSpace zahteva kvalifikovanu Dublin Core šemu",
+  "admin.registries.metadata.form.create": "Kreirajte šemu metapodataka",
+  "admin.registries.metadata.form.edit": "Uredite šemu metapodataka",
+  "admin.registries.metadata.form.name": "Ime",
+  "admin.registries.metadata.form.namespace": "Prostor imena",
+  "admin.registries.metadata.head": "Registar metapodataka",
+  "admin.registries.metadata.schemas.no-items": "Nema šema metapodataka za prikaz.",
+  "admin.registries.metadata.schemas.table.delete": "Izbriši izabrano",
+  "admin.registries.metadata.schemas.table.id": "ID",
+  "admin.registries.metadata.schemas.table.name": "Ime",
+  "admin.registries.metadata.schemas.table.namespace": "Prostor imena",
+  "admin.registries.metadata.title": "Registar metapodataka",
+  "admin.registries.schema.breadcrumbs": "Šema metapodataka",
+  "admin.registries.schema.description": "Ovo je šema metapodataka za \"{{namespace}}\".",
+  "admin.registries.schema.fields.head": "Polja metapodataka šeme",
+  "admin.registries.schema.fields.no-items": "Nema polja metapodataka za prikaz.",
+  "admin.registries.schema.fields.table.delete": "Izbriši izabrano",
+  "admin.registries.schema.fields.table.field": "Polje",
+  "admin.registries.schema.fields.table.id": "ID",
+  "admin.registries.schema.fields.table.scopenote": "Scope napomena",
+  "admin.registries.schema.form.create": "Kreirajte polje za metapodatke",
+  "admin.registries.schema.form.edit": "Izmenite polje za metapodatke",
+  "admin.registries.schema.form.element": "Element",
+  "admin.registries.schema.form.qualifier": "Kvalifikator",
+  "admin.registries.schema.form.scopenote": "Scope napomena",
+  "admin.registries.schema.head": "Šema metapodataka",
+  "admin.registries.schema.notification.created": "Uspešno kreirana šema metapodataka \"{{prefix}}\"",
+  "admin.registries.schema.notification.deleted.failure": "Neuspešno brisanje {{amount}} šema metapodataka",
+  "admin.registries.schema.notification.deleted.success": "Uspešno izbrisane {{amount}} šeme metapodataka",
+  "admin.registries.schema.notification.edited": "Uspešno izmenjena šema metapodataka \"{{prefix}}\"",
+  "admin.registries.schema.notification.failure": "Greška",
+  "admin.registries.schema.notification.field.created": "Uspešno kreirano polje metapodataka \"{{field}}\"",
+  "admin.registries.schema.notification.field.deleted.failure": "Neuspešno brisanje {{amount}} polja metapodataka ",
+  "admin.registries.schema.notification.field.deleted.success": "Uspešno izbrisana {{amount}} polja metapodataka",
+  "admin.registries.schema.notification.field.edited": "Uspešno izmenjeno polje metapodataka \"{{field}}\"",
+  "admin.registries.schema.notification.success": "Uspešno",
+  "admin.registries.schema.return": "Nazad",
+  "admin.registries.schema.title": "Registar šeme metapodataka",
+  "admin.access-control.bulk-access.breadcrumbs": "Upravljanje masovnim pristupom",
+  "administrativeBulkAccess.search.results.head": "Rezultati pretrage",
+  "admin.access-control.bulk-access": "Upravljanje masovnim pristupom",
+  "admin.access-control.bulk-access.title": "Upravljanje masovnim pristupom",
+  "admin.access-control.bulk-access-browse.header": "Korak 1: Izaberite objekte",
+  "admin.access-control.bulk-access-browse.search.header": "Pretraga",
+  "admin.access-control.bulk-access-browse.selected.header": "Trenutni izbor ({{number}})",
+  "admin.access-control.bulk-access-settings.header": "Korak 2: Operacija koju treba izvršiti",
+  "admin.access-control.epeople.actions.delete": "Izbrišite EPerson",
+  "admin.access-control.epeople.actions.impersonate": "Oponašati EPerson",
+  "admin.access-control.epeople.actions.reset": "Resetujte šifru",
+  "admin.access-control.epeople.actions.stop-impersonating": "Zaustavi predstavljanje kao EPerson",
+  "admin.access-control.epeople.breadcrumbs": "EPeople",
+  "admin.access-control.epeople.title": "EPeople",
+  "admin.access-control.epeople.head": "EPeople",
+  "admin.access-control.epeople.search.head": "Pretraga",
+  "admin.access-control.epeople.button.see-all": "Pregledajte sve",
+  "admin.access-control.epeople.search.scope.metadata": "Metapodaci",
+  "admin.access-control.epeople.search.scope.email": "E-mail (tačno)",
+  "admin.access-control.epeople.search.button": "Pretraga",
+  "admin.access-control.epeople.search.placeholder": "Pretražite ljude...",
+  "admin.access-control.epeople.button.add": "Dodajte EPerson",
+  "admin.access-control.epeople.table.id": "ID",
+  "admin.access-control.epeople.table.name": "Ime",
+  "admin.access-control.epeople.table.email": "E-mail (tačno)",
+  "admin.access-control.epeople.table.edit": "Izmena",
+  "admin.access-control.epeople.table.edit.buttons.edit": "Izmenite \"{{name}}\"",
+  "admin.access-control.epeople.table.edit.buttons.edit-disabled": "Niste ovlašćeni za uređivanje ove grupe",
+  "admin.access-control.epeople.table.edit.buttons.remove": "Izbrišite \"{{name}}\"",
+  "admin.access-control.epeople.no-items": "Nema EPeople za prikaz.",
+  "admin.access-control.epeople.form.create": "Kreirajte EPerson",
+  "admin.access-control.epeople.form.edit": "Izmenite EPerson",
+  "admin.access-control.epeople.form.firstName": "Ime",
+  "admin.access-control.epeople.form.lastName": "Prezime",
+  "admin.access-control.epeople.form.email": "E-mail",
+  "admin.access-control.epeople.form.emailHint": "Mora biti važeća e-mail adresa",
+  "admin.access-control.epeople.form.canLogIn": "Može se prijaviti",
+  "admin.access-control.epeople.form.requireCertificate": "Potreban je sertifikat",
+  "admin.access-control.epeople.form.return": "Nazad",
+  "admin.access-control.epeople.form.notification.created.success": "Uspešno kreiran EPerson \"{{name}}\"",
+  "admin.access-control.epeople.form.notification.created.failure": "Neuspešno kreiranje EPerson \"{{name}}\"",
+  "admin.access-control.epeople.form.notification.created.failure.emailInUse": "Neuspešno kreiranje EPerson \"{{name}}\", email \"{{email}}\" se već koristi.",
+  "admin.access-control.epeople.form.notification.edited.failure.emailInUse": "Neuspešna izmena EPerson \"{{name}}\", email \"{{email}}\" se već koristi.",
+  "admin.access-control.epeople.form.notification.edited.success": "Uspešno izmenjen EPerson \"{{name}}\"",
+  "admin.access-control.epeople.form.notification.edited.failure": "Neuspešna izmena EPerson \"{{name}}\" ",
+  "admin.access-control.epeople.form.notification.deleted.success": "Uspešno izbrisan EPerson \"{{name}}\"",
+  "admin.access-control.epeople.form.notification.deleted.failure": "Neuspešno brisanje EPerson \"{{name}}\" ",
+  "admin.access-control.epeople.form.groupsEPersonIsMemberOf": "Član ovih grupa:",
+  "admin.access-control.epeople.form.table.id": "ID",
+  "admin.access-control.epeople.form.table.name": "Ime",
+  "admin.access-control.epeople.form.table.collectionOrCommunity": "Kolekcija/Zajednica",
+  "admin.access-control.epeople.form.memberOfNoGroups": "Ovaj EPerson nije član nijedne grupe",
+  "admin.access-control.epeople.form.goToGroups": "Dodajte grupama",
+  "admin.access-control.epeople.notification.deleted.failure": "Neuspešno brisanje EPerson: \"{{name}}\"",
+  "admin.access-control.epeople.notification.deleted.success": "Uspešno izbrisan EPerson: \"{{name}}\"",
+  "admin.access-control.groups.title": "Grupe",
+  "admin.access-control.groups.breadcrumbs": "Grupe",
+  "admin.access-control.groups.singleGroup.breadcrumbs": "Izmenite grupu",
+  "admin.access-control.groups.title.singleGroup": "Izmenite grupu",
+  "admin.access-control.groups.title.addGroup": "Nova grupa",
+  "admin.access-control.groups.addGroup.breadcrumbs": "Nova grupa",
+  "admin.access-control.groups.head": "Grupe",
+  "admin.access-control.groups.button.add": "Dodajte grupu",
+  "admin.access-control.groups.search.head": "Pretraga grupa",
+  "admin.access-control.groups.button.see-all": "Pregledajte sve",
+  "admin.access-control.groups.search.button": "Pretraga",
+  "admin.access-control.groups.search.placeholder": "Pretražite grupe...",
+  "admin.access-control.groups.table.id": "ID",
+  "admin.access-control.groups.table.name": "Ime",
+  "admin.access-control.groups.table.collectionOrCommunity": "Kolekcija/Zajednica",
+  "admin.access-control.groups.table.members": "Članovi",
+  "admin.access-control.groups.table.edit": "Izmeniti",
+  "admin.access-control.groups.table.edit.buttons.edit": "Izmenite \"{{name}}\"",
+  "admin.access-control.groups.table.edit.buttons.remove": "Izbrišite \"{{name}}\"",
+  "admin.access-control.groups.no-items": "Nije pronađena nijedna grupa sa ovim u svom imenu ili ovim kao UUID",
+  "admin.access-control.groups.notification.deleted.success": "Uspešno izbrisana grupa \"{{name}}\"",
+  "admin.access-control.groups.notification.deleted.failure.title": "Neuspešno brisanje grupe \"{{name}}\"",
+  "admin.access-control.groups.notification.deleted.failure.content": "Uzrok: \"{{cause}}\"",
+  "admin.access-control.groups.form.alert.permanent": "Ova grupa je trajna, tako da se ne može menjati ili brisati. I dalje možete da dodajete i uklanjate članove grupe koristeći ovu stranicu.",
+  "admin.access-control.groups.form.alert.workflowGroup": "Ova grupa se ne može izmeniti ili izbrisati jer odgovara ulozi u procesu slanja i toka posla u \"{{name}}\" {{comcol}}. Možete je izbrisati sa kartice <a href='{{comcolEditRolesRoute}}'>\"dodeli uloge\"</a> na stranici za uređivanje {{comcol}}. I dalje možete da dodajete i uklanjate članove grupe koristeći ovu stranicu.",
+  "admin.access-control.groups.form.head.create": "Kreiraj grupu",
+  "admin.access-control.groups.form.head.edit": "Izmeni grupu",
+  "admin.access-control.groups.form.groupName": "Naziv grupe",
+  "admin.access-control.groups.form.groupCommunity": "Zajednica ili kolekcija",
+  "admin.access-control.groups.form.groupDescription": "Opis",
+  "admin.access-control.groups.form.notification.created.success": "Uspešno kreirana Grupa \"{{name}}\"",
+  "admin.access-control.groups.form.notification.created.failure": "Neuspešno kreiranje Grupe \"{{name}}\"",
+  "admin.access-control.groups.form.notification.created.failure.groupNameInUse": "Neuspešno kreiranje Grupe sa imenom: \"{{name}}\", proverite da ime nije već upotrebljeno.",
+  "admin.access-control.groups.form.notification.edited.failure": "Neuspešna izmena Grupe \"{{name}}\"",
+  "admin.access-control.groups.form.notification.edited.failure.groupNameInUse": "Naziv \"{{name}}\" se već koristi!",
+  "admin.access-control.groups.form.notification.edited.success": "Grupa \"{{name}}\" je uspešno izmenjena",
+  "admin.access-control.groups.form.actions.delete": "Izbrišite grupu",
+  "admin.access-control.groups.form.delete-group.modal.header": "Izbrišite grupu \"{{ dsoName }}\"",
+  "admin.access-control.groups.form.delete-group.modal.info": "Da li ste sigurni da želite da izbrišete grupu \"{{ dsoName }}\"",
+  "admin.access-control.groups.form.delete-group.modal.cancel": "Poništiti, otkazati",
+  "admin.access-control.groups.form.delete-group.modal.confirm": "Izbrišite",
+  "admin.access-control.groups.form.notification.deleted.success": "Grupa \"{{ name }}\" je uspešno obrisana",
+  "admin.access-control.groups.form.notification.deleted.failure.title": "Brisanje grupe \"{{ name }}\" nije uspelo",
+  "admin.access-control.groups.form.notification.deleted.failure.content": "Uzrok: \"{{ cause }}\"",
+  "admin.access-control.groups.form.members-list.head": "EPeople",
+  "admin.access-control.groups.form.members-list.search.head": "Dodajte EPeople",
+  "admin.access-control.groups.form.members-list.button.see-all": "Pregledajte sve",
+  "admin.access-control.groups.form.members-list.headMembers": "Trenutni članovi",
+  "admin.access-control.groups.form.members-list.search.scope.metadata": "Metapodatak",
+  "admin.access-control.groups.form.members-list.search.scope.email": "E-mail (tačno)",
+  "admin.access-control.groups.form.members-list.search.button": "Pretraga",
+  "admin.access-control.groups.form.members-list.table.id": "ID",
+  "admin.access-control.groups.form.members-list.table.name": "Ime",
+  "admin.access-control.groups.form.members-list.table.identity": "Identitet",
+  "admin.access-control.groups.form.members-list.table.email": "Email",
+  "admin.access-control.groups.form.members-list.table.netid": "NetID",
+  "admin.access-control.groups.form.members-list.table.edit": "Ukloni / Dodaj",
+  "admin.access-control.groups.form.members-list.table.edit.buttons.remove": "Uklonite člana sa imenom \"{{name}}\"",
+  "admin.access-control.groups.form.members-list.notification.success.addMember": "Član je uspešno dodat: \"{{name}}\"",
+  "admin.access-control.groups.form.members-list.notification.failure.addMember": "Dodavanje člana nije uspelo: \"{{name}}\"",
+  "admin.access-control.groups.form.members-list.notification.success.deleteMember": "Uspešno obrisan član: \"{{name}}\"",
+  "admin.access-control.groups.form.members-list.notification.failure.deleteMember": "Brisanje člana nije uspelo: \"{{name}}\"",
+  "admin.access-control.groups.form.members-list.table.edit.buttons.add": "Dodaj člana sa imenom \"{{name}}\"",
+  "admin.access-control.groups.form.members-list.notification.failure.noActiveGroup": "Nema trenutno aktivne grupe, prvo pošaljite ime.",
+  "admin.access-control.groups.form.members-list.no-members-yet": "Još nema članova u grupi, pretražite i dodajte.",
+  "admin.access-control.groups.form.members-list.no-items": "Nijedan EPeople nije pronađen u toj pretrazi",
+  "admin.access-control.groups.form.subgroups-list.notification.failure": "Nešto nije u redu: \"{{cause}}\"",
+  "admin.access-control.groups.form.subgroups-list.head": "Grupe",
+  "admin.access-control.groups.form.subgroups-list.search.head": "Dodajte podgrupu",
+  "admin.access-control.groups.form.subgroups-list.button.see-all": "Pregledajte sve",
+  "admin.access-control.groups.form.subgroups-list.headSubgroups": "Trenutne podgrupe",
+  "admin.access-control.groups.form.subgroups-list.search.button": "Pretraga",
+  "admin.access-control.groups.form.subgroups-list.table.id": "ID",
+  "admin.access-control.groups.form.subgroups-list.table.name": "Ime",
+  "admin.access-control.groups.form.subgroups-list.table.collectionOrCommunity": "Kolekcija/Zajednica",
+  "admin.access-control.groups.form.subgroups-list.table.edit": "Ukloni / Dodaj",
+  "admin.access-control.groups.form.subgroups-list.table.edit.buttons.remove": "Uklonite podgrupu sa imenom \"{{name}}\"",
+  "admin.access-control.groups.form.subgroups-list.table.edit.buttons.add": "Dodajte podgrupu sa imenom \"{{name}}\"",
+  "admin.access-control.groups.form.subgroups-list.table.edit.currentGroup": "Trenutna grupa",
+  "admin.access-control.groups.form.subgroups-list.notification.success.addSubgroup": "Podgrupa je uspešno dodata: \"{{name}}\"",
+  "admin.access-control.groups.form.subgroups-list.notification.failure.addSubgroup": "Dodavanje podgrupe nije uspelo: \"{{name}}\"",
+  "admin.access-control.groups.form.subgroups-list.notification.success.deleteSubgroup": "Uspešno obrisana podgrupa: \"{{name}}\"",
+  "admin.access-control.groups.form.subgroups-list.notification.failure.deleteSubgroup": "Brisanje podgrupe nije uspelo: \"{{name}}\"",
+  "admin.access-control.groups.form.subgroups-list.notification.failure.noActiveGroup": "Nema trenutno aktivne grupe, prvo pošaljite ime.",
+  "admin.access-control.groups.form.subgroups-list.notification.failure.subgroupToAddIsActiveGroup": "Ovo je trenutna grupa, ne može se dodati.",
+  "admin.access-control.groups.form.subgroups-list.no-items": "Nije pronađena nijedna grupa sa ovim u svom imenu ili ovim kao UUID",
+  "admin.access-control.groups.form.subgroups-list.no-subgroups-yet": "Još nema podgrupa u grupi.",
+  "admin.access-control.groups.form.return": "Nazad",
+  "admin.access-control.groups.form.tooltip.editGroupPage": "Na ovoj stranici možete da menjate svojstva i članove grupe. U gornjem odeljku možete da izmenite ime i opis grupe, osim ako je ovo administratorska grupa za kolekciju ili zajednicu, u kom slučaju se ime i opis grupe automatski generišu i ne mogu se menjati. U sledećim odeljcima možete da menjate članstvo u grupi. Pogledajte [viki](https://viki.lirasis.org/displai/DSDOC7k/Create+or+manage+a+user+group) za više detalja.",
+  "admin.access-control.groups.form.tooltip.editGroup.addEpeople": "Da biste dodali ili uklonili Eperson u/iz ove grupe, ili kliknite na dugme 'Pregledaj sve' ili koristite traku za pretragu ispod da biste pretražili korisnike (koristite padajući meni sa leve strane trake za pretragu da biste izabrali da li ćete pretraživati prema metapodacima ili prema e-mailu). Zatim kliknite na ikonu plus za svakog korisnika kojeg želite da dodate na listu ispod ili na ikonu korpe za smeće za svakog korisnika kojeg želite da uklonite. Lista u nastavku može imati nekoliko stranica: koristite kontrole stranice ispod liste da biste prešli na sledeće stranice. Kada budete spremni, sačuvajte promene klikom na dugme \"Sačuvaj\" u gornjem delu.",
+  "admin.access-control.groups.form.tooltip.editGroup.addSubgroups": "Da biste dodali ili uklonili podgrupu u/iz ove grupe, kliknite na dugme 'Pregledaj sve' ili koristite traku za pretragu ispod da biste pretražili korisnike. Zatim kliknite na ikonu plus za svakog korisnika kojeg želite da dodate na listu ispod ili na ikonu korpe za smeće za svakog korisnika kojeg želite da uklonite. Lista u nastavku može imati nekoliko stranica: koristite kontrole stranice ispod liste da biste prešli na sledeće stranice. Kada budete spremni, sačuvajte promene klikom na dugme \"Sačuvaj\" u gornjem delu.",
+  "admin.search.breadcrumbs": "Administrativna pretraga",
+  "admin.search.collection.edit": "Uredite",
+  "admin.search.community.edit": "Uredite",
+  "admin.search.item.delete": "Izbrišite",
+  "admin.search.item.edit": "Uredite",
+  "admin.search.item.make-private": "Učinite nevidljivim",
+  "admin.search.item.make-public": "Učinite vidljivim",
+  "admin.search.item.move": "Pomerite",
+  "admin.search.item.reinstate": "Reinstate",
+  "admin.search.item.withdraw": "Odustati",
+  "admin.search.title": "Administrativna pretraga",
+  "administrativeView.search.results.head": "Administrativna pretraga",
+  "admin.workflow.breadcrumbs": "Administriranje radnog procesa",
+  "admin.workflow.title": "Administriranje radnog procesa",
+  "admin.workflow.item.workflow": "Proces rada",
+  "admin.workflow.item.workspace": "Radni prostor",
+  "admin.workflow.item.delete": "Izbrišite",
+  "admin.workflow.item.send-back": "Vratite",
+  "admin.workflow.item.policies": "Politike",
+  "admin.workflow.item.supervision": "Nadzor",
+  "admin.metadata-import.breadcrumbs": "Uvezi metapodatke",
+  "admin.batch-import.breadcrumbs": "Uvezi Batch",
+  "admin.metadata-import.title": "Uvezi metapodatke",
+  "admin.batch-import.title": "Uvezi Batch",
+  "admin.metadata-import.page.header": "Uvezite metapodatke",
+  "admin.batch-import.page.header": "Uvezi Batch",
+  "admin.metadata-import.page.help": "Ovde možete da prevučete ili pregledate CSV fajlove koji sadrže batch operacije metapodataka za fajlove",
+  "admin.batch-import.page.help": "Izaberite kolekciju u koju želite da uvezete. Zatim prevucite ili potražite zip fajl jednostavnog arhivskog formata (SAF) koja uključuje stavke za uvoz",
+  "admin.batch-import.page.toggle.help": "Moguće je izvršiti uvoz bilo sa otpremanjem fajla ili preko URL-a, koristite gornji prekidač da biste podesili izvor unosa",
+  "admin.metadata-import.page.dropMsg": "Prevucite CSV sa metapodacima za uvoz",
+  "admin.batch-import.page.dropMsg": "Prevucite batch ZIP za uvoz",
+  "admin.metadata-import.page.dropMsgReplace": "Prevucite da zamenite CSV sa metapodacima za uvoz",
+  "admin.batch-import.page.dropMsgReplace": "Prevucite da zamenite batch ZIP za uvoz",
+  "admin.metadata-import.page.button.return": "Nazad",
+  "admin.metadata-import.page.button.proceed": "Nastavite",
+  "admin.metadata-import.page.button.select-collection": "Izaberite kolekciju",
+  "admin.metadata-import.page.error.addFile": "Prvo izaberite fajl!",
+  "admin.metadata-import.page.error.addFileUrl": "Prvo unesite url fajl!",
+  "admin.batch-import.page.error.addFile": "Prvo izaberite Zip fajl!",
+  "admin.metadata-import.page.toggle.upload": "Otpremite",
+  "admin.metadata-import.page.toggle.url": "URL",
+  "admin.metadata-import.page.urlMsg": "Umetnite batch ZIP URL za uvoz",
+  "admin.metadata-import.page.validateOnly": "Samo validiraj",
+  "admin.metadata-import.page.validateOnly.hint": "Kada se izabere, otpremljeni CSV će biti potvrđen. Dobićete izveštaj o utvrđenim promenama, ali promene neće biti sačuvane.",
+  "advanced-workflow-action.rating.form.rating.label": "Ocena",
+  "advanced-workflow-action.rating.form.rating.error": "Morate oceniti stavku",
+  "advanced-workflow-action.rating.form.review.label": "Pregled",
+  "advanced-workflow-action.rating.form.review.error": "Morate uneti recenziju da biste poslali ovu ocenu",
+  "advanced-workflow-action.rating.description": "Molimo izaberite ocenu ispod",
+  "advanced-workflow-action.rating.description-requiredDescription": "Molimo izaberite ocenu ispod i dodajte recenziju",
+  "advanced-workflow-action.select-reviewer.description-single": "Molimo izaberite jednog recenzenta ispod pre slanja",
+  "advanced-workflow-action.select-reviewer.description-multiple": "Molimo izaberite jednog ili više recenzenata ispod pre slanja",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.head": "EPeople",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.head": "Dodajte EPeople",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.button.see-all": "Pregledajte sve",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.headMembers": "Trenutni članovi",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.scope.metadata": "Metapodaci",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.scope.email": "E-mail (tačno)",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.button": "Pretraga",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.id": "ID",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.name": "Ime",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.identity": "Identitet",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.email": "Email",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.netid": "NetID",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.edit": "Uklonite / Dodajte",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.edit.buttons.remove": "Uklonite člana sa imenom \"{{name}}\"",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.success.addMember": "Uspešno dodat član: \"{{name}}\"",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.failure.addMember": "Neuspešno dodavanje člana: \"{{name}}\"",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.success.deleteMember": "Uspešno izbrisan član: \"{{name}}\"",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.failure.deleteMember": "Neuspešno brisanje člana: \"{{name}}\"",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.edit.buttons.add": "Dodajte člana sa imenom \"{{name}}\"",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.failure.noActiveGroup": "Trenutno nema aktivne grupe, prvo unesite ime.",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.no-members-yet": "Još nema članova u grupi, pretražite i dodajte.",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.no-items": "Nijedan EPeople nije pronađen u toj pretrazi",
+  "advanced-workflow-action.select-reviewer.no-reviewer-selected.error": "Nije izabran recenzent.",
+  "admin.batch-import.page.validateOnly.hint": "Kada se izabere, otpremljeni ZIP će biti potvrđen. Dobićete izveštaj o utvrđenim promenama, ali promene neće biti sačuvane.",
+  "admin.batch-import.page.remove": "ukloniti",
+  "auth.errors.invalid-user": "Pogrešna e-mail adresa ili lozinka.",
+  "auth.messages.expired": "Vaša sesija je istekla. Molimo prijavite se ponovo.",
+  "auth.messages.token-refresh-failed": "Osvežavanje tokena sesije nije uspelo. Molimo prijavite se ponovo.",
+  "bitstream.download.page": "Trenutno se preuzima {{bitstream}}...",
+  "bitstream.download.page.back": "Nazad",
+  "bitstream.edit.authorizations.link": "Izmenite polise bitstream-a",
+  "bitstream.edit.authorizations.title": "Izmenite polise bitstream-a",
+  "bitstream.edit.return": "Nazad",
+  "bitstream.edit.bitstream": "Bitstream:",
+  "bitstream.edit.form.description.hint": "Opciono, navedite kratak opis fajla, na primer \"<i>Glavni članak</i>\" ili \"<i>Očitavanja podataka eksperimenta</i>\".",
+  "bitstream.edit.form.description.label": "Opis",
+  "bitstream.edit.form.embargo.hint": "Prvi dan od kojeg je pristup dozvoljen. <b>Ovaj datum se ne može izmeniti u ovom obrascu.</b> Da biste postavili datum zabrane za bitstream, idite na karticu <i>Status stavke</i>, kliknite na <i>Ovlašćenja...</i >, kreirajte ili izmenite politiku bitstream-ova<i>PROČITAJTE</i> i postavite <i>Datum početka</i> po želji.",
+  "bitstream.edit.form.embargo.label": "Zabrana do određenog datuma",
+  "bitstream.edit.form.fileName.hint": "Promenite ime fajla za bitstream. Imajte na umu da će se ovim promeniti prikazani bitstream URL, ali će se stari linkovi i dalje razrešiti sve dok se ID sekvence ne promeni.",
+  "bitstream.edit.form.fileName.label": "Ime fajla",
+  "bitstream.edit.form.newFormat.label": "Opišite novi format",
+  "bitstream.edit.form.newFormat.hint": "Aplikacija koju ste koristili za kreiranje fajla, i broj verzije (na primer, \"<i>ACMESoft SuperApp verzija 1.5</i>\").",
+  "bitstream.edit.form.primaryBitstream.label": "Primarni bitstream",
+  "bitstream.edit.form.selectedFormat.hint": "Ako format nije na gornjoj listi, <b>izaberite \"format nije na listi\" iznad</b> i opišite ga pod \"Opišite novi format\".",
+  "bitstream.edit.form.selectedFormat.label": "Izabrani format",
+  "bitstream.edit.form.selectedFormat.unknown": "Format nije na listi",
+  "bitstream.edit.notifications.error.format.title": "Došlo je do greške prilikom čuvanja bitstream formata",
+  "bitstream.edit.notifications.error.primaryBitstream.title": "Došlo je do greške prilikom čuvanja primarnog bitstream-a",
+  "bitstream.edit.form.iiifLabel.label": "IIIF oznaka",
+  "bitstream.edit.form.iiifLabel.hint": "Oznaka canvas-a za ovu sliku. Ako nije data, koristiće se podrazumevana oznaka.",
+  "bitstream.edit.form.iiifToc.label": "IIIF Pregled sadržaja",
+  "bitstream.edit.form.iiifToc.hint": "Dodavanje teksta ovde, čini ovo mesto početkom novog opsega sadržaja.",
+  "bitstream.edit.form.iiifWidth.label": "IIIF širina platna",
+  "bitstream.edit.form.iiifWidth.hint": "Širina canvas-a obično treba da odgovara širini slike.",
+  "bitstream.edit.form.iiifHeight.label": "IIIF visina platna",
+  "bitstream.edit.form.iiifHeight.hint": "Visina canvas-a obično treba da odgovara visini slike.",
+  "bitstream.edit.notifications.saved.content": "Vaše promene u ovom bitstream-u su sačuvane.",
+  "bitstream.edit.notifications.saved.title": "Bitstream je sačuvan",
+  "bitstream.edit.title": "Izmenite bitstream",
+  "bitstream-request-a-copy.alert.canDownload1": "Već imate pristup ovom fajlu. Ako želite da preuzmete fajl, kliknite",
+  "bitstream-request-a-copy.alert.canDownload2": "ovde",
+  "bitstream-request-a-copy.header": "Zatražite kopiju fajla",
+  "bitstream-request-a-copy.intro": "Unesite sledeće informacije da biste zatražili kopiju sledeće stavke:",
+  "bitstream-request-a-copy.intro.bitstream.one": "Zahteva se sledeći fajl:",
+  "bitstream-request-a-copy.intro.bitstream.all": "Zahtevaju se svi fajlovi.",
+  "bitstream-request-a-copy.name.label": "ime *",
+  "bitstream-request-a-copy.name.error": "Ime je obavezno",
+  "bitstream-request-a-copy.email.label": "Vaša email adresa *",
+  "bitstream-request-a-copy.email.hint": "Ova e-mail adresa se koristi za slanje fajla.",
+  "bitstream-request-a-copy.email.error": "Molim Vas unesite ispravnu e-mail adresu.",
+  "bitstream-request-a-copy.allfiles.label": "Fajlovi",
+  "bitstream-request-a-copy.files-all-false.label": "Samo traženi fajl",
+  "bitstream-request-a-copy.files-all-true.label": "Sve fajlovi (ove stavke) u ograničenom pristupu",
+  "bitstream-request-a-copy.message.label": "Poruka",
+  "bitstream-request-a-copy.return": "Nazad",
+  "bitstream-request-a-copy.submit": "Zahtevaj kopiju",
+  "bitstream-request-a-copy.submit.success": "Zahtev za stavku je uspešno dostavljen.",
+  "bitstream-request-a-copy.submit.error": "Nešto nije u redu sa slanjem zahteva za stavku.",
+  "browse.back.all-results": "Svi rezultati pregleda",
+  "browse.comcol.by.author": "Po autoru",
+  "browse.comcol.by.dateissued": "Po datumu izdanja",
+  "browse.comcol.by.subject": "Po predmetu",
+  "browse.comcol.by.srsc": "Po kategoriji predmeta",
+  "browse.comcol.by.title": "Po naslovu",
+  "browse.comcol.head": "Pregledajte",
+  "browse.empty": "Nema stavki za prikaz.",
+  "browse.metadata.author": "Autoru",
+  "browse.metadata.dateissued": "Datumu izdanja",
+  "browse.metadata.subject": "Predmetu",
+  "browse.metadata.title": "Naslovu",
+  "browse.metadata.author.breadcrumbs": "Pregled po autoru",
+  "browse.metadata.dateissued.breadcrumbs": "Pregled po datumu",
+  "browse.metadata.subject.breadcrumbs": "Pregled po predmetu",
+  "browse.metadata.srsc.breadcrumbs": "Pregled po kategoriji predmeta",
+  "browse.metadata.title.breadcrumbs": "Pregled po naslovu",
+  "pagination.next.button": "Sledeće",
+  "pagination.previous.button": "Prethodno",
+  "pagination.next.button.disabled.tooltip": "Nema više stranica sa rezultatima",
+  "browse.startsWith": ", počevši od {{ startsWith }}",
+  "browse.startsWith.choose_start": "(Izaberite početak)",
+  "browse.startsWith.choose_year": "(Izaberite godinu)",
+  "browse.startsWith.choose_year.label": "Izaberite godinu izdanja",
+  "browse.startsWith.jump": "Filtrirajte rezultate po godini ili mesecu",
+  "browse.startsWith.months.april": "April",
+  "browse.startsWith.months.august": "Avgust",
+  "browse.startsWith.months.december": "Decembar",
+  "browse.startsWith.months.february": "Februar",
+  "browse.startsWith.months.january": "Januar",
+  "browse.startsWith.months.july": "Jul",
+  "browse.startsWith.months.june": "Jun",
+  "browse.startsWith.months.march": "Mart",
+  "browse.startsWith.months.may": "Maj ",
+  "browse.startsWith.months.none": "(Izaberite mesec)",
+  "browse.startsWith.months.none.label": "Izaberite mesec izdanja",
+  "browse.startsWith.months.november": "Novembar",
+  "browse.startsWith.months.october": "Oktobar",
+  "browse.startsWith.months.september": "Septembar",
+  "browse.startsWith.submit": "Pregledaj",
+  "browse.startsWith.type_date": "Filtrirajte rezultate po datumu",
+  "browse.startsWith.type_date.label": "Ili unesite datum (godina-mesec) i kliknite na dugme Pregledaj",
+  "browse.startsWith.type_text": "Filtrirajte rezultate upisivanjem prvih nekoliko slova",
+  "browse.startsWith.input": "Filter",
+  "browse.taxonomy.button": "Pregledaj",
+  "browse.title": "Pregledanje {{ collection }} prema {{ field }}{{ startsWith }} {{ value }}",
+  "browse.title.page": "Pregledanje {{ collection }} prema {{ field }} {{ value }}",
+  "search.browse.item-back": "Nazad na rezultate",
+  "chips.remove": "Uklonite čip",
+  "claimed-approved-search-result-list-element.title": "Odobreno",
+  "claimed-declined-search-result-list-element.title": "Odbijeno, vraćeno podnosiocu",
+  "claimed-declined-task-search-result-list-element.title": "Odbijeno, vraćeno menadžeru za pregled",
+  "collection.create.head": "Napravite kolekciju",
+  "collection.create.notifications.success": "Kolekcija je uspešno napravljena",
+  "collection.create.sub-head": "Napravite kolekciju za zajednicu {{ parent }}",
+  "collection.curate.header": "Sačuvaj kolekciju: {{collection}}",
+  "collection.delete.cancel": "Poništiti, otkazati",
+  "collection.delete.confirm": "Potvrdi",
+  "collection.delete.processing": "Brisanje",
+  "collection.delete.head": "Izbrišite kolekciju",
+  "collection.delete.notification.fail": "Kolekcija se ne može izbrisati",
+  "collection.delete.notification.success": "Kolekcija je uspešno izbrisana",
+  "collection.delete.text": "Da li ste sigurni da želite da izbrišete kolekciju \"{{ dso }}\"",
+  "collection.edit.delete": "Izbrišite ovu kolekciju",
+  "collection.edit.head": "Uredite kolekciju",
+  "collection.edit.breadcrumbs": "Uredite kolekciju",
+  "collection.edit.tabs.mapper.head": "Mapiranje stavki",
+  "collection.edit.tabs.item-mapper.title": "Uređivanje kolekcije - mapiranje stavki",
+  "collection.edit.item-mapper.cancel": "Poništiti, otkazati",
+  "collection.edit.item-mapper.collection": "Kolekcija: \"<b>{{name}}</b>\"",
+  "collection.edit.item-mapper.confirm": "Mapirajte izabrane stavke",
+  "collection.edit.item-mapper.description": "Ovo je alatka za mapiranje stavki koja omogućava administratorima kolekcije da mapiraju stavke iz drugih kolekcija u ovu kolekciju. Možete tražiti stavke iz drugih kolekcija i mapirati ih ili pregledati listu trenutno mapiranih stavki.",
+  "collection.edit.item-mapper.head": "Mapiranje stavki - mapa stavki iz drugih kolekcija",
+  "collection.edit.item-mapper.no-search": "Unesite upit za pretragu",
+  "collection.edit.item-mapper.notifications.map.error.content": "Došlo je do grešaka za mapiranje {{amount}} stavki.",
+  "collection.edit.item-mapper.notifications.map.error.head": "Greške u mapiranju",
+  "collection.edit.item-mapper.notifications.map.success.content": "Uspešno mapirane {{amount}} stavke.",
+  "collection.edit.item-mapper.notifications.map.success.head": "Mapiranje je završeno",
+  "collection.edit.item-mapper.notifications.unmap.error.content": "Došlo je do grešaka pri uklanjanju mapiranja stavki {{amount}}.",
+  "collection.edit.item-mapper.notifications.unmap.error.head": "Uklonite greške mapiranja",
+  "collection.edit.item-mapper.notifications.unmap.success.content": "Uspešno su uklonjena mapiranja {{amount}} stavki.",
+  "collection.edit.item-mapper.notifications.unmap.success.head": "Uklanjanje mapiranja je završeno",
+  "collection.edit.item-mapper.remove": "Uklanjanje mapiranja izabranih stavki",
+  "collection.edit.item-mapper.search-form.placeholder": "Pretraži stavke...",
+  "collection.edit.item-mapper.tabs.browse": "Pregledajte mapirane stavke",
+  "collection.edit.item-mapper.tabs.map": "Mapirajte nove stavke",
+  "collection.edit.logo.delete.title": "Izbrišite logo",
+  "collection.edit.logo.delete-undo.title": "Opozovi brisanje",
+  "collection.edit.logo.label": "Logo kolekcije",
+  "collection.edit.logo.notifications.add.error": "Otpremanje loga kolekcije nije uspelo. Proverite sadržaj pre ponovnog pokušaja.",
+  "collection.edit.logo.notifications.add.success": "Otpremanje loga kolekcije je uspešno.",
+  "collection.edit.logo.notifications.delete.success.title": "Logo je izbrisan",
+  "collection.edit.logo.notifications.delete.success.content": "Uspešno je obrisan logo kolekcije",
+  "collection.edit.logo.notifications.delete.error.title": "Greška pri brisanju loga",
+  "collection.edit.logo.upload": "Prevucite logotip kolekcije za otpremanje",
+  "collection.edit.notifications.success": "Uspešno uređena kolekcija",
+  "collection.edit.return": "Nazad",
+  "collection.edit.tabs.access-control.head": "Kontrola pristupa",
+  "collection.edit.tabs.access-control.title": "Uređivanje kolekcije - Kontrola pristupa",
+  "collection.edit.tabs.curate.head": "Curate",
+  "collection.edit.tabs.curate.title": "Uređivanje kolekcije - Curate",
+  "collection.edit.tabs.authorizations.head": "Ovlašćenja",
+  "collection.edit.tabs.authorizations.title": "Uređivanje kolekcije - ovlašćenja",
+  "collection.edit.item.authorizations.load-bundle-button": "Učitajte još paketa",
+  "collection.edit.item.authorizations.load-more-button": "Učitaj više",
+  "collection.edit.item.authorizations.show-bitstreams-button": "Prikaži bitstream smernice za paket",
+  "collection.edit.tabs.metadata.head": "Uredi metapodatke",
+  "collection.edit.tabs.metadata.title": "Uređivanje kolekcije - Metapodaci",
+  "collection.edit.tabs.roles.head": "Dodeli uloge",
+  "collection.edit.tabs.roles.title": "Uređivanje kolekcije - Uloge",
+  "collection.edit.tabs.source.external": "Ova kolekcija prikuplja svoj sadržaj iz spoljašnjeg izvora",
+  "collection.edit.tabs.source.form.errors.oaiSource.required": "Morate da obezbedite set ID ciljne kolekcije.",
+  "collection.edit.tabs.source.form.harvestType": "Sadržaj se prikuplja",
+  "collection.edit.tabs.source.form.head": "Konfigurišite spoljni izvor",
+  "collection.edit.tabs.source.form.metadataConfigId": "Format metapodataka",
+  "collection.edit.tabs.source.form.oaiSetId": "ID specifičnog skupa za OAI",
+  "collection.edit.tabs.source.form.oaiSource": "OAI provajder",
+  "collection.edit.tabs.source.form.options.harvestType.METADATA_AND_BITSTREAMS": "Sakupite metapodatke i bitstream-ove (zahteva ORE podršku)",
+  "collection.edit.tabs.source.form.options.harvestType.METADATA_AND_REF": "Sakupite metapodatke i reference na bitstream-ove (zahteva ORE podršku)",
+  "collection.edit.tabs.source.form.options.harvestType.METADATA_ONLY": "Samo prikupljeni metapodaci",
+  "collection.edit.tabs.source.head": "Izvor sadržaja",
+  "collection.edit.tabs.source.notifications.discarded.content": "Vaše promene su odbačene. Da biste ponovo postavili svoje promene, kliknite na dugme \"Opozovi\".",
+  "collection.edit.tabs.source.notifications.discarded.title": "Promene su odbačene",
+  "collection.edit.tabs.source.notifications.invalid.content": "Vaše promene nisu sačuvane. Proverite da li su sva polja ispravna pre nego što sačuvate.",
+  "collection.edit.tabs.source.notifications.invalid.title": "Metapodaci su nevažeći",
+  "collection.edit.tabs.source.notifications.saved.content": "Vaše promene izvora sadržaja ove kolekcije su sačuvane.",
+  "collection.edit.tabs.source.notifications.saved.title": "Izvor sadržaja je sačuvan",
+  "collection.edit.tabs.source.title": "Uređivanje kolekcije – Izvor sadržaja",
+  "collection.edit.template.add-button": "Dodati",
+  "collection.edit.template.breadcrumbs": "Šablon stavke",
+  "collection.edit.template.cancel": "Otkazati",
+  "collection.edit.template.delete-button": "Izbrišite",
+  "collection.edit.template.edit-button": "Izmenite",
+  "collection.edit.template.error": "Došlo je do greške pri preuzimanju stavke šablona",
+  "collection.edit.template.head": "Izmenite stavku šablona za kolekciju \"{{ collection }}\"",
+  "collection.edit.template.label": "Stavka šablona",
+  "collection.edit.template.loading": "Učitava se stavka šablona...",
+  "collection.edit.template.notifications.delete.error": "Neuspešno brisanje šablona stavke",
+  "collection.edit.template.notifications.delete.success": "Uspešno obrisan šablon stavke",
+  "collection.edit.template.title": "Izmenite stavku šablona",
+  "collection.form.abstract": "Kratak opis",
+  "collection.form.description": "Uvodni tekst (HTML)",
+  "collection.form.errors.title.required": "Molimo unesite ime kolekcije",
+  "collection.form.license": "Licenca",
+  "collection.form.provenance": "Poreklo",
+  "collection.form.rights": "Autorski tekst (HTML)",
+  "collection.form.tableofcontents": "Vesti (HTML)",
+  "collection.form.title": "Ime",
+  "collection.form.entityType": "Tip entiteta",
+  "collection.listelement.badge": "Kolekcija",
+  "collection.page.browse.recent.head": "Nedavni podnesci",
+  "collection.page.browse.recent.empty": "Nema stavki za prikaz",
+  "collection.page.edit": "Izmenite ovu kolekciju",
+  "collection.page.handle": "Trajni URI za ovu kolekciju",
+  "collection.page.license": "Licenca",
+  "collection.page.news": "Vesti",
+  "collection.select.confirm": "Potvrdite izabrano",
+  "collection.select.empty": "Nema kolekcija za prikaz",
+  "collection.select.table.title": "Naslov",
+  "collection.source.controls.head": "Kontrola prikupljanja",
+  "collection.source.controls.test.submit.error": "Nešto nije u redu sa pokretanjem testiranja podešavanja",
+  "collection.source.controls.test.failed": "Skripta za testiranje podešavanja nije uspela",
+  "collection.source.controls.test.completed": "Skripta za testiranje podešavanja je uspešno završena",
+  "collection.source.controls.test.submit": "Testna konfiguracija",
+  "collection.source.controls.test.running": "Testiranje konfiguracije...",
+  "collection.source.controls.import.submit.success": "Uvoz je uspešno pokrenut",
+  "collection.source.controls.import.submit.error": "Nešto nije u redu sa pokretanjem uvoza",
+  "collection.source.controls.import.submit": "Uvezite sada",
+  "collection.source.controls.import.running": "Uvoz...",
+  "collection.source.controls.import.failed": "Došlo je do greške tokom uvoza",
+  "collection.source.controls.import.completed": "Uvoz je završen",
+  "collection.source.controls.reset.submit.success": "Resetovanje i ponovni uvoz su uspešno pokrenuti",
+  "collection.source.controls.reset.submit.error": "Nešto nije u redu sa pokretanjem resetovanja i ponovnog uvoza",
+  "collection.source.controls.reset.failed": "Došlo je do greške tokom resetovanja i ponovnog uvoza",
+  "collection.source.controls.reset.completed": "Resetovanje i ponovni uvoz su završeni",
+  "collection.source.controls.reset.submit": "Resetujte i ponovo uvezite",
+  "collection.source.controls.reset.running": "Resetovanje i ponovni uvoz...",
+  "collection.source.controls.harvest.status": "Status prikupljaanja:",
+  "collection.source.controls.harvest.start": "Vreme početka prikupljanja:",
+  "collection.source.controls.harvest.last": "Vreme početka prikupljanja:",
+  "collection.source.controls.harvest.message": "Informacije o prikupljanju:",
+  "collection.source.controls.harvest.no-information": "N/A",
+  "collection.source.update.notifications.error.content": "Navedena podešavanja su testirana i nisu funkcionisala.",
+  "collection.source.update.notifications.error.title": "Greška na serveru",
+  "communityList.breadcrumbs": "Lista zajednice",
+  "communityList.tabTitle": "List zajednice",
+  "communityList.title": "Lista zajednica",
+  "communityList.showMore": "Prikaži više",
+  "community.create.head": "Kreirajte zajednicu",
+  "community.create.notifications.success": "Zajednica je uspešno kreirana",
+  "community.create.sub-head": "Kreirajte podzajednicu za zajednicu {{ parent }}",
+  "community.curate.header": "Urednik zajednice: {{community}}",
+  "community.delete.cancel": "Otkazati",
+  "community.delete.confirm": "Potvrdite",
+  "community.delete.processing": "Brisanje...",
+  "community.delete.head": "Izbrišite zajednicu",
+  "community.delete.notification.fail": "Nije moguće izbrisati zajednicu",
+  "community.delete.notification.success": "Uspešno izbrisana zajednica",
+  "community.delete.text": "Da li ste sigurni da želite da izbrišete zajednicu \"{{ dso }}\"",
+  "community.edit.delete": "Izbrišite ovu zajednicu",
+  "community.edit.head": "Izmenite zajednicu",
+  "community.edit.breadcrumbs": "Izmenite zajednicu",
+  "community.edit.logo.delete.title": "Izbrišite logo",
+  "community.edit.logo.delete-undo.title": "Poništite brisanje",
+  "community.edit.logo.label": "Logo zajednice",
+  "community.edit.logo.notifications.add.error": "Otpremanje logoa zajednice nije uspelo. Molimo proverite sadržaj pre ponovnog pokušaja.",
+  "community.edit.logo.notifications.add.success": "Uspešno otpremanje logoa zajednice.",
+  "community.edit.logo.notifications.delete.success.title": "Logo je izbrisan",
+  "community.edit.logo.notifications.delete.success.content": "Uspešno izbrisan logo zajednice",
+  "community.edit.logo.notifications.delete.error.title": "Greška pri brisanju logoa",
+  "community.edit.logo.upload": "Unesite logo zajednice da biste ga otpremili",
+  "community.edit.notifications.success": "Uspešno je izmenjena zajednica",
+  "community.edit.notifications.unauthorized": "Nemate ovlašćenje da izvršite ovu promenu",
+  "community.edit.notifications.error": "Došlo je do greške pri uređivanju zajednice",
+  "community.edit.return": "Nazad",
+  "community.edit.tabs.curate.head": "Curate",
+  "community.edit.tabs.curate.title": "Uređivanje zajednice - Curate",
+  "community.edit.tabs.access-control.head": "Kontrola pristupa",
+  "community.edit.tabs.access-control.title": "Uređivanje zajednice - Kontrola pristupa",
+  "community.edit.tabs.metadata.head": "Uredi metapodatke",
+  "community.edit.tabs.metadata.title": "Uređivanje zajednice – Metapodaci",
+  "community.edit.tabs.roles.head": "Dodeli uloge",
+  "community.edit.tabs.roles.title": "Uređivanje zajednice - Uloge",
+  "community.edit.tabs.authorizations.head": "Ovlašćenja",
+  "community.edit.tabs.authorizations.title": "Uređivanje zajednice - ovlašćenja",
+  "community.listelement.badge": "Zajednica",
+  "comcol-role.edit.no-group": "Nijedan",
+  "comcol-role.edit.create": "Kreirajte",
+  "comcol-role.edit.create.error.title": "Pravljenje grupe za ulogu \"{{ role }}\" nije uspelo",
+  "comcol-role.edit.restrict": "Ograničiti",
+  "comcol-role.edit.delete": "Izbrišite",
+  "comcol-role.edit.delete.error.title": "Brisanje grupe uloga \"{{ role }}\" nije uspelo",
+  "comcol-role.edit.community-admin.name": "Administratori",
+  "comcol-role.edit.collection-admin.name": "Administratori",
+  "comcol-role.edit.community-admin.description": "Administratori zajednice mogu da kreiraju podzajednice ili kolekcije i da upravljaju tim podzajednicama ili zbirkama ili da im dodeljuju upravljanje. Pored toga, oni odlučuju ko može da podnese stavke u bilo koju podzbirku, uređuju metapodatke stavki (nakon podnošenja) i dodaju (mapiraju) postojeće stavke iz drugih kolekcija (predmet ovlašćenja).",
+  "comcol-role.edit.collection-admin.description": "Administratori kolekcije odlučuju ko može da šalje stavke u kolekciju, uređuju metapodatke stavki (nakon slanja) i dodaju (mapiraju) postojeće stavke iz drugih kolekcija u ovu kolekciju (predmet ovlašćenja za tu kolekciju).",
+  "comcol-role.edit.submitters.name": "Podnosioci",
+  "comcol-role.edit.submitters.description": "E-ljudi i grupe koje imaju dozvolu da podnose nove stavke u ovu kolekciju.",
+  "comcol-role.edit.item_read.name": "Podrazumevani pristup za čitanje stavke",
+  "comcol-role.edit.item_read.description": "E-Ljudi i grupe koje mogu da čitaju nove stavke poslate u ovu kolekciju. Promene ove uloge nisu retroaktivne. Postojeće stavke u sistemu će i dalje moći da vide oni koji su imali pristup za čitanje u vreme njihovog dodavanja.",
+  "comcol-role.edit.item_read.anonymous-group": "Podrazumevano čitanje za dolazne stavke je trenutno postavljeno na Anonimno.",
+  "comcol-role.edit.bitstream_read.name": "Podrazumevani pristup za čitanje bitstreamova",
+  "comcol-role.edit.bitstream_read.description": "Administratori zajednice mogu da kreiraju podzajednice ili kolekcije i da upravljaju tim podzajednicama ili zbirkama ili da im dodeljuju upravljanje. Pored toga, oni odlučuju ko može da podnese stavke u bilo koju podzbirku, uređuju metapodatke stavki (nakon podnošenja) i dodaju (mapiraju) postojeće stavke iz drugih kolekcija (predmet ovlašćenja).",
+  "comcol-role.edit.bitstream_read.anonymous-group": "Podrazumevano čitanje za dolazne bitstreamove je trenutno podešeno na Anonimno.",
+  "comcol-role.edit.editor.name": "Urednici",
+  "comcol-role.edit.editor.description": "Urednici mogu da uređuju metapodatke dolaznih podnesaka, a zatim da ih prihvate ili odbiju.",
+  "comcol-role.edit.finaleditor.name": "Konačni urednici",
+  "comcol-role.edit.finaleditor.description": "Konačni urednici mogu da uređuju metapodatke dolaznih podnesaka, ali neće moći da ih odbiju.",
+  "comcol-role.edit.reviewer.name": "Recenzenti",
+  "comcol-role.edit.reviewer.description": "Recenzenti mogu da prihvate ili odbiju dolazne podneske. Međutim, oni ne mogu da uređuju metapodatke podneska.",
+  "comcol-role.edit.scorereviewers.name": "Rezultat recenzenata",
+  "comcol-role.edit.scorereviewers.description": "Recenzenti mogu da daju ocenu dolaznim podnescima, što će definisati da li će podnesak biti odbijen ili ne.",
+  "community.form.abstract": "Kratak opis",
+  "community.form.description": "Uvodni tekst (HTML)",
+  "community.form.errors.title.required": "Unesite naziv zajednice",
+  "community.form.rights": "Tekst autorskih prava (HTML)",
+  "community.form.tableofcontents": "Vesti (HTML)",
+  "community.form.title": "Ime",
+  "community.page.edit": "Uredite ovu zajednicu",
+  "community.page.handle": "Stalni URI za ovu zajednicu",
+  "community.page.license": "Licenca",
+  "community.page.news": "Vesti",
+  "community.all-lists.head": "Podzajednice i kolekcije",
+  "community.sub-collection-list.head": "Kolekcije u ovoj zajednici",
+  "community.sub-community-list.head": "Zajednice u ovoj zajednici",
+  "cookies.consent.accept-all": "Prihvatite sve",
+  "cookies.consent.accept-selected": "Prihvatite izabrano",
+  "cookies.consent.app.opt-out.description": "Ova aplikacija se podrazumevano učitava (ali možete da odustanete)",
+  "cookies.consent.app.opt-out.title": "(odustati)",
+  "cookies.consent.app.purpose": "Svrha",
+  "cookies.consent.app.required.description": "Ova aplikacija je uvek potrebna",
+  "cookies.consent.app.required.title": "(uvek potrebno)",
+  "cookies.consent.app.disable-all.description": "Koristite ovaj prekidač da omogućite ili onemogućite sve usluge.",
+  "cookies.consent.app.disable-all.title": "Omogućite ili onemogućite sve usluge",
+  "cookies.consent.update": "Bilo je promena od vaše poslednje posete, ažurirajte svoju saglasnost.",
+  "cookies.consent.close": "Zatvoriti",
+  "cookies.consent.decline": "Odbiti",
+  "cookies.consent.ok": "To je u redu",
+  "cookies.consent.save": "sačuvati",
+  "cookies.consent.content-notice.title": "Saglasnost za kolačiće",
+  "cookies.consent.content-notice.description": "Prikupljamo i obrađujemo vaše lične podatke u sledeće svrhe: <strong>Provera autentičnosti, podešavanja, potvrda i statistika</strong>. <br/> Da biste saznali više, pročitajte našu {privacyPolicy}.",
+  "cookies.consent.content-notice.description.no-privacy": "Prikupljamo i obrađujemo vaše lične podatke u sledeće svrhe: <strong>Provera autentičnosti, podešavanja, potvrda i statistika</strong>.",
+  "cookies.consent.content-notice.learnMore": "Prilagoditi",
+  "cookies.consent.content-modal.description": "Ovde možete videti i prilagoditi informacije koje prikupljamo o vama.",
+  "cookies.consent.content-modal.privacy-policy.name": "Pravila o privatnosti",
+  "cookies.consent.content-modal.privacy-policy.text": "Da saznate više, pročitajte našu {privacyPolicy}.",
+  "cookies.consent.content-modal.title": "Informacije koje prikupljamo",
+  "cookies.consent.content-modal.services": "Usluge",
+  "cookies.consent.content-modal.service": "Usluga",
+  "cookies.consent.app.title.authentication": "Provera",
+  "cookies.consent.app.description.authentication": "Potrebno za prijavljivanje",
+  "cookies.consent.app.title.preferences": "Podešavanja",
+  "cookies.consent.app.description.preferences": "Potrebno za čuvanje vaših podešavanja",
+  "cookies.consent.app.title.acknowledgement": "Potvrda",
+  "cookies.consent.app.description.acknowledgement": "Potrebno za čuvanje vaših potvrda i saglasnosti",
+  "cookies.consent.app.title.google-analytics": "Google analitike",
+  "cookies.consent.app.description.google-analytics": "Omogućava nam da pratimo statističke podatke",
+  "cookies.consent.app.title.google-recaptcha": "Google reCaptcha",
+  "cookies.consent.app.description.google-recaptcha": "Koristimo Google reCAPTCHA uslugu tokom registracije i oporavka lozinke",
+  "cookies.consent.purpose.functional": "Funkcionalni",
+  "cookies.consent.purpose.statistical": "Statistički",
+  "cookies.consent.purpose.registration-password-recovery": "Registracija i oporavak lozinke",
+  "cookies.consent.purpose.sharing": "Deljenje",
+  "curation-task.task.citationpage.label": "Generišite stranicu sa citatima",
+  "curation-task.task.checklinks.label": "Proverite veze u metapodacima",
+  "curation-task.task.noop.label": "NOOP",
+  "curation-task.task.profileformats.label": "Profil Bitstrim formati",
+  "curation-task.task.requiredmetadata.label": "Proverite potrebne metapodatke",
+  "curation-task.task.translate.label": "Microsoft prevodilac",
+  "curation-task.task.vscan.label": "Pretraga virusa",
+  "curation-task.task.register-doi.label": "Registrujte DOI",
+  "curation.form.task-select.label": "Zadatak:",
+  "curation.form.submit": "Početak",
+  "curation.form.submit.success.head": "Zadato kuriranje je uspešno pokrenuto",
+  "curation.form.submit.success.content": "Bićete preusmereni na odgovarajuću stranicu procesa.",
+  "curation.form.submit.error.head": "Neuspešno pokretanje zadatog kuriranja",
+  "curation.form.submit.error.content": "Došlo je do greške pri pokušaju pokretanja zadatog kuriranja.",
+  "curation.form.submit.error.invalid-handle": "Nije moguće odrediti ručicu za ovaj objekat",
+  "curation.form.handle.label": "Handle:",
+  "curation.form.handle.hint": "Savet: Unesite [your-handle-prefix]/0 da biste pokrenuli zadatak na celom sajtu (ovu mogućnost ne podržavaju svi zadaci)",
+  "deny-request-copy.email.message": "Poštovani {{ recipientName }}, \n Kao odgovor na vaš zahtev, sa žaljenjem vas obaveštavam da nije moguće poslati kopiju fajla koju ste tražili, u vezi sa dokumentom: \"{{ itemUrl }}\" ({{ itemName }}), čiji sam autor. \n Srdačan pozdrav, \n{{ authorName }} <{{ authorEmail }}>",
+  "deny-request-copy.email.subject": "Zatražite kopiju dokumenta",
+  "deny-request-copy.error": "Došlo je do greške",
+  "deny-request-copy.header": "Odbijen zahtev za kopiranje dokumenta",
+  "deny-request-copy.intro": "Ova poruka biće poslata podnosiocu zahteva",
+  "deny-request-copy.success": "Zahtev za stavku je odbijen uspešno",
+  "dso.name.untitled": "Bez naslova",
+  "dso.name.unnamed": "Bez imena",
+  "dso-selector.create.collection.head": "Nova kolekcija",
+  "dso-selector.create.collection.sub-level": "Kreirajte novu kolekciju u",
+  "dso-selector.create.community.head": "Nova zajednica",
+  "dso-selector.create.community.or-divider": "ili",
+  "dso-selector.create.community.sub-level": "Kreirajte novu zajednicu u",
+  "dso-selector.create.community.top-level": "Kreirajte novu zajednicu najvišeg nivoa",
+  "dso-selector.create.item.head": "Nova stavka",
+  "dso-selector.create.item.sub-level": "Kreirajte novu stavku u",
+  "dso-selector.create.submission.head": "Novi podnesak",
+  "dso-selector.edit.collection.head": "Izmenite kolekciju",
+  "dso-selector.edit.community.head": "Izmenite zajednicu",
+  "dso-selector.edit.item.head": "Izmenite stavku",
+  "dso-selector.error.title": "Došlo je do greške pri pretrazi {{ type }}",
+  "dso-selector.export-metadata.dspaceobject.head": "Izvezite metapodatke iz",
+  "dso-selector.export-batch.dspaceobject.head": "Izvezite paket (ZIP) iz",
+  "dso-selector.import-batch.dspaceobject.head": "Uvezite paket iz",
+  "dso-selector.no-results": "Nije pronađen {{ type }}",
+  "dso-selector.placeholder": "Pretražite {{ type }}",
+  "dso-selector.select.collection.head": "Izaberite kolekciju",
+  "dso-selector.set-scope.community.head": "Izaberite opseg pretrage",
+  "dso-selector.set-scope.community.button": "Pretražite čitav repozitorijum",
+  "dso-selector.set-scope.community.or-divider": "ili",
+  "dso-selector.set-scope.community.input-header": "Pretražite zajednicu ili kolekciju",
+  "dso-selector.claim.item.head": "Smernice za profil",
+  "dso-selector.claim.item.body": "Ovo su postojeći profili koji se možda odnose na Vas. Ako se prepoznate u jednom od ovih profila, izaberite ga i na stranici sa detaljima, među opcijama, izaberite da ga zatražite. U suprotnom, možete kreirati novi profil od nule koristeći dugme ispod.",
+  "dso-selector.claim.item.not-mine-label": "Nijedan od ovih nije moj",
+  "dso-selector.claim.item.create-from-scratch": "Kreirajte novi",
+  "dso-selector.results-could-not-be-retrieved": "Nešto nije u redu, molimo osvežite ponovo ↻",
+  "supervision-group-selector.header": "Selektor grupe za nadzor",
+  "supervision-group-selector.select.type-of-order.label": "Izaberite tip naloga",
+  "supervision-group-selector.select.type-of-order.option.none": "NIJEDAN",
+  "supervision-group-selector.select.type-of-order.option.editor": "UREDNIK",
+  "supervision-group-selector.select.type-of-order.option.observer": "POSMATRAČ",
+  "supervision-group-selector.select.group.label": "Izaberite grupu",
+  "supervision-group-selector.button.cancel": "Otkazati",
+  "supervision-group-selector.button.save": "Sačuvati",
+  "supervision-group-selector.select.type-of-order.error": "Molimo izaberite tip naloga",
+  "supervision-group-selector.select.group.error": "Molimo izaberite grupu",
+  "supervision-group-selector.notification.create.success.title": "Uspešno je kreiran nalog nadzora za grupu {{ name }}",
+  "supervision-group-selector.notification.create.failure.title": "Greška",
+  "supervision-group-selector.notification.create.already-existing": "Već postoji nalog za nadzor za ovu stavku izabrane grupe",
+  "confirmation-modal.export-metadata.header": "Izvoz metapodataka za {{ dsoName }}",
+  "confirmation-modal.export-metadata.info": "Da li ste sigurni da želite da izvezete metapodatke za {{ dsoName }}",
+  "confirmation-modal.export-metadata.cancel": "Otkazati",
+  "confirmation-modal.export-metadata.confirm": "Izvoz",
+  "confirmation-modal.export-batch.header": "Izvezite paket (ZIP) za {{ dsoName }}",
+  "confirmation-modal.export-batch.info": "Da li ste sigurni da želite da izvezete paket (ZIP) za {{ dsoName }}",
+  "confirmation-modal.export-batch.cancel": "Otkazati",
+  "confirmation-modal.export-batch.confirm": "Izvoz",
+  "confirmation-modal.delete-eperson.header": "Izbrišite Eperson \"{{ dsoName }}\"",
+  "confirmation-modal.delete-eperson.info": "Da li ste sigurni da želite da izbrišete Eperson \"{{ dsoName }}\"",
+  "confirmation-modal.delete-eperson.cancel": "Otkazati",
+  "confirmation-modal.delete-eperson.confirm": "Izbrisati",
+  "confirmation-modal.delete-profile.header": "Izbrišite profil",
+  "confirmation-modal.delete-profile.info": "Da li ste sigurni da želite da izbrišete svoj profil",
+  "confirmation-modal.delete-profile.cancel": "Otkazati",
+  "confirmation-modal.delete-profile.confirm": "Izbrisati",
+  "confirmation-modal.delete-subscription.header": "Ukloniti pretplatu",
+  "confirmation-modal.delete-subscription.info": "Da li ste sigurni da želite da izbrišete pretplatu za \"{{ dsoName }}\"",
+  "confirmation-modal.delete-subscription.cancel": "Otkazati",
+  "confirmation-modal.delete-subscription.confirm": "Izbrisati",
+  "error.bitstream": "Greška pri preuzimanju bitstream-a",
+  "error.browse-by": "Greška pri preuzimanju stavki",
+  "error.collection": "Greška pri preuzimanju kolekcije",
+  "error.collections": "Greška pri preuzimanju kolekcija",
+  "error.community": "Greška pri preuzimanju zajednice",
+  "error.identifier": "Nije pronađena nijedna stavka za identifikator",
+  "error.default": "Greška",
+  "error.item": "Greška pri preuzimanju stavke",
+  "error.items": "Greška pri preuzimanju stavki",
+  "error.objects": "Greška pri preuzimanju objekata",
+  "error.recent-submissions": "Greška pri preuzimanju nedavnih podnesaka",
+  "error.search-results": "Greška pri preuzimanju rezultata pretrage",
+  "error.invalid-search-query": "Upit za pretragu nije ispravan. Proverite najbolja rešenja za <a href=\"https://solr.apache.org/guide/kueri-sintak-and-parsing.html\" target=\"_blank\">Solr sintaksu upita</a> za dodatne informacije o ovoj grešci .",
+  "error.sub-collections": "Greška pri preuzimanju podkolekcija",
+  "error.sub-communities": "Greška pri preuzimanju podzajednica",
+  "error.submission.sections.init-form-error": "Došlo je do greške tokom inicijalizacije odeljka, molimo proverite konfiguraciju obrasca za unos. Detalji su ispod: <br> <br>",
+  "error.top-level-communities": "Greška pri preuzimanju zajednica najvišeg nivoa",
+  "error.validation.license.notgranted": "Morate dodeliti ovu licencu da biste dovršili svoj podnesak. Ako u ovom trenutku niste u mogućnosti da dodelite ovu licencu, možete da sačuvate svoj rad i vratite se kasnije ili uklonite podnesak.",
+  "error.validation.pattern": "Ovaj unos je ograničen trenutnim obrascem: {{ pattern }}.",
+  "error.validation.filerequired": "Otpremanje fajla je obavezno",
+  "error.validation.required": "Ovo polje je obavezno",
+  "error.validation.NotValidEmail": "Ovaj e-mail nije važeći e-mail",
+  "error.validation.emailTaken": "Ova e-mail adresa je već zauzeta",
+  "error.validation.groupExists": "Ova grupa već postoji",
+  "error.validation.metadata.name.invalid-pattern": "Ovo polje ne može da sadrži tačke, zareze ili razmake. Umesto toga, koristite polja Element i kvalifikator",
+  "error.validation.metadata.name.max-length": "Ovo polje ne sme da sadrži više od 32 znaka",
+  "error.validation.metadata.namespace.max-length": "Ovo polje ne sme da sadrži više od 256 znakova",
+  "error.validation.metadata.element.invalid-pattern": "Ovo polje ne može da sadrži tačke, zareze ili razmake. Umesto toga, koristite polje Kvalifikator",
+  "error.validation.metadata.element.max-length": "Ovo polje ne sme da sadrži više od 64 znaka",
+  "error.validation.metadata.qualifier.invalid-pattern": "Ovo polje ne može da sadrži tačke, zareze ili razmake",
+  "error.validation.metadata.qualifier.max-length": "Ovo polje ne sme da sadrži više od 64 znaka",
+  "feed.description": "Syndication feed",
+  "file-section.error.header": "Greška pri pribavljanju fajlova za ovu stavku",
+  "footer.copyright": "autorska prava © 2002-{{ year }}",
+  "footer.link.dspace": "DSpace softver",
+  "footer.link.lyrasis": "LIRASIS",
+  "footer.link.cookies": "Podešavanja kolačića",
+  "footer.link.privacy-policy": "Pravila o privatnosti",
+  "footer.link.end-user-agreement": "Ugovor sa krajnjim korisnikom",
+  "footer.link.feedback": "Pošalji povratne informacije",
+  "forgot-email.form.header": "Zaboravili ste lozinku",
+  "forgot-email.form.info": "Unesite e-mail adresu povezanu sa nalogom.",
+  "forgot-email.form.email": "E-mail adresa *",
+  "forgot-email.form.email.error.required": "Unesite e-mail adresu",
+  "forgot-email.form.email.error.not-email-form": "Unesite važeću e-mail adresu",
+  "forgot-email.form.email.hint": "E-mail sa daljim uputstvima biće poslat na ovu adresu ",
+  "forgot-email.form.submit": "Resetujte lozinku",
+  "forgot-email.form.success.head": "Poslat je e-mail za resetovanje lozinke",
+  "forgot-email.form.success.content": "E-mail koji sadrži posebnu URL adresu i dalja uputstva biće poslat na {{ email }} ",
+  "forgot-email.form.error.head": "Greška pri pokušaju resetovanja lozinke",
+  "forgot-email.form.error.content": "Došlo je do greške pri pokušaju resetovanja lozinke za nalog povezan sa sledećom adresom e-pošte: {{ email }}",
+  "forgot-password.title": "Zaboravili ste lozinku",
+  "forgot-password.form.head": "Zaboravili ste lozinku",
+  "forgot-password.form.info": "Unesite novu lozinku u polje ispod i potvrdite je tako što ćete je ponovo ukucati u drugo polje.",
+  "forgot-password.form.card.security": "Bezbednost",
+  "forgot-password.form.identification.header": "Identifikovati",
+  "forgot-password.form.identification.email": "E-mail adresa:",
+  "forgot-password.form.label.password": "Lozinka",
+  "forgot-password.form.label.passwordrepeat": "Ponovo otkucajte da biste potvrdili",
+  "forgot-password.form.error.empty-password": "Unesite lozinku u polje ispod.",
+  "forgot-password.form.error.matching-passwords": "Lozinke se ne poklapaju.",
+  "forgot-password.form.notification.error.title": "Greška pri pokušaju slanja nove lozinke",
+  "forgot-password.form.notification.success.content": "Resetovanje lozinke je bilo uspešno. Prijavljeni ste kao kreirani korisnik.",
+  "forgot-password.form.notification.success.title": "Resetovanje lozinke je završeno",
+  "forgot-password.form.submit": "Pošalji lozinku",
+  "form.add": "Dodaj još",
+  "form.add-help": "Kliknite ovde da dodate trenutni unos i da dodate još jedan",
+  "form.cancel": "Poništiti, otkazati",
+  "form.clear": "Jasno",
+  "form.clear-help": "Kliknite ovde da biste uklonili izabranu vrednost",
+  "form.discard": "Odbacite",
+  "form.drag": "Prevucite",
+  "form.edit": "Uredite",
+  "form.edit-help": "Kliknite ovde da biste izmenili izabranu vrednost",
+  "form.first-name": "Ime",
+  "form.group-collapse": "Skupi",
+  "form.group-collapse-help": "Kliknite ovde za skupljanje",
+  "form.group-expand": "Proširiti",
+  "form.group-expand-help": "Kliknite ovde da biste proširili i dodali još elemenata",
+  "form.last-name": "Prezime",
+  "form.loading": "Učitavanje...",
+  "form.lookup": "Potražite",
+  "form.lookup-help": "Kliknite ovde da biste potražili postojeću vezu",
+  "form.no-results": "Nisu pronađeni rezultati",
+  "form.no-value": "Nije uneta vrednost",
+  "form.other-information.email": "E-mail",
+  "form.other-information.first-name": "Ime",
+  "form.other-information.insolr": "U Solr indeksu",
+  "form.other-information.institution": "Institucija",
+  "form.other-information.last-name": "Prezime",
+  "form.other-information.orcid": "ORCID",
+  "form.remove": "Uklonite",
+  "form.save": "Sačuvajte",
+  "form.save-help": "Sačuvajte izmene",
+  "form.search": "Pretraga",
+  "form.search-help": "Kliknite ovde da biste potražili postojeću prepisku",
+  "form.submit": "Sačuvajte",
+  "form.create": "Kreirajte",
+  "form.repeatable.sort.tip": "Spustite stavku na novu poziciju",
+  "grant-deny-request-copy.deny": "Ne šalji kopiju",
+  "grant-deny-request-copy.email.back": "Nazad",
+  "grant-deny-request-copy.email.message": "Opciona dodatna poruka",
+  "grant-deny-request-copy.email.message.empty": "Unesite poruku",
+  "grant-deny-request-copy.email.permissions.info": "Možete iskoristiti ovu priliku da ponovo razmotrite ograničenja pristupa dokumentu, kako biste izbegli da odgovorite na ove zahteve. Ako želite da zamolite administratore spremišta da uklone ova ograničenja, označite polje ispod.",
+  "grant-deny-request-copy.email.permissions.label": "Promenite u otvoreni pristup",
+  "grant-deny-request-copy.email.send": "Pošaljite",
+  "grant-deny-request-copy.email.subject": "Predmet",
+  "grant-deny-request-copy.email.subject.empty": "Unesite temu",
+  "grant-deny-request-copy.grant": "Pošaljite kopiju",
+  "grant-deny-request-copy.header": "Zahtev za kopiju dokumenta",
+  "grant-deny-request-copy.home-page": "Vrati me na početnu stranicu",
+  "grant-deny-request-copy.intro1": "Ako ste jedan od autora dokumenta <a href='{{ url }}'>{{ name }}</a>, onda koristite jednu od opcija u nastavku da odgovorite na zahtev korisnika.",
+  "grant-deny-request-copy.intro2": "Nakon što odaberete opciju, biće vam predstavljen predloženi odgovor e-maila koji možete da izmenite.",
+  "grant-deny-request-copy.processed": "Ovaj zahtev je već obrađen. Možete koristiti dugme ispod da se vratite na početnu stranicu.",
+  "grant-request-copy.email.subject": "Zatražite kopiju dokumenta",
+  "grant-request-copy.error": "Došlo je do greške",
+  "grant-request-copy.header": "Odobrite zahtev za kopiju dokumenta",
+  "grant-request-copy.intro": "Podnosiocu zahteva će biti poslata poruka. Traženi dokument(i) će biti priložen.",
+  "grant-request-copy.success": "Zahtev za stavku je uspešno odobren",
+  "health.breadcrumbs": "Zdravlje",
+  "health-page.heading": "Zdravlje",
+  "health-page.info-tab": "Informacije",
+  "health-page.status-tab": "Status",
+  "health-page.error.msg": "Usluga provere zdravlja je privremeno nedostupna",
+  "health-page.property.status": "Statusni kod",
+  "health-page.section.db.title": "Baza podataka",
+  "health-page.section.geoIp.title": "GeoIp",
+  "health-page.section.solrAuthorityCore.title": "Solr: authority core",
+  "health-page.section.solrOaiCore.title": "Solr: oai core",
+  "health-page.section.solrSearchCore.title": "Solr: search core",
+  "health-page.section.solrStatisticsCore.title": "Solr: statistics core",
+  "health-page.section-info.app.title": "Backend aplikacije",
+  "health-page.section-info.java.title": "Java",
+  "health-page.status": "Status",
+  "health-page.status.ok.info": "Operativni",
+  "health-page.status.error.info": "Otkriveni su problemi",
+  "health-page.status.warning.info": "Otkriveni su mogući problemi",
+  "health-page.title": "Zdravlje",
+  "health-page.section.no-issues": "Nisu otkriveni problemi",
+  "home.description": "",
+  "home.breadcrumbs": "Home",
+  "home.search-form.placeholder": "Pretražite repozitorijum...",
+  "home.title": "Home",
+  "home.top-level-communities.head": "Zajednice u DSpace-u",
+  "home.top-level-communities.help": "Izaberite zajednicu da biste pregledali njene kolekcije.",
+  "info.end-user-agreement.accept": "Pročitao sam i prihvatam Ugovorom sa krajnjim korisnikom",
+  "info.end-user-agreement.accept.error": "Došlo je do greške pri prihvatanju Ugovora sa krajnjim korisnikom",
+  "info.end-user-agreement.accept.success": "Uspešno ažuriran Ugovor sa krajnjim korisnikom",
+  "info.end-user-agreement.breadcrumbs": "Ugovor sa krajnjim korisnikom",
+  "info.end-user-agreement.buttons.cancel": "Otkazati",
+  "info.end-user-agreement.buttons.save": "Sačuvati",
+  "info.end-user-agreement.head": "Ugovor sa krajnjim korisnikom",
+  "info.end-user-agreement.title": "Ugovor sa krajnjim korisnikom",
+  "info.end-user-agreement.hosting-country": "Sjedinjene Države",
+  "info.privacy.breadcrumbs": "Izjava o zaštiti privatnosti",
+  "info.privacy.head": "Izjava o zaštiti privatnosti",
+  "info.privacy.title": "Izjava o zaštiti privatnosti",
+  "info.feedback.breadcrumbs": "Povratna informacija",
+  "info.feedback.head": "Povratna informacija",
+  "info.feedback.title": "Povratna informacija",
+  "info.feedback.info": "Hvala Vam što ste podelili povratne informacije o DSpace sistemu. Cenimo Vaše komentare!",
+  "info.feedback.email_help": "Ova adresa će biti korišćena za praćenje vaših povratnih informacija.",
+  "info.feedback.send": "Pošaljite povratne informacije",
+  "info.feedback.comments": "Komentari",
+  "info.feedback.email-label": "Vaš Email",
+  "info.feedback.create.success": "Povratne informacije su uspešno poslate!",
+  "info.feedback.error.email.required": "Potrebna je važeća e-mail adresa",
+  "info.feedback.error.message.required": "Komentar je obavezan",
+  "info.feedback.page-label": "Strana",
+  "info.feedback.page_help": "Stranica je u vezi sa Vašim povratnim informacijama",
+  "item.alerts.private": "Ova stavka se ne može otkriti",
+  "item.alerts.withdrawn": "Ova stavka je povučena",
+  "item.edit.authorizations.heading": "Pomoću ovog editora možete da pregledate i menjate opcije stavke, kao i da menjate opcije pojedinačnih komponenti stavke: pakete i bitstream-ove. Ukratko, stavka je kontejner paketa, a paketi su kontejneri bitstream-ova. Kontejneri obično imaju opcije DODAVANJE/BRISANJE/ČITANJE/PISANJE, dok bitstream-ovi imaju samo opcije ČITANJE/PISANJE.",
+  "item.edit.authorizations.title": "Izmenite opcije stavke",
+  "item.badge.private": "Nevidljiv",
+  "item.badge.withdrawn": "Povučeno",
+  "item.bitstreams.upload.bundle": "Paket",
+  "item.bitstreams.upload.bundle.placeholder": "Izaberite paket ili unesite novo ime paketa",
+  "item.bitstreams.upload.bundle.new": "Kreirajte paket",
+  "item.bitstreams.upload.bundles.empty": "Ova stavka ne sadrži pakete za otpremanje bitstream-ova.",
+  "item.bitstreams.upload.cancel": "Otkazati",
+  "item.bitstreams.upload.drop-message": "Unesite datoteku za otpremanje",
+  "item.bitstreams.upload.item": "Stavka:",
+  "item.bitstreams.upload.notifications.bundle.created.content": "Uspešno kreiran novi paket.",
+  "item.bitstreams.upload.notifications.bundle.created.title": "Kreirani paket",
+  "item.bitstreams.upload.notifications.upload.failed": "Otpremanje neuspešno. Molimo Vas proverite sadržaj pre ponovnog pokušaja.",
+  "item.bitstreams.upload.title": "Otpremanje bitstream-a",
+  "item.edit.bitstreams.bundle.edit.buttons.upload": "Otpremiti",
+  "item.edit.bitstreams.bundle.displaying": "Trenutno se prikazuje {{ amount }} bitstream-ova od {{ total }}.",
+  "item.edit.bitstreams.bundle.load.all": "Učitajte sve ({{ total }})",
+  "item.edit.bitstreams.bundle.load.more": "Učitajte još",
+  "item.edit.bitstreams.bundle.name": "PAKET: {{ name }}",
+  "item.edit.bitstreams.discard-button": "Odbaciti",
+  "item.edit.bitstreams.edit.buttons.download": "Preuzimanje",
+  "item.edit.bitstreams.edit.buttons.drag": "Prevucite",
+  "item.edit.bitstreams.edit.buttons.edit": "Izmeniti",
+  "item.edit.bitstreams.edit.buttons.remove": "Ukloniti",
+  "item.edit.bitstreams.edit.buttons.undo": "Poništiti promene",
+  "item.edit.bitstreams.empty": "Ova stavka ne sadrži bitstream-ove. Kliknite na dugme za otpremanje da biste ga kreirali.",
+  "item.edit.bitstreams.headers.actions": "Radnje",
+  "item.edit.bitstreams.headers.bundle": "Paket",
+  "item.edit.bitstreams.headers.description": "Opis",
+  "item.edit.bitstreams.headers.format": "Format",
+  "item.edit.bitstreams.headers.name": "Ime",
+  "item.edit.bitstreams.notifications.discarded.content": "Vaše promene su odbačene. Da biste ponovo postavili svoje promene, kliknite na dugme \"Opozovi\".",
+  "item.edit.bitstreams.notifications.discarded.title": "Promene su odbačene",
+  "item.edit.bitstreams.notifications.move.failed.title": "Greška pri pokretanju bitstream-ova",
+  "item.edit.bitstreams.notifications.move.saved.content": "Promene koje ste pokrenuli u bitstream-ovima i paketima ove stavke su sačuvane.",
+  "item.edit.bitstreams.notifications.move.saved.title": "Pokrenute promene su sačuvane",
+  "item.edit.bitstreams.notifications.outdated.content": "Stavku na kojoj trenutno radite je promenio drugi korisnik. Vaše trenutne promene se odbacuju da bi se sprečili konflikti",
+  "item.edit.bitstreams.notifications.outdated.title": "Zastarele promene",
+  "item.edit.bitstreams.notifications.remove.failed.title": "Greška pri brisanju bitstream-a",
+  "item.edit.bitstreams.notifications.remove.saved.content": "Vaše izmene u vezi sa uklanjanjem bitstream-ova ove stavke su sačuvane.",
+  "item.edit.bitstreams.notifications.remove.saved.title": "Promene uklanjanja su sačuvane",
+  "item.edit.bitstreams.reinstate-button": "Poništiti",
+  "item.edit.bitstreams.save-button": "Sačuvati",
+  "item.edit.bitstreams.upload-button": "Otpremiti",
+  "item.edit.delete.cancel": "Otkazati",
+  "item.edit.delete.confirm": "Izbrisati",
+  "item.edit.delete.description": "Da li ste sigurni da ovu stavku treba potpuno izbrisati? Oprez: Trenutno ne bi ostao nijedan obrisani zapis.",
+  "item.edit.delete.error": "Došlo je do greške prilikom brisanja stavke",
+  "item.edit.delete.header": "Izbrišite stavku: {{ id }}",
+  "item.edit.delete.success": "Stavka je izbrisana",
+  "item.edit.head": "Uredite stavku",
+  "item.edit.breadcrumbs": "Uredite stavku",
+  "item.edit.tabs.disabled.tooltip": "Niste ovlašćeni da pristupite ovoj kartici",
+  "item.edit.tabs.mapper.head": "Mapiranje kolekcije",
+  "item.edit.tabs.item-mapper.title": "Uređivanje stavke - mapiranje kolekcije",
+  "item.edit.identifiers.doi.status.UNKNOWN": "Nepoznato",
+  "item.edit.identifiers.doi.status.TO_BE_REGISTERED": "Na čekanju za registraciju",
+  "item.edit.identifiers.doi.status.TO_BE_RESERVED": "Na čekanju za rezervaciju",
+  "item.edit.identifiers.doi.status.IS_REGISTERED": "Registrovano",
+  "item.edit.identifiers.doi.status.IS_RESERVED": "Rezervisano",
+  "item.edit.identifiers.doi.status.UPDATE_RESERVED": "Rezervisano (na čekanju za ažuriranje)",
+  "item.edit.identifiers.doi.status.UPDATE_REGISTERED": "Registrovano (na čekanju za ažuriranje)",
+  "item.edit.identifiers.doi.status.UPDATE_BEFORE_REGISTRATION": "Na čekanju za ažuriranje i registraciju",
+  "item.edit.identifiers.doi.status.TO_BE_DELETED": "Na čekanju za brisanje",
+  "item.edit.identifiers.doi.status.DELETED": "Izbrisano",
+  "item.edit.identifiers.doi.status.PENDING": "Na čekanju (nije registrovano)",
+  "item.edit.identifiers.doi.status.MINTED": "Minted (nije registrovano)",
+  "item.edit.tabs.status.buttons.register-doi.label": "Registrujte novi ili DOI na čekanju",
+  "item.edit.tabs.status.buttons.register-doi.button": "Registrujte DOI...",
+  "item.edit.register-doi.header": "Registrujte novi ili DOI na čekanju",
+  "item.edit.register-doi.description": "Pregledajte sve identifikatore i stavke metapodataka na čekanju ispod i kliknite na Potvrdi da biste nastavili sa DOI registracijom, ili Otkaži da biste se povukli",
+  "item.edit.register-doi.confirm": "Potvrditi",
+  "item.edit.register-doi.cancel": "Poništiti, otkazati",
+  "item.edit.register-doi.success": "DOI na čekanju za registraciju uspešno.",
+  "item.edit.register-doi.error": "Greška pri registraciji DOI",
+  "item.edit.register-doi.to-update": "Sledeći DOI je već minted i biće na čekanju za registraciju na mreži",
+  "item.edit.item-mapper.buttons.add": "Mapirajte stavku u izabrane kolekcije",
+  "item.edit.item-mapper.buttons.remove": "Uklonite mapiranje stavke za izabrane kolekcije",
+  "item.edit.item-mapper.cancel": "Poništiti, otkazati",
+  "item.edit.item-mapper.description": "Ovo je alatka za mapiranje stavki koja omogućava administratorima da mapiraju ovu stavku u druge kolekcije. Možete pretražiti kolekcije i mapirati ih ili pregledati listu kolekcija na koje je stavka trenutno mapirana.",
+  "item.edit.item-mapper.head": "Mapiranje stavke – mapirajte stavku u kolekcije",
+  "item.edit.item-mapper.item": "Stavka: \"<b>{{name}}</b>\"",
+  "item.edit.item-mapper.no-search": "Unesite upit za pretragu",
+  "item.edit.item-mapper.notifications.add.error.content": "Došlo je do grešaka pri mapiranju stavke u {{amount}} kolekcije.",
+  "item.edit.item-mapper.notifications.add.error.head": "Greške u mapiranju",
+  "item.edit.item-mapper.notifications.add.success.content": "Stavka je uspešno mapirana u {{amount}} kolekcije.",
+  "item.edit.item-mapper.notifications.add.success.head": "Mapiranje je završeno",
+  "item.edit.item-mapper.notifications.remove.error.content": "Došlo je do grešaka pri uklanjanju mapiranja na {{amount}} kolekcije.",
+  "item.edit.item-mapper.notifications.remove.error.head": "Uklanjanje grešaka u mapiranju",
+  "item.edit.item-mapper.notifications.remove.success.content": "Uspešno je uklonjeno mapiranje stavke u {{amount}} kolekcije.",
+  "item.edit.item-mapper.notifications.remove.success.head": "Uklanjanje mapiranja je završeno",
+  "item.edit.item-mapper.search-form.placeholder": "Pretraži kolekcije...",
+  "item.edit.item-mapper.tabs.browse": "Pregledajte mapirane kolekcije",
+  "item.edit.item-mapper.tabs.map": "Mapirajte nove kolekcije",
+  "item.edit.metadata.add-button": "Dodati",
+  "item.edit.metadata.discard-button": "Odbaciti",
+  "item.edit.metadata.edit.buttons.confirm": "Potvrditi",
+  "item.edit.metadata.edit.buttons.drag": "Prevucite da biste promenili redosled",
+  "item.edit.metadata.edit.buttons.edit": "Urediti",
+  "item.edit.metadata.edit.buttons.remove": "Ukloniti",
+  "item.edit.metadata.edit.buttons.undo": "Poništiti promene",
+  "item.edit.metadata.edit.buttons.unedit": "Zaustaviti uređivanje",
+  "item.edit.metadata.edit.buttons.virtual": "Ovo je virtuelna vrednost metapodataka, odnosno vrednost nasleđena od povezanog entiteta. Ne može se direktno menjati. Dodajte ili uklonite odgovarajući odnos na kartici \"Odnosi\".",
+  "item.edit.metadata.empty": "Stavka trenutno ne sadrži nikakve metapodatke. Kliknite na Dodaj da biste počeli da dodajete vrednost metapodataka.",
+  "item.edit.metadata.headers.edit": "Urediti",
+  "item.edit.metadata.headers.field": "Polje",
+  "item.edit.metadata.headers.language": "Jezik",
+  "item.edit.metadata.headers.value": "Vrednost",
+  "item.edit.metadata.metadatafield.error": "Došlo je do greške pri proveri polja metapodataka",
+  "item.edit.metadata.metadatafield.invalid": "Izaberite važeće polje za metapodatke",
+  "item.edit.metadata.notifications.discarded.content": "Vaše promene su odbačene. Da biste vratili svoje promene, kliknite na dugme \"Poništi\".",
+  "item.edit.metadata.notifications.discarded.title": "Promene su odbačene",
+  "item.edit.metadata.notifications.error.title": "Došlo je do greške",
+  "item.edit.metadata.notifications.invalid.content": "Vaše promene nisu sačuvane. Uverite se da su sva polja važeća pre nego što sačuvate.",
+  "item.edit.metadata.notifications.invalid.title": "Metapodaci su nevažeći",
+  "item.edit.metadata.notifications.outdated.content": "Stavku na kojoj trenutno radite je promenio drugi korisnik. Vaše trenutne promene se odbacuju da bi se sprečili konflikti",
+  "item.edit.metadata.notifications.outdated.title": "Promene su zastarele",
+  "item.edit.metadata.notifications.saved.content": "Vaše promene metapodataka ove stavke su sačuvane.",
+  "item.edit.metadata.notifications.saved.title": "Metapodaci su sačuvani",
+  "item.edit.metadata.reinstate-button": "Poništiti",
+  "item.edit.metadata.reset-order-button": "Poništite promenu redosleda",
+  "item.edit.metadata.save-button": "Sačuvati",
+  "item.edit.modify.overview.field": "Polje",
+  "item.edit.modify.overview.language": "Jezik",
+  "item.edit.modify.overview.value": "Vrednost",
+  "item.edit.move.cancel": "Nazad",
+  "item.edit.move.save-button": "Sačuvati",
+  "item.edit.move.discard-button": "Odbaciti",
+  "item.edit.move.description": "Izaberite kolekciju u koju želite da premestite ovu stavku. Da biste suzili listu prikazanih kolekcija, možete da unesete upit za pretragu u okvir.",
+  "item.edit.move.error": "Došlo je do greške pri pokušaju premeštanja stavke",
+  "item.edit.move.head": "Premestite stavku: {{id}}",
+  "item.edit.move.inheritpolicies.checkbox": "Smernice nasleđivanja",
+  "item.edit.move.inheritpolicies.description": "Nasledite podrazumevane smernice odredišne kolekcije",
+  "item.edit.move.move": "Premestite",
+  "item.edit.move.processing": "Premeštanje...",
+  "item.edit.move.search.placeholder": "Unesite upit za pretragu da biste potražili kolekcije",
+  "item.edit.move.success": "Stavka je uspešno premeštena",
+  "item.edit.move.title": "Premestite stavku",
+  "item.edit.private.cancel": "Poništiti, otkazati",
+  "item.edit.private.confirm": "Učinite nepristupačnim",
+  "item.edit.private.description": "Da li ste sigurni da ova stavka treba da bude nepristupačna u arhivi?",
+  "item.edit.private.error": "Došlo je do greške pri postavljanju nepristupačne stavke",
+  "item.edit.private.header": "Učinite stavku nepristupačnom: {{ id }}",
+  "item.edit.private.success": "Stavka je sada nepristupačna",
+  "item.edit.public.cancel": "Poništiti, otkazati",
+  "item.edit.public.confirm": "Učinite pristupačnim",
+  "item.edit.public.description": "Da li ste sigurni da ova stavka treba da bude pristupačna u arhivi?",
+  "item.edit.public.error": "Došlo je do greške pri omogućavanju vidljivosti stavke",
+  "item.edit.public.header": "Učinite stavku vidljivom: {{ id }}",
+  "item.edit.public.success": "Stavka je sada vidljiva",
+  "item.edit.reinstate.cancel": "Otkazati",
+  "item.edit.reinstate.confirm": "Obnoviti",
+  "item.edit.reinstate.description": "Da li ste sigurni da ovu stavku treba vratiti u arhivu?",
+  "item.edit.reinstate.error": "Došlo je do greške pri vraćanju stavke",
+  "item.edit.reinstate.header": "Vratite stavku: {{ id }}",
+  "item.edit.reinstate.success": "Stavka je uspešno vraćena",
+  "item.edit.relationships.discard-button": "Odbaciti",
+  "item.edit.relationships.edit.buttons.add": "Dodati",
+  "item.edit.relationships.edit.buttons.remove": "Ukloniti",
+  "item.edit.relationships.edit.buttons.undo": "Poništiti promene",
+  "item.edit.relationships.no-relationships": "Nema relacija",
+  "item.edit.relationships.notifications.discarded.content": "Vaše promene su odbačene. Da biste vratili svoje promene, kliknite na dugme \"Poništiti\".",
+  "item.edit.relationships.notifications.discarded.title": "Promene su odbačene",
+  "item.edit.relationships.notifications.failed.title": "Greška pri izmeni relacija",
+  "item.edit.relationships.notifications.outdated.content": "Stavku na kojoj trenutno radite je promenio drugi korisnik. Vaše trenutne promene su odbačene da bi se sprečili konflikti",
+  "item.edit.relationships.notifications.outdated.title": "Zastarele promene",
+  "item.edit.relationships.notifications.saved.content": "Vaše promene u relacijama ove stavke su sačuvane.",
+  "item.edit.relationships.notifications.saved.title": "Relacije su sačuvane",
+  "item.edit.relationships.reinstate-button": "Poništi",
+  "item.edit.relationships.save-button": "Sačuvati",
+  "item.edit.relationships.no-entity-type": "Dodajte metapodatke \"dspace.entity.type\" da biste omogućili relacije za ovu stavku",
+  "item.edit.return": "Nazad",
+  "item.edit.tabs.bitstreams.head": "Bitstream-ovi",
+  "item.edit.tabs.bitstreams.title": "Izmena stavke - Bitstream-ovi",
+  "item.edit.tabs.curate.head": "Kuriranje",
+  "item.edit.tabs.curate.title": "Izmena stavke - Kuriranje",
+  "item.edit.curate.title": "Kuriranje stavke: {{item}}",
+  "item.edit.tabs.access-control.head": "Kontrola pristupa",
+  "item.edit.tabs.access-control.title": "Izmena stavke - Kontrola pristupa",
+  "item.edit.tabs.metadata.head": "Metapodaci",
+  "item.edit.tabs.metadata.title": "Izmena stavke – Metapodaci",
+  "item.edit.tabs.relationships.head": "Relacije",
+  "item.edit.tabs.relationships.title": "Izmena stavke - Relacije",
+  "item.edit.tabs.status.buttons.authorizations.button": "Ovlašćenja...",
+  "item.edit.tabs.status.buttons.authorizations.label": "Izmenite smernice ovlašćenja stavke",
+  "item.edit.tabs.status.buttons.delete.button": "Trajno izbrisati",
+  "item.edit.tabs.status.buttons.delete.label": "Potpuno izbrisati stavku",
+  "item.edit.tabs.status.buttons.mappedCollections.button": "Mapirane kolekcije",
+  "item.edit.tabs.status.buttons.mappedCollections.label": "Upravljajte mapiranim kolekcijama",
+  "item.edit.tabs.status.buttons.move.button": "Premesti ovu stavku u drugu kolekciju",
+  "item.edit.tabs.status.buttons.move.label": "Premesti stavku u drugu kolekciju",
+  "item.edit.tabs.status.buttons.private.button": "Postavite da bude nevidljivo...",
+  "item.edit.tabs.status.buttons.private.label": "Postavite stavku da bude nevidljiva",
+  "item.edit.tabs.status.buttons.public.button": "Postavite da bude vidljivo...",
+  "item.edit.tabs.status.buttons.public.label": "Postavite stavku da bude vidljiva",
+  "item.edit.tabs.status.buttons.reinstate.button": "Ponovo postavite...",
+  "item.edit.tabs.status.buttons.reinstate.label": "Vratite stavku u repozitorijum",
+  "item.edit.tabs.status.buttons.unauthorized": "Niste ovlašćeni da izvršite ovu radnju",
+  "item.edit.tabs.status.buttons.withdraw.button": "Povucite ovu stavku",
+  "item.edit.tabs.status.buttons.withdraw.label": "Povucite stavku iz repozitorijuma",
+  "item.edit.tabs.status.description": "Dobrodošli na stranicu za upravljanje stavkama. Odavde možete povući, vratiti, premestiti ili izbrisati stavku. Takođe možete ažurirati ili dodati nove metapodatke / bitstream-ove na drugim karticama.",
+  "item.edit.tabs.status.head": "Status",
+  "item.edit.tabs.status.labels.handle": "Handle",
+  "item.edit.tabs.status.labels.id": "Interni ID stavke",
+  "item.edit.tabs.status.labels.itemPage": "Stranica stavke",
+  "item.edit.tabs.status.labels.lastModified": "Poslednja izmena",
+  "item.edit.tabs.status.title": "Izmena stavke - Status",
+  "item.edit.tabs.versionhistory.head": "Istorija verzija",
+  "item.edit.tabs.versionhistory.title": "Izmena stavke - Istorija verzija",
+  "item.edit.tabs.versionhistory.under-construction": "Izmena ili dodavanje novih verzija još uvek nije moguće u ovom korisničkom interfejsu.",
+  "item.edit.tabs.view.head": "Prikaži stavku",
+  "item.edit.tabs.view.title": "Izmeni stavku - Prikaži",
+  "item.edit.withdraw.cancel": "Otkazati",
+  "item.edit.withdraw.confirm": "Povucite",
+  "item.edit.withdraw.description": "Da li ste sigurni da ovu stavku treba povući iz arhive?",
+  "item.edit.withdraw.error": "Došlo je do greške pri povlačenju stavke",
+  "item.edit.withdraw.header": "Povucite stavku: {{ id }}",
+  "item.edit.withdraw.success": "Stavka je uspešno povučena",
+  "item.orcid.return": "Nazad",
+  "item.listelement.badge": "Stavka",
+  "item.page.description": "Opis",
+  "item.page.journal-issn": "ISSN časopisa",
+  "item.page.journal-title": "Naslov časopisa",
+  "item.page.publisher": "Izdavač",
+  "item.page.titleprefix": "Stavka:",
+  "item.page.volume-title": "Naslov sveske",
+  "item.search.results.head": "Rezultati pretrage stavki",
+  "item.search.title": "Pretraga stavke",
+  "item.truncatable-part.show-more": "Prikažite još",
+  "item.truncatable-part.show-less": "Skupiti",
+  "workflow-item.search.result.delete-supervision.modal.header": "Izbrišite nalog za nadzor",
+  "workflow-item.search.result.delete-supervision.modal.info": "Da li ste sigurni da želite da izbrišete nalog za nadzor",
+  "workflow-item.search.result.delete-supervision.modal.cancel": "Otkazati",
+  "workflow-item.search.result.delete-supervision.modal.confirm": "Izbrisati",
+  "workflow-item.search.result.notification.deleted.success": "Uspešno je izbrisan nalog za nadzor \"{{name}}\"",
+  "workflow-item.search.result.notification.deleted.failure": "Neuspešno brisanje naloga za nadzor \"{{name}}\"",
+  "workflow-item.search.result.list.element.supervised-by": "Pregledao:",
+  "workflow-item.search.result.list.element.supervised.remove-tooltip": "Ukloniti grupu za nadzor",
+  "item.page.abstract": "Sažetak",
+  "item.page.author": "Autori",
+  "item.page.citation": "Citat",
+  "item.page.collections": "Kolekcije",
+  "item.page.collections.loading": "Učitavanje...",
+  "item.page.collections.load-more": "Učitajte još",
+  "item.page.date": "Datum",
+  "item.page.edit": "Izmenite ovu stavku",
+  "item.page.files": "Fajlovi",
+  "item.page.filesection.description": "Opis:",
+  "item.page.filesection.download": "Preuzimanje",
+  "item.page.filesection.format": "Format:",
+  "item.page.filesection.name": "ime:",
+  "item.page.filesection.size": "Veličina:",
+  "item.page.journal.search.title": "Članci u ovom časopisu",
+  "item.page.link.full": "Pun zapis stavke",
+  "item.page.link.simple": "Jednostavan zapis stavke",
+  "item.page.orcid.title": "ORCID",
+  "item.page.orcid.tooltip": "Otvorite stranicu za podešavanje ORCID-a",
+  "item.page.person.search.title": "Članci ovog autora",
+  "item.page.related-items.view-more": "Prikaži još {{ amount}}",
+  "item.page.related-items.view-less": "Sakrij poslednji {{ amount}}",
+  "item.page.relationships.isAuthorOfPublication": "Publikacije",
+  "item.page.relationships.isJournalOfPublication": "Publikacije",
+  "item.page.relationships.isOrgUnitOfPerson": "Autori",
+  "item.page.relationships.isOrgUnitOfProject": "Istraživački projekti",
+  "item.page.subject": "Ključne reči",
+  "item.page.uri": "URI",
+  "item.page.bitstreams.view-more": "Prikaži više",
+  "item.page.bitstreams.collapse": "Skupiti",
+  "item.page.filesection.original.bundle": "Originalni paket",
+  "item.page.filesection.license.bundle": "Licencni paket",
+  "item.page.return": "Nazad",
+  "item.page.version.create": "Kreirajte novu verziju",
+  "item.page.version.hasDraft": "Nova verzija se ne može kreirati zato što je u toku podnošenje",
+  "item.page.claim.button": "Potvrda",
+  "item.page.claim.tooltip": "Potvrdi ovu stavku kao profil",
+  "item.preview.dc.identifier.uri": "Identifikator:",
+  "item.preview.dc.contributor.author": "Autori:",
+  "item.preview.dc.date.issued": "Datum objavljivanja:",
+  "item.preview.dc.description.abstract": "Sažetak:",
+  "item.preview.dc.identifier.other": "Drugi identifikator:",
+  "item.preview.dc.language.iso": "Jezik:",
+  "item.preview.dc.subject": "Predmeti:",
+  "item.preview.dc.title": "Naslov:",
+  "item.preview.dc.type": "Tip:",
+  "item.preview.oaire.citation.issue": "Izdanje",
+  "item.preview.oaire.citation.volume": "Opseg",
+  "item.preview.dc.relation.issn": "ISSN",
+  "item.preview.dc.identifier.isbn": "ISBN",
+  "item.preview.dc.identifier": "Identifikator:",
+  "item.preview.dc.relation.ispartof": "Časopis ili serija",
+  "item.preview.dc.identifier.doi": "DOI",
+  "item.preview.dc.publisher": "Izdavač:",
+  "item.preview.person.familyName": "prezime:",
+  "item.preview.person.givenName": "Ime:",
+  "item.preview.person.identifier.orcid": "ORCID:",
+  "item.preview.project.funder.name": "Finansijer:",
+  "item.preview.project.funder.identifier": "Identifikator finansijera:",
+  "item.preview.oaire.awardNumber": "ID finansiranja:",
+  "item.preview.dc.title.alternative": "Akronim:",
+  "item.preview.dc.coverage.spatial": "Jurisdikcija:",
+  "item.preview.oaire.fundingStream": "Tok finansiranja:",
+  "item.select.confirm": "Potvrdite izabrano",
+  "item.select.empty": "Nema stavki za prikaz",
+  "item.select.table.author": "Autor",
+  "item.select.table.collection": "Kolekcija",
+  "item.select.table.title": "Naslov",
+  "item.version.history.empty": "Još uvek nema drugih verzija za ovu stavku.",
+  "item.version.history.head": "Istorija verzija",
+  "item.version.history.return": "Nazad",
+  "item.version.history.selected": "Izabrana verzija",
+  "item.version.history.selected.alert": "Trenutno gledate verziju {{version}} stavke.",
+  "item.version.history.table.version": "Verzija",
+  "item.version.history.table.item": "Stavka",
+  "item.version.history.table.editor": "Urednik",
+  "item.version.history.table.date": "Datum",
+  "item.version.history.table.summary": "Rezime",
+  "item.version.history.table.workspaceItem": "Stavka radnog prostora",
+  "item.version.history.table.workflowItem": "Stavka procesa rada",
+  "item.version.history.table.actions": "Postupak",
+  "item.version.history.table.action.editWorkspaceItem": "Uredite stavku radnog prostora",
+  "item.version.history.table.action.editSummary": "Uredite rezime",
+  "item.version.history.table.action.saveSummary": "Sačuvajte izmene rezimea",
+  "item.version.history.table.action.discardSummary": "Odbacite izmene rezimea",
+  "item.version.history.table.action.newVersion": "Kreirajte novu verziju od ovog",
+  "item.version.history.table.action.deleteVersion": "Izbrišite verziju",
+  "item.version.history.table.action.hasDraft": "Nova verzija se ne može kreirati zato što je u toku prihvat u istoriji verzija",
+  "item.version.notice": "Ovo nije najnovija verzija ove stavke. Najnoviju verziju možete pronaći <a href='{{destination}}'>ovde</a>.",
+  "item.version.create.modal.header": "Nova verzija",
+  "item.version.create.modal.text": "Napravite novu verziju za ovu stavku",
+  "item.version.create.modal.text.startingFrom": "počevši od verzije {{version}}",
+  "item.version.create.modal.button.confirm": "Kreirajte",
+  "item.version.create.modal.button.confirm.tooltip": "Kreirajte novu verziju",
+  "item.version.create.modal.button.cancel": "Poništiti, otkazati",
+  "item.version.create.modal.button.cancel.tooltip": "Ne kreirajte novu verziju",
+  "item.version.create.modal.form.summary.label": "Rezime",
+  "item.version.create.modal.form.summary.placeholder": "Ubacite rezime za novu verziju",
+  "item.version.create.modal.submitted.header": "Kreiranje nove verzije...",
+  "item.version.create.modal.submitted.text": "Nova verzija je u izradi. Ovo može potrajati neko vreme ako stavka ima mnogo veza.",
+  "item.version.create.notification.success": "Nova verzija je napravljena sa brojem verzije {{version}}",
+  "item.version.create.notification.failure": "Nova verzija nije kreirana",
+  "item.version.create.notification.inProgress": "Nova verzija se ne može kreirati zato što je u toku prihvat u istoriji verzija",
+  "item.version.delete.modal.header": "Izbrišite verziju",
+  "item.version.delete.modal.text": "Da li želite da izbrišete verziju {{version}}?",
+  "item.version.delete.modal.button.confirm": "Izbrišite",
+  "item.version.delete.modal.button.confirm.tooltip": "Izbrišite ovu verziju",
+  "item.version.delete.modal.button.cancel": "Poništiti, otkazati",
+  "item.version.delete.modal.button.cancel.tooltip": "Nemojte brisati ovu verziju",
+  "item.version.delete.notification.success": "Verzija broj {{version}} je izbrisana",
+  "item.version.delete.notification.failure": "Verzija broj {{version}} nije izbrisana",
+  "item.version.edit.notification.success": "Sažetak verzije broj {{version}} je promenjen",
+  "item.version.edit.notification.failure": "Sažetak verzije broj {{version}} nije promenjen",
+  "itemtemplate.edit.metadata.add-button": "Dodati",
+  "itemtemplate.edit.metadata.discard-button": "Odbaciti",
+  "itemtemplate.edit.metadata.edit.buttons.confirm": "Potvrditi",
+  "itemtemplate.edit.metadata.edit.buttons.drag": "Prevucite da biste promenili redosled",
+  "itemtemplate.edit.metadata.edit.buttons.edit": "Izmeniti",
+  "itemtemplate.edit.metadata.edit.buttons.remove": "Ukloniti",
+  "itemtemplate.edit.metadata.edit.buttons.undo": "Poništiti promene",
+  "itemtemplate.edit.metadata.edit.buttons.unedit": "Zaustavite izmene",
+  "itemtemplate.edit.metadata.empty": "Šablon stavke trenutno ne sadrži nikakve metapodatke. Kliknite na Dodaj da biste započeli dodavanje vrednosti metapodataka.",
+  "itemtemplate.edit.metadata.headers.edit": "Izmeniti",
+  "itemtemplate.edit.metadata.headers.field": "Polje",
+  "itemtemplate.edit.metadata.headers.language": "Jezik",
+  "itemtemplate.edit.metadata.headers.value": "Vrednost",
+  "itemtemplate.edit.metadata.metadatafield.error": "Došlo je do greške prilikom provere polja metapodataka",
+  "itemtemplate.edit.metadata.metadatafield.invalid": "Molimo izaberite važeće polje metapodataka",
+  "itemtemplate.edit.metadata.notifications.discarded.content": "Vaše promene su odbačene. Da biste vratili svoje promene, kliknite na dugme \"Poništi\".",
+  "itemtemplate.edit.metadata.notifications.discarded.title": "Promene su odbačene",
+  "itemtemplate.edit.metadata.notifications.error.title": "Došlo je do greške",
+  "itemtemplate.edit.metadata.notifications.invalid.content": "Vaše promene nisu sačuvane. Molimo proverite da li su sva polja ispravna pre nego što sačuvate.",
+  "itemtemplate.edit.metadata.notifications.invalid.title": "Metapodaci su nevažeći",
+  "itemtemplate.edit.metadata.notifications.outdated.content": "Drugi korisnik je promenio šablon stavke na kome trenutno radite. Vaše trenutne promene se odbacuju da bi se sprečili konflikti",
+  "itemtemplate.edit.metadata.notifications.outdated.title": "Promene su zastarele",
+  "itemtemplate.edit.metadata.notifications.saved.content": "Vaše promene metapodataka ovog šablona stavke su sačuvane.",
+  "itemtemplate.edit.metadata.notifications.saved.title": "Metapodaci su sačuvani",
+  "itemtemplate.edit.metadata.reinstate-button": "Poništiti",
+  "itemtemplate.edit.metadata.reset-order-button": "Poništiti promenu redosleda",
+  "itemtemplate.edit.metadata.save-button": "Sačuvati",
+  "journal.listelement.badge": "Časopis",
+  "journal.page.description": "Opis",
+  "journal.page.edit": "Uredite ovu stavku",
+  "journal.page.editor": "Glavni urednik",
+  "journal.page.issn": "ISSN",
+  "journal.page.publisher": "Izdavač",
+  "journal.page.titleprefix": "Časopis:",
+  "journal.search.results.head": "Rezultati pretrage časopisa",
+  "journal-relationships.search.results.head": "Rezultati pretrage časopisa",
+  "journal.search.title": "Pretraga časopisa",
+  "journalissue.listelement.badge": "Izdanje časopisa",
+  "journalissue.page.description": "Opis",
+  "journalissue.page.edit": "Izmenite ovu stavku",
+  "journalissue.page.issuedate": "Datum izdanja",
+  "journalissue.page.journal-issn": "Časopis ISSN",
+  "journalissue.page.journal-title": "Naslov časopisa",
+  "journalissue.page.keyword": "Ključne reči",
+  "journalissue.page.number": "Broj",
+  "journalissue.page.titleprefix": "Izdanje časopisa:",
+  "journalvolume.listelement.badge": "Sveska časopisa",
+  "journalvolume.page.description": "Opis",
+  "journalvolume.page.edit": "Izmenite ovu stavku",
+  "journalvolume.page.issuedate": "Datum izdanja",
+  "journalvolume.page.titleprefix": "Sveska časopisa:",
+  "journalvolume.page.volume": "Sveska",
+  "iiifsearchable.listelement.badge": "Spisak medija",
+  "iiifsearchable.page.titleprefix": "Dokument:",
+  "iiifsearchable.page.doi": "Trajna veza:",
+  "iiifsearchable.page.issue": "Izdanje:",
+  "iiifsearchable.page.description": "Opis:",
+  "iiifviewer.fullscreen.notice": "Koristite ceo ekran da bolje vidite.",
+  "iiif.listelement.badge": "Image Media",
+  "iiif.page.titleprefix": "Slika:",
+  "iiif.page.doi": "Trajna veza:",
+  "iiif.page.issue": "Izdanje:",
+  "iiif.page.description": "Opis:",
+  "loading.bitstream": "Učitavanje bitstream-a...",
+  "loading.bitstreams": "Učitavanje bitstream-ova...",
+  "loading.browse-by": "Učitavanje stavki...",
+  "loading.browse-by-page": "Učitavanje stranice...",
+  "loading.collection": "Učitavanje kolekcije...",
+  "loading.collections": "Učitavanje kolekcija...",
+  "loading.content-source": "Učitavanje izvora sadržaja...",
+  "loading.community": "Učitavanje zajednice...",
+  "loading.default": "Učitavanje...",
+  "loading.item": "Učitavanje stavke...",
+  "loading.items": "Učitavanje stavki...",
+  "loading.mydspace-results": "Učitavanje stavki...",
+  "loading.objects": "Učitavanje...",
+  "loading.recent-submissions": "Učitavanje nedavnih podnesaka...",
+  "loading.search-results": "Učitavanje rezultata pretrage...",
+  "loading.sub-collections": "Učitavanje potkolekcija...",
+  "loading.sub-communities": "Učitavanje podzajednica...",
+  "loading.top-level-communities": "Učitavanje zajednica najvišeg nivoa...",
+  "login.form.email": "Email adresa",
+  "login.form.forgot-password": "Zaboravili ste lozinku?",
+  "login.form.header": "Molimo prijavite se na DSpace",
+  "login.form.new-user": "Novi korisnik? Kliknite ovde da se registrujete.",
+  "login.form.or-divider": "ili",
+  "login.form.oidc": "Prijavite se sa OIDC",
+  "login.form.orcid": "Prijavite se sa ORCID-om",
+  "login.form.password": "Lozinka",
+  "login.form.shibboleth": "Prijavite se sa Shibboleth",
+  "login.form.submit": "Prijavite se",
+  "login.title": "Prijavite se",
+  "login.breadcrumbs": "Prijavite se",
+  "logout.form.header": "Odjavite se sa DSpace-a",
+  "logout.form.submit": "Odjavite se",
+  "logout.title": "Odjavite se",
+  "menu.header.admin": "Menadžment",
+  "menu.header.image.logo": "Logo repozitorijuma",
+  "menu.header.admin.description": "Menadžment meni",
+  "menu.section.access_control": "Kontrola pristupa",
+  "menu.section.access_control_authorizations": "Ovlašćenja",
+  "menu.section.access_control_bulk": "Upravljanje masovnim pristupom",
+  "menu.section.access_control_groups": "Grupe",
+  "menu.section.access_control_people": "Ljudi",
+  "menu.section.admin_search": "Admin pretraga",
+  "menu.section.browse_community": "Ova zajednica",
+  "menu.section.browse_community_by_author": "Po autoru",
+  "menu.section.browse_community_by_issue_date": "Po datumu izdanja",
+  "menu.section.browse_community_by_title": "Po naslovu",
+  "menu.section.browse_global": "Čitav repozitorijum",
+  "menu.section.browse_global_by_author": "Po autoru",
+  "menu.section.browse_global_by_dateissued": "Po datumu izdanja",
+  "menu.section.browse_global_by_subject": "Po predmetu",
+  "menu.section.browse_global_by_srsc": "Po kategoriji predmeta",
+  "menu.section.browse_global_by_title": "Po naslovu",
+  "menu.section.browse_global_communities_and_collections": "Zajednice i kolekcije",
+  "menu.section.control_panel": "Kontrolna tabla",
+  "menu.section.curation_task": "Kurativni zadatak",
+  "menu.section.edit": "Urediti",
+  "menu.section.edit_collection": "Kolekcija",
+  "menu.section.edit_community": "Zajednica",
+  "menu.section.edit_item": "Stavka",
+  "menu.section.export": "Izvoz",
+  "menu.section.export_collection": "Kolekcija",
+  "menu.section.export_community": "Zajednica",
+  "menu.section.export_item": "Stavka",
+  "menu.section.export_metadata": "Metapodaci",
+  "menu.section.export_batch": "Grupni izvoz (ZIP)",
+  "menu.section.icon.access_control": "Odeljak menija Kontrola pristupa",
+  "menu.section.icon.admin_search": "Odeljak menija za admin pretragu",
+  "menu.section.icon.control_panel": "Odeljak menija kontrolne table",
+  "menu.section.icon.curation_tasks": "Odeljak menija Zadatak kuriranja",
+  "menu.section.icon.edit": "Uredite odeljak menija",
+  "menu.section.icon.export": "Izvezite odeljak menija",
+  "menu.section.icon.find": "Pronađite odeljak menija",
+  "menu.section.icon.health": "Odeljak menija za zdravstvenu proveru",
+  "menu.section.icon.import": "Uvezite odeljak menija",
+  "menu.section.icon.new": "Novi odeljak menija",
+  "menu.section.icon.pin": "Zakačite bočnu traku",
+  "menu.section.icon.processes": "Procesi provere zdravlja",
+  "menu.section.icon.registries": "Odeljak menija Registri",
+  "menu.section.icon.statistics_task": "Odeljak menija Statistički zadatak",
+  "menu.section.icon.workflow": "Odeljak menija Administracija procesa rada",
+  "menu.section.icon.unpin": "Otkačite bočnu traku",
+  "menu.section.import": "Uvoz",
+  "menu.section.import_batch": "Grupni uvoz (ZIP)",
+  "menu.section.import_metadata": "Metapodaci",
+  "menu.section.new": "Novo",
+  "menu.section.new_collection": "Kolekcija",
+  "menu.section.new_community": "Zajednica",
+  "menu.section.new_item": "Stavka",
+  "menu.section.new_item_version": "Verzija stavke",
+  "menu.section.new_process": "Proces",
+  "menu.section.pin": "Zakačite bočnu traku",
+  "menu.section.unpin": "Otkačite bočnu traku",
+  "menu.section.processes": "Procesi",
+  "menu.section.health": "Zdravlje",
+  "menu.section.registries": "Registri",
+  "menu.section.registries_format": "Format",
+  "menu.section.registries_metadata": "Metapodaci",
+  "menu.section.statistics": "Statistika",
+  "menu.section.statistics_task": "Statistički zadatak",
+  "menu.section.toggle.access_control": "Uključite odeljak Kontrola pristupa",
+  "menu.section.toggle.control_panel": "Uključite odeljak Kontrolna tabla",
+  "menu.section.toggle.curation_task": "Uključi/isključi odeljak Zadatak kuriranja",
+  "menu.section.toggle.edit": "Uključite odeljak Uredi",
+  "menu.section.toggle.export": "Uključite odeljak Izvezi",
+  "menu.section.toggle.find": "Uključi odeljak Pronađi",
+  "menu.section.toggle.import": "Uključite odeljak Uvezi",
+  "menu.section.toggle.new": "Uključite novi odeljak",
+  "menu.section.toggle.registries": "Uključite odeljak Registri",
+  "menu.section.toggle.statistics_task": "Uključi/isključi odeljak statistički zadatak",
+  "menu.section.workflow": "Administracija procesa rada",
+  "metadata-export-search.tooltip": "Izvezite rezultate pretrage kao CSV",
+  "metadata-export-search.submit.success": "Izvoz je uspešno započet",
+  "metadata-export-search.submit.error": "Pokretanje izvoza nije uspelo",
+  "mydspace.breadcrumbs": "Moj DSpace",
+  "mydspace.description": "",
+  "mydspace.messages.controller-help": "Izaberite ovu opciju da biste poslali poruku podnosiocu stavke.",
+  "mydspace.messages.description-placeholder": "Unesite svoju poruku ovde...",
+  "mydspace.messages.hide-msg": "Sakrijte poruku",
+  "mydspace.messages.mark-as-read": "Označite kao pročitano",
+  "mydspace.messages.mark-as-unread": "Označite kao nepročitanu",
+  "mydspace.messages.no-content": "Bez sadržaja.",
+  "mydspace.messages.no-messages": "Još nema poruka.",
+  "mydspace.messages.send-btn": "Pošalji",
+  "mydspace.messages.show-msg": "Prikaži poruku",
+  "mydspace.messages.subject-placeholder": "Predmet...",
+  "mydspace.messages.submitter-help": "Izaberite ovu opciju da biste poslali poruku kontroloru.",
+  "mydspace.messages.title": "Poruke",
+  "mydspace.messages.to": "Do",
+  "mydspace.new-submission": "Novi podnesak",
+  "mydspace.new-submission-external": "Uvezite metapodatke iz spoljnog izvora",
+  "mydspace.new-submission-external-short": "Uvezite metapodatke",
+  "mydspace.results.head": "Vaši podnesci",
+  "mydspace.results.no-abstract": "Nema sažetka",
+  "mydspace.results.no-authors": "Nema autora",
+  "mydspace.results.no-collections": "Nema kolekcija",
+  "mydspace.results.no-date": "Nema datuma",
+  "mydspace.results.no-files": "Nema fajlova",
+  "mydspace.results.no-results": "Nema stavki za prikaz",
+  "mydspace.results.no-title": "Bez naslova",
+  "mydspace.results.no-uri": "Nema URI",
+  "mydspace.search-form.placeholder": "Pretraga u mydspace...",
+  "mydspace.show.workflow": "Radni zadaci",
+  "mydspace.show.workspace": "Vaši podnesci",
+  "mydspace.show.supervisedWorkspace": "Nadzirane stavke",
+  "mydspace.status.mydspaceArchived": "Arhivirano",
+  "mydspace.status.mydspaceValidation": "Validacija",
+  "mydspace.status.mydspaceWaitingController": "Čeka se kontroler",
+  "mydspace.status.mydspaceWorkflow": "Radni proces",
+  "mydspace.status.mydspaceWorkspace": "Radni prostor",
+  "mydspace.title": "MyDSpace",
+  "mydspace.upload.upload-failed": "Greška pri kreiranju novog radnog prostora. Molimo proverite otpremljeni sadržaj pre nego što pokušate ponovo.",
+  "mydspace.upload.upload-failed-manyentries": "Neobrađen fajl. Otkriveno je previše unosa, ali je dozvoljen samo za jedan fajl.",
+  "mydspace.upload.upload-failed-moreonefile": "Neobrađen zahtev. Dozvoljen je samo jedan fajl.",
+  "mydspace.upload.upload-multiple-successful": "{{qty}} novih stavki radnog prostora je kreirano.",
+  "mydspace.view-btn": "Pogled",
+  "nav.browse.header": "Čitav repozitorijum",
+  "nav.community-browse.header": "Od zajednice",
+  "nav.context-help-toggle": "Uključite dodatnu pomoć",
+  "nav.language": "Promena jezika",
+  "nav.login": "Prijavi se",
+  "nav.user-profile-menu-and-logout": "Meni korisničkog profila i odjava",
+  "nav.logout": "Odjaviti se",
+  "nav.main.description": "Glavna navigaciona traka",
+  "nav.mydspace": "MyDSpace",
+  "nav.profile": "Profil",
+  "nav.search": "Pretraga",
+  "nav.search.button": "Pošaljite pretragu",
+  "nav.statistics.header": "Statistika",
+  "nav.stop-impersonating": "Prestanite da se predstavljate kao Eperson",
+  "nav.subscriptions": "Pretplate",
+  "nav.toggle": "Uključivanje navigacije",
+  "nav.user.description": "Traka korisničkog profila",
+  "none.listelement.badge": "Stavka",
+  "orgunit.listelement.badge": "Organizaciona jedinica",
+  "orgunit.listelement.no-title": "Bez naslova",
+  "orgunit.page.city": "Grad",
+  "orgunit.page.country": "Država",
+  "orgunit.page.dateestablished": "Datum postavljanja",
+  "orgunit.page.description": "Opis",
+  "orgunit.page.edit": "Izmeniti ovu stavku",
+  "orgunit.page.id": "ID",
+  "orgunit.page.titleprefix": "Organizaciona jedinica:",
+  "pagination.options.description": "Opcije straničenja",
+  "pagination.results-per-page": "Rezultati po stranici",
+  "pagination.showing.detail": "{{ range }} od {{ total }}",
+  "pagination.showing.label": "Prikazuje se ",
+  "pagination.sort-direction": "Opcije sortiranja",
+  "person.listelement.badge": "Osoba",
+  "person.listelement.no-title": "Ime nije pronađeno",
+  "person.page.birthdate": "Datum rođenja",
+  "person.page.edit": "Izmeniti ovu stavku",
+  "person.page.email": "Email adresa",
+  "person.page.firstname": "Ime",
+  "person.page.jobtitle": "Zvanje",
+  "person.page.lastname": "Prezime",
+  "person.page.name": "Ime",
+  "person.page.link.full": "Prikaži sve metapodatke",
+  "person.page.orcid": "ORCID",
+  "person.page.staffid": "ID zaposlenih",
+  "person.page.titleprefix": "Osoba:",
+  "person.search.results.head": "Rezultati pretrage osoba",
+  "person-relationships.search.results.head": "Rezultati pretrage osoba",
+  "person.search.title": "Pretraga osoba",
+  "process.new.select-parameters": "Parametri",
+  "process.new.cancel": "Otkazati",
+  "process.new.submit": "Sačuvati",
+  "process.new.select-script": "Skripta",
+  "process.new.select-script.placeholder": "Izaberite skriptu...",
+  "process.new.select-script.required": "Skripta je obavezna",
+  "process.new.parameter.file.upload-button": "Izaberite fajl...",
+  "process.new.parameter.file.required": "Molimo izaberite fajl",
+  "process.new.parameter.string.required": "Vrednost parametra je obavezna",
+  "process.new.parameter.type.value": "vrednost",
+  "process.new.parameter.type.file": "fajl",
+  "process.new.parameter.required.missing": "Sledeći parametri su obavezni, ali još uvek nedostaju:",
+  "process.new.notification.success.title": "Uspeh",
+  "process.new.notification.success.content": "Proces je uspešno kreiran",
+  "process.new.notification.error.title": "Greška",
+  "process.new.notification.error.content": "Došlo je do greške pri kreiranju ovog procesa",
+  "process.new.notification.error.max-upload.content": "Fajl prevazilazi maksimalnu veličinu za otpremanje",
+  "process.new.header": "Kreirajte novi proces",
+  "process.new.title": "Kreirajte novi proces",
+  "process.new.breadcrumbs": "Kreirajte novi proces",
+  "process.detail.arguments": "Argumenti",
+  "process.detail.arguments.empty": "Ovaj proces ne sadrži argumente",
+  "process.detail.back": "Nazad",
+  "process.detail.output": "Izlaz procesa",
+  "process.detail.logs.button": "Preuzmite izlaz procesa",
+  "process.detail.logs.loading": "Preuzimanje",
+  "process.detail.logs.none": "Ovaj proces nema izlaz",
+  "process.detail.output-files": "Izlazni fajlovi",
+  "process.detail.output-files.empty": "Ovaj proces ne sadrži izlazne fajlove",
+  "process.detail.script": "Skripta",
+  "process.detail.title": "Proces: {{ id }} - {{ name }}",
+  "process.detail.start-time": "Vreme početka",
+  "process.detail.end-time": "Vreme završetka",
+  "process.detail.status": "Status",
+  "process.detail.create": "Napravite sličan proces",
+  "process.detail.actions": "Akcije",
+  "process.detail.delete.button": "Izbrišite proces",
+  "process.detail.delete.header": "Izbrišite proces",
+  "process.detail.delete.body": "Da li ste sigurni da želite da izbrišete trenutni proces?",
+  "process.detail.delete.cancel": "Poništiti, otkazati",
+  "process.detail.delete.confirm": "Izbrišite proces",
+  "process.detail.delete.success": "Proces je uspešno obrisan.",
+  "process.detail.delete.error": "Nešto je pošlo naopako prilikom brisanja procesa",
+  "process.overview.table.finish": "Vreme završetka (UTC)",
+  "process.overview.table.id": "ID procesa",
+  "process.overview.table.name": "Ime",
+  "process.overview.table.start": "Vreme početka (UTC)",
+  "process.overview.table.status": "Status",
+  "process.overview.table.user": "Korisnik",
+  "process.overview.title": "Pregled procesa",
+  "process.overview.breadcrumbs": "Pregled procesa",
+  "process.overview.new": "Novo",
+  "process.overview.table.actions": "Akcije",
+  "process.overview.delete": "Izbrišite {{count}} procesa",
+  "process.overview.delete.clear": "Očistite izbor za brisanje",
+  "process.overview.delete.processing": "Brišu se procesi ({{count}}). Sačekajte da se brisanje u potpunosti završi. Imajte na umu da ovo može potrajati.",
+  "process.overview.delete.body": "Da li ste sigurni da želite da izbrišete {{count}} proces(e)?",
+  "process.overview.delete.header": "Izbrišite procese",
+  "process.bulk.delete.error.head": "Greška u procesu brisanja",
+  "process.bulk.delete.error.body": "Nije moguće izbrisati proces sa ID-om {{processId}}. Preostali procesi će nastaviti da se brišu.",
+  "process.bulk.delete.success": "Procesi ({{count}}) su uspešno izbrisani",
+  "profile.breadcrumbs": "Ažuriranje profila",
+  "profile.card.identify": "Identitet",
+  "profile.card.security": "Bezbednost",
+  "profile.form.submit": "Sačuvati",
+  "profile.groups.head": "Grupe ovlašćenja kojima pripadate",
+  "profile.special.groups.head": "Autorizacija posebnih grupa kojima pripadate",
+  "profile.head": "Ažuriranje profil",
+  "profile.metadata.form.error.firstname.required": "Ime je obavezno",
+  "profile.metadata.form.error.lastname.required": "Prezime je obavezno",
+  "profile.metadata.form.label.email": "Email adresa",
+  "profile.metadata.form.label.firstname": "Ime",
+  "profile.metadata.form.label.language": "Jezik",
+  "profile.metadata.form.label.lastname": "Prezime",
+  "profile.metadata.form.label.phone": "Kontakt telefon",
+  "profile.metadata.form.notifications.success.content": "Vaše promene na profilu su sačuvane.",
+  "profile.metadata.form.notifications.success.title": "Profil je sačuvan",
+  "profile.notifications.warning.no-changes.content": "Nisu napravljene nikakve promene na profilu.",
+  "profile.notifications.warning.no-changes.title": "Bez promene",
+  "profile.security.form.error.matching-passwords": "Lozinke se ne poklapaju.",
+  "profile.security.form.info": "Opciono, možete da unesete novu lozinku u polje ispod i potvrdite je tako što ćete je ponovo ukucati u drugo polje.",
+  "profile.security.form.label.password": "Lozinka",
+  "profile.security.form.label.passwordrepeat": "Ponovo otkucajte da biste potvrdili",
+  "profile.security.form.label.current-password": "Trenutna lozinka",
+  "profile.security.form.notifications.success.content": "Vaše promene lozinke su sačuvane.",
+  "profile.security.form.notifications.success.title": "Lozinka je sačuvana",
+  "profile.security.form.notifications.error.title": "Greška pri promeni lozinki",
+  "profile.security.form.notifications.error.change-failed": "Došlo je do greške pri pokušaju promene lozinke. Proverite da li je trenutna lozinka tačna.",
+  "profile.security.form.notifications.error.not-same": "Navedene lozinke nisu iste.",
+  "profile.security.form.notifications.error.general": "Popunite obavezna polja bezbednosnog obrasca.",
+  "profile.title": "Ažuriranje profila",
+  "profile.card.researcher": "Profil istraživača",
+  "project.listelement.badge": "Istraživački projekat",
+  "project.page.contributor": "Saradnici",
+  "project.page.description": "Opis",
+  "project.page.edit": "Uredite ovu stavku",
+  "project.page.expectedcompletion": "Očekivani završetak",
+  "project.page.funder": "finansijeri",
+  "project.page.id": "ID",
+  "project.page.keyword": "Ključne reči",
+  "project.page.status": "Status",
+  "project.page.titleprefix": "Istraživački projekat:",
+  "project.search.results.head": "Rezultati pretrage projekta",
+  "project-relationships.search.results.head": "Rezultati pretrage projekta",
+  "publication.listelement.badge": "Publikacija",
+  "publication.page.description": "Opis",
+  "publication.page.edit": "Uredite ovu stavku",
+  "publication.page.journal-issn": "Časopis ISSN",
+  "publication.page.journal-title": "Naslov časopisa",
+  "publication.page.publisher": "Izdavač",
+  "publication.page.titleprefix": "Publikacija:",
+  "publication.page.volume-title": "Naslov sveske",
+  "publication.search.results.head": "Rezultati pretrage publikacije",
+  "publication-relationships.search.results.head": "Rezultati pretrage publikacije",
+  "publication.search.title": "Pretraga publikacija",
+  "media-viewer.next": "Sledeće",
+  "media-viewer.previous": "Prethodno",
+  "media-viewer.playlist": "Play lista",
+  "register-email.title": "Registracija novog korisnika",
+  "register-page.create-profile.header": "Napravite profil",
+  "register-page.create-profile.identification.header": "Identifikovati",
+  "register-page.create-profile.identification.email": "Email adresa",
+  "register-page.create-profile.identification.first-name": "Ime *",
+  "register-page.create-profile.identification.first-name.error": "Molimo unesite ime",
+  "register-page.create-profile.identification.last-name": "Prezime *",
+  "register-page.create-profile.identification.last-name.error": "Molimo unesite prezime",
+  "register-page.create-profile.identification.contact": "Kontakt telefon",
+  "register-page.create-profile.identification.language": "Jezik",
+  "register-page.create-profile.security.header": "Bezbednost",
+  "register-page.create-profile.security.info": "Molimo unesite lozinku u polje ispod i potvrdite je tako što ćete je ponovo uneti u drugo polje.",
+  "register-page.create-profile.security.label.password": "Lozinka *",
+  "register-page.create-profile.security.label.passwordrepeat": "Unesite ponovo da potvrdite *",
+  "register-page.create-profile.security.error.empty-password": "Molimo unesite lozinku u polje ispod.",
+  "register-page.create-profile.security.error.matching-passwords": "Lozinke se ne poklapaju.",
+  "register-page.create-profile.submit": "Završite registraciju",
+  "register-page.create-profile.submit.error.content": "Nešto nije u redu prilikom registracije novog korisnika.",
+  "register-page.create-profile.submit.error.head": "Neuspešna registracija",
+  "register-page.create-profile.submit.success.content": "Registracija je uspešna. Prijavljeni ste kao kreirani korisnik.",
+  "register-page.create-profile.submit.success.head": "Registracija je završena",
+  "register-page.registration.header": "Registracija novog korisnika",
+  "register-page.registration.info": "Registrujte nalog da biste se pretplatili na kolekcije za ažuriranja putem email-a i pošaljite nove stavke na DSpace.",
+  "register-page.registration.email": "Email adresa *",
+  "register-page.registration.email.error.required": "Molimo unesite email adresu",
+  "register-page.registration.email.error.not-email-form": "Molimo unesite važeću email adresu.",
+  "register-page.registration.email.error.not-valid-domain": "Koristite email sa dozvoljenim domenima: {{ domains }}",
+  "register-page.registration.email.hint": "Ova adresa će biti verifikovana i korišćena kao vaše korisničko ime.",
+  "register-page.registration.submit": "Registrovati",
+  "register-page.registration.success.head": "Verifikacioni email je poslat",
+  "register-page.registration.success.content": "Email je poslat na {{ email }} koji sadrži poseban URL i dalja uputstva.",
+  "register-page.registration.error.head": "Greška pri pokušaju registracije email-a",
+  "register-page.registration.error.content": "Došlo je do greške pri registraciji sledeće email adrese: {{ email }}",
+  "register-page.registration.error.recaptcha": "Greška pri pokušaju autentifikacije pomoću recaptcha",
+  "register-page.registration.google-recaptcha.must-accept-cookies": "Da biste se registrovali, morate prihvatiti kolačiće za <b>registraciju i vraćanje lozinke</b> (Google reCaptcha).",
+  "register-page.registration.error.maildomain": "Ova email adresa nije na listi domena koji se mogu registrovati. Dozvoljeni domeni su {{ domains }}",
+  "register-page.registration.google-recaptcha.open-cookie-settings": "Otvorite podešavanja kolačića",
+  "register-page.registration.google-recaptcha.notification.title": "Google reCaptcha",
+  "register-page.registration.google-recaptcha.notification.message.error": "Došlo je do greške tokom reCaptcha verifikacije",
+  "register-page.registration.google-recaptcha.notification.message.expired": "Verifikacija je istekla. Molimo potvrdite ponovo.",
+  "register-page.registration.info.maildomain": "Nalozi se mogu registrovati za email adrese domena",
+  "relationships.add.error.relationship-type.content": "Nije pronađeno odgovarajuće podudaranje za tip veze {{ type }} između dve stavke",
+  "relationships.add.error.server.content": "Server je vratio grešku",
+  "relationships.add.error.title": "Nije moguće dodati vezu",
+  "relationships.isAuthorOf": "Autori",
+  "relationships.isAuthorOf.Person": "Autori (osoba)",
+  "relationships.isAuthorOf.OrgUnit": "Autori (organizacione jedinice)",
+  "relationships.isIssueOf": "Izdanja časopisa",
+  "relationships.isJournalIssueOf": "Izdanja časopsa",
+  "relationships.isJournalOf": "Časopisi",
+  "relationships.isOrgUnitOf": "Organizacione jedinice",
+  "relationships.isPersonOf": "Autori",
+  "relationships.isProjectOf": "Istraživački projekti",
+  "relationships.isPublicationOf": "Izdanja",
+  "relationships.isPublicationOfJournalIssue": "Članci",
+  "relationships.isSingleJournalOf": "Časopis",
+  "relationships.isSingleVolumeOf": "Sveska časopisa",
+  "relationships.isVolumeOf": "Sveske časopisa",
+  "relationships.isContributorOf": "Saradnici",
+  "relationships.isContributorOf.OrgUnit": "Saradnik (Organizaciona jedinica)",
+  "relationships.isContributorOf.Person": "Saradnik",
+  "relationships.isFundingAgencyOf.OrgUnit": "Osnivač",
+  "repository.image.logo": "Logo repozitorijuma",
+  "repository.title": "DSpace Repozitorijum",
+  "repository.title.prefix": "DSpace Repozitorijum ::",
+  "resource-policies.add.button": "Dodati",
+  "resource-policies.add.for.": "Dodajte nove smernice",
+  "resource-policies.add.for.bitstream": "Dodajte nove bitstream smernice",
+  "resource-policies.add.for.bundle": "Dodajte nove smernice paketa",
+  "resource-policies.add.for.item": "Dodajte nove smernice stavki",
+  "resource-policies.add.for.community": "Dodajte nove smernice zajednice",
+  "resource-policies.add.for.collection": "Dodajte nove smernice kolekcija",
+  "resource-policies.create.page.heading": "Kreirajte nove smernice resursa za",
+  "resource-policies.create.page.failure.content": "Došlo je do greške pri kreiranju smernica resursa.",
+  "resource-policies.create.page.success.content": "Operacija uspela",
+  "resource-policies.create.page.title": "Kreirajte nove smernice resursa",
+  "resource-policies.delete.btn": "Izbrišite izabrano",
+  "resource-policies.delete.btn.title": "Izbrišite izabrane smernice resursa",
+  "resource-policies.delete.failure.content": "Došlo je do greške prilikom brisanja izabranih smernica resursa.",
+  "resource-policies.delete.success.content": "Operacija uspela",
+  "resource-policies.edit.page.heading": "Izmenite smernice resursa",
+  "resource-policies.edit.page.failure.content": "Došlo je do greške prilikom izmene smernica resursa.",
+  "resource-policies.edit.page.target-failure.content": "Došlo je do greške prilikom izmene cilja (ePerson ili grupe) smernica resursa.",
+  "resource-policies.edit.page.other-failure.content": "Došlo je do greške prilikom izmene smernica resursa. Cilj (ePerson ili grupa) je uspešno ažuriran.",
+  "resource-policies.edit.page.success.content": "Operacija uspela",
+  "resource-policies.edit.page.title": "Izmena smernica resursa",
+  "resource-policies.form.action-type.label": "Izabrati vrstu akcije",
+  "resource-policies.form.action-type.required": "Morate da izaberete akciju polise resursa.",
+  "resource-policies.form.eperson-group-list.label": "Eperson ili grupa koja će dobiti ovlašćenje",
+  "resource-policies.form.eperson-group-list.select.btn": "Izabrati",
+  "resource-policies.form.eperson-group-list.tab.eperson": "Potražite ePerson",
+  "resource-policies.form.eperson-group-list.tab.group": "Potražite grupu",
+  "resource-policies.form.eperson-group-list.table.headers.action": "Postupak",
+  "resource-policies.form.eperson-group-list.table.headers.id": "ID",
+  "resource-policies.form.eperson-group-list.table.headers.name": "Ime",
+  "resource-policies.form.eperson-group-list.modal.header": "Ne može se promeniti tip",
+  "resource-policies.form.eperson-group-list.modal.text1.toGroup": "Nije moguće zameniti ePerson sa grupom.",
+  "resource-policies.form.eperson-group-list.modal.text1.toEPerson": "Nije moguće zameniti grupu sa ePerson.",
+  "resource-policies.form.eperson-group-list.modal.text2": "Izbrišite trenutne polise resursa i kreirajte nove sa željenim tipom.",
+  "resource-policies.form.eperson-group-list.modal.close": "Ok",
+  "resource-policies.form.date.end.label": "Datum završetka",
+  "resource-policies.form.date.start.label": "Datum početka",
+  "resource-policies.form.description.label": "Opis",
+  "resource-policies.form.name.label": "Ime",
+  //"resource-policies.form.name.hint": "Max 30 characters",
+  // TODO New key - Add a translation
+  "resource-policies.form.name.hint": "Max 30 characters",
+  "resource-policies.form.policy-type.label": "Izaberite tip polise",
+  "resource-policies.form.policy-type.required": "Morate da izaberete tip polise resursa.",
+  "resource-policies.table.headers.action": "Postupak",
+  "resource-policies.table.headers.date.end": "Datum završetka",
+  "resource-policies.table.headers.date.start": "Datum početka",
+  "resource-policies.table.headers.edit": "Izmeniti",
+  "resource-policies.table.headers.edit.group": "Izmeniti grupu",
+  "resource-policies.table.headers.edit.policy": "Izmeniti smernice",
+  "resource-policies.table.headers.eperson": "Eperson",
+  "resource-policies.table.headers.group": "Grupa",
+  "resource-policies.table.headers.id": "ID",
+  "resource-policies.table.headers.name": "Ime",
+  "resource-policies.table.headers.policyType": "tip",
+  "resource-policies.table.headers.title.for.bitstream": "Smernice za bitstream",
+  "resource-policies.table.headers.title.for.bundle": "Smernice za paket",
+  "resource-policies.table.headers.title.for.item": "Smernice za stavku",
+  "resource-policies.table.headers.title.for.community": "Smernice za zajednicu",
+  "resource-policies.table.headers.title.for.collection": "Smernice za kolekciju",
+  "search.description": "",
+  "search.switch-configuration.title": "Prikaži",
+  "search.title": "Pretraga",
+  "search.breadcrumbs": "Pretraga",
+  "search.search-form.placeholder": "Pretražite spremište...",
+  "search.filters.applied.f.author": "Autor",
+  "search.filters.applied.f.dateIssued.max": "Datum završetka",
+  "search.filters.applied.f.dateIssued.min": "Datum početka",
+  "search.filters.applied.f.dateSubmitted": "Datum prihvatanja",
+  "search.filters.applied.f.discoverable": "Nije moguće otkriti",
+  "search.filters.applied.f.entityType": "Tip stavke",
+  "search.filters.applied.f.has_content_in_original_bundle": "Ima fajlove",
+  "search.filters.applied.f.itemtype": "Tip",
+  "search.filters.applied.f.namedresourcetype": "Status",
+  "search.filters.applied.f.subject": "Predmet",
+  "search.filters.applied.f.submitter": "Podnosilac",
+  "search.filters.applied.f.jobTitle": "Zvanje",
+  "search.filters.applied.f.birthDate.max": "Rođenje - krajnji datum",
+  "search.filters.applied.f.birthDate.min": "Rođenje - početni datum",
+  "search.filters.applied.f.supervisedBy": "Pregledao",
+  "search.filters.applied.f.withdrawn": "Povučen",
+  "search.filters.filter.author.head": "Autor",
+  "search.filters.filter.author.placeholder": "Ime autora",
+  "search.filters.filter.author.label": "Pretražite ime autora",
+  "search.filters.filter.birthDate.head": "Datum rođenja",
+  "search.filters.filter.birthDate.placeholder": "Datum rođenja",
+  "search.filters.filter.birthDate.label": "Pretražite datum rođenja",
+  "search.filters.filter.collapse": "Skupi filter",
+  "search.filters.filter.creativeDatePublished.head": "Datum objavljivanja",
+  "search.filters.filter.creativeDatePublished.placeholder": "Datum objavljivanja",
+  "search.filters.filter.creativeDatePublished.label": "Pretražite datum objavljivanja",
+  "search.filters.filter.creativeWorkEditor.head": "Editor",
+  "search.filters.filter.creativeWorkEditor.placeholder": "Editor",
+  "search.filters.filter.creativeWorkEditor.label": "Pretraga urednika",
+  "search.filters.filter.creativeWorkKeywords.head": "Predmet",
+  "search.filters.filter.creativeWorkKeywords.placeholder": "Predmet",
+  "search.filters.filter.creativeWorkKeywords.label": "Predmet pretrage",
+  "search.filters.filter.creativeWorkPublisher.head": "Izdavač",
+  "search.filters.filter.creativeWorkPublisher.placeholder": "Izdavač",
+  "search.filters.filter.creativeWorkPublisher.label": "Pretraga izdavača",
+  "search.filters.filter.dateIssued.head": "Datum",
+  "search.filters.filter.dateIssued.max.placeholder": "Maksimalni datum",
+  "search.filters.filter.dateIssued.max.label": "Kraj",
+  "search.filters.filter.dateIssued.min.placeholder": "Minimalni datum",
+  "search.filters.filter.dateIssued.min.label": "Početak",
+  "search.filters.filter.dateSubmitted.head": "Datum prihvatanja",
+  "search.filters.filter.dateSubmitted.placeholder": "Datum prihvatanja",
+  "search.filters.filter.dateSubmitted.label": "Pretraga datuma prihvatanja",
+  "search.filters.filter.discoverable.head": "Nije moguće otkriti",
+  "search.filters.filter.withdrawn.head": "Povučen",
+  "search.filters.filter.entityType.head": "Tip stavke",
+  "search.filters.filter.entityType.placeholder": "Tip stavke",
+  "search.filters.filter.entityType.label": "Pretražite tip stavke",
+  "search.filters.filter.expand": "Proširi filter",
+  "search.filters.filter.has_content_in_original_bundle.head": "Ima fajlove",
+  "search.filters.filter.itemtype.head": "Tip",
+  "search.filters.filter.itemtype.placeholder": "Tip",
+  "search.filters.filter.itemtype.label": "Tip pretrage",
+  "search.filters.filter.jobTitle.head": "Zvanje",
+  "search.filters.filter.jobTitle.placeholder": "Zvanje",
+  "search.filters.filter.jobTitle.label": "Pretraga zvanja",
+  "search.filters.filter.knowsLanguage.head": "Poznati jezik",
+  "search.filters.filter.knowsLanguage.placeholder": "Poznati jezik",
+  "search.filters.filter.knowsLanguage.label": "Pretražite poznati jezik",
+  "search.filters.filter.namedresourcetype.head": "Status",
+  "search.filters.filter.namedresourcetype.placeholder": "Status",
+  "search.filters.filter.namedresourcetype.label": "Status pretrage",
+  "search.filters.filter.objectpeople.head": "Ljudi",
+  "search.filters.filter.objectpeople.placeholder": "Ljudi",
+  "search.filters.filter.objectpeople.label": "Pretražite ljude",
+  "search.filters.filter.organizationAddressCountry.head": "Država",
+  "search.filters.filter.organizationAddressCountry.placeholder": "Država",
+  "search.filters.filter.organizationAddressCountry.label": "Pretražite državu",
+  "search.filters.filter.organizationAddressLocality.head": "Grad",
+  "search.filters.filter.organizationAddressLocality.placeholder": "Grad",
+  "search.filters.filter.organizationAddressLocality.label": "Pretražite grad",
+  "search.filters.filter.organizationFoundingDate.head": "Datum osnivanja",
+  "search.filters.filter.organizationFoundingDate.placeholder": "Datum osnivanja",
+  "search.filters.filter.organizationFoundingDate.label": "Pretražite datum osnivanja",
+  "search.filters.filter.scope.head": "Opseg",
+  "search.filters.filter.scope.placeholder": "Filter opsega",
+  "search.filters.filter.scope.label": "Pretražite filter opsega",
+  "search.filters.filter.show-less": "Skupiti",
+  "search.filters.filter.show-more": "Prikaži više",
+  "search.filters.filter.subject.head": "Predmet",
+  "search.filters.filter.subject.placeholder": "Predmet",
+  "search.filters.filter.subject.label": "Predmet pretrage",
+  "search.filters.filter.submitter.head": "Podnosilac",
+  "search.filters.filter.submitter.placeholder": "Podnosilac",
+  "search.filters.filter.submitter.label": "Podnosilac pretrage",
+  "search.filters.filter.show-tree": "Pregledajte stablo {{ name }}",
+  "search.filters.filter.supervisedBy.head": "Pregledao",
+  "search.filters.filter.supervisedBy.placeholder": "Pregledao",
+  "search.filters.filter.supervisedBy.label": "Pretragu nadgledao",
+  "search.filters.entityType.JournalIssue": "Izdanja časopisa",
+  "search.filters.entityType.JournalVolume": "Sveska časopisa",
+  "search.filters.entityType.OrgUnit": "Organizaciona jedinica",
+  "search.filters.has_content_in_original_bundle.true": "Da",
+  "search.filters.has_content_in_original_bundle.false": "Ne",
+  "search.filters.discoverable.true": "Ne",
+  "search.filters.discoverable.false": "Da",
+  "search.filters.namedresourcetype.Archived": "Arhivirano",
+  "search.filters.namedresourcetype.Validation": "Ispravnost",
+  "search.filters.namedresourcetype.Waiting for Controller": "Čeka se kontrolor",
+  "search.filters.namedresourcetype.Workflow": "Proces rada",
+  "search.filters.namedresourcetype.Workspace": "Radni prostor",
+  "search.filters.withdrawn.true": "Da",
+  "search.filters.withdrawn.false": "Ne",
+  "search.filters.head": "Filteri",
+  "search.filters.reset": "Resetovanje filtera",
+  "search.filters.search.submit": "Prihvatite",
+  "search.form.search": "Pretraga",
+  "search.form.search_dspace": "Svi repozitorijumi",
+  "search.form.scope.all": "Čitav repozitorijum",
+  "search.results.head": "Rezultati pretrage",
+  "search.results.no-results": "Vaša pretraga nije dala rezultate. Imate problema sa pronalaženjem onoga što tražite? Pokušajte da stavite",
+  "search.results.no-results-link": "navodnike oko toga",
+  "search.results.empty": "Vaša pretraga nije dala rezultate.",
+  "search.results.view-result": "Pogledati",
+  "search.results.response.500": "Došlo je do greške tokom izvršavanja upita, molimo pokušajte ponovo kasnije",
+  "default.search.results.head": "Rezultati pretrage",
+  "default-relationships.search.results.head": "Rezultati pretrage",
+  "search.sidebar.close": "Povratak na rezultate",
+  "search.sidebar.filters.title": "Filteri",
+  "search.sidebar.open": "Alati za pretragu",
+  "search.sidebar.results": "rezultati",
+  "search.sidebar.settings.rpp": "Rezultati po strani",
+  "search.sidebar.settings.sort-by": "Sortirati po",
+  "search.sidebar.settings.title": "Podešavanja",
+  "search.view-switch.show-detail": "Prikazati detalje",
+  "search.view-switch.show-grid": "Prikazati kao mrežu",
+  "search.view-switch.show-list": "Prikazati kao listu",
+  "sorting.ASC": "Rastuće",
+  "sorting.DESC": "Opadajuće",
+  "sorting.dc.title.ASC": "Naslov rastuće",
+  "sorting.dc.title.DESC": "Naslov opadajuće",
+  "sorting.score.ASC": "Najmanje relevantno",
+  "sorting.score.DESC": "Najrelevantnije",
+  "sorting.dc.date.issued.ASC": "Datum izdanja rastuće",
+  "sorting.dc.date.issued.DESC": "Datum izdanja opadajuće",
+  "sorting.dc.date.accessioned.ASC": "Datum pristupa rastuće",
+  "sorting.dc.date.accessioned.DESC": "Datum pristupa opadajuće",
+  "sorting.lastModified.ASC": "Poslednja izmena rastuće",
+  "sorting.lastModified.DESC": "Poslednja izmena opadajuće",
+  "statistics.title": "Statistika",
+  "statistics.header": "Statistika za {{ scope }}",
+  "statistics.breadcrumbs": "Statistika",
+  "statistics.page.no-data": "Nema dostupnih podataka",
+  "statistics.table.no-data": "Nema dostupnih podataka",
+  "statistics.table.title.TotalVisits": "Ukupno poseta",
+  "statistics.table.title.TotalVisitsPerMonth": "Ukupno poseta mesečno",
+  "statistics.table.title.TotalDownloads": "Posete fajlovima",
+  "statistics.table.title.TopCountries": "Najviše pregleda po državama",
+  "statistics.table.title.TopCities": "Najviše pregleda po gradovima",
+  "statistics.table.header.views": "Pogledi",
+  "statistics.table.no-name": "(ime objekta se ne može učitati)",
+  "submission.edit.breadcrumbs": "Izmena podneska",
+  "submission.edit.title": "Izmena podneska",
+  "submission.general.cancel": "Otkazati",
+  "submission.general.cannot_submit": "Nemate dozvolu da podnesete novu prijavu.",
+  "submission.general.deposit": "Deponovati",
+  "submission.general.discard.confirm.cancel": "Otkazati",
+  "submission.general.discard.confirm.info": "Ova operacija se ne može opozvati. Da li ste sigurni?",
+  "submission.general.discard.confirm.submit": "Da siguran sam",
+  "submission.general.discard.confirm.title": "Odbacite podnesak",
+  "submission.general.discard.submit": "Odbaciti",
+  "submission.general.info.saved": "Sačuvano",
+  "submission.general.info.pending-changes": "Nesačuvane promene",
+  "submission.general.save": "Sačuvati",
+  "submission.general.save-later": "Sačuvati za kasnije",
+  "submission.import-external.page.title": "Uvezite metapodatke iz spoljnog izvora",
+  "submission.import-external.title": "Uvezite metapodatke iz spoljnog izvora",
+  "submission.import-external.title.Journal": "Uvezite časopis iz spoljnog izvora",
+  "submission.import-external.title.JournalIssue": "Uvezite izdanje časopisa iz spoljnog izvora",
+  "submission.import-external.title.JournalVolume": "Uvezite volume časopisa iz spoljnog izvora",
+  "submission.import-external.title.OrgUnit": "Uvezite izdavača iz spoljnog izvora",
+  "submission.import-external.title.Person": "Uvezite osobu iz spoljnog izvora",
+  "submission.import-external.title.Project": "Uvezite projekat iz spoljnog izvora",
+  "submission.import-external.title.Publication": "Uvezite publikaciju iz spoljnog izvora",
+  "submission.import-external.title.none": "Uvezite metapodatke iz spoljnog izvora",
+  "submission.import-external.page.hint": "Unesite upit iznad da biste pronašli stavke sa veba za uvoz u DSpace.",
+  "submission.import-external.back-to-my-dspace": "Nazad na MyDSpace",
+  "submission.import-external.search.placeholder": "Pretraga spoljnog izvora",
+  "submission.import-external.search.button": "Pretraga",
+  "submission.import-external.search.button.hint": "Napišite nekoliko reči za pretragu",
+  "submission.import-external.search.source.hint": "Izaberite spoljni izvor",
+  "submission.import-external.source.arxiv": "arXiv",
+  "submission.import-external.source.ads": "NASA/ADS",
+  "submission.import-external.source.cinii": "CiNii",
+  "submission.import-external.source.crossref": "Crossref",
+  "submission.import-external.source.datacite": "DataCite",
+  "submission.import-external.source.scielo": "SciELO",
+  "submission.import-external.source.scopus": "Scopus",
+  "submission.import-external.source.vufind": "VuFind",
+  "submission.import-external.source.wos": "Naučna mreža",
+  "submission.import-external.source.orcidWorks": "ORCID",
+  "submission.import-external.source.epo": "Evropski zavod za patente (EPO)",
+  "submission.import-external.source.loading": "Učitavanje...",
+  "submission.import-external.source.sherpaJournal": "SHERPA časopisi",
+  "submission.import-external.source.sherpaJournalIssn": "SHERPA časopisi od ISSN",
+  "submission.import-external.source.sherpaPublisher": "SHERPA Publishers",
+  "submission.import-external.source.openAIREFunding": "Finansiranje OpenAIRE API-ja",
+  "submission.import-external.source.orcid": "ORCID",
+  "submission.import-external.source.pubmed": "Pubmed",
+  "submission.import-external.source.pubmedeu": "Pubmed Europe",
+  "submission.import-external.source.lcname": "Biblioteka Kongresnih imena",
+  "submission.import-external.preview.title": "Pregled stavke",
+  "submission.import-external.preview.title.Publication": "Pregled publikacije",
+  "submission.import-external.preview.title.none": "Pregled stavke",
+  "submission.import-external.preview.title.Journal": "Pregled časopisa",
+  "submission.import-external.preview.title.OrgUnit": "Pregled organizacione jedinice",
+  "submission.import-external.preview.title.Person": "Pregled osobe",
+  "submission.import-external.preview.title.Project": "Pregled projekta",
+  "submission.import-external.preview.subtitle": "Metapodaci u nastavku su uvezeni iz spoljnog izvora. Biće unapred popunjen kada započnete prihvatanje.",
+  "submission.import-external.preview.button.import": "Počnite sa prihvatanjem",
+  "submission.import-external.preview.error.import.title": "Greška pri prihvatanju",
+  "submission.import-external.preview.error.import.body": "Došlo je do greške tokom ulaznog procesa uvoza spoljašnjeg izvora.",
+  "submission.sections.describe.relationship-lookup.close": "Zatvori",
+  "submission.sections.describe.relationship-lookup.external-source.added": "Uspešno je dodat lokalni ulaz u izbor",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.isAuthorOfPublication": "Uvezite udaljenog autora",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Journal": "Uvezite udaljeni dnevnik",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Journal Issue": "Uvezite udaljeno izdanje časopisa",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Journal Volume": "Uvezite udaljeni opseg časopisa",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.isProjectOfPublication": "Projekat",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.none": "Uvezite udaljenu stavku",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Event": "Uvezite udaljeni događaj",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Product": "Uvezite udaljeni proizvod",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Equipment": "Uvezite udaljenu opremu",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.OrgUnit": "Uvezite udaljenu organizacionu jedinicu",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Funding": "Uvezite udaljeni fond",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Person": "Uvezite udaljenu osobu",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Patent": "Uvezite udaljeni patent",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Project": "Uvezite udaljeni projekat",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Publication": "Uvezite udaljenu publikaciju",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.isProjectOfPublication.added.new-entity": "Dodat je novi entitet!",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.isProjectOfPublication.title": "Projekat",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.openAIREFunding": "Finansiranje OpenAIRE API-ja",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.isAuthorOfPublication.title": "Uvezi udaljenog autora",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.isAuthorOfPublication.added.local-entity": "Lokalni autor je uspešno dodat u izbor",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.isAuthorOfPublication.added.new-entity": "Spoljašnji autor je uspešno uvezen i dodat u izbor",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.authority": "Uprava",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.authority.new": "Uvezite kao novi ulaz lokalne uprave",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.cancel": "Poništiti, otkazati",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.collection": "Izaberite kolekciju u koju ćete uvesti nove ulaze",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.entities": "Entiteti",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.entities.new": "Uvezite kao novi lokalni entitet",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.lcname": "Uvezite iz LC imena",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.orcid": "Uvezite iz ORCID-a",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.sherpaJournal": "Uvezite iz časopisa Sherpa",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.sherpaPublisher": "Uvezite iz Sherpa izdavača",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.pubmed": "Uvezite iz PubMed-a",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.arxiv": "Uvezite iz arXiv",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.import": "Uvoz",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal.title": "Uvezite udaljeni časopis",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal.added.local-entity": "Uspešno dodat lokalni časopis u izbor",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal.added.new-entity": "Uspešno uvezen i dodat spoljašnji časopis u izbor",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Issue.title": "Uvezite udaljeno izdanje časopisa",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Issue.added.local-entity": "Uspešno je dodat lokalni broj časopisa u izbor",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Issue.added.new-entity": "Uspešno uvezen i dodat spoljašnji broj časopisa u izbor",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Volume.title": "Uvezite udaljeni opseg časopisa",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Volume.added.local-entity": "Uspešno je dodat lokalni volumen časopisa u izbor",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Volume.added.new-entity": "Uspešno uvezen i dodat spoljašnji opseg časopisa u izbor",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.select": "Izaberite lokalno podudaranje:",
+  "submission.sections.describe.relationship-lookup.search-tab.deselect-all": "Poništite sve",
+  "submission.sections.describe.relationship-lookup.search-tab.deselect-page": "Opozovite izbor stranice",
+  "submission.sections.describe.relationship-lookup.search-tab.loading": "Učitavanje...",
+  "submission.sections.describe.relationship-lookup.search-tab.placeholder": "Upit za pretragu",
+  "submission.sections.describe.relationship-lookup.search-tab.search": "Idi",
+  "submission.sections.describe.relationship-lookup.search-tab.search-form.placeholder": "Pretraga...",
+  "submission.sections.describe.relationship-lookup.search-tab.select-all": "Izaberi sve",
+  "submission.sections.describe.relationship-lookup.search-tab.select-page": "Izaberite stranicu",
+  "submission.sections.describe.relationship-lookup.selected": "Izabrane stavke {{ size }}",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isAuthorOfPublication": "Lokalni autori ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalOfPublication": "Lokalni časopisi ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.Project": "Lokalni projekti ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.Publication": "Lokalne publikacije ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.Person": "Lokalni autori ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.OrgUnit": "Lokalne organizacione jedinice ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.DataPackage": "Lokalni paketi podataka ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.DataFile": "Lokalni fajlovi podataka ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.Journal": "Lokalni časopisi ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalIssueOfPublication": "Lokalna izdanja časopisa ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.JournalIssue": "Lokalna izdanja časopisa ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalVolumeOfPublication": "Lokalni opseg časopisa ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.JournalVolume": "Lokalni opseg časopisa ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaJournal": "Sherpa časopisi ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaPublisher": "Sherpa izdavači({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.orcid": "ORCID ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.lcname": "LC imena ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.pubmed": "PubMed ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.arxiv": "arXiv ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingAgencyOfPublication": "Potražite finansijere",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingOfPublication": "Potražite sredstva",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isChildOrgUnitOf": "Potražite organizacione jedinice",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.openAIREFunding": "Finansiranje OpenAIRE API-ja",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isProjectOfPublication": "Projekti",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingAgencyOfProject": "Finansijer projekta",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isPublicationOfAuthor": "Publikacija autora",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.openAIREFunding": "Finansiranje OpenAIRE API-ja",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isProjectOfPublication": "Projekat",
+  "submission.sections.describe.relationship-lookup.title.isProjectOfPublication": "Projekti",
+  "submission.sections.describe.relationship-lookup.title.isFundingAgencyOfProject": "Finansijer projekta",
+  "submission.sections.describe.relationship-lookup.selection-tab.search-form.placeholder": "Pretraga...",
+  "submission.sections.describe.relationship-lookup.selection-tab.tab-title": "Trenutni izbor ({{ count }})",
+  "submission.sections.describe.relationship-lookup.title.isJournalIssueOfPublication": "Izdanja časopisa",
+  "submission.sections.describe.relationship-lookup.title.JournalIssue": "Izdanja časopisa",
+  "submission.sections.describe.relationship-lookup.title.isJournalVolumeOfPublication": "Sveske časopisa",
+  "submission.sections.describe.relationship-lookup.title.JournalVolume": "Sveske časopisa",
+  "submission.sections.describe.relationship-lookup.title.isJournalOfPublication": "Časopisi",
+  "submission.sections.describe.relationship-lookup.title.isAuthorOfPublication": "Autori",
+  "submission.sections.describe.relationship-lookup.title.isFundingAgencyOfPublication": "Finansijska agencija",
+  "submission.sections.describe.relationship-lookup.title.Project": "Projekti",
+  "submission.sections.describe.relationship-lookup.title.Publication": "Publikacije",
+  "submission.sections.describe.relationship-lookup.title.Person": "Autori",
+  "submission.sections.describe.relationship-lookup.title.OrgUnit": "Organizacione jedinice",
+  "submission.sections.describe.relationship-lookup.title.DataPackage": "Paketi podataka",
+  "submission.sections.describe.relationship-lookup.title.DataFile": "Fajlovi sa podacima",
+  "submission.sections.describe.relationship-lookup.title.Funding Agency": "Finansijska agencija",
+  "submission.sections.describe.relationship-lookup.title.isFundingOfPublication": "Finansiranje",
+  "submission.sections.describe.relationship-lookup.title.isChildOrgUnitOf": "Matična organizaciona jedinica",
+  "submission.sections.describe.relationship-lookup.title.isPublicationOfAuthor": "Publikacija",
+  "submission.sections.describe.relationship-lookup.search-tab.toggle-dropdown": "Uključite padajući meni",
+  "submission.sections.describe.relationship-lookup.selection-tab.settings": "Podešavanja",
+  "submission.sections.describe.relationship-lookup.selection-tab.no-selection": "Vaš izbor je trenutno prazan.",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isAuthorOfPublication": "Izabrani autori",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalOfPublication": "Izabrani časopisi",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalVolumeOfPublication": "Izabrana sveska časopisa",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.Project": "Izabrani projekti",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.Publication": "Izabrane publikacije",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.Person": "Izabrani autori",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.OrgUnit": "Izabrane organizacione jedinice",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.DataPackage": "Izabrani paketi podataka",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.DataFile": "Izabrani fajlovi sa podacima",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.Journal": "Izabrani časopisi",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalIssueOfPublication": "Izabrano izdanje",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.JournalVolume": "Izabrana sveska časopisa",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isFundingAgencyOfPublication": "Izabrana finansijska agencija",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isFundingOfPublication": "Izabrano finansiranje",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.JournalIssue": "Izabrano izdanje",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isChildOrgUnitOf": "Izabrana organizaciona jedinica",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaJournal": "Rezultati pretrage",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaPublisher": "Rezultati pretrage",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.orcid": "Rezultati pretrage",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.orcidv2": "Rezultati pretrage",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.lcname": "Rezultati pretrage",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.pubmed": "Rezultati pretrage",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.arxiv": "Rezultati pretrage",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.crossref": "Rezultati pretrage",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.epo": "Rezultati pretrage",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.scopus": "Rezultati pretrage",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.scielo": "Rezultati pretrage",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.wos": "Rezultati pretrage",
+  "submission.sections.describe.relationship-lookup.selection-tab.title": "Rezultati pretrage",
+  "submission.sections.describe.relationship-lookup.name-variant.notification.content": "Da li želite da sačuvate \"{{ value }}\" kao varijantu imena za ovu osobu da biste vi i drugi mogli da ga ponovo koristite za buduće slanje? Ako to ne uradite, i dalje možete da ga koristite za ovaj podnesak.",
+  "submission.sections.describe.relationship-lookup.name-variant.notification.confirm": "Sačuvajte novu varijantu imena",
+  "submission.sections.describe.relationship-lookup.name-variant.notification.decline": "Koristi se samo za ovaj podnesak",
+  "submission.sections.ccLicense.type": "Tip licence",
+  "submission.sections.ccLicense.select": "Izaberite tip licence…",
+  "submission.sections.ccLicense.change": "Promenite tip licence…",
+  "submission.sections.ccLicense.none": "Nema dostupnih licenci",
+  "submission.sections.ccLicense.option.select": "Izaberite opciju…",
+  "submission.sections.ccLicense.link": "Izabrali ste sledeću licencu:",
+  "submission.sections.ccLicense.confirmation": "Dodeljujem licencu iznad",
+  "submission.sections.general.add-more": "Dodajte još",
+  "submission.sections.general.cannot_deposit": "Prijava se ne može dovršiti zbog grešaka u obrascu.<br>Popunite sva obavezna polja da biste dovršili prijavu.",
+  "submission.sections.general.collection": "Kolekcija",
+  "submission.sections.general.deposit_error_notice": "Došlo je do problema prilikom slanja stavke, molimo pokušajte ponovo kasnije.",
+  "submission.sections.general.deposit_success_notice": "Prijava je uspešno podneta.",
+  "submission.sections.general.discard_error_notice": "Došlo je do problema pri odbacivanju stavke, molimo pokušajte ponovo kasnije.",
+  "submission.sections.general.discard_success_notice": "Slanje je uspešno odbačeno.",
+  "submission.sections.general.metadata-extracted": "Novi metapodaci su izdvojeni i dodati u odeljak <strong>{{sectionId}}</strong>.",
+  "submission.sections.general.metadata-extracted-new-section": "Novi odeljak <strong>{{sectionId}}</strong> je dodat u prijavu.",
+  "submission.sections.general.no-collection": "Nije pronađena kolekcija",
+  "submission.sections.general.no-sections": "Nema dostupnih opcija",
+  "submission.sections.general.save_error_notice": "Došlo je do problema prilikom čuvanja stavke, molimo pokušajte ponovo kasnije.",
+  "submission.sections.general.save_success_notice": "Prijava je uspešno sačuvana.",
+  "submission.sections.general.search-collection": "Potražite kolekciju",
+  "submission.sections.general.sections_not_valid": "Postoje nepotpuni odeljci.",
+  "submission.sections.identifiers.info": "Sledeći identifikatori će biti kreirani za vašu stavku:",
+  "submission.sections.identifiers.no_handle": "Za ovu stavku nije vezan handle.",
+  "submission.sections.identifiers.no_doi": "Nijedan DOIs nije vezan za ovu stavku.",
+  "submission.sections.identifiers.handle_label": "Handle:",
+  "submission.sections.identifiers.doi_label": "DOI:",
+  "submission.sections.identifiers.otherIdentifiers_label": "Ostali identifikatori:",
+  "submission.sections.submit.progressbar.accessCondition": "Uslovi pristupanja stavki",
+  "submission.sections.submit.progressbar.CClicense": "Creative Commons licenca",
+  "submission.sections.submit.progressbar.describe.recycle": "Reciklaža",
+  "submission.sections.submit.progressbar.describe.stepcustom": "Opisati",
+  "submission.sections.submit.progressbar.describe.stepone": "Opisati",
+  "submission.sections.submit.progressbar.describe.steptwo": "Opisati",
+  "submission.sections.submit.progressbar.detect-duplicate": "Potencijalni duplikati",
+  "submission.sections.submit.progressbar.identifiers": "Identifikatori",
+  "submission.sections.submit.progressbar.license": "Dozvola za depozit",
+  "submission.sections.submit.progressbar.sherpapolicy": "Sherpa propisi",
+  "submission.sections.submit.progressbar.upload": "Dodaj fajlove",
+  "submission.sections.submit.progressbar.sherpaPolicies": "Informacije o politici otvorenog pristupa izdavača",
+  "submission.sections.sherpa-policy.title-empty": "Nema dostupnih informacija o smernicama za izdavače. Ako vaš rad ima pridruženi ISSN, unesite ga iznad da biste videli sve povezane smernice otvorenog pristupa za izdavače.",
+  "submission.sections.status.errors.title": "Greške",
+  "submission.sections.status.valid.title": "Važeće",
+  "submission.sections.status.warnings.title": "Upozorenja",
+  "submission.sections.status.errors.aria": "Ima greške",
+  "submission.sections.status.valid.aria": "Važeće je",
+  "submission.sections.status.warnings.aria": "Ima upozorenja",
+  "submission.sections.status.info.title": "Dodatne Informacije",
+  "submission.sections.status.info.aria": "Dodatne Informacije",
+  "submission.sections.toggle.open": "Otvori odeljak",
+  "submission.sections.toggle.close": "Zatvori odeljak",
+  "submission.sections.toggle.aria.open": "Proširite {{sectionHeader}} odeljak",
+  "submission.sections.toggle.aria.close": "Skupite {{sectionHeader}} odeljak",
+  "submission.sections.upload.delete.confirm.cancel": "Poništiti, otkazati",
+  "submission.sections.upload.delete.confirm.info": "Ova operacija se ne može opozvati. Jeste li sigurni?",
+  "submission.sections.upload.delete.confirm.submit": "Da, siguran sam",
+  "submission.sections.upload.delete.confirm.title": "Izbrišite bitstream",
+  "submission.sections.upload.delete.submit": "Izbrišite",
+  "submission.sections.upload.download.title": "Preuzmite bitstream",
+  "submission.sections.upload.drop-message": "Spustite fajlove da biste ih priložili stavci",
+  "submission.sections.upload.edit.title": "Uredite bitstream",
+  "submission.sections.upload.form.access-condition-label": "Tip uslova pristupa",
+  "submission.sections.upload.form.access-condition-hint": "Izaberite uslov pristupa koji ćete primeniti na bitstream kada se stavka deponuje",
+  "submission.sections.upload.form.date-required": "Datum je obavezan.",
+  "submission.sections.upload.form.date-required-from": "Obavezno odobrenje pristupa od datuma.",
+  "submission.sections.upload.form.date-required-until": "Obavezno odobrenje pristupa do datuma.",
+  "submission.sections.upload.form.from-label": "Odobrenje pristupa od",
+  "submission.sections.upload.form.from-hint": "Izaberite datum od koga se primenjuje odgovarajući uslov pristupa",
+  "submission.sections.upload.form.from-placeholder": "Od",
+  "submission.sections.upload.form.group-label": "Grupa",
+  "submission.sections.upload.form.group-required": "Grupa je obavezna.",
+  "submission.sections.upload.form.until-label": "Odobrenje pristupa do",
+  "submission.sections.upload.form.until-hint": "Izaberite datum do kojeg se primenjuje odgovarajući uslov pristupa",
+  "submission.sections.upload.form.until-placeholder": "Sve dok",
+  "submission.sections.upload.header.policy.default.nolist": "Otpremljeni fajlovi u kolekciji {{collectionName}} biće dostupne prema sledećim grupama:",
+  "submission.sections.upload.header.policy.default.withlist": "Imajte na umu da će otpremljeni fajlovi u kolekciji {{collectionName}} biti dostupni, pored onoga što je izričito odlučeno za jedan fajl, sa sledećim grupama:",
+  "submission.sections.upload.info": "Ovde ćete pronaći sve fajlove koji se trenutno nalaze u stavci. Možete da ažurirate metapodatke fajla i uslove pristupa ili <strong> otpremite dodatne fajlove tako što ćete ih prevući i otpustiti bilo gde na stranici.</strong>",
+  "submission.sections.upload.no-entry": "Ne",
+  "submission.sections.upload.no-file-uploaded": "Još uvek nije otpremljen nijedan fajl.",
+  "submission.sections.upload.save-metadata": "Sačuvaj metapodatke",
+  "submission.sections.upload.undo": "Poništiti, otkazati",
+  "submission.sections.upload.upload-failed": "Otpremanje nije uspelo",
+  "submission.sections.upload.upload-successful": "Otpremanje je uspešno",
+  "submission.sections.accesses.form.discoverable-description": "Kada je označeno, ova stavka će biti vidljiva u pretrazi/pregledu. Kada nije označeno, stavka će biti dostupna samo preko direktne veze i nikada se neće pojaviti u pretrazi/pregledu.",
+  "submission.sections.accesses.form.discoverable-label": "Otkrivanje",
+  "submission.sections.accesses.form.access-condition-label": "Tip uslova pristupa",
+  "submission.sections.accesses.form.access-condition-hint": "Izaberite uslov pristupa koji ćete primeniti na stavku kada se deponuje",
+  "submission.sections.accesses.form.date-required": "Datum je obavezan.",
+  "submission.sections.accesses.form.date-required-from": "Obavezno odobrenje pristupa od datuma.",
+  "submission.sections.accesses.form.date-required-until": "Obavezno odobrenje pristupa do datuma.",
+  "submission.sections.accesses.form.from-label": "Odobrenje pristupa od",
+  "submission.sections.accesses.form.from-hint": "Izaberite datum od koga se primenjuje odgovarajući uslov pristupa",
+  "submission.sections.accesses.form.from-placeholder": "Od",
+  "submission.sections.accesses.form.group-label": "Grupa",
+  "submission.sections.accesses.form.group-required": "Grupa je obavezna.",
+  "submission.sections.accesses.form.until-label": "Odobrenje pristupa do",
+  "submission.sections.accesses.form.until-hint": "Izaberite datum do kojeg se primenjuje odgovarajući uslov pristupa",
+  "submission.sections.accesses.form.until-placeholder": "Sve dok",
+  "submission.sections.license.granted-label": "Potvrđujem gore navedenu licencu",
+  "submission.sections.license.required": "Morate prihvatiti licencu",
+  "submission.sections.license.notgranted": "Morate prihvatiti licencu",
+  "submission.sections.sherpa.publication.information": "Informacije o publikaciji",
+  "submission.sections.sherpa.publication.information.title": "Naslov",
+  "submission.sections.sherpa.publication.information.issns": "ISSN-ovi",
+  "submission.sections.sherpa.publication.information.url": "URL",
+  "submission.sections.sherpa.publication.information.publishers": "Izdavač",
+  "submission.sections.sherpa.publication.information.romeoPub": "Romeo Pub",
+  "submission.sections.sherpa.publication.information.zetoPub": "Zeto Pub",
+  "submission.sections.sherpa.publisher.policy": "Propis za izdavače",
+  "submission.sections.sherpa.publisher.policy.description": "Informacije u nastavku su pronađene preko SherpaRomea. Na osnovu smernica vašeg izdavača, on pruža savete o tome da li je embargo možda neophodan i/ili koje datoteke možete da otpremite. Ako imate pitanja, kontaktirajte svog administratora sajta putem obrasca za povratne informacije u podnožju.",
+  "submission.sections.sherpa.publisher.policy.openaccess": "Putevi otvorenog pristupa dozvoljeni politikom ovog časopisa navedeni su u nastavku prema verziji članka. Kliknite na putanju za detaljniji prikaz",
+  "submission.sections.sherpa.publisher.policy.more.information": "Za više informacija pogledajte sledeće linkove:",
+  "submission.sections.sherpa.publisher.policy.version": "Verzija",
+  "submission.sections.sherpa.publisher.policy.embargo": "Embargo",
+  "submission.sections.sherpa.publisher.policy.noembargo": "Nema embarga",
+  "submission.sections.sherpa.publisher.policy.nolocation": "Nijedan",
+  "submission.sections.sherpa.publisher.policy.license": "Licenca",
+  "submission.sections.sherpa.publisher.policy.prerequisites": "Preduslovi",
+  "submission.sections.sherpa.publisher.policy.location": "Lokacija",
+  "submission.sections.sherpa.publisher.policy.conditions": "Uslovi",
+  "submission.sections.sherpa.publisher.policy.refresh": "Osvežite",
+  "submission.sections.sherpa.record.information": "Zapišite informaciju",
+  "submission.sections.sherpa.record.information.id": "ID",
+  "submission.sections.sherpa.record.information.date.created": "Datum kreiranja",
+  "submission.sections.sherpa.record.information.date.modified": "Poslednja izmena",
+  "submission.sections.sherpa.record.information.uri": "URI",
+  "submission.sections.sherpa.error.message": "Došlo je do greške pri preuzimanju Sherpa informacija",
+  "submission.submit.breadcrumbs": "Novi podnesak",
+  "submission.submit.title": "Novi podnesak",
+  "submission.workflow.generic.delete": "Izbrišite",
+  "submission.workflow.generic.delete-help": "Izaberite ovu opciju da biste odbacili ovu stavku. Zatim će biti zatraženo da to potvrdite.",
+  "submission.workflow.generic.edit": "Uredite",
+  "submission.workflow.generic.edit-help": "Izaberite ovu opciju da biste promenili metapodatke stavke.",
+  "submission.workflow.generic.view": "Pogledajte",
+  "submission.workflow.generic.view-help": "Izaberite ovu opciju da biste videli metapodatke stavke.",
+  "submission.workflow.generic.submit_select_reviewer": "Izaberite recenzenta",
+  "submission.workflow.generic.submit_select_reviewer-help": "izaberite pomoć recenzenta",
+  "submission.workflow.generic.submit_score": "Ocena",
+  "submission.workflow.generic.submit_score-help": "rezultat-pomoć",
+  "submission.workflow.tasks.claimed.approve": "Odobriti",
+  "submission.workflow.tasks.claimed.approve_help": "Ako ste pregledali stavku i ako je pogodna za pridruživanje kolekciji, izaberite \"Odobriti\".",
+  "submission.workflow.tasks.claimed.edit": "Izmeniti",
+  "submission.workflow.tasks.claimed.edit_help": "Izaberite ovu opciju da biste promenili metapodatke stavke.",
+  "submission.workflow.tasks.claimed.decline": "Odbiti",
+  "submission.workflow.tasks.claimed.decline_help": "odbiti pomoć",
+  "submission.workflow.tasks.claimed.reject.reason.info": "Unesite razlog za odbijanje prijave u polje ispod, navodeći da li podnosilac može da reši problem i ponovo pošalje.",
+  "submission.workflow.tasks.claimed.reject.reason.placeholder": "Opišite razlog odbijanja",
+  "submission.workflow.tasks.claimed.reject.reason.submit": "Odbacite stavku",
+  "submission.workflow.tasks.claimed.reject.reason.title": "Razlog",
+  "submission.workflow.tasks.claimed.reject.submit": "Odbiti",
+  "submission.workflow.tasks.claimed.reject_help": "Ako ste pregledali stavku i utvrdili da <strong>nije</strong> prikladna za pridruživanje kolekciji, izaberite \"Odbij\". Od vas će se zatim tražiti da unesete poruku koja navodi zašto je stavka neprikladna i da li podnosilac treba nešto da promeni i ponovo pošalje.",
+  "submission.workflow.tasks.claimed.return": "Povratak u grupu",
+  "submission.workflow.tasks.claimed.return_help": "Vratite zadatak u grupu tako da drugi korisnik može da izvrši zadatak.",
+  "submission.workflow.tasks.generic.error": "Došlo je do greške u radu...",
+  "submission.workflow.tasks.generic.processing": "Obrada...",
+  "submission.workflow.tasks.generic.submitter": "Podnosilac",
+  "submission.workflow.tasks.generic.success": "Operacija uspela",
+  "submission.workflow.tasks.pool.claim": "Potraživanje",
+  "submission.workflow.tasks.pool.claim_help": "Dodelite ovaj zadatak sebi.",
+  "submission.workflow.tasks.pool.hide-detail": "Sakriti detalje",
+  "submission.workflow.tasks.pool.show-detail": "Prikazati detalje",
+  "submission.workspace.generic.view": "Pogledati",
+  "submission.workspace.generic.view-help": "Izaberite ovu opciju da biste videli metapodatke stavke.",
+  "submitter.empty": "N/A",
+  "subscriptions.title": "Pretplate",
+  "subscriptions.item": "Pretplate na stavke",
+  "subscriptions.collection": "Pretplate na kolekcije",
+  "subscriptions.community": "Pretplate za zajednice",
+  "subscriptions.subscription_type": "Vrsta pretplate",
+  "subscriptions.frequency": "Učestalost pretplate",
+  "subscriptions.frequency.D": "Dnevno",
+  "subscriptions.frequency.M": "Mesečno",
+  "subscriptions.frequency.W": "Nedeljno",
+  "subscriptions.tooltip": "Pretplatiti se",
+  "subscriptions.modal.title": "Pretplate",
+  "subscriptions.modal.type-frequency": "Vrsta i učestalost",
+  "subscriptions.modal.close": "Zatvoriti",
+  "subscriptions.modal.delete-info": "Da biste uklonili ovu pretplatu, molimo posetite stranicu \"Pretplate\" ispod vašeg korisničkog profila",
+  "subscriptions.modal.new-subscription-form.type.content": "Sadržaj",
+  "subscriptions.modal.new-subscription-form.frequency.D": "Dnevno",
+  "subscriptions.modal.new-subscription-form.frequency.W": "Nedeljno",
+  "subscriptions.modal.new-subscription-form.frequency.M": "Mesečno",
+  "subscriptions.modal.new-subscription-form.submit": "Podnesi",
+  "subscriptions.modal.new-subscription-form.processing": "Obrada...",
+  "subscriptions.modal.create.success": "Uspešno ste pretplaćeni na {{ type }}.",
+  "subscriptions.modal.delete.success": "Pretplata je uspešno izbrisana",
+  "subscriptions.modal.update.success": "Pretplata na {{ type }} je uspešno ažurirana",
+  "subscriptions.modal.create.error": "Došlo je do greške tokom kreiranja pretplate",
+  "subscriptions.modal.delete.error": "Došlo je do greške tokom brisanja pretplate",
+  "subscriptions.modal.update.error": "Došlo je do greške tokom ažuriranja pretplate",
+  "subscriptions.table.dso": "Predmet",
+  "subscriptions.table.subscription_type": "Vrsta pretplate",
+  "subscriptions.table.subscription_frequency": "Učestalost pretplate",
+  "subscriptions.table.action": "Postupak",
+  "subscriptions.table.edit": "Izmeniti",
+  "subscriptions.table.delete": "Izbrisati",
+  "subscriptions.table.not-available": "Nije dostupno",
+  "subscriptions.table.not-available-message": "Pretplaćena stavka je izbrisana ili trenutno nemate dozvolu da je vidite",
+  "subscriptions.table.empty.message": "Trenutno nemate nijednu pretplatu. Da biste se pretplatili na ažuriranja putem email-a za zajednicu ili kolekciju, koristite dugme za pretplatu na stranici objekta.",
+  "thumbnail.default.alt": "Umanjena slika",
+  "thumbnail.default.placeholder": "Nema dostupnih umanjenih slika",
+  "thumbnail.project.alt": "Logo projekta",
+  "thumbnail.project.placeholder": "Slika referenta projekta",
+  "thumbnail.orgunit.alt": "Logo organizacione jedinice",
+  "thumbnail.orgunit.placeholder": "Slika referenta organizacione jedinice",
+  "thumbnail.person.alt": "Profilna slika",
+  "thumbnail.person.placeholder": "Slika profila nije dostupna",
+  "title": "DSpace",
+  "vocabulary-treeview.header": "Prikaz hijerarhijskog stabla",
+  "vocabulary-treeview.load-more": "Učitati još",
+  "vocabulary-treeview.search.form.reset": "Resetovati",
+  "vocabulary-treeview.search.form.search": "Pretraga",
+  "vocabulary-treeview.search.no-result": "Nije bilo stavki za prikaz",
+  "vocabulary-treeview.tree.description.nsi": "The Norwegian Science Index",
+  "vocabulary-treeview.tree.description.srsc": "Kategorije predmeta istraživanja",
+  "vocabulary-treeview.info": "Izaberite temu koju želite da dodate kao filter za pretragu",
+  "uploader.browse": "pretraži",
+  "uploader.drag-message": "Prevucite i stavite svoje fajlove ovde",
+  "uploader.delete.btn-title": "Obriši",
+  "uploader.or": ", ili",
+  "uploader.processing": "Obrada otpremljenih fajlova... (sada je bezbedno zatvoriti ovu stranicu)",
+  "uploader.queue-length": "Dužina reda",
+  "virtual-metadata.delete-item.info": "Izaberite tipove za koje želite da sačuvate virtuelne metapodatke kao stvarne metapodatke",
+  "virtual-metadata.delete-item.modal-head": "Virtuelni metapodaci ove relacije",
+  "virtual-metadata.delete-relationship.modal-head": "Izaberite stavke za koje želite da sačuvate virtuelne metapodatke kao stvarne metapodatke",
+  "supervisedWorkspace.search.results.head": "Nadzirane stavke",
+  "workspace.search.results.head": "Vaši podnesci",
+  "workflowAdmin.search.results.head": "Upravljanje radnim procesom",
+  "workflow.search.results.head": "Radni zadaci",
+  "supervision.search.results.head": "Zadaci radnog procesa i radnog prostora",
+  "workflow-item.edit.breadcrumbs": "Izmena stavke radnog procesa",
+  "workflow-item.edit.title": "Izmena stavke radnog procesa",
+  "workflow-item.delete.notification.success.title": "Izbrisano",
+  "workflow-item.delete.notification.success.content": "Ova stavka radnog procesa je uspešno izbrisana",
+  "workflow-item.delete.notification.error.title": "Nešto nije u redu",
+  "workflow-item.delete.notification.error.content": "Nije moguće izbrisati stavku procesa rada",
+  "workflow-item.delete.title": "Izbrišite stavku radnog procesa",
+  "workflow-item.delete.header": "Izbrišite stavku radnog procesa",
+  "workflow-item.delete.button.cancel": "Poništiti, otkazati",
+  "workflow-item.delete.button.confirm": "Izbrišite",
+  "workflow-item.send-back.notification.success.title": "Vraćeno podnosiocu",
+  "workflow-item.send-back.notification.success.content": "Ova stavka radnog procesa je uspešno vraćena podnosiocu",
+  "workflow-item.send-back.notification.error.title": "Nešto nije u redu",
+  "workflow-item.send-back.notification.error.content": "Stavka radnog procesa nije mogla da se vrati podnosiocu",
+  "workflow-item.send-back.title": "Vratite stavku radnog procesa podnosiocu",
+  "workflow-item.send-back.header": "Vratite stavku radnog procesa podnosiocu",
+  "workflow-item.send-back.button.cancel": "Poništiti, otkazati",
+  "workflow-item.send-back.button.confirm": "Vratiti",
+  "workflow-item.view.breadcrumbs": "Prikaz radnog procesa",
+  "workspace-item.view.breadcrumbs": "Prikaz radnog prostora",
+  "workspace-item.view.title": "Prikaz radnog prostora",
+  "workspace-item.delete.breadcrumbs": "Izbrišite radni prostor",
+  "workspace-item.delete.header": "Izbrišite stavku radnog prostora",
+  "workspace-item.delete.button.confirm": "Izbrišite",
+  "workspace-item.delete.button.cancel": "Poništiti, otkazati",
+  "workspace-item.delete.notification.success.title": "Izbrisan",
+  "workspace-item.delete.title": "Ova stavka radnog prostora je uspešno izbrisana",
+  "workspace-item.delete.notification.error.title": "Nešto nije u redu",
+  "workspace-item.delete.notification.error.content": "Nije moguće izbrisati stavku radnog prostora",
+  "workflow-item.advanced.title": "Napredni radni proces",
+  "workflow-item.selectrevieweraction.notification.success.title": "Izabrani recenzent",
+  "workflow-item.selectrevieweraction.notification.success.content": "Recenzent za ovu stavku radnog procesa je uspešno izabran",
+  "workflow-item.selectrevieweraction.notification.error.title": "Nešto nije u redu",
+  "workflow-item.selectrevieweraction.notification.error.content": "Nije moguće izabrati recenzenta za ovu stavku radnog procesa",
+  "workflow-item.selectrevieweraction.title": "Izaberite recenzenta",
+  "workflow-item.selectrevieweraction.header": "Izaberite recenzenta",
+  "workflow-item.selectrevieweraction.button.cancel": "Poništiti, otkazati",
+  "workflow-item.selectrevieweraction.button.confirm": "Potvrdite",
+  "workflow-item.scorereviewaction.notification.success.title": "Ocena pregleda",
+  "workflow-item.scorereviewaction.notification.success.content": "Ocena za ovu stavku radnog procesa je uspešno poslata",
+  "workflow-item.scorereviewaction.notification.error.title": "Nešto nije u redu",
+  "workflow-item.scorereviewaction.notification.error.content": "Nije moguće oceniti ovu stavku",
+  "workflow-item.scorereviewaction.title": "Ocenite ovu stavku",
+  "workflow-item.scorereviewaction.header": "Ocenite ovu stavku",
+  "workflow-item.scorereviewaction.button.cancel": "Poništiti, otkazati",
+  "workflow-item.scorereviewaction.button.confirm": "Potvrdite",
+  "idle-modal.header": "Sesija uskoro ističe",
+  "idle-modal.info": "Iz bezbednosnih razloga, korisničke sesije ističu posle {{ timeToExpire }} minuta neaktivnosti. Vaša sesija uskoro ističe. Da li želite da produžite ili da se odjavite?",
+  "idle-modal.log-out": "Odjaviti se",
+  "idle-modal.extend-session": "Produžite sesiju",
+  "researcher.profile.action.processing": "Obrada...",
+  "researcher.profile.associated": "Povezani profil istraživača",
+  "researcher.profile.change-visibility.fail": "Došlo je do neočekivane greške prilikom promene vidljivosti profila",
+  "researcher.profile.create.new": "Kreiraj novi",
+  "researcher.profile.create.success": "Profil istraživača je uspešno kreiran",
+  "researcher.profile.create.fail": "Došlo je do greške tokom kreiranja profila istraživača",
+  "researcher.profile.delete": "Izbrišite",
+  "researcher.profile.expose": "Izlaganje",
+  "researcher.profile.hide": "Sakrijte",
+  "researcher.profile.not.associated": "Profil istraživača još nije povezan",
+  "researcher.profile.view": "Pogled",
+  "researcher.profile.private.visibility": "PRIVATNO",
+  "researcher.profile.public.visibility": "JAVNO",
+  "researcher.profile.status": "Status:",
+  "researcherprofile.claim.not-authorized": "Niste ovlašćeni da potvrdite ovu stavku. Za više detalja kontaktirajte administratora(e).",
+  "researcherprofile.error.claim.body": "Došlo je do greške pri potvrđivanju profila, molimo vas pokušajte ponovo kasnije",
+  "researcherprofile.error.claim.title": "Greška",
+  "researcherprofile.success.claim.body": "Profil je uspešno potvrđen",
+  "researcherprofile.success.claim.title": "Uspešno",
+  "person.page.orcid.create": "Kreirajte ORCID ID",
+  "person.page.orcid.granted-authorizations": "Odobrena ovlašćenja",
+  "person.page.orcid.grant-authorizations": "Odobrite ovlašćenja",
+  "person.page.orcid.link": "Povežite se na ORCID ID",
+  "person.page.orcid.link.processing": "Povezivanje profila sa ORCID-om...",
+  "person.page.orcid.link.error.message": "Nešto je pošlo naopako pri povezivanju profila sa ORCID-om. Ako se problem i dalje javlja, kontaktirajte administratora.",
+  "person.page.orcid.orcid-not-linked-message": "ORCID ID ovog profila ({{ orcid }}) još uvek nije povezan sa nalogom u ORCID registru ili je veza istekla.",
+  "person.page.orcid.unlink": "Prekinite vezu sa ORCID-om",
+  "person.page.orcid.unlink.processing": "Obrada...",
+  "person.page.orcid.missing-authorizations": "Nedostaju ovlašćenja",
+  "person.page.orcid.missing-authorizations-message": "Nedostaju sledeća ovlašćenja:",
+  "person.page.orcid.no-missing-authorizations-message": "Divno! Ovo polje je prazno, tako da ste odobrili sva prava pristupa za korišćenje svih funkcija koje nudi vaša institucija.",
+  "person.page.orcid.no-orcid-message": "Još uvek nije povezan ORCID ID. Klikom na dugme ispod moguće je povezati ovaj profil sa ORCID nalogom.",
+  "person.page.orcid.profile-preferences": "Prioriteti profila",
+  "person.page.orcid.funding-preferences": "Prioriteti finansiranja",
+  "person.page.orcid.publications-preferences": "Prioriteti publikacije",
+  "person.page.orcid.remove-orcid-message": "Ako treba da uklonite svoj ORCID, kontaktirajte administratora repozitorijuma",
+  "person.page.orcid.save.preference.changes": "Podešavanja ažuriranja",
+  "person.page.orcid.sync-profile.affiliation": "Pripadnost",
+  "person.page.orcid.sync-profile.biographical": "Biografski podaci",
+  "person.page.orcid.sync-profile.education": "Obrazovanje",
+  "person.page.orcid.sync-profile.identifiers": "Identifikatori",
+  "person.page.orcid.sync-fundings.all": "Sva sredstva",
+  "person.page.orcid.sync-fundings.mine": "Moja sredstva",
+  "person.page.orcid.sync-fundings.my_selected": "Odabrana sredstva",
+  "person.page.orcid.sync-fundings.disabled": "Onemogućeno",
+  "person.page.orcid.sync-publications.all": "Sve publikacije",
+  "person.page.orcid.sync-publications.mine": "Moje publikacije",
+  "person.page.orcid.sync-publications.my_selected": "Izabrane publikacije",
+  "person.page.orcid.sync-publications.disabled": "Onemogućeno",
+  "person.page.orcid.sync-queue.discard": "Odbacite promenu i nemojte da se sinhronizujete sa ORCID registrom",
+  "person.page.orcid.sync-queue.discard.error": "Odbacivanje zapisa ORCID reda nije uspelo",
+  "person.page.orcid.sync-queue.discard.success": "Zapis ORCID reda je uspešno odbačen",
+  "person.page.orcid.sync-queue.empty-message": "Zapis ORCID registra je prazan",
+  "person.page.orcid.sync-queue.table.header.type": "Tip",
+  "person.page.orcid.sync-queue.table.header.description": "Opis",
+  "person.page.orcid.sync-queue.table.header.action": "Postupak",
+  "person.page.orcid.sync-queue.description.affiliation": "Pripadnosti",
+  "person.page.orcid.sync-queue.description.country": "Država",
+  "person.page.orcid.sync-queue.description.education": "Obrazovanja",
+  "person.page.orcid.sync-queue.description.external_ids": "Spoljašnji id",
+  "person.page.orcid.sync-queue.description.other_names": "Druga imena",
+  "person.page.orcid.sync-queue.description.qualification": "Kvalifikacije",
+  "person.page.orcid.sync-queue.description.researcher_urls": "URL-ovi istraživača",
+  "person.page.orcid.sync-queue.description.keywords": "Ključne reči",
+  "person.page.orcid.sync-queue.tooltip.insert": "Dodajte novi unos u ORCID registar",
+  "person.page.orcid.sync-queue.tooltip.update": "Ažurirajte ovaj unos u ORCID registru",
+  "person.page.orcid.sync-queue.tooltip.delete": "Uklonite ovaj unos iz ORCID registra",
+  "person.page.orcid.sync-queue.tooltip.publication": "Publikacija",
+  "person.page.orcid.sync-queue.tooltip.project": "Projekat",
+  "person.page.orcid.sync-queue.tooltip.affiliation": "Pripadnost",
+  "person.page.orcid.sync-queue.tooltip.education": "Оbrazovanje",
+  "person.page.orcid.sync-queue.tooltip.qualification": "Kvalifikacija",
+  "person.page.orcid.sync-queue.tooltip.other_names": "Drugo ime",
+  "person.page.orcid.sync-queue.tooltip.country": "Država",
+  "person.page.orcid.sync-queue.tooltip.keywords": "Ključna reč",
+  "person.page.orcid.sync-queue.tooltip.external_ids": "Spoljašnji identifikator",
+  "person.page.orcid.sync-queue.tooltip.researcher_urls": "URL istraživača",
+  "person.page.orcid.sync-queue.send": "Sinhronizacija sa ORCID registrom",
+  "person.page.orcid.sync-queue.send.unauthorized-error.title": "Pristupanje ORCID-u nije uspelo zbog nedostajućih ovlašćenja.",
+  "person.page.orcid.sync-queue.send.unauthorized-error.content": "Kliknite <a href='{{orcid}}'>ovde</a> da ponovo dodelite potrebne dozvole. Ako se problem nastavi, kontaktirajte administratora",
+  "person.page.orcid.sync-queue.send.bad-request-error": "Slanje ORCID-u nije uspelo jer resurs poslat u ORCID registar nije važeći",
+  "person.page.orcid.sync-queue.send.error": "Slanje ORCID-u nije uspelo",
+  "person.page.orcid.sync-queue.send.conflict-error": "Slanje ORCID-u nije uspelo jer se resurs već nalazi u ORCID registru",
+  "person.page.orcid.sync-queue.send.not-found-warning": "Resurs se više ne nalazi u ORCID registru.",
+  "person.page.orcid.sync-queue.send.success": "Slanje ORCID-u je uspešno završeno",
+  "person.page.orcid.sync-queue.send.validation-error": "Podaci koje želite da sinhronizujete sa ORCID-om nisu ispravni",
+  "person.page.orcid.sync-queue.send.validation-error.amount-currency.required": "Valuta je obavezna",
+  "person.page.orcid.sync-queue.send.validation-error.external-id.required": "Resurs koji se šalje zahteva najmanje jedan identifikator",
+  "person.page.orcid.sync-queue.send.validation-error.title.required": "Naslov je obavezan",
+  "person.page.orcid.sync-queue.send.validation-error.type.required": "Dc.type je obavezan",
+  "person.page.orcid.sync-queue.send.validation-error.start-date.required": "Datum početka je obavezan",
+  "person.page.orcid.sync-queue.send.validation-error.funder.required": "Finansijer je neophodan",
+  "person.page.orcid.sync-queue.send.validation-error.country.invalid": "Nevažeće 2 cifre ISO 3166 zemlja",
+  "person.page.orcid.sync-queue.send.validation-error.organization.required": "Potrebna je organizacija",
+  "person.page.orcid.sync-queue.send.validation-error.organization.name-required": "Naziv organizacije je obavezan",
+  "person.page.orcid.sync-queue.send.validation-error.publication.date-invalid": "Datum objavljivanja mora biti godinu dana posle 1900. godine",
+  "person.page.orcid.sync-queue.send.validation-error.organization.address-required": "Organizacija zahteva adresu",
+  "person.page.orcid.sync-queue.send.validation-error.organization.city-required": "Adresa organizacije koja se šalje zahteva grad",
+  "person.page.orcid.sync-queue.send.validation-error.organization.country-required": "Adresa organizacije koja se šalje zahteva važeće 2 cifre ISO 3166 zemlje",
+  "person.page.orcid.sync-queue.send.validation-error.disambiguated-organization.required": "Potreban je identifikator za nedvosmislenost organizacija. Podržani ID-ovi su GRID, Ringgold, Legal Entity identifiers (LEIs) i Crossref Funder Registry identifiers",
+  "person.page.orcid.sync-queue.send.validation-error.disambiguated-organization.value-required": "Identifikatori organizacije zahtevaju vrednost",
+  "person.page.orcid.sync-queue.send.validation-error.disambiguation-source.required": "Identifikatorima organizacije je potreban izvor",
+  "person.page.orcid.sync-queue.send.validation-error.disambiguation-source.invalid": "Izvor jednog od identifikatora organizacije je nevažeći. Podržani izvori su RINGGOLD, GRID, LEI i FUNDREF",
+  "person.page.orcid.synchronization-mode": "Način sinhronizacije",
+  "person.page.orcid.synchronization-mode.batch": "Batch",
+  "person.page.orcid.synchronization-mode.label": "Način sinhronizacije",
+  "person.page.orcid.synchronization-mode-message": "Molimo izaberite kako želite da se sinhronizacija sa ORCID-om odvija. Opcije uključuju \"Manual\" (morate ručno da pošaljete svoje podatke ORCID-u) ili \"Batch\" (sistem će poslati vaše podatke ORCID-u preko planirane skripte).",
+  "person.page.orcid.synchronization-mode-funding-message": "Izaberite da li želite da pošaljete vaše povezane entitete projekta na listu informacija o finansiranju vašeg ORCID zapisa.",
+  "person.page.orcid.synchronization-mode-publication-message": "Izaberite da li želite da pošaljete vaše povezane entitete publikacije na listu radova vašeg ORCID zapisa.",
+  "person.page.orcid.synchronization-mode-profile-message": "Izaberite da li želite da pošaljete vaše biografske podatke ili lične identifikatore u vaš ORCID zapis.",
+  "person.page.orcid.synchronization-settings-update.success": "Podešavanja sinhronizacije su uspešno ažurirana",
+  "person.page.orcid.synchronization-settings-update.error": "Ažuriranje podešavanja sinhronizacije nije uspelo",
+  "person.page.orcid.synchronization-mode.manual": "Uputstvo",
+  "person.page.orcid.scope.authenticate": "Preuzmite svoj ORCID iD",
+  "person.page.orcid.scope.read-limited": "Čitajte svoje informacije uz vidljivost podešenu na Pouzdane strane",
+  "person.page.orcid.scope.activities-update": "Dodajte/ažurirajte vaše istraživačke aktivnosti",
+  "person.page.orcid.scope.person-update": "Dodajte/ažurirajte druge informacije o sebi",
+  "person.page.orcid.unlink.success": "Prekid veze između profila i ORCID registra je bio uspešan",
+  "person.page.orcid.unlink.error": "Došlo je do greške prilikom prekida veze između profila i ORCID registra. Pokušajte ponovo",
+  "person.orcid.sync.setting": "ORCID podešavanja sinhronizacije",
+  "person.orcid.registry.queue": "ORCID Registry Queue",
+  "person.orcid.registry.auth": "ORCID ovlašćenja",
+  "home.recent-submissions.head": "Nedavni podnesci",
+  "listable-notification-object.default-message": "Nije moguće preuzeti ovaj objekat",
+  "system-wide-alert-banner.retrieval.error": "Nešto nije u redu pri preuzimanju banera sistemskog upozorenja",
+  "system-wide-alert-banner.countdown.prefix": "U",
+  "system-wide-alert-banner.countdown.days": "{{days}} dan(i),",
+  "system-wide-alert-banner.countdown.hours": "{{hours}} sat(i) i",
+  "system-wide-alert-banner.countdown.minutes": "{{minutes}} minut(i):",
+  "menu.section.system-wide-alert": "Sistemsko upozorenje",
+  "system-wide-alert.form.header": "Sistemsko upozorenje",
+  "system-wide-alert-form.retrieval.error": "Nešto nije u redu pri preuzimanju sistemskog upozorenja",
+  "system-wide-alert.form.cancel": "Otkazati",
+  "system-wide-alert.form.save": "Sačuvati",
+  "system-wide-alert.form.label.active": "AKTIVNO",
+  "system-wide-alert.form.label.inactive": "NEAKTIVNO",
+  "system-wide-alert.form.error.message": "Sistemsko upozorenje mora sadržati poruku",
+  "system-wide-alert.form.label.message": "Poruka upozorenja",
+  "system-wide-alert.form.label.countdownTo.enable": "Uključite vremensko odbrojavanje",
+  "system-wide-alert.form.label.countdownTo.hint": "Savet: Podesite tajmer za odbrojavanje. Kada je uključen, datum se može podesiti u budućnosti i baner sistemskog upozorenja će izvršiti odbrojavanje do postavljenog datuma. Kada tajmer završi, nestaće iz upozorenja. Server NEĆE biti automatski zaustavljen.",
+  "system-wide-alert.form.label.preview": "Pregled sistemskog upozorenja",
+  "system-wide-alert.form.update.success": "Sistemsko upozorenje je uspešno ažurirano",
+  "system-wide-alert.form.update.error": "Nešto nije u redu sa ažuriranjem sistemskog upozorenja",
+  "system-wide-alert.form.create.success": "Sistemsko upozorenje je uspešno kreirano",
+  "system-wide-alert.form.create.error": "Nešto nije u redu sa kreiranjem sistemskog upozorenja",
+  "admin.system-wide-alert.breadcrumbs": "Sistemska upozorenja",
+  "admin.system-wide-alert.title": "Sistemska upozorenja",
+  "item-access-control-title": "Ovaj obrazac vam omogućava da izvršite promene uslova pristupa metapodacima stavke ili njenim bitstream-ovima.",
+  "collection-access-control-title": "Ovaj obrazac vam omogućava da izvršite izmene uslova pristupa svim stavkama ove kolekcije. Promene mogu da se izvrše ili na svim metapodacima stavke ili na celom sadržaju (bitstream-ova).",
+  "community-access-control-title": "Ovaj obrazac vam omogućava da izvršite promene uslova pristupa svim stavkama bilo koje kolekcije u ovoj zajednici. Promene mogu da se izvrše ili na svim metapodacima stavke ili na celom sadržaju (bitstream-ova).",
+  "access-control-item-header-toggle": "Metapodaci stavke",
+  "access-control-bitstream-header-toggle": "Bitstream-ovi",
+  "access-control-mode": "Način",
+  "access-control-access-conditions": "Uslovi pristupa",
+  "access-control-no-access-conditions-warning-message": "Trenutno nisu navedeni uslovi pristupa ispod. Ako se izvrši, to će zameniti trenutne uslove pristupa podrazumevanim uslovima pristupa nasleđenim iz vlasničke kolekcije.",
+  "access-control-replace-all": "Zamena uslova pristupa",
+  "access-control-add-to-existing": "Dodati postojećim",
+  "access-control-limit-to-specific": "Ograničite promene na određene bitstream-ove",
+  "access-control-process-all-bitstreams": "Ažurirajte sve bitstream-ove u stavci",
+  "access-control-bitstreams-selected": "izabrani bitstream-ovi",
+  "access-control-cancel": "Otkazati",
+  "access-control-execute": "Izvršiti",
+  "access-control-add-more": "Dodati još",
+  "access-control-select-bitstreams-modal.title": "Izaberite bitstream-ove",
+  "access-control-select-bitstreams-modal.no-items": "Nema stavki za prikaz.",
+  "access-control-select-bitstreams-modal.close": "Zatvoriti",
+  "access-control-option-label": "Vrsta uslova pristupa",
+  "access-control-option-note": "Izaberite uslov pristupa koji ćete primeniti na izabrane objekte.",
+  "access-control-option-start-date": "Pristup odobren od",
+  "access-control-option-start-date-note": "Izaberite datum od kojeg se primenjuje odgovarajući uslov pristupa",
+  "access-control-option-end-date": "Pristup odobren do",
+  "access-control-option-end-date-note": "Izaberite datum do kojeg se primenjuje odgovarajući uslov pristupa",
+}
diff --git a/src/assets/i18n/sv.json5 b/src/assets/i18n/sv.json5
index c988577c92..81bf4ab939 100644
--- a/src/assets/i18n/sv.json5
+++ b/src/assets/i18n/sv.json5
@@ -3151,7 +3151,7 @@
   // "item.page.version.create": "Create new version",
   "item.page.version.create": "Skapa ny version",
 
-  // "item.page.version.hasDraft": "A new version cannot be created because there is an inprogress submission in the version history",
+  // "item.page.version.hasDraft": "A new version cannot be created because there is an in-progress submission in the version history",
   "item.page.version.hasDraft": "Ny version kan inte skapas pga pågående uppladdning i versionshistoriken",
 
   // "item.preview.dc.identifier.uri": "Identifier:",
@@ -3281,9 +3281,9 @@
   // "item.version.history.table.action.deleteVersion": "Delete version",
   "item.version.history.table.action.deleteVersion": "Radera version",
 
-  // "item.version.history.table.action.hasDraft": "A new version cannot be created because there is an inprogress submission in the version history",
+  // "item.version.history.table.action.hasDraft": "A new version cannot be created because there is an in-progress submission in the version history",
   // TODO New key - Add a translation
-  "item.version.history.table.action.hasDraft": "A new version cannot be created because there is an inprogress submission in the version history",
+  "item.version.history.table.action.hasDraft": "A new version cannot be created because there is an in-progress submission in the version history",
 
 
   // "item.version.notice": "This is not the latest version of this item. The latest version can be found <a href='{{destination}}'>here</a>.",
@@ -3323,9 +3323,9 @@
   // "item.version.create.notification.failure" : "New version has not been created",
   "item.version.create.notification.failure": "Ny version har inte skapats",
 
-  // "item.version.create.notification.inProgress" : "A new version cannot be created because there is an inprogress submission in the version history",
+  // "item.version.create.notification.inProgress" : "A new version cannot be created because there is an in-progress submission in the version history",
   // TODO New key - Add a translation
-  "item.version.create.notification.inProgress": "A new version cannot be created because there is an inprogress submission in the version history",
+  "item.version.create.notification.inProgress": "A new version cannot be created because there is an in-progress submission in the version history",
 
 
   // "item.version.delete.modal.header": "Delete version",
@@ -3934,20 +3934,20 @@
   // "mydspace.show.workspace": "Your Submissions",
   "mydspace.show.workspace": "Dina registreringar",
 
-  // "mydspace.status.archived": "Archived",
-  "mydspace.status.archived": "I arkivet",
+  // "mydspace.status.mydspaceArchived": "Archived",
+  "mydspace.status.mydspaceArchived": "I arkivet",
 
-  // "mydspace.status.validation": "Validation",
-  "mydspace.status.validation": "Validering",
+  // "mydspace.status.mydspaceValidation": "Validation",
+  "mydspace.status.mydspaceValidation": "Validering",
 
-  // "mydspace.status.waiting-for-controller": "Waiting for controller",
-  "mydspace.status.waiting-for-controller": "Väntar på kontrollant",
+  // "mydspace.status.mydspaceWaitingController": "Waiting for reviewer",
+  "mydspace.status.mydspaceWaitingController": "Väntar på kontrollant",
 
-  // "mydspace.status.workflow": "Workflow",
-  "mydspace.status.workflow": "Arbetsflöde",
+  // "mydspace.status.mydspaceWorkflow": "Workflow",
+  "mydspace.status.mydspaceWorkflow": "Arbetsflöde",
 
-  // "mydspace.status.workspace": "Workspace",
-  "mydspace.status.workspace": "I arbetsflödet",
+  // "mydspace.status.mydspaceWorkspace": "Workspace",
+  "mydspace.status.mydspaceWorkspace": "I arbetsflödet",
 
   // "mydspace.title": "MyDSpace",
   "mydspace.title": "Mitt DSpace",
@@ -4737,6 +4737,10 @@
   // "resource-policies.form.name.label": "Name",
   "resource-policies.form.name.label": "Namn",
 
+  //"resource-policies.form.name.hint": "Max 30 characters",
+  // TODO New key - Add a translation
+  "resource-policies.form.name.hint": "Max 30 characters",
+
   // "resource-policies.form.policy-type.label": "Select the policy type",
   "resource-policies.form.policy-type.label": "Välj typ av policy",
 
diff --git a/src/assets/i18n/sw.json5 b/src/assets/i18n/sw.json5
index 47253dea9f..a402570e9d 100644
--- a/src/assets/i18n/sw.json5
+++ b/src/assets/i18n/sw.json5
@@ -4276,25 +4276,25 @@
   // TODO New key - Add a translation
   "mydspace.show.workspace": "Your Submissions",
 
-  // "mydspace.status.archived": "Archived",
+  // "mydspace.status.mydspaceArchived": "Archived",
   // TODO New key - Add a translation
-  "mydspace.status.archived": "Archived",
+  "mydspace.status.mydspaceArchived": "Archived",
 
-  // "mydspace.status.validation": "Validation",
+  // "mydspace.status.mydspaceValidation": "Validation",
   // TODO New key - Add a translation
-  "mydspace.status.validation": "Validation",
+  "mydspace.status.mydspaceValidation": "Validation",
 
-  // "mydspace.status.waiting-for-controller": "Waiting for controller",
+  // "mydspace.status.mydspaceWaitingController": "Waiting for reviewer",
   // TODO New key - Add a translation
-  "mydspace.status.waiting-for-controller": "Waiting for controller",
+  "mydspace.status.mydspaceWaitingController": "Waiting for reviewer",
 
-  // "mydspace.status.workflow": "Workflow",
+  // "mydspace.status.mydspaceWorkflow": "Workflow",
   // TODO New key - Add a translation
-  "mydspace.status.workflow": "Workflow",
+  "mydspace.status.mydspaceWorkflow": "Workflow",
 
-  // "mydspace.status.workspace": "Workspace",
+  // "mydspace.status.mydspaceWorkspace": "Workspace",
   // TODO New key - Add a translation
-  "mydspace.status.workspace": "Workspace",
+  "mydspace.status.mydspaceWorkspace": "Workspace",
 
   // "mydspace.title": "MyDSpace",
   // TODO New key - Add a translation
@@ -5193,6 +5193,10 @@
   // TODO New key - Add a translation
   "resource-policies.form.name.label": "Name",
 
+  //"resource-policies.form.name.hint": "Max 30 characters",
+  // TODO New key - Add a translation
+  "resource-policies.form.name.hint": "Max 30 characters",
+
   // "resource-policies.form.policy-type.label": "Select the policy type",
   // TODO New key - Add a translation
   "resource-policies.form.policy-type.label": "Select the policy type",
diff --git a/src/assets/i18n/tr.json5 b/src/assets/i18n/tr.json5
index e9869e0019..631fe923f4 100644
--- a/src/assets/i18n/tr.json5
+++ b/src/assets/i18n/tr.json5
@@ -3257,20 +3257,20 @@
   // "mydspace.show.workspace": "Your Submissions",
   "mydspace.show.workspace": "Gönderimleriniz",
 
-  // "mydspace.status.archived": "Archived",
-  "mydspace.status.archived": "Arşivlendi",
+  // "mydspace.status.mydspaceArchived": "Archived",
+  "mydspace.status.mydspaceArchived": "Arşivlendi",
 
-  // "mydspace.status.validation": "Validation",
-  "mydspace.status.validation": "Doğrulama",
+  // "mydspace.status.mydspaceValidation": "Validation",
+  "mydspace.status.mydspaceValidation": "Doğrulama",
 
-  // "mydspace.status.waiting-for-controller": "Waiting for controller",
-  "mydspace.status.waiting-for-controller": "Kontrolör bekleniyor",
+  // "mydspace.status.mydspaceWaitingController": "Waiting for reviewer",
+  "mydspace.status.mydspaceWaitingController": "Kontrolör bekleniyor",
 
-  // "mydspace.status.workflow": "Workflow",
-  "mydspace.status.workflow": "İş akışı",
+  // "mydspace.status.mydspaceWorkflow": "Workflow",
+  "mydspace.status.mydspaceWorkflow": "İş akışı",
 
-  // "mydspace.status.workspace": "Workspace",
-  "mydspace.status.workspace": "Çalışma alanı",
+  // "mydspace.status.mydspaceWorkspace": "Workspace",
+  "mydspace.status.mydspaceWorkspace": "Çalışma alanı",
 
   // "mydspace.title": "MyDSpace",
   "mydspace.title": "MyDSpace",
@@ -3951,6 +3951,10 @@
   // "resource-policies.form.name.label": "Name",
   "resource-policies.form.name.label": "Ad",
 
+  //"resource-policies.form.name.hint": "Max 30 characters",
+  // TODO New key - Add a translation
+  "resource-policies.form.name.hint": "Max 30 characters",
+
   // "resource-policies.form.policy-type.label": "Select the policy type",
   "resource-policies.form.policy-type.label": "Politika türünü seçin",
 
diff --git a/src/assets/i18n/uk.json5 b/src/assets/i18n/uk.json5
index 5cbb480179..fb2613e744 100644
--- a/src/assets/i18n/uk.json5
+++ b/src/assets/i18n/uk.json5
@@ -3383,20 +3383,20 @@
   // "mydspace.show.workspace": "Your Submissions",
   "mydspace.show.workspace": "Ваші надіслані документи ",
 
-  // "mydspace.status.archived": "Archived",
-  "mydspace.status.archived": "Заархівовані",
+  // "mydspace.status.mydspaceArchived": "Archived",
+  "mydspace.status.mydspaceArchived": "Заархівовані",
 
-  // "mydspace.status.validation": "Validation",
-  "mydspace.status.validation": "Перевірка",
+  // "mydspace.status.mydspaceValidation": "Validation",
+  "mydspace.status.mydspaceValidation": "Перевірка",
 
-  // "mydspace.status.waiting-for-controller": "Waiting for controller",
-  "mydspace.status.waiting-for-controller": "Чекаємо контролера",
+  // "mydspace.status.mydspaceWaitingController": "Waiting for reviewer",
+  "mydspace.status.mydspaceWaitingController": "Чекаємо контролера",
 
-  // "mydspace.status.workflow": "Workflow",
-  "mydspace.status.workflow": "Робочий процес",
+  // "mydspace.status.mydspaceWorkflow": "Workflow",
+  "mydspace.status.mydspaceWorkflow": "Робочий процес",
 
-  // "mydspace.status.workspace": "Workspace",
-  "mydspace.status.workspace": "Робоче середовище",
+  // "mydspace.status.mydspaceWorkspace": "Workspace",
+  "mydspace.status.mydspaceWorkspace": "Робоче середовище",
 
   // "mydspace.title": "MyDSpace",
   "mydspace.title": "Моє середовище",
@@ -4148,6 +4148,10 @@
 
   "resource-policies.form.name.label": "Назва",
 
+  //"resource-policies.form.name.hint": "Max 30 characters",
+  // TODO New key - Add a translation
+  "resource-policies.form.name.hint": "Max 30 characters",
+
   // "resource-policies.form.policy-type.label": "Select the policy type",
 
   "resource-policies.form.policy-type.label": "Виберіть тип політики",
diff --git a/src/assets/i18n/vi.json5 b/src/assets/i18n/vi.json5
index 7627818978..4ebe2c05d1 100644
--- a/src/assets/i18n/vi.json5
+++ b/src/assets/i18n/vi.json5
@@ -671,7 +671,7 @@
   "curation-task.task.citationpage.label": "Tạo trang trích dẫn",
   "curation-task.task.noop.label": "NOOP",
   "curation-task.task.profileformats.label": "Định dạng tệp tin",
-  "curation-task.task.register-doi.label": "Đăng ký DOI",
+  "curation-task.task.registerdoi.label": "Đăng ký DOI",
   "curation-task.task.requiredmetadata.label": "Kiểm tra các trường dữ liệu bắt buộc",
   "curation-task.task.translate.label": "Bộ dịch của Microsoft",
   "curation-task.task.vscan.label": "Quét Virus",
@@ -1449,11 +1449,11 @@
   "mydspace.search-form.placeholder": "Tìm kiếm trong trang cá nhân của tôi...",
   "mydspace.show.workflow": "Tất cả nhiệm vụ",
   "mydspace.show.workspace": "Tài liệu của tôi",
-  "mydspace.status.archived": "Đã lưu trữ",
-  "mydspace.status.validation": "Đang kiểm tra",
-  "mydspace.status.waiting-for-controller": "Đợi nhận nhiệm vụ",
-  "mydspace.status.workflow": "Đang kiểm duyệt",
-  "mydspace.status.workspace": "Đang biên mục",
+  "mydspace.status.mydspaceArchived": "Đã lưu trữ",
+  "mydspace.status.mydspaceValidation": "Đang kiểm tra",
+  "mydspace.status.mydspaceWaitingController": "Đợi nhận nhiệm vụ",
+  "mydspace.status.mydspaceWorkflow": "Đang kiểm duyệt",
+  "mydspace.status.mydspaceWorkspace": "Đang biên mục",
   "mydspace.title": "Trang cá nhân",
   "mydspace.upload.upload-failed": "Có lỗi xảy ra khi tạo tài liệu mới. Vui lòng xác minh nội dung đã tải lên trước khi thử lại.",
   "mydspace.upload.upload-failed-manyentries": "Không thể xử lý tệp tin. Có quá nhiều mục trong khi hệ thống chỉ cho phép một mục trong tệp tin.",
@@ -1828,6 +1828,9 @@
   "resource-policies.form.eperson-group-list.table.headers.id": "ID",
   "resource-policies.form.eperson-group-list.table.headers.name": "Tên",
   "resource-policies.form.name.label": "Tên",
+  //"resource-policies.form.name.hint": "Max 30 characters",
+  // TODO New key - Add a translation
+  "resource-policies.form.name.hint": "Max 30 characters",
   "resource-policies.form.policy-type.label": "Lựa chọn kiểu chính sách",
   "resource-policies.form.policy-type.required": "Bạn cần lựa chọn kiểu chính sách tài nguyên.",
   "resource-policies.table.headers.action": "Quyền",
@@ -2026,7 +2029,7 @@
   "submission.import-external.source.ads": "NASA/ADS",
   "submission.import-external.source.arxiv": "arXiv",
   "submission.import-external.source.cinii": "CiNii",
-  "submission.import-external.source.crossref": "CrossRef",
+  "submission.import-external.source.crossref": "Crossref",
   "submission.import-external.source.datacite": "submission.import-external.source.datacite",
   "submission.import-external.source.epo": "Văn phòng Bằng sáng chế Châu Âu (EPO)",
   "submission.import-external.source.lcname": "Tên Thư viện Quốc hội",
diff --git a/src/assets/images/dspace-logo.png b/src/assets/images/dspace-logo.png
deleted file mode 100644
index 40b59feeaa..0000000000
Binary files a/src/assets/images/dspace-logo.png and /dev/null differ
diff --git a/src/config/app-config.interface.ts b/src/config/app-config.interface.ts
index 84a30549a7..af78d4ab88 100644
--- a/src/config/app-config.interface.ts
+++ b/src/config/app-config.interface.ts
@@ -9,7 +9,7 @@ import { FormConfig } from './form-config.interfaces';
 import { LangConfig } from './lang-config.interface';
 import { ItemConfig } from './item-config.interface';
 import { CollectionPageConfig } from './collection-page-config.interface';
-import { ThemeConfig } from './theme.model';
+import { ThemeConfig } from './theme.config';
 import { AuthConfig } from './auth-config.interfaces';
 import { UIServerConfig } from './ui-server-config.interface';
 import { MediaViewerConfig } from './media-viewer-config.interface';
@@ -22,6 +22,8 @@ import { HomeConfig } from './homepage-config.interface';
 import { MarkdownConfig } from './markdown-config.interface';
 import { FilterVocabularyConfig } from './filter-vocabulary-config';
 import { DiscoverySortConfig } from './discovery-sort.config';
+import { LiveRegionConfig } from '../app/shared/live-region/live-region.config';
+import { SearchConfig } from './search-page-config.interface';
 
 interface AppConfig extends Config {
   ui: UIServerConfig;
@@ -48,6 +50,8 @@ interface AppConfig extends Config {
   markdown: MarkdownConfig;
   vocabularies: FilterVocabularyConfig[];
   comcolSelectionSort: DiscoverySortConfig;
+  liveRegion: LiveRegionConfig;
+  search: SearchConfig
 }
 
 /**
diff --git a/src/config/config.server.ts b/src/config/config.server.ts
index 65daede0a8..488c1c7a4c 100644
--- a/src/config/config.server.ts
+++ b/src/config/config.server.ts
@@ -227,6 +227,7 @@ export const buildAppConfig = (destConfigPath?: string): AppConfig => {
   appConfig.rest.port = isNotEmpty(ENV('REST_PORT', true)) ? getNumberFromString(ENV('REST_PORT', true)) : appConfig.rest.port;
   appConfig.rest.nameSpace = isNotEmpty(ENV('REST_NAMESPACE', true)) ? ENV('REST_NAMESPACE', true) : appConfig.rest.nameSpace;
   appConfig.rest.ssl = isNotEmpty(ENV('REST_SSL', true)) ? getBooleanFromString(ENV('REST_SSL', true)) : appConfig.rest.ssl;
+  appConfig.rest.ssrBaseUrl = isNotEmpty(ENV('REST_SSRBASEURL', true)) ? ENV('REST_SSRBASEURL', true) : appConfig.rest.ssrBaseUrl;
 
   // apply build defined production
   appConfig.production = env === 'production';
diff --git a/src/config/config.util.spec.ts b/src/config/config.util.spec.ts
index 2d1d8e1be7..4dc2b67260 100644
--- a/src/config/config.util.spec.ts
+++ b/src/config/config.util.spec.ts
@@ -1,7 +1,7 @@
 import { environment } from '../environments/environment.production';
 import { extendEnvironmentWithAppConfig } from './config.util';
 import { DefaultAppConfig } from './default-app-config';
-import { HandleThemeConfig } from './theme.model';
+import { HandleThemeConfig } from './theme.config';
 
 describe('Config Util', () => {
   describe('extendEnvironmentWithAppConfig', () => {
diff --git a/src/config/config.util.ts b/src/config/config.util.ts
index 3d152d4563..c1d87e3490 100644
--- a/src/config/config.util.ts
+++ b/src/config/config.util.ts
@@ -5,7 +5,8 @@ import { environment } from '../environments/environment';
 import { hasNoValue } from '../app/shared/empty.util';
 
 import { AppConfig } from './app-config.interface';
-import { ThemeConfig } from './theme.model';
+import { ThemeConfig, NamedThemeConfig } from './theme.config';
+import { BASE_THEME_NAME } from '../app/shared/theme-support/theme.constants';
 
 /**
  * Extend Angular environment with app config.
@@ -44,7 +45,9 @@ const getDefaultThemeConfig = (): ThemeConfig => {
     hasNoValue(themeConfig.regex) &&
     hasNoValue(themeConfig.handle) &&
     hasNoValue(themeConfig.uuid)
-  );
+  ) ?? {
+    name: BASE_THEME_NAME,
+  } as NamedThemeConfig;
 };
 
 export {
diff --git a/src/config/default-app-config.ts b/src/config/default-app-config.ts
index a6e9e092e4..de4f3bd56e 100644
--- a/src/config/default-app-config.ts
+++ b/src/config/default-app-config.ts
@@ -12,7 +12,7 @@ import { MediaViewerConfig } from './media-viewer-config.interface';
 import { INotificationBoardOptions } from './notifications-config.interfaces';
 import { ServerConfig } from './server-config.interface';
 import { SubmissionConfig } from './submission-config.interface';
-import { ThemeConfig } from './theme.model';
+import { ThemeConfig } from './theme.config';
 import { UIServerConfig } from './ui-server-config.interface';
 import { BundleConfig } from './bundle-config.interface';
 import { ActuatorsConfig } from './actuators.config';
@@ -22,6 +22,8 @@ import { HomeConfig } from './homepage-config.interface';
 import { MarkdownConfig } from './markdown-config.interface';
 import { FilterVocabularyConfig } from './filter-vocabulary-config';
 import { DiscoverySortConfig } from './discovery-sort.config';
+import { LiveRegionConfig } from '../app/shared/live-region/live-region.config';
+import { SearchConfig } from './search-page-config.interface';
 
 export class DefaultAppConfig implements AppConfig {
   production = false;
@@ -216,28 +218,31 @@ export class DefaultAppConfig implements AppConfig {
   // When set to active, users will be able to switch to the use of this language in the user interface.
   languages: LangConfig[] = [
     { code: 'en', label: 'English', active: true },
+    { code: 'ar', label: 'العربية', active: true },
+    { code: 'bn', label: 'বাংলা', active: true },
     { code: 'ca', label: 'Català', active: true },
     { code: 'cs', label: 'Čeština', active: true },
     { code: 'de', label: 'Deutsch', active: true },
+    { code: 'el', label: 'Ελληνικά', active: true },
     { code: 'es', label: 'Español', active: true },
+    { code: 'fi', label: 'Suomi', active: true },
     { code: 'fr', label: 'Français', active: true },
     { code: 'gd', label: 'Gàidhlig', active: true },
-    { code: 'it', label: 'Italiano', active: true },
-    { code: 'lv', label: 'Latviešu', active: true },
+    { code: 'hi', label: 'हिंदी', active: true },
     { code: 'hu', label: 'Magyar', active: true },
+    { code: 'it', label: 'Italiano', active: true },
+    { code: 'kk', label: 'Қазақ', active: true },
+    { code: 'lv', label: 'Latviešu', active: true },
     { code: 'nl', label: 'Nederlands', active: true },
     { code: 'pl', label: 'Polski', active: true },
     { code: 'pt-PT', label: 'Português', active: true },
     { code: 'pt-BR', label: 'Português do Brasil', active: true },
-    { code: 'fi', label: 'Suomi', active: true },
+    { code: 'sr-lat', label: 'Srpski (lat)', active: true },
+    { code: 'sr-cyr', label: 'Српски', active: true },
     { code: 'sv', label: 'Svenska', active: true },
     { code: 'tr', label: 'Türkçe', active: true },
+    { code: 'uk', label: 'Yкраї́нська', active: true },
     { code: 'vi', label: 'Tiếng Việt', active: true },
-    { code: 'kk', label: 'Қазақ', active: true },
-    { code: 'bn', label: 'বাংলা', active: true },
-    { code: 'hi', label: 'हिंदी', active: true},
-    { code: 'el', label: 'Ελληνικά', active: true },
-    { code: 'uk', label: 'Yкраї́нська', active: true}
   ];
 
   // Browse-By Pages
@@ -432,4 +437,14 @@ export class DefaultAppConfig implements AppConfig {
     sortField:'dc.title',
     sortDirection:'ASC',
   };
+
+  // Live Region configuration, used by the LiveRegionService
+  liveRegion: LiveRegionConfig = {
+    messageTimeOutDurationMs: 30000,
+    isVisible: false,
+  };
+
+  search: SearchConfig = {
+    filterPlaceholdersCount: 5
+  };
 }
diff --git a/src/config/search-page-config.interface.ts b/src/config/search-page-config.interface.ts
new file mode 100644
index 0000000000..410876cde2
--- /dev/null
+++ b/src/config/search-page-config.interface.ts
@@ -0,0 +1,12 @@
+import { Config } from './config.interface';
+
+export interface SearchConfig extends Config {
+  /**
+   * Number used to render n UI elements called loading skeletons that act as placeholders.
+   * These elements indicate that some content will be loaded in their stead.
+   * Since we don't know how many filters will be loaded before we receive a response from the server we use this parameter for the skeletons count.
+   * For instance if we set 5 then 5 loading skeletons will be visualized before the actual filters are retrieved.
+   */
+  filterPlaceholdersCount?: number;
+
+}
diff --git a/src/config/server-config.interface.ts b/src/config/server-config.interface.ts
index 8797ea3d60..ad9fa0868a 100644
--- a/src/config/server-config.interface.ts
+++ b/src/config/server-config.interface.ts
@@ -6,4 +6,8 @@ export class ServerConfig implements Config {
   public port: number;
   public nameSpace: string;
   public baseUrl?: string;
+  public ssrBaseUrl?: string;
+  // This boolean will be automatically set on server startup based on whether "baseUrl" and "ssrBaseUrl"
+  // have different values.
+  public hasSsrBaseUrl?: boolean;
 }
diff --git a/src/config/theme.config.ts b/src/config/theme.config.ts
new file mode 100644
index 0000000000..7989dc3af9
--- /dev/null
+++ b/src/config/theme.config.ts
@@ -0,0 +1,51 @@
+import { Config } from './config.interface';
+
+export interface NamedThemeConfig extends Config {
+  name: string;
+
+  /**
+   * Specify another theme to build upon: whenever a themed component is not found in the current theme,
+   * its ancestor theme(s) will be checked recursively before falling back to the default theme.
+   */
+  extends?: string;
+
+  /**
+   * A list of HTML tags that should be added to the HEAD section of the document, whenever this theme is active.
+   */
+  headTags?: HeadTagConfig[];
+}
+
+/**
+ * Interface that represents a single theme-specific HTML tag in the HEAD section of the page.
+ */
+export interface HeadTagConfig extends Config {
+  /**
+   * The name of the HTML tag
+   */
+  tagName: string;
+
+  /**
+   * The attributes on the HTML tag
+   */
+  attributes?: {
+    [key: string]: string;
+  };
+}
+
+export interface RegExThemeConfig extends NamedThemeConfig {
+  regex: string;
+}
+
+export interface HandleThemeConfig extends NamedThemeConfig {
+  handle: string;
+}
+
+export interface UUIDThemeConfig extends NamedThemeConfig {
+  uuid: string;
+}
+
+export type ThemeConfig
+  = NamedThemeConfig
+  | RegExThemeConfig
+  | HandleThemeConfig
+  | UUIDThemeConfig;
diff --git a/src/config/theme.model.spec.ts b/src/config/theme.model.spec.ts
index 79b5a1f32b..de2e2f7cef 100644
--- a/src/config/theme.model.spec.ts
+++ b/src/config/theme.model.spec.ts
@@ -1,4 +1,4 @@
-import { HandleTheme, RegExTheme, Theme, UUIDTheme } from './theme.model';
+import { HandleTheme, RegExTheme, Theme, UUIDTheme } from '../app/shared/theme-support/theme.model';
 import { getCommunityModuleRoute } from '../app/community-page/community-page-routing-paths';
 import { Community } from '../app/core/shared/community.model';
 import { COMMUNITY } from '../app/core/shared/community.resource-type';
@@ -9,12 +9,15 @@ import { Item } from '../app/core/shared/item.model';
 import { ITEM } from '../app/core/shared/item.resource-type';
 import { getItemModuleRoute } from '../app/item-page/item-page-routing-paths';
 import { HandleService } from '../app/shared/handle.service';
+import { TestBed } from '@angular/core/testing';
+import { ConfigurationDataService } from '../app/core/data/configuration-data.service';
+import { ConfigurationDataServiceStub } from '../app/shared/testing/configuration-data.service.stub';
 
 describe('Theme Models', () => {
   let theme: Theme;
 
   describe('RegExTheme', () => {
-    it('should return true when the regex matches the community\'s DSO route', () => {
+    it('should return true when the regex matches the community\'s DSO route', (done: DoneFn) => {
       theme = new RegExTheme({
         name: 'community',
         regex: getCommunityModuleRoute() + '/.*',
@@ -23,10 +26,13 @@ describe('Theme Models', () => {
         type: COMMUNITY.value,
         uuid: 'community-uuid',
       });
-      expect(theme.matches('', dso)).toEqual(true);
+      theme.matches('', dso).subscribe((matches: boolean) => {
+        expect(matches).toBeTrue();
+        done();
+      });
     });
 
-    it('should return true when the regex matches the collection\'s DSO route', () => {
+    it('should return true when the regex matches the collection\'s DSO route', (done: DoneFn) => {
       theme = new RegExTheme({
         name: 'collection',
         regex: getCollectionModuleRoute() + '/.*',
@@ -35,10 +41,13 @@ describe('Theme Models', () => {
         type: COLLECTION.value,
         uuid: 'collection-uuid',
       });
-      expect(theme.matches('', dso)).toEqual(true);
+      theme.matches('', dso).subscribe((matches: boolean) => {
+        expect(matches).toBeTrue();
+        done();
+      });
     });
 
-    it('should return true when the regex matches the item\'s DSO route', () => {
+    it('should return true when the regex matches the item\'s DSO route', (done: DoneFn) => {
       theme = new RegExTheme({
         name: 'item',
         regex: getItemModuleRoute() + '/.*',
@@ -47,32 +56,51 @@ describe('Theme Models', () => {
         type: ITEM.value,
         uuid: 'item-uuid',
       });
-      expect(theme.matches('', dso)).toEqual(true);
+      theme.matches('', dso).subscribe((matches: boolean) => {
+        expect(matches).toBeTrue();
+        done();
+      });
     });
 
-    it('should return true when the regex matches the url', () => {
+    it('should return true when the regex matches the url', (done: DoneFn) => {
       theme = new RegExTheme({
         name: 'url',
         regex: '.*partial.*',
       });
-      expect(theme.matches('theme/partial/url/match', null)).toEqual(true);
+      theme.matches('theme/partial/url/match', null).subscribe((matches: boolean) => {
+        expect(matches).toBeTrue();
+        done();
+      });
     });
 
-    it('should return false when the regex matches neither the url, nor the DSO route', () => {
+    it('should return false when the regex matches neither the url, nor the DSO route', (done: DoneFn) => {
       theme = new RegExTheme({
         name: 'no-match',
         regex: '.*no/match.*',
       });
-      expect(theme.matches('theme/partial/url/match', null)).toEqual(false);
+      theme.matches('theme/partial/url/match', null).subscribe((matches: boolean) => {
+        expect(matches).toBeFalse();
+        done();
+      });
     });
   });
 
   describe('HandleTheme', () => {
-    let handleService;
+    let handleService: HandleService;
+
+    let configurationService: ConfigurationDataServiceStub;
+
     beforeEach(() => {
-      handleService = new HandleService();
+      configurationService = new ConfigurationDataServiceStub();
+
+      TestBed.configureTestingModule({
+        providers: [
+          { provide: ConfigurationDataService, useValue: configurationService },
+        ],
       });
-    it('should return true when the DSO\'s handle matches the theme\'s handle', () => {
+      handleService = TestBed.inject(HandleService);
+    });
+    it('should return true when the DSO\'s handle matches the theme\'s handle', (done: DoneFn) => {
       theme = new HandleTheme({
         name: 'matching-handle',
         handle: '1234/5678',
@@ -82,9 +110,12 @@ describe('Theme Models', () => {
         uuid: 'item-uuid',
         handle: '1234/5678',
       }, handleService);
-      expect(theme.matches('', matchingDso)).toEqual(true);
+      theme.matches('', matchingDso).subscribe((matches: boolean) => {
+        expect(matches).toBeTrue();
+        done();
+      });
     });
-    it('should return false when the DSO\'s handle contains the theme\'s handle as a subpart', () => {
+    it('should return false when the DSO\'s handle contains the theme\'s handle as a subpart', (done: DoneFn) => {
       theme = new HandleTheme({
         name: 'matching-handle',
         handle: '1234/5678',
@@ -94,10 +125,13 @@ describe('Theme Models', () => {
         uuid: 'item-uuid',
         handle: '1234/567891011',
       });
-      expect(theme.matches('', dso)).toEqual(false);
+      theme.matches('', dso).subscribe((matches: boolean) => {
+        expect(matches).toBeFalse();
+        done();
+      });
     });
 
-    it('should return false when the handles don\'t match', () => {
+    it('should return false when the handles don\'t match', (done: DoneFn) => {
       theme = new HandleTheme({
         name: 'no-matching-handle',
         handle: '1234/5678',
@@ -107,12 +141,15 @@ describe('Theme Models', () => {
         uuid: 'item-uuid',
         handle: '1234/6789',
       });
-      expect(theme.matches('', dso)).toEqual(false);
+      theme.matches('', dso).subscribe((matches: boolean) => {
+        expect(matches).toBeFalse();
+        done();
+      });
     });
   });
 
   describe('UUIDTheme', () => {
-    it('should return true when the DSO\'s UUID matches the theme\'s UUID', () => {
+    it('should return true when the DSO\'s UUID matches the theme\'s UUID', (done: DoneFn) => {
       theme = new UUIDTheme({
         name: 'matching-uuid',
         uuid: 'item-uuid',
@@ -121,10 +158,13 @@ describe('Theme Models', () => {
         type: ITEM.value,
         uuid: 'item-uuid',
       });
-      expect(theme.matches('', dso)).toEqual(true);
+      theme.matches('', dso).subscribe((matches: boolean) => {
+        expect(matches).toBeTrue();
+        done();
+      });
     });
 
-    it('should return true when the UUIDs don\'t match', () => {
+    it('should return true when the UUIDs don\'t match', (done: DoneFn) => {
       theme = new UUIDTheme({
         name: 'matching-uuid',
         uuid: 'item-uuid',
@@ -133,7 +173,10 @@ describe('Theme Models', () => {
         type: COLLECTION.value,
         uuid: 'collection-uuid',
       });
-      expect(theme.matches('', dso)).toEqual(false);
+      theme.matches('', dso).subscribe((matches: boolean) => {
+        expect(matches).toBeFalse();
+        done();
+      });
     });
   });
 });
diff --git a/src/config/theme.model.ts b/src/config/theme.model.ts
deleted file mode 100644
index 019540f18a..0000000000
--- a/src/config/theme.model.ts
+++ /dev/null
@@ -1,131 +0,0 @@
-/* eslint-disable max-classes-per-file */
-import { Config } from './config.interface';
-import { hasValue, hasNoValue, isNotEmpty } from '../app/shared/empty.util';
-import { DSpaceObject } from '../app/core/shared/dspace-object.model';
-import { getDSORoute } from '../app/app-routing-paths';
-import { HandleObject } from '../app/core/shared/handle-object.model';
-import { Injector } from '@angular/core';
-import { HandleService } from '../app/shared/handle.service';
-
-export interface NamedThemeConfig extends Config {
-  name: string;
-
-  /**
-   * Specify another theme to build upon: whenever a themed component is not found in the current theme,
-   * its ancestor theme(s) will be checked recursively before falling back to the default theme.
-   */
-  extends?: string;
-
-  /**
-   * A list of HTML tags that should be added to the HEAD section of the document, whenever this theme is active.
-   */
-  headTags?: HeadTagConfig[];
-}
-
-/**
- * Interface that represents a single theme-specific HTML tag in the HEAD section of the page.
- */
-export interface HeadTagConfig extends Config {
-  /**
-   * The name of the HTML tag
-   */
-  tagName: string;
-
-  /**
-   * The attributes on the HTML tag
-   */
-  attributes?: {
-    [key: string]: string;
-  };
-}
-
-export interface RegExThemeConfig extends NamedThemeConfig {
-  regex: string;
-}
-
-export interface HandleThemeConfig extends NamedThemeConfig {
-  handle: string;
-}
-
-export interface UUIDThemeConfig extends NamedThemeConfig {
-  uuid: string;
-}
-
-export class Theme {
-  constructor(public config: NamedThemeConfig) {
-  }
-
-  matches(url: string, dso: DSpaceObject): boolean {
-    return true;
-  }
-}
-
-export class RegExTheme extends Theme {
-  regex: RegExp;
-
-  constructor(public config: RegExThemeConfig) {
-    super(config);
-    this.regex = new RegExp(this.config.regex);
-  }
-
-  matches(url: string, dso: DSpaceObject): boolean {
-    let match;
-    const route = getDSORoute(dso);
-
-    if (isNotEmpty(route)) {
-      match = route.match(this.regex);
-    }
-
-    if (hasNoValue(match)) {
-      match = url.match(this.regex);
-    }
-
-    return hasValue(match);
-  }
-}
-
-export class HandleTheme extends Theme {
-
-  private normalizedHandle;
-
-  constructor(public config: HandleThemeConfig,
-              protected handleService: HandleService
-              ) {
-    super(config);
-    this.normalizedHandle = this.handleService.normalizeHandle(this.config.handle);
-
-  }
-
-  matches<T extends DSpaceObject & HandleObject>(url: string, dso: T): boolean {
-    return hasValue(dso) && hasValue(dso.handle)
-      && this.handleService.normalizeHandle(dso.handle) === this.normalizedHandle;
-  }
-}
-
-export class UUIDTheme extends Theme {
-  constructor(public config: UUIDThemeConfig) {
-    super(config);
-  }
-
-  matches(url: string, dso: DSpaceObject): boolean {
-    return hasValue(dso) && dso.uuid === this.config.uuid;
-  }
-}
-
-export const themeFactory = (config: ThemeConfig, injector: Injector): Theme => {
-  if (hasValue((config as RegExThemeConfig).regex)) {
-    return new RegExTheme(config as RegExThemeConfig);
-  } else if (hasValue((config as HandleThemeConfig).handle)) {
-    return new HandleTheme(config as HandleThemeConfig, injector.get(HandleService));
-  } else if (hasValue((config as UUIDThemeConfig).uuid)) {
-    return new UUIDTheme(config as UUIDThemeConfig);
-  } else {
-    return new Theme(config as NamedThemeConfig);
-  }
-};
-
-export type ThemeConfig
-  = NamedThemeConfig
-  | RegExThemeConfig
-  | HandleThemeConfig
-  | UUIDThemeConfig;
diff --git a/src/config/universal-config.interface.ts b/src/config/universal-config.interface.ts
index c088dcd657..531f7d54d5 100644
--- a/src/config/universal-config.interface.ts
+++ b/src/config/universal-config.interface.ts
@@ -1,7 +1,53 @@
 import { Config } from './config.interface';
 
+export interface SsrExcludePatterns {
+  pattern: string | RegExp;
+  flag?: string;
+}
+
 export interface UniversalConfig extends Config {
   preboot: boolean;
   async: boolean;
   time: boolean;
+
+  /**
+   * Whether to inline "critical" styles into the server-side rendered HTML.
+   *
+   * Determining which styles are critical is a relatively expensive operation;
+   * this option can be disabled to boost server performance at the expense of
+   * loading smoothness.
+   */
+  inlineCriticalCss?: boolean;
+
+  /**
+   * Enable state transfer from the server-side application to the client-side application.
+   * Defaults to true.
+   *
+   * Note: When using an external application cache layer, it's recommended not to transfer the state to avoid caching it.
+   * Disabling it ensures that dynamic state information is not inadvertently cached, which can improve security and
+   * ensure that users always use the most up-to-date state.
+   */
+  transferState: boolean;
+
+  /**
+   * When a different REST base URL is used for the server-side application, the generated state contains references to
+   * REST resources with the internal URL configured. By default, these internal URLs are replaced with public URLs.
+   * Disable this setting to avoid URL replacement during SSR. In this the state is not transferred to avoid security issues.
+   */
+  replaceRestUrl: boolean;
+
+  /**
+   * Patterns to be used as regexes to match url's path and check if SSR is disabled for it.
+   */
+  excludePathPatterns:  SsrExcludePatterns[];
+
+  /**
+   * Whether to enable rendering of search component on SSR
+   */
+  enableSearchComponent: boolean;
+
+  /**
+   * Whether to enable rendering of browse component on SSR
+   */
+  enableBrowseComponent: boolean;
 }
diff --git a/src/environments/environment.production.ts b/src/environments/environment.production.ts
index 09b5f19ade..e5066ab48f 100644
--- a/src/environments/environment.production.ts
+++ b/src/environments/environment.production.ts
@@ -7,6 +7,30 @@ export const environment: Partial<BuildConfig> = {
   universal: {
     preboot: true,
     async: true,
-    time: false
-  }
+    time: false,
+    inlineCriticalCss: false,
+    transferState: true,
+    replaceRestUrl: true,
+    excludePathPatterns: [
+      {
+        pattern: '^/communities/[a-f0-9-]{36}/browse(/.*)?$',
+        flag: 'i',
+      },
+      {
+        pattern: '^/collections/[a-f0-9-]{36}/browse(/.*)?$',
+        flag: 'i',
+      },
+      { pattern: '^/browse/' },
+      { pattern: '^/search' },
+      { pattern: '^/community-list$' },
+      { pattern: '^/statistics/?' },
+      { pattern: '^/admin/' },
+      { pattern: '^/processes/?' },
+      { pattern: '^/notifications/' },
+      { pattern: '^/access-control/' },
+      { pattern: '^/health$' },
+    ],
+    enableSearchComponent: false,
+    enableBrowseComponent: false,
+  },
 };
diff --git a/src/environments/environment.test.ts b/src/environments/environment.test.ts
index cb9d2c7130..29db39d899 100644
--- a/src/environments/environment.test.ts
+++ b/src/environments/environment.test.ts
@@ -10,7 +10,31 @@ export const environment: BuildConfig = {
   universal: {
     preboot: true,
     async: true,
-    time: false
+    time: false,
+    inlineCriticalCss: false,
+    transferState: true,
+    replaceRestUrl: false,
+    excludePathPatterns: [
+      {
+        pattern: '^/communities/[a-f0-9-]{36}/browse(/.*)?$',
+        flag: 'i',
+      },
+      {
+        pattern: '^/collections/[a-f0-9-]{36}/browse(/.*)?$',
+        flag: 'i',
+      },
+      { pattern: '^/browse/' },
+      { pattern: '^/search' },
+      { pattern: '^/community-list$' },
+      { pattern: '^/statistics/?' },
+      { pattern: '^/admin/' },
+      { pattern: '^/processes/?' },
+      { pattern: '^/notifications/' },
+      { pattern: '^/access-control/' },
+      { pattern: '^/health$' },
+    ],
+    enableSearchComponent: false,
+    enableBrowseComponent: false,
   },
 
   // Angular Universal server settings.
@@ -313,5 +337,14 @@ export const environment: BuildConfig = {
       vocabulary: 'srsc',
       enabled: true
     }
-  ]
+  ],
+
+  liveRegion: {
+    messageTimeOutDurationMs: 30000,
+    isVisible: false,
+  },
+
+  search: {
+    filterPlaceholdersCount: 5
+  }
 };
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index dc0e808be0..11525e4790 100644
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@@ -12,8 +12,32 @@ export const environment: Partial<BuildConfig> = {
   universal: {
     preboot: false,
     async: true,
-    time: false
-  }
+    time: false,
+    inlineCriticalCss: false,
+    transferState: true,
+    replaceRestUrl: false,
+    excludePathPatterns: [
+      {
+        pattern: '^/communities/[a-f0-9-]{36}/browse(/.*)?$',
+        flag: 'i',
+      },
+      {
+        pattern: '^/collections/[a-f0-9-]{36}/browse(/.*)?$',
+        flag: 'i',
+      },
+      { pattern: '^/browse/' },
+      { pattern: '^/search' },
+      { pattern: '^/community-list$' },
+      { pattern: '^/statistics/?' },
+      { pattern: '^/admin/' },
+      { pattern: '^/processes/?' },
+      { pattern: '^/notifications/' },
+      { pattern: '^/access-control/' },
+      { pattern: '^/health$' },
+    ],
+    enableSearchComponent: false,
+    enableBrowseComponent: false,
+  },
 };
 
 /*
diff --git a/src/modules/app/browser-app.module.ts b/src/modules/app/browser-app.module.ts
index d6295cf791..2f1f6a200e 100644
--- a/src/modules/app/browser-app.module.ts
+++ b/src/modules/app/browser-app.module.ts
@@ -1,5 +1,5 @@
 import { HttpClient, HttpClientModule } from '@angular/common/http';
-import { NgModule } from '@angular/core';
+import { APP_INITIALIZER, NgModule } from '@angular/core';
 import { BrowserModule, BrowserTransferStateModule, makeStateKey, TransferState } from '@angular/platform-browser';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { REQUEST } from '@nguniversal/express-engine/tokens';
@@ -32,6 +32,8 @@ import { AuthRequestService } from '../../app/core/auth/auth-request.service';
 import { BrowserAuthRequestService } from '../../app/core/auth/browser-auth-request.service';
 import { BrowserInitService } from './browser-init.service';
 import { ReferrerService } from '../../app/core/services/referrer.service';
+import { BrowserXSRFService } from '../../app/core/xsrf/browser-xsrf.service';
+import { XSRFService } from '../../app/core/xsrf/xsrf.service';
 import { BrowserReferrerService } from '../../app/core/services/browser.referrer.service';
 
 export const REQ_KEY = makeStateKey<string>('req');
@@ -73,6 +75,16 @@ export function getRequest(transferState: TransferState): any {
       useFactory: getRequest,
       deps: [TransferState]
     },
+    {
+      provide: APP_INITIALIZER,
+      useFactory: (xsrfService: XSRFService, httpClient: HttpClient) => xsrfService.initXSRFToken(httpClient),
+      deps: [ XSRFService, HttpClient ],
+      multi: true,
+    },
+    {
+      provide: XSRFService,
+      useClass: BrowserXSRFService,
+    },
     {
       provide: AuthService,
       useClass: AuthService
diff --git a/src/modules/app/browser-init.service.ts b/src/modules/app/browser-init.service.ts
index 61d57f10f9..4b1c6b40d2 100644
--- a/src/modules/app/browser-init.service.ts
+++ b/src/modules/app/browser-init.service.ts
@@ -30,8 +30,12 @@ import { filter, find, map } from 'rxjs/operators';
 import { isNotEmpty } from '../../app/shared/empty.util';
 import { logStartupMessage } from '../../../startup-message';
 import { MenuService } from '../../app/shared/menu/menu.service';
+import { RequestService } from '../../app/core/data/request.service';
 import { RootDataService } from '../../app/core/data/root-data.service';
-import { firstValueFrom, Subscription } from 'rxjs';
+import { firstValueFrom, lastValueFrom, Subscription } from 'rxjs';
+import { ServerCheckGuard } from '../../app/core/server-check/server-check.guard';
+import { HALEndpointService } from '../../app/core/shared/hal-endpoint.service';
+import { BuildConfig } from '../../config/build-config.interface';
 
 /**
  * Performs client-side initialization.
@@ -45,7 +49,7 @@ export class BrowserInitService extends InitService {
     protected store: Store<AppState>,
     protected correlationIdService: CorrelationIdService,
     protected transferState: TransferState,
-    @Inject(APP_CONFIG) protected appConfig: AppConfig,
+    @Inject(APP_CONFIG) protected appConfig: BuildConfig,
     protected translate: TranslateService,
     protected localeService: LocaleService,
     protected angulartics2DSpace: Angulartics2DSpace,
@@ -56,7 +60,10 @@ export class BrowserInitService extends InitService {
     protected authService: AuthService,
     protected themeService: ThemeService,
     protected menuService: MenuService,
-    private rootDataService: RootDataService
+    private rootDataService: RootDataService,
+    protected serverCheckGuard: ServerCheckGuard,
+    private requestService: RequestService,
+    private halService: HALEndpointService,
   ) {
     super(
       store,
@@ -115,13 +122,20 @@ export class BrowserInitService extends InitService {
    * @private
    */
   private async loadAppState(): Promise<boolean> {
-    const state = this.transferState.get<any>(InitService.NGRX_STATE, null);
-    this.transferState.remove(InitService.NGRX_STATE);
-    this.store.dispatch(new StoreAction(StoreActionTypes.REHYDRATE, state));
-    return this.store.select(coreSelector).pipe(
-      find((core: any) => isNotEmpty(core)),
-      map(() => true)
-    ).toPromise();
+    // The app state can be transferred only when SSR and CSR are using the same base url for the REST API
+    if (this.appConfig.universal.transferState) {
+      const state = this.transferState.get<any>(InitService.NGRX_STATE, null);
+      this.transferState.remove(InitService.NGRX_STATE);
+      this.store.dispatch(new StoreAction(StoreActionTypes.REHYDRATE, state));
+      return lastValueFrom(
+        this.store.select(coreSelector).pipe(
+          find((core: any) => isNotEmpty(core)),
+          map(() => true),
+        ),
+      );
+    } else {
+      return Promise.resolve(true);
+    }
   }
 
   private trackAuthTokenExpiration(): void {
@@ -143,17 +157,15 @@ export class BrowserInitService extends InitService {
   }
 
   /**
-   * During an external authentication flow invalidate the SSR transferState
+   * During an external authentication flow invalidate the
    * data in the cache. This allows the app to fetch fresh content.
    * @private
    */
   private externalAuthCheck() {
-
     this.sub = this.authService.isExternalAuthentication().pipe(
         filter((externalAuth: boolean) => externalAuth)
       ).subscribe(() => {
-        // Clear the transferState data.
-        this.rootDataService.invalidateRootCache();
+        this.requestService.setStaleByHrefSubstring(this.halService.getRootHref());
         this.authService.setExternalAuthStatus(false);
       }
     );
@@ -172,4 +184,13 @@ export class BrowserInitService extends InitService {
       });
   }
 
+  /**
+   * Start route-listening subscriptions
+   * @protected
+   */
+  protected initRouteListeners(): void {
+    super.initRouteListeners();
+    this.serverCheckGuard.listenForRouteChanges();
+  }
+
 }
diff --git a/src/modules/app/server-app.module.ts b/src/modules/app/server-app.module.ts
index b3d718b0b2..970a852be4 100644
--- a/src/modules/app/server-app.module.ts
+++ b/src/modules/app/server-app.module.ts
@@ -35,6 +35,8 @@ import { ServerAuthRequestService } from '../../app/core/auth/server-auth-reques
 import { ServerInitService } from './server-init.service';
 import { XhrFactory } from '@angular/common';
 import { ServerXhrService } from '../../app/core/services/server-xhr.service';
+import { ServerXSRFService } from '../../app/core/xsrf/server-xsrf.service';
+import { XSRFService } from '../../app/core/xsrf/xsrf.service';
 import { ReferrerService } from '../../app/core/services/referrer.service';
 import { ServerReferrerService } from '../../app/core/services/server.referrer.service';
 
@@ -94,6 +96,10 @@ export function createTranslateLoader(transferState: TransferState) {
       provide: AuthRequestService,
       useClass: ServerAuthRequestService,
     },
+    {
+      provide: XSRFService,
+      useClass: ServerXSRFService,
+    },
     {
       provide: LocaleService,
       useClass: ServerLocaleService
diff --git a/src/modules/app/server-init.service.ts b/src/modules/app/server-init.service.ts
index 715f872cd9..e0c55211e3 100644
--- a/src/modules/app/server-init.service.ts
+++ b/src/modules/app/server-init.service.ts
@@ -21,6 +21,8 @@ import { BreadcrumbsService } from '../../app/breadcrumbs/breadcrumbs.service';
 import { ThemeService } from '../../app/shared/theme-support/theme.service';
 import { take } from 'rxjs/operators';
 import { MenuService } from '../../app/shared/menu/menu.service';
+import { isEmpty, isNotEmpty } from '../../app/shared/empty.util';
+import { BuildConfig } from '../../config/build-config.interface';
 
 /**
  * Performs server-side initialization.
@@ -31,7 +33,7 @@ export class ServerInitService extends InitService {
     protected store: Store<AppState>,
     protected correlationIdService: CorrelationIdService,
     protected transferState: TransferState,
-    @Inject(APP_CONFIG) protected appConfig: AppConfig,
+    @Inject(APP_CONFIG) protected appConfig: BuildConfig,
     protected translate: TranslateService,
     protected localeService: LocaleService,
     protected angulartics2DSpace: Angulartics2DSpace,
@@ -80,17 +82,27 @@ export class ServerInitService extends InitService {
    * @private
    */
   private saveAppState() {
-    this.transferState.onSerialize(InitService.NGRX_STATE, () => {
-      let state;
-      this.store.pipe(take(1)).subscribe((saveState: any) => {
-        state = saveState;
-      });
+    if (this.appConfig.universal.transferState && (isEmpty(this.appConfig.rest.ssrBaseUrl) || this.appConfig.universal.replaceRestUrl)) {
+      this.transferState.onSerialize(InitService.NGRX_STATE, () => {
+        let state;
+        this.store.pipe(take(1)).subscribe((saveState: any) => {
+          state = saveState;
+        });
 
-      return state;
-    });
+        return state;
+      });
+    }
   }
 
   private saveAppConfigForCSR(): void {
-    this.transferState.set<AppConfig>(APP_CONFIG_STATE, environment as AppConfig);
+    if (isNotEmpty(environment.rest.ssrBaseUrl) && environment.rest.baseUrl !== environment.rest.ssrBaseUrl) {
+      // Avoid to transfer ssrBaseUrl in order to prevent security issues
+      const config: AppConfig = Object.assign({}, environment as AppConfig, {
+        rest: Object.assign({}, environment.rest, { ssrBaseUrl: '', hasSsrBaseUrl: true }),
+      });
+      this.transferState.set<AppConfig>(APP_CONFIG_STATE, config);
+    } else {
+      this.transferState.set<AppConfig>(APP_CONFIG_STATE, environment as AppConfig);
+    }
   }
 }
diff --git a/src/ngx-translate-loaders/translate-browser.loader.ts b/src/ngx-translate-loaders/translate-browser.loader.ts
index a6188c9f15..85d59c96f0 100644
--- a/src/ngx-translate-loaders/translate-browser.loader.ts
+++ b/src/ngx-translate-loaders/translate-browser.loader.ts
@@ -5,6 +5,7 @@ import { NGX_TRANSLATE_STATE, NgxTranslateState } from './ngx-translate-state';
 import { hasValue } from '../app/shared/empty.util';
 import { map } from 'rxjs/operators';
 import { of as observableOf, Observable } from 'rxjs';
+import { environment } from '../environments/environment';
 
 /**
  * A TranslateLoader for ngx-translate to retrieve i18n messages from the TransferState, or download
@@ -33,9 +34,10 @@ export class TranslateBrowserLoader implements TranslateLoader {
     if (hasValue(messages)) {
       return observableOf(messages);
     } else {
+      const translationHash: string = environment.production ? `.${(process.env.languageHashes as any)[lang + '.json5']}` : '';
       // If they're not available on the transfer state (e.g. when running in dev mode), retrieve
       // them using HttpClient
-      return this.http.get('' + this.prefix + lang + this.suffix, { responseType: 'text' }).pipe(
+      return this.http.get(`${this.prefix}${lang}${translationHash}${this.suffix}`, { responseType: 'text' }).pipe(
         map((json: any) => JSON.parse(json))
       );
     }
diff --git a/src/ngx-translate-loaders/translate-server.loader.ts b/src/ngx-translate-loaders/translate-server.loader.ts
index c09c71f049..1f47dfe95b 100644
--- a/src/ngx-translate-loaders/translate-server.loader.ts
+++ b/src/ngx-translate-loaders/translate-server.loader.ts
@@ -23,8 +23,9 @@ export class TranslateServerLoader implements TranslateLoader {
    * @param lang the language code
    */
   public getTranslation(lang: string): Observable<any> {
+    const translationHash: string = (process.env.languageHashes as any)[lang + '.json5'];
     // Retrieve the file for the given language, and parse it
-    const messages = JSON.parse(readFileSync(`${this.prefix}${lang}${this.suffix}`, 'utf8'));
+    const messages = JSON.parse(readFileSync(`${this.prefix}${lang}.${translationHash}${this.suffix}`, 'utf8'));
     // Store the parsed messages in the transfer state so they'll be available immediately when the
     // app loads on the client
     this.storeInTransferState(lang, messages);
diff --git a/src/robots.txt.ejs b/src/robots.txt.ejs
index cd5e228b3a..f6dc7fa5cb 100644
--- a/src/robots.txt.ejs
+++ b/src/robots.txt.ejs
@@ -16,6 +16,8 @@ Disallow: /submit
 Disallow: /workspaceitems
 Disallow: /profile
 Disallow: /workflowitems
+# Crawlers should be able to access entity pages, but not the facet search links present on entity pages
+Disallow: /entities/*?f
 
 # Optionally uncomment the following line ONLY if sitemaps are working
 # and you have verified that your site is being indexed correctly.
diff --git a/src/styles/_bootstrap_variables.scss b/src/styles/_bootstrap_variables.scss
index 5dfc03fbd3..0c023d5d2a 100644
--- a/src/styles/_bootstrap_variables.scss
+++ b/src/styles/_bootstrap_variables.scss
@@ -1,60 +1,102 @@
-/** Help Variables **/
-$fa-fixed-width: 1.25rem !default;
-$icon-padding: 1rem !default;
-$collapsed-sidebar-width: calculatePx($fa-fixed-width + (2 * $icon-padding)) !default;
-$sidebar-items-width: 250px !default;
-$total-sidebar-width: $collapsed-sidebar-width + $sidebar-items-width !default;
+// DSpace works with CSS variables for its own components, and has a mapping of all bootstrap Sass
+// variables to CSS equivalents (see src/styles/_bootstrap_variables_mapping.scss). However Bootstrap
+// still uses Sass variables internally. So if you want to override Bootstrap (or other sass
+// variables) you can do so here. Their CSS counterparts will include the changes you make here.
 
-/* Fonts */
-// Starting this url with a caret (^) allows it to be a relative path based on UI's deployment path
-// See https://github.com/angular/angular-cli/issues/12797#issuecomment-598534241
-$fa-font-path: "^assets/fonts" !default;
-/* Images */
-$image-path: "../assets/images" !default;
+// When this file is going to be compiled, internal Bootstrap variables won't have been declared yet,
+// therefore if you want to use any Bootstrap variable you also need to declare it here.
+
+// If you want to change the 'dspace' or the 'custom' theme you should not edit this file, and you should edit
+// _theme_sass_variable_overrides.scss in the theme folder.
+
+// All SASS variables that are declared must have the '!default' flag, otherwise it won't be possible
+// to override them in custom themes.
+
+
+/*** FONT FAMILIES AND FONT SIZES ***/
+
+$font-size-base: 1rem !default; // Assumes the browser default, typically `16px`
+$h1-font-size: $font-size-base * 2.125 !default;
+$h2-font-size: $font-size-base * 1.75 !default;
+$h3-font-size: $font-size-base * 1.5 !default;
+$h4-font-size: $font-size-base * 1.25 !default;
+$h5-font-size: $font-size-base * 1.125 !default;
+$h6-font-size: $font-size-base !default;
+
+
+/*** BOOTSTRAP OPTIONS ***/
 
 // enable-responsive-font-sizes allows text to scale more naturally across device and viewport sizes
-$enable-responsive-font-sizes: true;
-
-/** Bootstrap Variables **/
-/* Colors */
-$gray-700: #495057 !default;  // Bootstrap $gray-700
-$gray-100: #f8f9fa !default;  //           $gray-100
-
-/* Reassign color vars to semantic color scheme */
-$blue:   #2B4E72 !default;
-$green:  #94BA65 !default;
-$cyan:   #006666 !default;
-$yellow: #ec9433 !default;
-$red:    #CF4444 !default;
-$dark:   darken($blue, 17%) !default;
+$enable-responsive-font-sizes: true !default;
+$enable-shadows: true !default;
 
 
+/*** SEMANTIC COLOR SCHEME ***/
 
-$theme-colors: (
-        primary: $blue,
-        secondary: $gray-700,
-        success: $green,
-        info: $cyan,
-        warning: $yellow,
-        danger: $red,
-        light: $gray-100,
-        dark: $dark
-) !default;
-/* Fonts */
-$link-color: map-get($theme-colors, info) !default;
+// Override semantic colors
+$primary:   #2b4e72 !default;               // Blue gray
+$secondary: #495057 !default;               // As Bootstrap $gray-700
+$success:   #94ba65 !default;               // Lime
+$info:      #006666 !default;               // Blue green
+$warning:   #ec9433 !default;               // Orange
+$danger:    #cf4444 !default;               // Red
+$light:     #f8f9fa !default;               // As Bootstrap $gray-100
+$dark:      darken(#2b4e72, 17%) !default;  // Blue gray (darker)
+
+
+/*** OTHER BOOTSTRAP VARIABLES ***/
+
+$link-color: #1F7293 !default;
+$link-hover-color: darken($link-color, 15%) !default;
+
+// The yiq lightness value that determines when the lightness of color changes from "dark" to "light". Acceptable values are between 0 and 255.
+$yiq-contrasted-threshold: 165 !default;
 
 $navbar-dark-color: rgba(white, .5) !default;
 $navbar-light-color: rgba(black, .5) !default;
 $navbar-dark-toggler-icon-bg: url("data:image/svg+xml;charset=utf8,<svg+viewBox='0+0+30+30'+xmlns='http://www.w3.org/2000/svg'><path+stroke='#{$navbar-dark-color}'+stroke-width='2'+stroke-linecap='round'+stroke-miterlimit='10'+d='M4+7h22M4+15h22M4+23h22'/></svg>") !default;
 $navbar-light-toggler-icon-bg: url("data:image/svg+xml;charset=utf8,<svg+viewBox='0+0+30+30'+xmlns='http://www.w3.org/2000/svg'><path+stroke='#{$navbar-light-color}'+stroke-width='2'+stroke-linecap='round'+stroke-miterlimit='10'+d='M4+7h22M4+15h22M4+23h22'/></svg>") !default;
 
-$enable-shadows: true !default;
 
-$yiq-contrasted-threshold:  165 !default;
+/*** CUSTOM DSPACE VARIABLES ***/
 
-$primary-bg: #{lighten(map-get($theme-colors, primary), 30%)} !default;
-$secondary-bg: #{lighten(map-get($theme-colors, secondary), 30%)} !default;
-$success-bg: #{lighten(map-get($theme-colors, success), 30%)} !default;
-$info-bg: #{lighten(map-get($theme-colors, info), 30%)} !default;
-$warning-bg: #{lighten(map-get($theme-colors, warning), 30%)} !default;
-$danger-bg: #{lighten(map-get($theme-colors, danger), 30%)} !default;
+$ds-home-news-link-color: $link-color !default;
+$ds-home-news-link-hover-color: darken($ds-home-news-link-color, 15%) !default;
+$ds-breadcrumb-link-color: #003333 !default;
+$ds-breadcrumb-link-active-color: #040D11 !default;
+
+$ds-header-navbar-border-top-color: #fff !default;
+$ds-header-navbar-border-bottom-color: #ced4da !default;
+
+$ds-header-bg: #fff !default;
+$ds-header-icon-color: $link-color !default;
+$ds-header-icon-color-hover: $link-hover-color !default;
+
+$ds-navbar-bg: #fff !default;
+$ds-navbar-dropdown-bg: #fff !default;
+$ds-expandable-navbar-bg: #fff !default;
+$ds-navbar-link-color: $link-color !default;
+$ds-navbar-link-color-hover: #{darken($ds-navbar-link-color, 15%)} !default;
+
+$ds-slider-color: $success !default;
+
+$ds-admin-sidebar-bg: darken(#2b4e72, 17%) !default;
+$ds-admin-sidebar-active-bg: darken($ds-admin-sidebar-bg, 3%) !default;
+$ds-admin-sidebar-fg: #47495d !default;
+$ds-admin-sidebar-fixed-element-width: 55px !default;
+$ds-admin-sidebar-collapsible-element-width: 250px !default;
+$ds-admin-sidebar-total-width: $ds-admin-sidebar-fixed-element-width + $ds-admin-sidebar-collapsible-element-width; // do not change/override
+
+$ds-primary-bg: #{lighten($primary, 30%)} !default;
+$ds-secondary-bg: #{lighten($secondary, 30%)} !default;
+$ds-success-bg: #{lighten($success, 30%)} !default;
+$ds-info-bg: #{lighten($info, 30%)} !default;
+$ds-warning-bg: #{lighten($warning, 30%)} !default;
+$ds-danger-bg: #{lighten($danger, 30%)} !default;
+
+
+/*** MISC ***/
+
+// Starting this url with a caret (^) allows it to be a relative path based on UI's deployment path
+// See https://github.com/angular/angular-cli/issues/12797#issuecomment-598534241
+$fa-font-path: "^assets/fonts" !default;
diff --git a/src/styles/_bootstrap_variables_mapping.scss b/src/styles/_bootstrap_variables_mapping.scss
index 16719f9919..944166399e 100644
--- a/src/styles/_bootstrap_variables_mapping.scss
+++ b/src/styles/_bootstrap_variables_mapping.scss
@@ -29,17 +29,11 @@
   --bs-teal: #{$teal};
   --bs-cyan: #{$cyan};
   --bs-primary: #{$primary};
-  --bs-primary-bg: #{$primary-bg};
   --bs-secondary: #{$secondary};
-  --bs-secondary-bg: #{$secondary-bg};
   --bs-success: #{$success};
-  --bs-success-bg: #{$success-bg};
   --bs-info: #{$info};
-  --bs-info-bg: #{$info-bg};
   --bs-warning: #{$warning};
-  --bs-warning-bg: #{$warning-bg};
   --bs-danger: #{$danger};
-  --bs-danger-bg: #{$danger-bg};
   --bs-light: #{$light};
   --bs-dark: #{$dark};
 
@@ -226,7 +220,6 @@
   --bs-table-dark-hover-color: #{$table-dark-hover-color};
   --bs-table-dark-hover-bg: #{$table-dark-hover-bg};
   --bs-table-dark-border-color: #{$table-dark-border-color};
-  --bs-table-dark-color: #{$table-dark-color};
   --bs-table-striped-order: #{$table-striped-order};
   --bs-table-caption-color: #{$table-caption-color};
   --bs-table-bg-level: #{$table-bg-level};
diff --git a/src/styles/_custom_variables.scss b/src/styles/_custom_variables.scss
index ddf490c7a7..3c3244549e 100644
--- a/src/styles/_custom_variables.scss
+++ b/src/styles/_custom_variables.scss
@@ -1,5 +1,5 @@
 :root {
-  --ds-content-spacing: #{$spacer * 1.5};
+  --ds-content-spacing: #{$spacer}; // equivalent to Bootstrap spaces of size 3
 
   --ds-button-height: #{$input-btn-padding-y * 2 + $input-btn-line-height + calculateRem($input-btn-border-width*2)};
 
@@ -13,31 +13,64 @@
   --ds-login-logo-width:72px;
   --ds-submission-header-z-index: 1001;
   --ds-submission-footer-z-index: 999;
+  --ds-live-region-z-index: 1030;
 
   --ds-main-z-index: 1;
   --ds-nav-z-index: 10;
   --ds-footer-z-index: 0;
   --ds-sidebar-z-index: 20;
 
-  --ds-header-bg: #{$white};
-  --ds-header-logo-height: 50px;
-  --ds-header-logo-height-xs: 50px;
-  --ds-header-icon-color: #{$link-color};
-  --ds-header-icon-color-hover: #{$link-hover-color};
-  --ds-header-navbar-border-top-color: #{$white};
-  --ds-header-navbar-border-bottom-color: #{$gray-400};
-  --ds-navbar-link-color: #{$cyan};
-  --ds-navbar-link-color-hover: #{darken($cyan, 15%)};
+  --ds-header-bg: #{$ds-header-bg};
+  --ds-header-icon-color: #{$ds-header-icon-color};
+  --ds-header-icon-color-hover: #{$ds-header-icon-color-hover};
 
-  $admin-sidebar-bg: darken(#2B4E72, 17%);
-  $admin-sidebar-active-bg: darken($admin-sidebar-bg, 3%);
-  --ds-admin-sidebar-bg: #{$admin-sidebar-bg};
-  --ds-admin-sidebar-active-bg: #{$admin-sidebar-active-bg};
-  --ds-admin-sidebar-header-bg: #{darken($admin-sidebar-bg, 7%)};
+  --ds-navbar-bg: #{$ds-navbar-bg};
+  --ds-navbar-item-vertical-padding: 0;
+  --ds-navbar-item-horizontal-padding: 0.25rem;
+  --ds-navbar-dropdown-bg: #{$ds-navbar-dropdown-bg};
+  --ds-navbar-dropdown-item-vertical-padding: 0.5rem;
+  --ds-navbar-dropdown-item-horizontal-padding: 1rem;
+  --ds-navbar-link-color: #{$ds-navbar-link-color};
+  --ds-navbar-link-color-hover: #{$ds-navbar-link-color-hover};
 
-  --ds-dark-scrollbar-bg: #{$admin-sidebar-active-bg};
-  --ds-dark-scrollbar-alt-bg: #{lighten($admin-sidebar-active-bg, 2%)};
-  --ds-dark-scrollbar-fg: #47495d;
+  --ds-header-navbar-border-top-color: #{$ds-header-navbar-border-bottom-color};
+  --ds-header-navbar-border-bottom-color: #{$ds-header-navbar-border-bottom-color};
+
+  --ds-expandable-navbar-bg: #{$ds-expandable-navbar-bg};
+  --ds-expandable-navbar-link-color: #{$body-color};
+  --ds-expandable-navbar-link-color-hover: #{$body-color};
+  --ds-expandable-navbar-link-background-hover: #{$ds-navbar-link-color-hover};
+  --ds-expandable-navbar-item-vertical-padding: 0.25rem;
+
+  --ds-user-menu-item-vertical-padding: 0.25rem;
+  --ds-user-menu-dropdown-padding: 1rem;
+  --ds-user-menu-dropdown-link-color: #{$dark};
+  --ds-user-menu-dropdown-link-background-hover: #{$gray-200};
+
+  @include media-breakpoint-up(md) {
+    --ds-header-logo-height: 50px;
+  }
+  @include media-breakpoint-down(sm) {
+    --ds-header-logo-height: 50px;
+  }
+
+  --ds-admin-sidebar-bg: #{$ds-admin-sidebar-bg};
+  --ds-admin-sidebar-active-bg: #{$ds-admin-sidebar-active-bg};
+  --ds-admin-sidebar-header-bg: #{darken($ds-admin-sidebar-bg, 7%)};
+  --ds-admin-sidebar-logo-height: 20px;
+  --ds-admin-sidebar-fixed-element-width: #{$ds-admin-sidebar-fixed-element-width};
+  --ds-admin-sidebar-fixed-element-z-index: 10;
+  --ds-admin-sidebar-collapsible-element-width: #{$ds-admin-sidebar-collapsible-element-width};
+  --ds-admin-sidebar-total-width: #{$ds-admin-sidebar-total-width};
+  --ds-admin-sidebar-link-color: #{$navbar-dark-color};
+  --ds-admin-sidebar-link-hover-color: #{$navbar-dark-hover-color};
+  --ds-admin-sidebar-item-padding: 1rem;
+  --ds-admin-sidebar-section-indent: .75rem;
+
+  --ds-dark-scrollbar-bg: #{$ds-admin-sidebar-active-bg};
+  --ds-dark-scrollbar-alt-bg: #{lighten($ds-admin-sidebar-active-bg, 2%)};
+  --ds-dark-scrollbar-fg: #{$ds-admin-sidebar-fg};
+  --ds-dark-scrollbar-width: 8px;
 
   --ds-submission-sections-margin-bottom: .5rem;
 
@@ -58,12 +91,6 @@
   --ds-notification-bg-info: #{darken(adjust-hue($info, -10), 10%)};
   --ds-notification-bg-warning: #{darken(adjust-hue($warning, -10), 10%)};
 
-  --ds-fa-fixed-width: #{$fa-fixed-width};
-  --ds-icon-padding: #{$icon-padding};
-  --ds-collapsed-sidebar-width: #{$collapsed-sidebar-width};
-  --ds-sidebar-items-width: #{$sidebar-items-width};
-  --ds-total-sidebar-width: #{$total-sidebar-width};
-
   --ds-top-footer-bg: #{$gray-200};
   --ds-footer-bg: #{theme-color('primary')};
   --ds-footer-border: 1px solid var(--bs-gray-400);
@@ -71,18 +98,18 @@
   --ds-footer-padding-bottom: 0;
   --ds-footer-logo-height: 50px;
 
-  $home-news-link-color: $cyan;
-  --ds-home-news-link-color: #{$home-news-link-color};
-  --ds-home-news-link-hover-color: #{darken($home-news-link-color, 15%)};
+  --ds-home-news-link-color: #{$ds-home-news-link-color};
+  --ds-home-news-link-hover-color: #{darken($ds-home-news-link-color, 15%)};
   --ds-home-news-background-color: #{$gray-200};
 
   --ds-breadcrumb-bg: #{$gray-200} !important;
-  --ds-breadcrumb-link-color: #{$cyan};
-  --ds-breadcrumb-link-active-color: #{darken($cyan, 30%)};
+  --ds-breadcrumb-link-color: #{$ds-breadcrumb-link-color};
+  --ds-breadcrumb-link-active-color: #{$ds-breadcrumb-link-active-color};
   --ds-breadcrumb-max-length: 200px;
 
-  --ds-slider-color: #{$green};
+  --ds-slider-color: #{$ds-slider-color};
   --ds-slider-handle-width: 18px;
+  --ds-slider-handle-color: #{darken($blue, 17%)};
 
   --ds-search-form-scope-max-width: 150px;
 
@@ -97,4 +124,30 @@
   --ds-dso-edit-lang-width: 90px;
   --ds-dso-edit-actions-width: 173px;
   --ds-dso-edit-virtual-tooltip-min-width: 300px;
+
+  --ds-comcol-logo-max-width: 500px;
+  --ds-comcol-logo-max-height: 500px;
+
+  --ds-primary-bg: #{$ds-primary-bg};
+  --ds-secondary-bg: #{$ds-secondary-bg};
+  --ds-success-bg: #{$ds-success-bg};
+  --ds-info-bg: #{$ds-info-bg};
+  --ds-warning-bg: #{$ds-warning-bg};
+  --ds-danger-bg: #{$ds-danger-bg};
+
+  --green1: #1FB300;  // This variable represents the success color for the Klaro cookie banner
+  --button-text-color-cookie: #333; // This variable represents the text color for buttons in the Klaro cookie banner
+  --very-dark-cyan: #215E50; // This variable represents the background color of the save cookies button
+
+  --ds-search-skeleton-text-height: 20px;
+  --ds-search-skeleton-badge-height: 18px;
+  --ds-search-skeleton-thumbnail-margin: 1em;
+  --ds-search-skeleton-text-line-count: 2;
+  --ds-search-skeleton-badge-width: 75px;
+  --ds-search-skeleton-filter-badge-width: 200px;
+  --ds-search-skeleton-info-width: 200px;
+  --ds-search-skeleton-card-height: 435px;
+
+  --ds-filters-skeleton-height: 40px;
+  --ds-filters-skeleton-spacing: 12px;
 }
diff --git a/src/styles/_global-styles.scss b/src/styles/_global-styles.scss
index b714d399a0..50dff1d739 100644
--- a/src/styles/_global-styles.scss
+++ b/src/styles/_global-styles.scss
@@ -23,11 +23,9 @@ body {
     position: relative;
 }
 
-.main-content {
+#main-content {
     z-index: var(--ds-main-z-index);
     flex: 1 1 100%;
-    margin-top: var(--ds-content-spacing);
-    margin-bottom: var(--ds-content-spacing);
 }
 
 .alert.hide {
@@ -35,15 +33,51 @@ body {
     margin: 0;
 }
 
-ds-admin-sidebar {
-    position: fixed;
-    z-index: var(--ds-sidebar-z-index);
-}
-
 .sticky-top {
     z-index: 0;
 }
 
+.klaro
+.cookie-notice {
+  .cn-buttons {
+    .cm-btn.cm-btn-success {
+      color: var(--button-text-color-cookie);
+      background-color: var(--green1);
+      font-weight: 600;
+    }
+  }
+}
+
+.klaro .cookie-modal .cm-btn.cm-btn-success.cm-btn-accept-all {
+  color: var(--button-text-color-cookie);
+  background-color: var(--green1);
+  font-weight: 600;
+}
+
+.klaro .cookie-modal a,
+.klaro .context-notice a,
+.klaro .cookie-notice a {
+  color: var(--green1);
+  text-decoration: underline !important;
+}
+
+.klaro .cookie-modal .cm-modal .cm-body span,
+.klaro
+  .cookie-modal
+  .cm-modal
+  .cm-body
+  ul.cm-purposes
+  li.cm-purpose
+  span.cm-required,
+p.purposes,
+.klaro .cookie-modal .cm-modal .cm-footer .cm-powered-by a {
+  color: var(--bs-light) !important;
+}
+
+.klaro .cookie-modal .cm-btn.cm-btn-info {
+  background-color: var(--very-dark-cyan) !important;
+}
+
 .media-viewer
 .change-gallery
 .ngx-gallery
@@ -196,15 +230,31 @@ ds-dynamic-form-control-container.d-none {
 }
 
 .thumb-font-2 {
-    .thumbnail-placeholder {
-        font-size: 0.9rem;
-        padding: 0.125rem;
+  .thumbnail-placeholder {
+    @media screen and (max-width: map-get($grid-breakpoints, sm)) {
+      font-size: 0.4rem;
+      padding: 0.1rem;
     }
+    @media screen and (min-width: map-get($grid-breakpoints, sm)) and (max-width: map-get($grid-breakpoints, lg)) {
+        font-size: 0.7rem;
+        padding: 0.1rem;
+    }
+    font-size: 1rem;
+    padding: 0.5rem;
+  }
 }
 
 .thumb-font-3 {
     .thumbnail-placeholder {
-        font-size: 1.25rem;
+        @media screen and (max-width: map-get($grid-breakpoints, sm)) {
+          font-size: 0.4rem;
+          padding: 0.1rem;
+        }
+        @media screen and (min-width: map-get($grid-breakpoints, sm)) and (max-width: map-get($grid-breakpoints, lg)) {
+            font-size: 0.7rem;
+            padding: 0.1rem;
+        }
+        font-size: 1rem;
         padding: 0.5rem;
     }
 }
@@ -222,48 +272,254 @@ ds-dynamic-form-control-container.d-none {
 }
 
 .badge-validation {
-  background-color: #{map-get($theme-colors, warning)};
+    background-color: #{map-get($theme-colors, warning)};
 }
 
 .badge-waiting-controller {
-  background-color: #{map-get($theme-colors, info)};
+    background-color: #{map-get($theme-colors, info)};
 }
 
 .badge-workspace {
-  background-color: #{map-get($theme-colors, primary)};
+    background-color: #{map-get($theme-colors, primary)};
 }
 
 .badge-archived {
-  background-color: #{map-get($theme-colors, success)};
+    background-color: darken($green, 25);
 }
 
 .badge-workflow {
-  background-color: #{map-get($theme-colors, info)};
+    background-color: #{map-get($theme-colors, info)};
 }
 
 .badge-item-type {
-  background-color: #{map-get($theme-colors, info)};
+    background-color: #{map-get($theme-colors, info)};
 }
 
 .visually-hidden {
-  position: absolute !important;
-  width: 1px !important;
-  height: 1px !important;
-  padding: 0 !important;
-  margin: -1px !important;
-  overflow: hidden !important;
-  clip: rect(0, 0, 0, 0) !important;
-  white-space: nowrap !important;
-  border: 0 !important;
+    position: absolute !important;
+    width: 1px !important;
+    height: 1px !important;
+    padding: 0 !important;
+    margin: -1px !important;
+    overflow: hidden !important;
+    clip: rect(0, 0, 0, 0) !important;
+    white-space: nowrap !important;
+    border: 0 !important;
 }
 
-ul.dso-edit-menu-dropdown > li .nav-item.nav-link {
-  // ensure that links in DSO edit menu dropdowns are unstyled (li elements are styled instead to support icons)
-  padding: 0;
-  display: inline;
+ul.dso-edit-menu-dropdown>li .nav-item.nav-link {
+    // ensure that links in DSO edit menu dropdowns are unstyled (li elements are styled instead to support icons)
+    padding: 0;
+    display: inline;
 }
 
 .table th,
 .table td {
-  vertical-align: middle;
+    vertical-align: middle;
+}
+
+/* Flexbox gap */
+
+.gap-0 { gap: 0; }
+.gap-1 { gap: calc(#{$spacer} * .25); }
+.gap-2 { gap: calc(#{$spacer} * .5); }
+.gap-3 { gap: #{$spacer}; }
+.gap-4 { gap: calc(#{$spacer} * 1.5); }
+.gap-5 { gap: calc(#{$spacer} * 3); }
+
+.gapx-0 { column-gap: 0; }
+.gapx-1 { column-gap: calc(#{$spacer} * .25); }
+.gapx-2 { column-gap: calc(#{$spacer} * .5); }
+.gapx-3 { column-gap: #{$spacer}; }
+.gapx-4 { column-gap: calc(#{$spacer} * 1.5); }
+.gapx-5 { column-gap: calc(#{$spacer} * 3); }
+
+.gapy-0 { row-gap: 0; }
+.gapy-1 { row-gap: calc(#{$spacer} * .25); }
+.gapy-2 { row-gap: calc(#{$spacer} * .5); }
+.gapy-3 { row-gap: #{$spacer}; }
+.gapy-4 { row-gap: calc(#{$spacer} * 1.5); }
+.gapy-5 { row-gap: calc(#{$spacer} * 3); }
+
+
+.pt-0\.5 {
+    padding-top: 0.125rem !important;
+}
+
+.pr-0\.5 {
+    padding-right: 0.125rem !important;
+}
+
+.pb-0\.5 {
+    padding-bottom: 0.125rem !important;
+}
+
+.pl-0\.5 {
+    padding-left: 0.125rem !important;
+}
+
+.px-0\.5 {
+    padding-left: 0.125rem !important;
+    padding-right: 0.125rem !important;
+}
+
+.py-0\.5 {
+    padding-top: 0.125rem !important;
+    padding-bottom: 0.125rem !important;
+}
+
+.btn {
+    &:focus {
+        outline-offset: 2px !important;
+        outline-style: solid !important;
+        outline-width: 2px !important;
+        box-shadow: none !important;
+    }
+    &:disabled {
+        opacity: 0.7;
+    }
+    &.btn-success {
+        background-color: darken($success, 20%);
+        border-color: darken($success, 20%);
+        &:hover {
+            background-color: darken($success, 30%);
+            border-color: darken($success, 30%);
+        }
+        &:focus {
+            outline-color: darken($success, 20%);
+        }
+    }
+    &.btn-outline-success {
+        border-color: darken($success, 20%);
+        color: darken($success, 20%);
+
+        &:hover {
+            background-color: darken($success, 30%);
+            color: $white;
+        }
+        &:focus {
+            outline-color: darken($success, 20%);
+        }
+    }
+    &.btn-warning {
+        background-color: darken($warning, 20%);
+        &:hover {
+            background-color: darken($warning, 30%);
+        }
+        &:disabled {
+            background-color: transparent;
+        }
+        &:focus {
+            outline-color: darken($warning, 22%);
+        }
+    }
+
+    &.btn-outline-warning {
+        border-color: darken($warning, 20%);
+        color: darken($warning, 20%);
+        &:hover {
+            background-color: darken($warning, 30%);
+            color: $white;
+        }
+        &:disabled {
+            background-color: transparent;
+
+            &:hover {
+                color: darken($warning, 20%);
+            }
+        }
+        :focus {
+            outline-color: darken($warning, 22%);
+        }
+        &:not(:disabled):hover {
+            background-color: darken($warning, 22%);
+        }
+    }
+
+    &.btn-secondary {
+        &:focus {
+            outline-color: darken($secondary, 20%);
+        }
+    }
+
+    &.btn-danger:focus, &.btn-outline-danger:focus {
+        outline-color: darken($danger, 20%);
+    }
+
+    &.btn-primary:focus, &.btn-outline-primary:focus {
+        outline-color: darken($primary, 5%);
+    }
+}
+
+dynamic-ng-bootstrap-checkbox .custom-control-input:focus ~ .custom-control-label::before {
+    outline: 2px solid $gray-700 !important;
+    box-shadow: none !important;
+    outline-offset: 2px !important;
+}
+
+dynamic-ng-bootstrap-checkbox .custom-control-label::before {
+    border-color: $gray-700;
+}
+
+.text-warning {
+    color: darken($warning, 10%) !important;
+}
+
+.text-success {
+    color: darken($success, 11%) !important;
+}
+
+ngb-accordion {
+    a.close {
+        opacity: 0.75;
+    }
+    a.close:not(:disabled):not(.disabled):hover {
+        opacity: 0.9;
+    }
+}
+
+.form-control, .page-link {
+    &:disabled::placeholder {
+        color: lighten($gray-700, 10%);
+    }
+    &:focus {
+        box-shadow: none;
+        outline: 2px solid lighten($gray-700, 10%);
+        outline-offset: 2px !important;
+    }
+}
+
+.alert-success {
+    color: darken($success, 22%);
+}
+
+.alert-danger {
+    color: darken($danger, 22%);
+}
+
+// Margin utility classes based on DSpace content spacing
+.mt-cs { margin-top: var(--ds-content-spacing); }
+.mb-cs { margin-bottom: var(--ds-content-spacing); }
+.my-cs { margin-top: var(--ds-content-spacing); margin-bottom: var(--ds-content-spacing); }
+.mt-ncs { margin-top: calc(var(--ds-content-spacing) * -1); }
+.mb-ncs { margin-bottom: calc(var(--ds-content-spacing) * -1); }
+.my-ncs { margin-top: calc(var(--ds-content-spacing) * -1); margin-bottom: calc(var(--ds-content-spacing) * -1); }
+
+
+.link-contrast {
+  // Rules for accessibility to meet minimum contrast and have an identifiable link between other texts
+  color: darken($link-color, 5%);
+  // We use underline to discern link from text as we can't make color lighter on a white bg
+  text-decoration: underline;
+}
+
+// An element that is disabled should not have focus styles to avoid confusion
+// It however is still focusable for screen readers and keyboard navigation
+.disabled {
+    pointer-events: none;
+}
+
+.disabled:focus {
+    outline: none;
+    box-shadow: none;
 }
diff --git a/src/styles/_mixins.scss b/src/styles/_mixins.scss
index ae9e6082f5..eb39b8c786 100644
--- a/src/styles/_mixins.scss
+++ b/src/styles/_mixins.scss
@@ -14,7 +14,7 @@
 
 @mixin dark-scrollbar() {
     &::-webkit-scrollbar {
-        width: 8px;
+        width: var(--ds-dark-scrollbar-width);
         height: 3px;
     }
     &::-webkit-scrollbar-button {
diff --git a/src/styles/_truncatable-part.component.scss b/src/styles/_truncatable-part.component.scss
index d9158a6751..127dda0171 100644
--- a/src/styles/_truncatable-part.component.scss
+++ b/src/styles/_truncatable-part.component.scss
@@ -4,24 +4,11 @@
     height: $lines * $height;
   }
   .content {
-    max-height: $lines * $height;
-    position: relative;
+    text-overflow: ellipsis;
+    display: -webkit-box;
+    -webkit-line-clamp: $lines;
+    -webkit-box-orient: vertical;
     overflow: hidden;
-    line-height: $line-height;
-    overflow-wrap: break-word;
-    &:after {
-      content: "";
-      position: absolute;
-      padding-right: 15px;
-      top: ($lines - 1) * $height;
-      right: 0;
-      width: 30%;
-      min-width: 75px;
-      max-width: 150px;
-      height: $height;
-      background: linear-gradient(to right, rgba(255, 255, 255, 0), rgba($bg, 1) 70%);
-      pointer-events: none;
-    }
   }
 
 }
diff --git a/src/styles/_vendor.scss b/src/styles/_vendor.scss
index 9d9842b9b3..b2b94c2826 100644
--- a/src/styles/_vendor.scss
+++ b/src/styles/_vendor.scss
@@ -1,5 +1,5 @@
 // node_modules imports meant for all the themes
 
 @import '~node_modules/bootstrap/scss/bootstrap.scss';
-@import '~node_modules/nouislider/distribute/nouislider.min';
+@import '~node_modules/nouislider/dist/nouislider.min';
 @import '~node_modules/ngx-ui-switch/ui-switch.component.scss';
diff --git a/src/themes/custom/app/entity-groups/research-entities/item-pages/person/person.component.html b/src/themes/custom/app/entity-groups/research-entities/item-pages/person/person.component.html
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/entity-groups/research-entities/item-pages/person/person.component.scss b/src/themes/custom/app/entity-groups/research-entities/item-pages/person/person.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/entity-groups/research-entities/item-pages/person/person.component.ts b/src/themes/custom/app/entity-groups/research-entities/item-pages/person/person.component.ts
new file mode 100644
index 0000000000..3d3f69409f
--- /dev/null
+++ b/src/themes/custom/app/entity-groups/research-entities/item-pages/person/person.component.ts
@@ -0,0 +1,20 @@
+import { Component } from '@angular/core';
+import { ViewMode } from '../../../../../../../app/core/shared/view-mode.model';
+import {
+  listableObjectComponent
+} from '../../../../../../../app/shared/object-collection/shared/listable-object/listable-object.decorator';
+import {
+  PersonComponent as BaseComponent
+} from '../../../../../../../app/entity-groups/research-entities/item-pages/person/person.component';
+import { Context } from '../../../../../../../app/core/shared/context.model';
+
+@listableObjectComponent('Person', ViewMode.StandalonePage, Context.Any, 'custom')
+@Component({
+  selector: 'ds-person',
+  // styleUrls: ['./person.component.scss'],
+  styleUrls: ['../../../../../../../app/entity-groups/research-entities/item-pages/person/person.component.scss'],
+  // templateUrl: './person.component.html',
+  templateUrl: '../../../../../../../app/entity-groups/research-entities/item-pages/person/person.component.html',
+})
+export class PersonComponent extends BaseComponent {
+}
diff --git a/src/themes/custom/app/footer/footer.component.ts b/src/themes/custom/app/footer/footer.component.ts
index de80ceb311..81286fb662 100644
--- a/src/themes/custom/app/footer/footer.component.ts
+++ b/src/themes/custom/app/footer/footer.component.ts
@@ -3,9 +3,9 @@ import { FooterComponent as BaseComponent } from '../../../../app/footer/footer.
 
 @Component({
   selector: 'ds-footer',
-  // styleUrls: ['footer.component.scss'],
+  // styleUrls: ['./footer.component.scss'],
   styleUrls: ['../../../../app/footer/footer.component.scss'],
-  // templateUrl: 'footer.component.html'
+  // templateUrl: './footer.component.html'
   templateUrl: '../../../../app/footer/footer.component.html'
 })
 export class FooterComponent extends BaseComponent {
diff --git a/src/themes/custom/app/header-nav-wrapper/header-navbar-wrapper.component.ts b/src/themes/custom/app/header-nav-wrapper/header-navbar-wrapper.component.ts
index 875b5f69b8..e049543630 100644
--- a/src/themes/custom/app/header-nav-wrapper/header-navbar-wrapper.component.ts
+++ b/src/themes/custom/app/header-nav-wrapper/header-navbar-wrapper.component.ts
@@ -6,9 +6,9 @@ import { HeaderNavbarWrapperComponent as BaseComponent } from '../../../../app/h
  */
 @Component({
   selector: 'ds-header-navbar-wrapper',
-  // styleUrls: ['header-navbar-wrapper.component.scss'],
+  // styleUrls: ['./header-navbar-wrapper.component.scss'],
   styleUrls: ['../../../../app/header-nav-wrapper/header-navbar-wrapper.component.scss'],
-  // templateUrl: 'header-navbar-wrapper.component.html',
+  // templateUrl: './header-navbar-wrapper.component.html',
   templateUrl: '../../../../app/header-nav-wrapper/header-navbar-wrapper.component.html',
 })
 export class HeaderNavbarWrapperComponent extends BaseComponent {
diff --git a/src/themes/custom/app/login-page/login-page.component.html b/src/themes/custom/app/login-page/login-page.component.html
index 84059877f4..e69de29bb2 100644
--- a/src/themes/custom/app/login-page/login-page.component.html
+++ b/src/themes/custom/app/login-page/login-page.component.html
@@ -1,10 +0,0 @@
-<div class="container w-100 h-100">
-  <div class="text-center mt-5 row justify-content-center">
-    <div>
-      <img class="mb-4 login-logo" src="assets/images/dspace-logo.png">
-      <h1 class="h3 mb-0 font-weight-normal">{{"login.form.header" | translate}}</h1>
-      <ds-log-in
-      [isStandalonePage]="true"></ds-log-in>
-    </div>
-  </div>
-</div>
diff --git a/src/themes/custom/app/login-page/login-page.component.scss b/src/themes/custom/app/login-page/login-page.component.scss
index d628a5089f..e69de29bb2 100644
--- a/src/themes/custom/app/login-page/login-page.component.scss
+++ b/src/themes/custom/app/login-page/login-page.component.scss
@@ -1,4 +0,0 @@
-.login-logo {
-  height: var(--ds-login-logo-height);
-  width: var(--ds-login-logo-width);
-}
diff --git a/src/themes/custom/app/logout-page/logout-page.component.html b/src/themes/custom/app/logout-page/logout-page.component.html
index b5012ed53b..e69de29bb2 100644
--- a/src/themes/custom/app/logout-page/logout-page.component.html
+++ b/src/themes/custom/app/logout-page/logout-page.component.html
@@ -1,9 +0,0 @@
-<div class="container w-100 h-100">
-  <div class="text-center mt-5 row justify-content-md-center">
-    <div class="mx-auto">
-      <img class="mb-4 login-logo" src="assets/images/dspace-logo.png">
-      <h1 class="h3 mb-0 font-weight-normal">{{"logout.form.header" | translate}}</h1>
-      <ds-log-out></ds-log-out>
-    </div>
-  </div>
-</div>
diff --git a/src/themes/custom/app/logout-page/logout-page.component.scss b/src/themes/custom/app/logout-page/logout-page.component.scss
index a25e77fb6b..e69de29bb2 100644
--- a/src/themes/custom/app/logout-page/logout-page.component.scss
+++ b/src/themes/custom/app/logout-page/logout-page.component.scss
@@ -1 +0,0 @@
-@import '../login-page/login-page.component.scss';
diff --git a/src/themes/custom/app/register-email-form/register-email-form.component.html b/src/themes/custom/app/register-email-form/register-email-form.component.html
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/register-email-form/register-email-form.component.ts b/src/themes/custom/app/register-email-form/register-email-form.component.ts
new file mode 100644
index 0000000000..8489a1d89c
--- /dev/null
+++ b/src/themes/custom/app/register-email-form/register-email-form.component.ts
@@ -0,0 +1,12 @@
+import { Component } from '@angular/core';
+import {
+  RegisterEmailFormComponent as BaseComponent
+} from '../../../../app/register-email-form/register-email-form.component';
+
+@Component({
+  selector: 'ds-register-email-form',
+  // templateUrl: './register-email-form.component.html',
+  templateUrl: '../../../../app/register-email-form/register-email-form.component.html',
+})
+export class RegisterEmailFormComponent extends BaseComponent {
+}
diff --git a/src/themes/custom/app/shared/auth-nav-menu/auth-nav-menu.component.ts b/src/themes/custom/app/shared/auth-nav-menu/auth-nav-menu.component.ts
index af54aacd44..ff5f09eb76 100644
--- a/src/themes/custom/app/shared/auth-nav-menu/auth-nav-menu.component.ts
+++ b/src/themes/custom/app/shared/auth-nav-menu/auth-nav-menu.component.ts
@@ -9,9 +9,9 @@ import { fadeInOut, fadeOut } from '../../../../../app/shared/animations/fade';
  */
 @Component({
   selector: 'ds-auth-nav-menu',
-  // templateUrl: 'auth-nav-menu.component.html',
+  // templateUrl: './auth-nav-menu.component.html',
   templateUrl: '../../../../../app/shared/auth-nav-menu/auth-nav-menu.component.html',
-  // styleUrls: ['auth-nav-menu.component.scss'],
+  // styleUrls: ['./auth-nav-menu.component.scss'],
   styleUrls: ['../../../../../app/shared/auth-nav-menu/auth-nav-menu.component.scss'],
   animations: [fadeInOut, fadeOut]
 })
diff --git a/src/themes/custom/app/shared/auth-nav-menu/user-menu/user-menu.component.html b/src/themes/custom/app/shared/auth-nav-menu/user-menu/user-menu.component.html
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/shared/auth-nav-menu/user-menu/user-menu.component.scss b/src/themes/custom/app/shared/auth-nav-menu/user-menu/user-menu.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/shared/auth-nav-menu/user-menu/user-menu.component.ts b/src/themes/custom/app/shared/auth-nav-menu/user-menu/user-menu.component.ts
new file mode 100644
index 0000000000..f9f1db65ee
--- /dev/null
+++ b/src/themes/custom/app/shared/auth-nav-menu/user-menu/user-menu.component.ts
@@ -0,0 +1,15 @@
+import { Component } from '@angular/core';
+import { UserMenuComponent as BaseComponent } from '../../../../../../app/shared/auth-nav-menu/user-menu/user-menu.component';
+
+/**
+ * Component representing the {@link UserMenuComponent} of a page
+ */
+@Component({
+  selector: 'ds-user-menu',
+  // templateUrl: 'user-menu.component.html',
+  templateUrl: '../../../../../../app/shared/auth-nav-menu/user-menu/user-menu.component.html',
+  // styleUrls: ['user-menu.component.scss'],
+  styleUrls: ['../../../../../../app/shared/auth-nav-menu/user-menu/user-menu.component.scss'],
+})
+export class UserMenuComponent extends BaseComponent {
+}
diff --git a/src/themes/custom/app/shared/browse-by/browse-by.component.html b/src/themes/custom/app/shared/browse-by/browse-by.component.html
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/shared/browse-by/browse-by.component.scss b/src/themes/custom/app/shared/browse-by/browse-by.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/shared/browse-by/browse-by.component.ts b/src/themes/custom/app/shared/browse-by/browse-by.component.ts
new file mode 100644
index 0000000000..81435b9b37
--- /dev/null
+++ b/src/themes/custom/app/shared/browse-by/browse-by.component.ts
@@ -0,0 +1,17 @@
+import { Component } from '@angular/core';
+import { fadeIn, fadeInOut } from '../../../../../app/shared/animations/fade';
+import { BrowseByComponent as BaseComponent } from '../../../../../app/shared/browse-by/browse-by.component';
+
+@Component({
+  selector: 'ds-browse-by',
+  // styleUrls: ['./browse-by.component.scss'],
+  styleUrls: ['../../../../../app/shared/browse-by/browse-by.component.scss'],
+  // templateUrl: './browse-by.component.html',
+  templateUrl: '../../../../../app/shared/browse-by/browse-by.component.html',
+  animations: [
+    fadeIn,
+    fadeInOut,
+  ],
+})
+export class BrowseByComponent extends BaseComponent {
+}
diff --git a/src/themes/custom/app/shared/lang-switch/lang-switch.component.html b/src/themes/custom/app/shared/lang-switch/lang-switch.component.html
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/shared/lang-switch/lang-switch.component.scss b/src/themes/custom/app/shared/lang-switch/lang-switch.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/shared/lang-switch/lang-switch.component.ts b/src/themes/custom/app/shared/lang-switch/lang-switch.component.ts
new file mode 100644
index 0000000000..fe803949db
--- /dev/null
+++ b/src/themes/custom/app/shared/lang-switch/lang-switch.component.ts
@@ -0,0 +1,12 @@
+import { Component } from '@angular/core';
+import { LangSwitchComponent as BaseComponent } from '../../../../../app/shared/lang-switch/lang-switch.component';
+
+@Component({
+  selector: 'ds-lang-switch',
+  // styleUrls: ['./lang-switch.component.scss'],
+  styleUrls: ['../../../../../app/shared/lang-switch/lang-switch.component.scss'],
+  // templateUrl: './lang-switch.component.html',
+  templateUrl: '../../../../../app/shared/lang-switch/lang-switch.component.html',
+})
+export class LangSwitchComponent extends BaseComponent {
+}
diff --git a/src/themes/custom/app/shared/log-in/log-in.component.html b/src/themes/custom/app/shared/log-in/log-in.component.html
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/shared/log-in/log-in.component.scss b/src/themes/custom/app/shared/log-in/log-in.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/shared/log-in/log-in.component.ts b/src/themes/custom/app/shared/log-in/log-in.component.ts
new file mode 100644
index 0000000000..5d1df59699
--- /dev/null
+++ b/src/themes/custom/app/shared/log-in/log-in.component.ts
@@ -0,0 +1,12 @@
+import { Component } from '@angular/core';
+import { LogInComponent as BaseComponent } from '../../../../../app/shared/log-in/log-in.component';
+
+@Component({
+  selector: 'ds-log-in',
+  // templateUrl: './log-in.component.html',
+  templateUrl: '../../../../../app/shared/log-in/log-in.component.html',
+  // styleUrls: ['./log-in.component.scss'],
+  styleUrls: ['../../../../../app/shared/log-in/log-in.component.scss'],
+})
+export class LogInComponent extends BaseComponent {
+}
diff --git a/src/themes/custom/app/shared/object-list/browse-entry-list-element/browse-entry-list-element.component.html b/src/themes/custom/app/shared/object-list/browse-entry-list-element/browse-entry-list-element.component.html
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/shared/object-list/browse-entry-list-element/browse-entry-list-element.component.scss b/src/themes/custom/app/shared/object-list/browse-entry-list-element/browse-entry-list-element.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/shared/object-list/browse-entry-list-element/browse-entry-list-element.component.ts b/src/themes/custom/app/shared/object-list/browse-entry-list-element/browse-entry-list-element.component.ts
new file mode 100644
index 0000000000..0b1fd94e6a
--- /dev/null
+++ b/src/themes/custom/app/shared/object-list/browse-entry-list-element/browse-entry-list-element.component.ts
@@ -0,0 +1,19 @@
+import { Component } from '@angular/core';
+import { BrowseEntry } from '../../../../../../app/core/shared/browse-entry.model';
+import { ViewMode } from '../../../../../../app/core/shared/view-mode.model';
+import { listableObjectComponent } from '../../../../../../app/shared/object-collection/shared/listable-object/listable-object.decorator';
+import { Context } from '../../../../../../app/core/shared/context.model';
+import {
+  BrowseEntryListElementComponent as BaseComponent
+} from '../../../../../../app/shared/object-list/browse-entry-list-element/browse-entry-list-element.component';
+
+@Component({
+  selector: 'ds-browse-entry-list-element',
+  // styleUrls: ['./browse-entry-list-element.component.scss'],
+  styleUrls: ['../../../../../../app/shared/object-list/browse-entry-list-element/browse-entry-list-element.component.scss'],
+  // templateUrl: './browse-entry-list-element.component.html',
+  templateUrl: '../../../../../../app/shared/object-list/browse-entry-list-element/browse-entry-list-element.component.html',
+})
+@listableObjectComponent(BrowseEntry, ViewMode.ListElement, Context.Any, 'custom')
+export class BrowseEntryListElementComponent extends BaseComponent {
+}
diff --git a/src/themes/custom/app/shared/object-list/object-list.component.ts b/src/themes/custom/app/shared/object-list/object-list.component.ts
index 49f464610f..a376336870 100644
--- a/src/themes/custom/app/shared/object-list/object-list.component.ts
+++ b/src/themes/custom/app/shared/object-list/object-list.component.ts
@@ -9,7 +9,7 @@ import { ObjectListComponent as BaseComponent} from '../../../../../app/shared/o
   selector: 'ds-object-list',
   // styleUrls: ['./object-list.component.scss'],
   styleUrls: ['../../../../../app/shared/object-list/object-list.component.scss'],
-  // templateUrl: 'object-list.component.html'
+  // templateUrl: './object-list.component.html'
   templateUrl: '../../../../../app/shared/object-list/object-list.component.html'
 })
 
diff --git a/src/themes/custom/app/workflowitems-edit-page/workflow-item-send-back/workflow-item-send-back.component.ts b/src/themes/custom/app/workflowitems-edit-page/workflow-item-send-back/workflow-item-send-back.component.ts
index 49121e64b9..022c46ef22 100644
--- a/src/themes/custom/app/workflowitems-edit-page/workflow-item-send-back/workflow-item-send-back.component.ts
+++ b/src/themes/custom/app/workflowitems-edit-page/workflow-item-send-back/workflow-item-send-back.component.ts
@@ -3,7 +3,10 @@ import { WorkflowItemSendBackComponent as BaseComponent } from '../../../../../a
 
 @Component({
   selector: 'ds-workflow-item-send-back',
-  // styleUrls: ['workflow-item-send-back.component.scss'],
+  // NOTE: the SCSS file for workflow-item-action-page does not have a corresponding file in the original
+  // implementation, so this commented out line below is a stub, here if you
+  // need it, but you probably don't need it.
+  // styleUrls: ['./workflow-item-send-back.component.scss'],
   // templateUrl: './workflow-item-send-back.component.html'
   templateUrl: '../../../../../app/workflowitems-edit-page/workflow-item-action-page.component.html'
 })
diff --git a/src/themes/custom/eager-theme.module.ts b/src/themes/custom/eager-theme.module.ts
index 7d7f5b3d8b..31047e239a 100644
--- a/src/themes/custom/eager-theme.module.ts
+++ b/src/themes/custom/eager-theme.module.ts
@@ -54,6 +54,10 @@ import {
   ItemSearchResultListElementComponent
 } from './app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component';
 import { TopLevelCommunityListComponent } from './app/home-page/top-level-community-list/top-level-community-list.component';
+import { LogInComponent } from './app/shared/log-in/log-in.component';
+import { BrowseEntryListElementComponent } from './app/shared/object-list/browse-entry-list-element/browse-entry-list-element.component';
+import { PersonComponent } from './app/entity-groups/research-entities/item-pages/person/person.component';
+import { LangSwitchComponent } from './app/shared/lang-switch/lang-switch.component';
 
 
 /**
@@ -64,6 +68,7 @@ const ENTRY_COMPONENTS = [
   JournalComponent,
   JournalIssueComponent,
   JournalVolumeComponent,
+  PersonComponent,
   PublicationComponent,
   UntypedItemComponent,
   CommunityListElementComponent,
@@ -75,6 +80,7 @@ const ENTRY_COMPONENTS = [
   PublicationSidebarSearchListElementComponent,
   ItemSearchResultListElementComponent,
   TopLevelCommunityListComponent,
+  BrowseEntryListElementComponent,
 ];
 
 const DECLARATIONS = [
@@ -91,6 +97,8 @@ const DECLARATIONS = [
   EditCollectionSelectorComponent,
   EditCommunitySelectorComponent,
   EditItemSelectorComponent,
+  LogInComponent,
+  LangSwitchComponent,
 ];
 
 @NgModule({
diff --git a/src/themes/custom/lazy-theme.module.ts b/src/themes/custom/lazy-theme.module.ts
index edb3f5478c..546d2dccbf 100644
--- a/src/themes/custom/lazy-theme.module.ts
+++ b/src/themes/custom/lazy-theme.module.ts
@@ -156,6 +156,11 @@ import { ItemStatusComponent } from './app/item-page/edit-item-page/item-status/
 import { EditBitstreamPageComponent } from './app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component';
 import { FormModule } from '../../app/shared/form/form.module';
 import { RequestCopyModule } from 'src/app/request-copy/request-copy.module';
+import {UserMenuComponent} from './app/shared/auth-nav-menu/user-menu/user-menu.component';
+import { BrowseByComponent } from './app/shared/browse-by/browse-by.component';
+import { RegisterEmailFormComponent } from './app/register-email-form/register-email-form.component';
+import { NgxSkeletonLoaderModule } from 'ngx-skeleton-loader';
+
 
 const DECLARATIONS = [
   FileSectionComponent,
@@ -239,6 +244,9 @@ const DECLARATIONS = [
   SubmissionSectionUploadFileComponent,
   ItemStatusComponent,
   EditBitstreamPageComponent,
+  UserMenuComponent,
+  BrowseByComponent,
+  RegisterEmailFormComponent,
 ];
 
 @NgModule({
@@ -299,6 +307,7 @@ const DECLARATIONS = [
     NgxGalleryModule,
     FormModule,
     RequestCopyModule,
+    NgxSkeletonLoaderModule
   ],
   declarations: DECLARATIONS,
   exports: [
diff --git a/src/themes/dspace/app/header-nav-wrapper/header-navbar-wrapper.component.html b/src/themes/dspace/app/header-nav-wrapper/header-navbar-wrapper.component.html
index 091d152258..5f51689df8 100644
--- a/src/themes/dspace/app/header-nav-wrapper/header-navbar-wrapper.component.html
+++ b/src/themes/dspace/app/header-nav-wrapper/header-navbar-wrapper.component.html
@@ -1,3 +1,9 @@
-<div [ngClass]="{'open': !(isNavBarCollapsed | async)}">
+<div id="header-navbar-wrapper"><!-- [class.open]="!(isNavBarCollapsed$ | async)" -->
   <ds-themed-header></ds-themed-header>
+  <!-- Collapsible navbar (mobile only) -->
+  <div *ngIf="(isMobile$ | async)" id="mobile-navbar-wrapper" [@slideMobileNav]="(isNavBarCollapsed$ | async) ? 'collapsed' : 'expanded'">
+    <nav class="px-3" id="collapsible-mobile-navbar" [attr.aria-hidden]="(isNavBarCollapsed$ | async)" [attr.aria-label]="'nav.main.description' | translate">
+      <ds-themed-navbar></ds-themed-navbar>
+    </nav>
+  </div>
 </div>
diff --git a/src/themes/dspace/app/header-nav-wrapper/header-navbar-wrapper.component.scss b/src/themes/dspace/app/header-nav-wrapper/header-navbar-wrapper.component.scss
index e69de29bb2..444d3a9722 100644
--- a/src/themes/dspace/app/header-nav-wrapper/header-navbar-wrapper.component.scss
+++ b/src/themes/dspace/app/header-nav-wrapper/header-navbar-wrapper.component.scss
@@ -0,0 +1,81 @@
+:host {
+  --ds-header-navbar-border-bottom-style: solid var(--ds-header-navbar-border-bottom-height) var(--ds-header-navbar-border-bottom-color);
+  --ds-expandable-navbar-border-top-style: solid var(--ds-expandable-navbar-border-top-height) var(--ds-expandable-navbar-border-top-color);
+  --ds-expandable-navbar-height: calc(100vh - var(--ds-header-height));
+
+  div#header-navbar-wrapper {
+    // The header-navbar-wrapper should not have a z-index, otherwise it would cover the media viewer despite its higher z-index
+    position: relative; // required by the mobile collapsible navbar
+    border-bottom: var(--ds-header-navbar-border-bottom-style); // gets covered by mobile navbar wrapper, when open
+
+    div#mobile-navbar-wrapper {
+      width: 100%;
+      background-color: var(--ds-expandable-navbar-bg);
+      position: absolute;
+      z-index: var(--ds-nav-z-index);
+      overflow: hidden;
+
+      nav#collapsible-mobile-navbar {
+        // Following parameters are changed by slideMobileNav animation
+        min-height: var(--ds-expandable-navbar-height);
+        height: auto;
+        border-bottom: var(--ds-header-navbar-border-bottom-style);
+      }
+    }
+  }
+
+  /* MENU ITEMS */
+
+  ::ng-deep {
+    .ds-menu-item, .ds-menu-toggler-wrapper {
+      white-space: nowrap;
+      text-decoration: none;
+    }
+
+    nav#desktop-navbar { // in header component
+      #main-site-navigation {
+        /* Desktop menu */
+
+        .ds-menu-item-wrapper, .ds-menu-item, .ds-menu-toggler-wrapper {
+          // fill navbar height (required by dropdown menus) and center content
+          display: flex;
+          align-items: center;
+          height: 100%;
+        }
+        .ds-menu-item {
+          // define here the style for top-level navbar menu items
+          padding: var(--ds-navbar-item-vertical-padding) var(--ds-navbar-item-horizontal-padding);
+        }
+        .ds-menu-item, .ds-menu-toggler-wrapper {
+          color: var(--ds-navbar-link-color) !important;
+          &:hover, &:focus {
+            color: var(--ds-navbar-link-color-hover) !important;
+          }
+        }
+
+        /* desktop submenu */
+
+        .dropdown-menu {
+          .ds-menu-item {
+            // define here the style for second-level navbar menu items
+            padding: var(--ds-navbar-dropdown-item-vertical-padding) var(--ds-navbar-dropdown-item-horizontal-padding);
+          }
+        }
+
+      }
+    }
+
+    nav#collapsible-mobile-navbar { // in header-navbar-wrapper component
+
+      border-top: var(--ds-expandable-navbar-border-top-style);
+      padding-top: var(--ds-expandable-navbar-padding-top);
+
+      #main-site-navigation {
+        .ds-menu-item {
+          padding: var(--ds-expandable-navbar-item-vertical-padding) 0;
+        }
+      }
+
+    }
+  }
+}
diff --git a/src/themes/dspace/app/header-nav-wrapper/header-navbar-wrapper.component.ts b/src/themes/dspace/app/header-nav-wrapper/header-navbar-wrapper.component.ts
index 57ade022ae..ef7d38028a 100644
--- a/src/themes/dspace/app/header-nav-wrapper/header-navbar-wrapper.component.ts
+++ b/src/themes/dspace/app/header-nav-wrapper/header-navbar-wrapper.component.ts
@@ -1,13 +1,15 @@
 import { Component } from '@angular/core';
 import { HeaderNavbarWrapperComponent as BaseComponent } from '../../../../app/header-nav-wrapper/header-navbar-wrapper.component';
+import { slideMobileNav } from '../../../../app/shared/animations/slide';
 
 /**
  * This component represents a wrapper for the horizontal navbar and the header
  */
 @Component({
   selector: 'ds-header-navbar-wrapper',
-  styleUrls: ['../../../../app/header-nav-wrapper/header-navbar-wrapper.component.scss'],
+  styleUrls: ['header-navbar-wrapper.component.scss'],
   templateUrl: 'header-navbar-wrapper.component.html',
+  animations: [slideMobileNav],
 })
 export class HeaderNavbarWrapperComponent extends BaseComponent {
 }
diff --git a/src/themes/dspace/app/header/header.component.html b/src/themes/dspace/app/header/header.component.html
index dbc98098ae..eaf107dff8 100644
--- a/src/themes/dspace/app/header/header.component.html
+++ b/src/themes/dspace/app/header/header.component.html
@@ -1,25 +1,34 @@
-<header class="header">
-  <nav role="navigation" [attr.aria-label]="'nav.user.description' | translate" class="container navbar navbar-expand-md px-0">
-    <div class="d-flex flex-grow-1">
-      <a class="navbar-brand m-2" routerLink="/home">
-        <img src="assets/images/dspace-logo.svg" [attr.alt]="'menu.header.image.logo' | translate"/>
+<header id="main-site-header">
+  <div class="container h-100 d-flex flex-row flex-wrap align-items-center justify-content-between gapx-3 gapy-2" id="main-site-header-container">
+    <!-- Logo and navbar wrapper -->
+    <div id="header-left"
+         [attr.role]="(isMobile$ | async) ? 'navigation' : 'presentation'"
+         [attr.aria-label]="(isMobile$ | async) ? ('nav.main.description' | translate) : null"
+         class="h-100 flex-fill d-flex flex-row flex-nowrap justify-content-start align-items-center gapx-3">
+      <a class="d-block my-2 my-md-0" routerLink="/home" [attr.aria-label]="'home.title' | translate" role="button" tabindex="0">
+        <img id="header-logo" src="assets/images/dspace-logo.svg" [attr.alt]="'menu.header.image.logo' | translate"/>
       </a>
+      <nav *ngIf="!(isMobile$ | async)" class="navbar navbar-expand p-0 align-items-stretch align-self-stretch" id="desktop-navbar" [attr.aria-label]="'nav.main.description' | translate">
+        <ds-themed-navbar></ds-themed-navbar>
+      </nav>
     </div>
-    <div class="d-flex flex-grow-1 ml-auto justify-content-end align-items-center">
+    <!-- Search bar and other menus -->
+    <div id="header-right" class="h-100 d-flex flex-row flex-nowrap justify-content-end align-items-center gapx-1 ml-auto">
       <ds-themed-search-navbar></ds-themed-search-navbar>
-      <ds-lang-switch></ds-lang-switch>
-      <ds-context-help-toggle></ds-context-help-toggle>
-      <ds-themed-auth-nav-menu></ds-themed-auth-nav-menu>
-      <ds-impersonate-navbar></ds-impersonate-navbar>
-      <div class="pl-2">
-        <button class="navbar-toggler" type="button" (click)="toggleNavbar()"
-                aria-controls="collapsingNav"
-                aria-expanded="false" [attr.aria-label]="'nav.toggle' | translate">
-          <span class="navbar-toggler-icon fas fa-bars fa-fw" aria-hidden="true"></span>
+      <div role="menubar" class="h-100 d-flex flex-row flex-nowrap align-items-center gapx-1">
+        <ds-themed-lang-switch></ds-themed-lang-switch>
+        <ds-context-help-toggle></ds-context-help-toggle>
+        <ds-impersonate-navbar></ds-impersonate-navbar>
+        <ds-themed-auth-nav-menu></ds-themed-auth-nav-menu>
+      </div>
+
+      <div id="mobile-navbar-toggler" class="d-block d-lg-none ml-3" *ngIf="(isMobile$ | async)">
+        <button id="navbar-toggler" class="btn" type="button" (click)="toggleNavbar()"
+                [attr.aria-label]="'nav.toggle' | translate" aria-controls="collapsible-mobile-navbar" [attr.aria-expanded]="!(isNavBarCollapsed$ | async)">
+          <span class="fas fa-bars fa-fw fa-xl toggler-icon" aria-hidden="true"></span>
         </button>
       </div>
-    </div>
-  </nav>
-  <ds-themed-navbar></ds-themed-navbar>
 
+    </div>
+  </div>
 </header>
diff --git a/src/themes/dspace/app/header/header.component.scss b/src/themes/dspace/app/header/header.component.scss
index 2fc857826f..5aae8af017 100644
--- a/src/themes/dspace/app/header/header.component.scss
+++ b/src/themes/dspace/app/header/header.component.scss
@@ -1,26 +1,28 @@
-@media screen and (min-width: map-get($grid-breakpoints, md)) {
-  nav.navbar {
-    display: none;
-  }
-  .header {
+:host {
+  #main-site-header {
+    min-height: var(--ds-header-height);
+
+    @include media-breakpoint-up(md) {
+      height: var(--ds-header-height);
+    }
+
     background-color: var(--ds-header-bg);
-  }
-}
 
-.navbar-brand img {
-  @media screen and (max-width: map-get($grid-breakpoints, md)) {
-    height: var(--ds-header-logo-height-xs);
+    &-container {
+      min-height: var(--ds-header-height);
+    }
   }
-}
-.navbar-toggler .navbar-toggler-icon {
-  background-image: none !important;
-  line-height: 1.5;
-}
 
-.navbar-toggler {
-  color: var(--ds-header-icon-color);
-
-  &:hover, &:focus {
-    color: var(--ds-header-icon-color-hover);
+  img#header-logo {
+    height: var(--ds-header-logo-height);
   }
+
+  button#navbar-toggler {
+    color: var(--ds-header-icon-color);
+
+    &:hover, &:focus {
+      color: var(--ds-header-icon-color-hover);
+    }
+  }
+
 }
diff --git a/src/themes/dspace/app/header/header.component.ts b/src/themes/dspace/app/header/header.component.ts
index 6da89b47d5..98768d8b26 100644
--- a/src/themes/dspace/app/header/header.component.ts
+++ b/src/themes/dspace/app/header/header.component.ts
@@ -1,5 +1,6 @@
-import { Component } from '@angular/core';
+import { Component, OnInit } from '@angular/core';
 import { HeaderComponent as BaseComponent } from '../../../../app/header/header.component';
+import { Observable } from 'rxjs';
 
 /**
  * Represents the header with the logo and simple navigation
@@ -9,5 +10,11 @@ import { HeaderComponent as BaseComponent } from '../../../../app/header/header.
   styleUrls: ['header.component.scss'],
   templateUrl: 'header.component.html',
 })
-export class HeaderComponent extends BaseComponent {
+export class HeaderComponent extends BaseComponent implements OnInit {
+  public isNavBarCollapsed$: Observable<boolean>;
+
+  ngOnInit() {
+    super.ngOnInit();
+    this.isNavBarCollapsed$ = this.menuService.isMenuCollapsed(this.menuID);
+  }
 }
diff --git a/src/themes/dspace/app/home-page/home-news/home-news.component.html b/src/themes/dspace/app/home-page/home-news/home-news.component.html
index ef576ed99c..dad1666a32 100644
--- a/src/themes/dspace/app/home-page/home-news/home-news.component.html
+++ b/src/themes/dspace/app/home-page/home-news/home-news.component.html
@@ -1,4 +1,4 @@
-<div class="background-image-container">
+<div class="background-image-container mt-ncs">
   <div class="container">
     <div class="jumbotron jumbotron-fluid">
       <div class="d-flex flex-wrap">
@@ -19,7 +19,7 @@
           handle.net and DataCite DOI
         </li>
       </ul>
-      <p>Join an international community of <a href="https://wiki.lyrasis.org/display/DSPACE/DSpace+Positioning" target="_blank">leading institutions using DSpace</a>.</p>
+      <p>Join an international community of <a href="https://wiki.lyrasis.org/display/DSPACE/DSpace+Positioning" target="_blank" role="link" tabindex="0">leading institutions using DSpace</a>.</p>
       <p>The test user accounts below have their password set to the name of this
         software in lowercase.</p>
       <ul>
@@ -35,5 +35,5 @@
     <source type="image/jpg" srcset="assets/dspace/images/banner.jpg 2000w, assets/dspace/images/banner-half.jpg 1200w, assets/dspace/images/banner-tall.jpg 768w">
     <img alt="" [src]="'assets/dspace/images/banner.jpg'"/><!-- without the []="''" Firefox downloads both the fallback and the resolved image -->
   </picture>
-  <small class="credits">Photo by <a href="https://www.pexels.com/@inspiredimages">@inspiredimages</a></small>
+  <small class="credits">Photo by <a href="https://www.pexels.com/@inspiredimages" role="link" tabindex="0">@inspiredimages</a></small>
 </div>
diff --git a/src/themes/dspace/app/home-page/home-news/home-news.component.scss b/src/themes/dspace/app/home-page/home-news/home-news.component.scss
index 93ec1763f3..d00b0ec959 100644
--- a/src/themes/dspace/app/home-page/home-news/home-news.component.scss
+++ b/src/themes/dspace/app/home-page/home-news/home-news.component.scss
@@ -1,10 +1,10 @@
 :host {
   display: block;
-  margin-top: calc(var(--ds-content-spacing) * -1);
 
   div.background-image-container {
     color: white;
     position: relative;
+    font-weight: 600;
 
     .background-image > img {
       background-color: var(--bs-info);
@@ -69,6 +69,11 @@
       color: var(--ds-home-news-link-hover-color);
     }
   }
+
+  .lead {
+    font-size: 1.25rem;
+    font-weight: 400;
+  }
 }
 
 
diff --git a/src/themes/dspace/app/navbar/navbar.component.html b/src/themes/dspace/app/navbar/navbar.component.html
index 05afac7d7e..d828206e7a 100644
--- a/src/themes/dspace/app/navbar/navbar.component.html
+++ b/src/themes/dspace/app/navbar/navbar.component.html
@@ -1,24 +1,9 @@
-<nav [ngClass]="{'open': !(menuCollapsed | async)}" [@slideMobileNav]="!(windowService.isXsOrSm() | async) ? 'default' : ((menuCollapsed | async) ? 'collapsed' : 'expanded')"
-  class="navbar navbar-expand-md navbar-light p-0 navbar-container" role="navigation" [attr.aria-label]="'nav.main.description' | translate">
-  <div class="navbar-inner-container w-100 h-100" [class.container]="!(isXsOrSm$ | async)">
-    <a class="navbar-brand my-2" routerLink="/home">
-      <img src="assets/images/dspace-logo.svg" [attr.alt]="'menu.header.image.logo' | translate" />
-    </a>
-
-    <div id="collapsingNav" class="w-100 h-100">
-      <ul class="navbar-nav me-auto mb-2 mb-lg-0 h-100">
-        <li *ngIf="(isXsOrSm$ | async) && (isAuthenticated$ | async)">
-            <ds-user-menu [inExpandableNavbar]="true"></ds-user-menu>
-        </li>
-        <ng-container *ngFor="let section of (sections | async)">
-          <ng-container *ngComponentOutlet="(sectionMap$ | async).get(section.id)?.component; injector: (sectionMap$ | async).get(section.id)?.injector;"></ng-container>
-        </ng-container>
-      </ul>
-    </div>
-    <ds-search-navbar class="navbar-collapsed"></ds-search-navbar>
-    <ds-lang-switch class="navbar-collapsed"></ds-lang-switch>
-    <ds-context-help-toggle class="navbar-collapsed"></ds-context-help-toggle>
-    <ds-themed-auth-nav-menu class="navbar-collapsed"></ds-themed-auth-nav-menu>
-    <ds-impersonate-navbar class="navbar-collapsed"></ds-impersonate-navbar>
-  </div>
-</nav>
+<ng-container *ngIf="(isMobile$ | async) && (isAuthenticated$ | async)">
+  <ds-user-menu [inExpandableNavbar]="true"></ds-user-menu>
+</ng-container>
+<div class="navbar-nav h-100 align-items-md-stretch gapx-3" role="menubar" id="main-site-navigation" [ngClass]="(isMobile$ | async) ? 'navbar-nav-mobile' : 'navbar-nav-desktop'">
+  <ng-container *ngFor="let section of (sections | async)">
+    <ng-container
+      *ngComponentOutlet="(sectionMap$ | async).get(section.id)?.component; injector: (sectionMap$ | async).get(section.id)?.injector;"></ng-container>
+  </ng-container>
+</div>
diff --git a/src/themes/dspace/app/navbar/navbar.component.scss b/src/themes/dspace/app/navbar/navbar.component.scss
index d3aea9f078..32c65c8c97 100644
--- a/src/themes/dspace/app/navbar/navbar.component.scss
+++ b/src/themes/dspace/app/navbar/navbar.component.scss
@@ -1,56 +1,3 @@
-nav.navbar {
-  border-top: 1px var(--ds-header-navbar-border-top-color) solid;
-  border-bottom: 5px var(--ds-header-navbar-border-bottom-color) solid;
-  align-items: baseline;
-}
+:host {
 
-/** Mobile menu styling **/
-@media screen and (max-width: map-get($grid-breakpoints, md)-0.02) {
-  .navbar {
-    width: 100%;
-    background-color: var(--bs-white);
-    position: absolute;
-    overflow: hidden;
-    height: 0;
-    &.open {
-      height: 100vh; //doesn't matter because wrapper is sticky
-    }
-  }
-}
-
-@media screen and (min-width: map-get($grid-breakpoints, md)) {
-  .reset-padding-md {
-    margin-left: calc(var(--bs-spacer) / -2);
-    margin-right: calc(var(--bs-spacer) / -2);
-  }
-}
-
-/* TODO remove when https://github.com/twbs/bootstrap/issues/24726 is fixed */
-.navbar-expand-md.navbar-container {
-  @media screen and (max-width: map-get($grid-breakpoints, md)-0.02) {
-    > .navbar-inner-container {
-      padding: 0 var(--bs-spacer);
-      a.navbar-brand {
-        display: none;
-      }
-      .navbar-collapsed {
-        display: none;
-      }
-    }
-    padding: 0;
-  }
-  height: 80px;
-}
-
-a.navbar-brand img {
-  max-height: var(--ds-header-logo-height);
-}
-
-.navbar-nav {
-  ::ng-deep a.nav-link {
-    color: var(--ds-navbar-link-color);
-  }
-  ::ng-deep a.nav-link:hover {
-    color: var(--ds-navbar-link-color-hover);
-  }
 }
diff --git a/src/themes/dspace/styles/_global-styles.scss b/src/themes/dspace/styles/_global-styles.scss
index e41dae0e3f..5bd4c19bc0 100644
--- a/src/themes/dspace/styles/_global-styles.scss
+++ b/src/themes/dspace/styles/_global-styles.scss
@@ -17,7 +17,7 @@
     background-color: var(--bs-primary);
   }
 
-  h5 {
+  h4 {
     font-size: 1.1rem
   }
 }
diff --git a/src/themes/dspace/styles/_theme_css_variable_overrides.scss b/src/themes/dspace/styles/_theme_css_variable_overrides.scss
index 516eff9f7e..46d73997eb 100644
--- a/src/themes/dspace/styles/_theme_css_variable_overrides.scss
+++ b/src/themes/dspace/styles/_theme_css_variable_overrides.scss
@@ -1,11 +1,25 @@
 // Override or add CSS variables for your theme here
 
 :root {
-  --ds-header-logo-height: 40px;
-  --ds-banner-text-background: rgba(0, 0, 0, 0.45);
-  --ds-banner-background-gradient-width: 300px;
-  --ds-home-news-link-color: #{$green};
-  --ds-home-news-link-hover-color: #{darken($green, 15%)};
-  --ds-header-navbar-border-bottom-color: #{$green};
-}
 
+  @include media-breakpoint-up(md) {
+    --ds-header-logo-height: 40px;
+    --ds-header-height: 80px;
+  }
+  @include media-breakpoint-down(sm) {
+    --ds-header-logo-height: 50px;
+    --ds-header-height: 90px;
+  }
+
+  --ds-banner-text-background: rgba(0, 0, 0, 0.58);
+  --ds-banner-background-gradient-width: 300px;
+
+  --ds-header-navbar-border-bottom-height: 5px;
+
+  /* set the next two properties as `--ds-header-navbar-border-bottom-*`
+  in order to keep the bottom border of the header when navbar is expanded */
+
+  --ds-expandable-navbar-border-top-color: #{$white};
+  --ds-expandable-navbar-border-top-height: 0;
+  --ds-expandable-navbar-padding-top: 0;
+}
diff --git a/src/themes/dspace/styles/_theme_sass_variable_overrides.scss b/src/themes/dspace/styles/_theme_sass_variable_overrides.scss
index b5799c9749..3750b1f826 100644
--- a/src/themes/dspace/styles/_theme_sass_variable_overrides.scss
+++ b/src/themes/dspace/styles/_theme_sass_variable_overrides.scss
@@ -1,41 +1,90 @@
 // DSpace works with CSS variables for its own components, and has a mapping of all bootstrap Sass
 // variables to CSS equivalents (see src/styles/_bootstrap_variables_mapping.scss). However Bootstrap
-// still uses Sass variables internally. So if you want to override bootstrap (or other sass
-// variables) you can do so here. Their CSS counterparts will include the changes you make here
+// still uses Sass variables internally. So if you want to override Bootstrap (or other sass
+// variables) you can do so here. Their CSS counterparts will include the changes you make here.
+
+// When this file is going to be compiled, internal Bootstrap variables won't have been declared yet,
+// therefore if you want to use any Bootstrap variable you also need to declare it here.
+
+// All SASS variables from the base theme are also included here. Do not use the '!default' flag
+// here if you want to override them.
+
+
+/*** FONT FAMILIES ***/
 
 @import url('https://fonts.googleapis.com/css2?family=Nunito:ital,wght@0,200;0,300;0,400;0,600;0,700;0,800;1,200;1,300;1,400;1,600;1,700;1,800&display=swap');
 
 $font-family-sans-serif: 'Nunito', -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
 
-$navbar-dark-color: #FFFFFF;
 
-/* Reassign color vars to semantic color scheme */
-$blue: #2b4e72 !default;
-$green: #92C642 !default;
-$cyan: #207698 !default;
-$yellow: #ec9433 !default;
-$red: #CF4444 !default;
-$dark: #43515f !default;
+/*** SEMANTIC COLOR SCHEME ***/
 
-$gray-800: #343a40 !default;
-$gray-700: #495057 !default;
-$gray-400: #ced4da !default;
-$gray-100: #f8f9fa !default;
+// Gray scale (uncomment the variables that you want to override or that you need to use in this file)
+//$white:    #fff;
+//$gray-100: #f8f9fa;
+//$gray-200: #e9ecef;
+//$gray-300: #dee2e6;
+//$gray-400: #ced4da;
+//$gray-500: #adb5bd;
+//$gray-600: #6c757d;
+//$gray-700: #495057;
+//$gray-800: #343a40;
+//$gray-900: #212529;
+//$black:    #000;
 
-$body-color: $gray-800 !default;                    // Bootstrap $gray-800
+// Other colors (uncomment the variables that you want to override or that you need to use in this file)
+//$blue:    #007bff !default;
+//$indigo:  #6610f2 !default;
+//$purple:  #6f42c1 !default;
+//$pink:    #e83e8c !default;
+//$red:     #dc3545 !default;
+//$orange:  #fd7e14 !default;
+//$yellow:  #ffc107 !default;
+//$green:   #28a745 !default;
+//$teal:    #20c997 !default;
+//$cyan:    #17a2b8 !default;
 
-$table-accent-bg: $gray-100 !default;   // Bootstrap $gray-100
-$table-hover-bg: $gray-400 !default;   // Bootstrap $gray-400
+// Define or override other colors here
+// ...
 
-$yiq-contrasted-threshold:  170 !default;
+// Override semantic colors here
+$primary:   #43515f;  // Gray
+$secondary: #495057;  // As Bootstrap $gray-700
+$success:   #92c642;  // Lime
+$info:      #207698;  // Light blue
+$warning:   #ec9433;  // Orange
+$danger:    #cf4444;  // Red
+$light:     #f8f9fa;  // As Bootstrap $gray-100
+$dark:      #43515f;  // Gray
 
+// Add new semantic colors here (you don't need to add existing semantic colors)
 $theme-colors: (
-        primary: $dark,
-        secondary: $gray-700,
-        success: $green,
-        info: $cyan,
-        warning: $yellow,
-        danger: $red,
-        light: $gray-100,
-        dark: $dark
-) !default;
+  // ...
+);
+
+
+/*** OTHER BOOTSTRAP VARIABLES ***/
+
+// The yiq lightness value that determines when the lightness of color changes from "dark" to "light". Acceptable values are between 0 and 255.
+$yiq-contrasted-threshold: 170;
+
+$body-color: #343a40;       // As Bootstrap $gray-800
+
+$link-color: #207698;       // Blue green, as DSpace $info
+$link-decoration: none;
+$link-hover-color: darken($link-color, 15%);
+$link-hover-decoration: underline;
+
+$table-accent-bg: #f8f9fa;  // As Bootstrap $gray-100
+$table-hover-bg: #ced4da;   // As Bootstrap $gray-400
+
+$navbar-dark-color: #fff;
+
+
+/*** CUSTOM DSPACE VARIABLES ***/
+
+$ds-home-news-link-color: #D2FC93;
+$ds-header-navbar-border-bottom-color: #92c642;
+
+$ds-breadcrumb-link-color: #154E66 !default;
+$ds-breadcrumb-link-active-color: #040D11 !default;
diff --git a/webpack/helpers.ts b/webpack/helpers.ts
index 43855f6c72..f0b42a8a69 100644
--- a/webpack/helpers.ts
+++ b/webpack/helpers.ts
@@ -1,18 +1,49 @@
-const path = require('path');
+import { readFileSync, readdirSync, statSync, Stats } from 'fs';
+import { join, resolve } from 'path';
+
+const md5 = require('md5');
 
 export const projectRoot = (relativePath) => {
-  return path.resolve(__dirname, '..', relativePath);
+  return resolve(__dirname, '..', relativePath);
 };
 
 export const globalCSSImports = () => {
   return [
-    projectRoot(path.join('src', 'styles', '_variables.scss')),
-    projectRoot(path.join('src', 'styles', '_mixins.scss')),
+    projectRoot(join('src', 'styles', '_variables.scss')),
+    projectRoot(join('src', 'styles', '_mixins.scss')),
   ];
 };
 
+/**
+ * Calculates the md5 hash of a file
+ *
+ * @param filePath The path of the file
+ */
+export function calculateFileHash(filePath: string): string {
+  const fileContent: Buffer = readFileSync(filePath);
+  return md5(fileContent);
+}
 
-module.exports = {
-  projectRoot,
-  globalCSSImports
-};
+/**
+ * Calculate the hashes of all the files (matching the given regex) in a certain folder
+ *
+ * @param folderPath The path of the folder
+ * @param regExp A regex of the files in the folder for which a hash needs to be generated
+ */
+export function getFileHashes(folderPath: string, regExp: RegExp): { [fileName: string]: string } {
+  const files: string[] = readdirSync(folderPath);
+  let hashes: { [fileName: string]: string } = {};
+
+  for (const file of files) {
+    if (file.match(regExp)) {
+      const filePath: string = join(folderPath, file);
+      const stats: Stats = statSync(filePath);
+
+      if (stats.isFile()) {
+        hashes[file] = calculateFileHash(filePath);
+      }
+    }
+  }
+
+  return hashes;
+}
diff --git a/webpack/webpack.browser.ts b/webpack/webpack.browser.ts
index 5a3b4910ae..168185ef24 100644
--- a/webpack/webpack.browser.ts
+++ b/webpack/webpack.browser.ts
@@ -35,5 +35,12 @@ module.exports = Object.assign({}, commonExports, {
       buildAppConfig(join(process.cwd(), 'src/assets/config.json'));
       return middlewares;
     }
-  }
+  },
+  watchOptions: {
+    // Ignore directories that should not be watched for recompiling angular
+    ignored: [
+      '**/node_modules', '**/_build', '**/.git', '**/docker',
+      '**/.angular', '**/.idea', '**/.vscode', '**/.history', '**/.vsix'
+    ]
+  },
 });
diff --git a/webpack/webpack.common.ts b/webpack/webpack.common.ts
index 1a1ecfd6ef..8d433edf39 100644
--- a/webpack/webpack.common.ts
+++ b/webpack/webpack.common.ts
@@ -1,4 +1,5 @@
-import { globalCSSImports, projectRoot } from './helpers';
+import { globalCSSImports, projectRoot, getFileHashes, calculateFileHash } from './helpers';
+import { EnvironmentPlugin } from 'webpack';
 
 const CopyWebpackPlugin = require('copy-webpack-plugin');
 const path = require('path');
@@ -18,12 +19,13 @@ export const copyWebpackOptions = {
         // use [\/|\\] to match both POSIX and Windows separators
         const matches = absoluteFilename.match(/.*[\/|\\]assets[\/|\\](.+)\.json5$/);
         if (matches) {
+          const fileHash: string = process.env.NODE_ENV === 'production' ? `.${calculateFileHash(absoluteFilename)}` : '';
           // matches[1] is the relative path from src/assets to the JSON5 file, without the extension
-          return path.join('assets', matches[1] + '.json');
+          return path.join('assets', `${matches[1]}${fileHash}.json`);
         }
       },
       transform(content) {
-        return JSON.stringify(JSON5.parse(content.toString()))
+        return JSON.stringify(JSON5.parse(content.toString()));
       }
     },
     {
@@ -77,6 +79,9 @@ const SCSS_LOADERS = [
 
 export const commonExports = {
   plugins: [
+    new EnvironmentPlugin({
+      languageHashes: getFileHashes(path.join(__dirname, '..', 'src', 'assets', 'i18n'), /.*\.json5/g),
+    }),
     new CopyWebpackPlugin(copyWebpackOptions),
   ],
   module: {
diff --git a/yarn.lock b/yarn.lock
index 730966fcdb..4082e15b15 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -31,21 +31,21 @@
     tsconfig-paths "^4.1.0"
     webpack-merge "^5.7.3"
 
-"@angular-devkit/architect@0.1502.5", "@angular-devkit/architect@>=0.1500.0 < 0.1600.0", "@angular-devkit/architect@~0.1502.0":
-  version "0.1502.5"
-  resolved "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1502.5.tgz"
-  integrity sha512-6KVrXQ/X7W88WSJvYe69ed/2QzQNlObKpj3BWzmcKnA+IvJB37/mvw8VaGFP9y+pDa/b1D1yCDtAJLeP5QY3xg==
+"@angular-devkit/architect@0.1502.11", "@angular-devkit/architect@>=0.1500.0 < 0.1600.0", "@angular-devkit/architect@~0.1502.0":
+  version "0.1502.11"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.1502.11.tgz#841a25eaed0c463329726644fbb3bb06a8617f0e"
+  integrity sha512-+hkG5UjIaKMRdo6SFLNQs+Cv7yAVeN8ijfDwI2z/mp7/otowuSEy+H3Tii195jfJ8TQ+y1B7svnx2D6O7oOYbQ==
   dependencies:
-    "@angular-devkit/core" "15.2.5"
+    "@angular-devkit/core" "15.2.11"
     rxjs "6.6.7"
 
-"@angular-devkit/architect@0.1502.6":
-  version "0.1502.6"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.1502.6.tgz#bf9452610f128ee312ee836510700152993a2447"
-  integrity sha512-n4oJ9vzFWwabf+AfgqqevVzdJhNKNCav7ytefjD/Y01vkNwlXqWnHcvyyHCLkVibJ6WR8J9lK4t77j/HFlDvWQ==
+"@angular-devkit/architect@0.1602.16":
+  version "0.1602.16"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.1602.16.tgz#7ffcaa5840037682d8205054c2c3bb84a053aeb7"
+  integrity sha512-aWEeGU4UlbrSKpcAZsldVNxNXAWEeu9hM2BPk77GftbRC8PBMWpgYyrJWTz2ryn8aSmGKT3T8OyBH4gZA/667w==
   dependencies:
-    "@angular-devkit/core" "15.2.6"
-    rxjs "6.6.7"
+    "@angular-devkit/core" "16.2.16"
+    rxjs "7.8.1"
 
 "@angular-devkit/architect@^0.1202.10":
   version "0.1202.18"
@@ -55,15 +55,15 @@
     "@angular-devkit/core" "12.2.18"
     rxjs "6.6.7"
 
-"@angular-devkit/build-angular@^15.0.0":
-  version "15.2.5"
-  resolved "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-15.2.5.tgz"
-  integrity sha512-D2LxjBtUlgJnPxybOIN0XsENEGkVkqCGBBii5oK84HvgBHXO/EyP1WXpOdb2lOYSUZyjhOOs0q42LCobJoaxUw==
+"@angular-devkit/build-angular@^15.0.0", "@angular-devkit/build-angular@^15.2.11":
+  version "15.2.11"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/build-angular/-/build-angular-15.2.11.tgz#1235d45c6d417912d01ef3fbcad1465fcb8a81d2"
+  integrity sha512-MnpVCJdk5jHuK7CH/cTcRT0JQkkKkRTEV3WTyOUhTm0O3PlKwvTM6/Sner+zyuhKyw5VFBBMypHh59aTUDEZ1A==
   dependencies:
     "@ampproject/remapping" "2.2.0"
-    "@angular-devkit/architect" "0.1502.5"
-    "@angular-devkit/build-webpack" "0.1502.5"
-    "@angular-devkit/core" "15.2.5"
+    "@angular-devkit/architect" "0.1502.11"
+    "@angular-devkit/build-webpack" "0.1502.11"
+    "@angular-devkit/core" "15.2.11"
     "@babel/core" "7.20.12"
     "@babel/generator" "7.20.14"
     "@babel/helper-annotate-as-pure" "7.18.6"
@@ -75,7 +75,7 @@
     "@babel/runtime" "7.20.13"
     "@babel/template" "7.20.7"
     "@discoveryjs/json-ext" "0.5.7"
-    "@ngtools/webpack" "15.2.5"
+    "@ngtools/webpack" "15.2.11"
     ansi-colors "4.1.3"
     autoprefixer "10.4.13"
     babel-loader "9.1.2"
@@ -102,13 +102,13 @@
     ora "5.4.1"
     parse5-html-rewriting-stream "7.0.0"
     piscina "3.2.0"
-    postcss "8.4.21"
+    postcss "8.4.31"
     postcss-loader "7.0.2"
     resolve-url-loader "5.0.0"
     rxjs "6.6.7"
     sass "1.58.1"
     sass-loader "13.2.0"
-    semver "7.3.8"
+    semver "7.5.3"
     source-map-loader "4.0.1"
     source-map-support "0.5.21"
     terser "5.16.3"
@@ -116,95 +116,19 @@
     tree-kill "1.2.2"
     tslib "2.5.0"
     webpack "5.76.1"
-    webpack-dev-middleware "6.0.1"
+    webpack-dev-middleware "6.1.2"
     webpack-dev-server "4.11.1"
     webpack-merge "5.8.0"
     webpack-subresource-integrity "5.1.0"
   optionalDependencies:
     esbuild "0.17.8"
 
-"@angular-devkit/build-angular@^15.2.6":
-  version "15.2.6"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/build-angular/-/build-angular-15.2.6.tgz#15f15c27eed465c8becc7a313d4909a7ee66f959"
-  integrity sha512-OmMcdXXUrAdZNxwxDE8SUx1FMcq9FyMnrSv1PmP9sHPBoxAdBVc/qNdGA9V7C5yHvWHGgzsx7ZK5TDuvifzS5g==
+"@angular-devkit/build-webpack@0.1502.11":
+  version "0.1502.11"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/build-webpack/-/build-webpack-0.1502.11.tgz#eec4dcd783557401305dc57778ad5f1f09cd6df3"
+  integrity sha512-OTONIRp770Jfems4+cULmtoeSzjnpx5UjV2EazojnhRXXBSJMWRMPvwD2QvQl9UO/6eOV3d2mgmP2xOZgc/D6w==
   dependencies:
-    "@ampproject/remapping" "2.2.0"
-    "@angular-devkit/architect" "0.1502.6"
-    "@angular-devkit/build-webpack" "0.1502.6"
-    "@angular-devkit/core" "15.2.6"
-    "@babel/core" "7.20.12"
-    "@babel/generator" "7.20.14"
-    "@babel/helper-annotate-as-pure" "7.18.6"
-    "@babel/helper-split-export-declaration" "7.18.6"
-    "@babel/plugin-proposal-async-generator-functions" "7.20.7"
-    "@babel/plugin-transform-async-to-generator" "7.20.7"
-    "@babel/plugin-transform-runtime" "7.19.6"
-    "@babel/preset-env" "7.20.2"
-    "@babel/runtime" "7.20.13"
-    "@babel/template" "7.20.7"
-    "@discoveryjs/json-ext" "0.5.7"
-    "@ngtools/webpack" "15.2.6"
-    ansi-colors "4.1.3"
-    autoprefixer "10.4.13"
-    babel-loader "9.1.2"
-    babel-plugin-istanbul "6.1.1"
-    browserslist "4.21.5"
-    cacache "17.0.4"
-    chokidar "3.5.3"
-    copy-webpack-plugin "11.0.0"
-    critters "0.0.16"
-    css-loader "6.7.3"
-    esbuild-wasm "0.17.8"
-    glob "8.1.0"
-    https-proxy-agent "5.0.1"
-    inquirer "8.2.4"
-    jsonc-parser "3.2.0"
-    karma-source-map-support "1.4.0"
-    less "4.1.3"
-    less-loader "11.1.0"
-    license-webpack-plugin "4.0.2"
-    loader-utils "3.2.1"
-    magic-string "0.29.0"
-    mini-css-extract-plugin "2.7.2"
-    open "8.4.1"
-    ora "5.4.1"
-    parse5-html-rewriting-stream "7.0.0"
-    piscina "3.2.0"
-    postcss "8.4.21"
-    postcss-loader "7.0.2"
-    resolve-url-loader "5.0.0"
-    rxjs "6.6.7"
-    sass "1.58.1"
-    sass-loader "13.2.0"
-    semver "7.3.8"
-    source-map-loader "4.0.1"
-    source-map-support "0.5.21"
-    terser "5.16.3"
-    text-table "0.2.0"
-    tree-kill "1.2.2"
-    tslib "2.5.0"
-    webpack "5.76.1"
-    webpack-dev-middleware "6.0.1"
-    webpack-dev-server "4.11.1"
-    webpack-merge "5.8.0"
-    webpack-subresource-integrity "5.1.0"
-  optionalDependencies:
-    esbuild "0.17.8"
-
-"@angular-devkit/build-webpack@0.1502.5":
-  version "0.1502.5"
-  resolved "https://registry.npmjs.org/@angular-devkit/build-webpack/-/build-webpack-0.1502.5.tgz"
-  integrity sha512-gPkAa4AvQ7BxU+jmVJqrAO18kw/6iks+VUQ+2BVPyHCdqhroANHYdGbZ/pFlZdPmZVzSpusjd6VIbLhbHr/Ohw==
-  dependencies:
-    "@angular-devkit/architect" "0.1502.5"
-    rxjs "6.6.7"
-
-"@angular-devkit/build-webpack@0.1502.6":
-  version "0.1502.6"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/build-webpack/-/build-webpack-0.1502.6.tgz#5fb444fc54d816e57458d36f3c280b522e5f5cfc"
-  integrity sha512-X7XQ11QDz2Bs5qpJ3a5glIytvI+S74ORQxdzvT6a6KB8ayW0SgZEhTwD+GF7pa5My8draIaXBGzzQR1qmpWK5Q==
-  dependencies:
-    "@angular-devkit/architect" "0.1502.6"
+    "@angular-devkit/architect" "0.1502.11"
     rxjs "6.6.7"
 
 "@angular-devkit/core@12.2.18", "@angular-devkit/core@^12.2.17":
@@ -219,10 +143,10 @@
     rxjs "6.6.7"
     source-map "0.7.3"
 
-"@angular-devkit/core@15.2.5", "@angular-devkit/core@^15.0.0", "@angular-devkit/core@~15.2.0":
-  version "15.2.5"
-  resolved "https://registry.npmjs.org/@angular-devkit/core/-/core-15.2.5.tgz"
-  integrity sha512-ZfjEkAe2yYeekc3xjZ/U4pK9nb+w6BFwAEjou6mE8PWZH7iYskm0YCCXkmu+B+zViEcCLhAkJAxu9MwX4efd8g==
+"@angular-devkit/core@15.2.11", "@angular-devkit/core@^15.0.0", "@angular-devkit/core@~15.2.0":
+  version "15.2.11"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-15.2.11.tgz#23ed023cf4066816d910cb341dd8ac2461cdf40f"
+  integrity sha512-zd6QelJ8pOPvz6TsehR0JqixjDjzgEOkKywBJBuwNXY+Nw3MJGayJeWS0UgC+Gk+LoTkpI21RoyaYELkAmD/tw==
   dependencies:
     ajv "8.12.0"
     ajv-formats "2.1.1"
@@ -230,15 +154,16 @@
     rxjs "6.6.7"
     source-map "0.7.4"
 
-"@angular-devkit/core@15.2.6":
-  version "15.2.6"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-15.2.6.tgz#9118faadbc5e3613283da1774826d2b41883330f"
-  integrity sha512-YVTWZ+M+xNKdFX4EnY9QX49PZraawiaA0iTd2CUW8ZoTUvU7yOGMKZLSdz6aokTMRVfm0449wt6YL994ibOo1g==
+"@angular-devkit/core@16.2.16":
+  version "16.2.16"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-16.2.16.tgz#078c48790c7b2b87eb5f78c6b724c4d28cbe26a1"
+  integrity sha512-5xHs9JFmp78sydrOAg0UGErxfMVv5c2f3RXoikS7eBOOXTWEi5pmnOkOvSJ3loQFGVs3Y7i+u02G3VrF5ZxOrA==
   dependencies:
     ajv "8.12.0"
     ajv-formats "2.1.1"
     jsonc-parser "3.2.0"
-    rxjs "6.6.7"
+    picomatch "2.3.1"
+    rxjs "7.8.1"
     source-map "0.7.4"
 
 "@angular-devkit/schematics@12.2.18", "@angular-devkit/schematics@^12.2.17":
@@ -250,16 +175,16 @@
     ora "5.4.1"
     rxjs "6.6.7"
 
-"@angular-devkit/schematics@15.2.6":
-  version "15.2.6"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-15.2.6.tgz#fb5b7530f21586dbdec45cac56f8a418bcfd053d"
-  integrity sha512-f7VgnAcok7AwR/DhX0ZWskB0rFBo/KsvtIUA2qZSrpKMf8eFiwu03dv/b2mI0vnf+1FBfIQzJvO0ww45zRp6dA==
+"@angular-devkit/schematics@16.2.16":
+  version "16.2.16"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-16.2.16.tgz#7f8dbf16fe440f0a9d2b5b25d0dbe16b73356216"
+  integrity sha512-pF6fdtJh6yLmgA7Gs45JIdxPl2MsTAhYcZIMrX1a6ID64dfwtF0MP8fDE6vrWInV1zXbzzf7l7PeKuqVtTSzKg==
   dependencies:
-    "@angular-devkit/core" "15.2.6"
+    "@angular-devkit/core" "16.2.16"
     jsonc-parser "3.2.0"
-    magic-string "0.29.0"
+    magic-string "0.30.1"
     ora "5.4.1"
-    rxjs "6.6.7"
+    rxjs "7.8.1"
 
 "@angular-eslint/builder@15.2.1":
   version "15.2.1"
@@ -318,57 +243,57 @@
     "@angular-eslint/bundled-angular-compiler" "15.2.1"
     "@typescript-eslint/utils" "5.48.2"
 
-"@angular/animations@^15.2.8":
-  version "15.2.8"
-  resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-15.2.8.tgz#11de2b0e7fc50918056bdc6d7545ea1864a8592d"
-  integrity sha512-I3xh8EASQ04s3qXQYpIORI0jFiFmvBQERBqS70TieTCIML7banOf9R3K7sAWB9frG5J0CEUwr+wtF47DCs/7eQ==
+"@angular/animations@^15.2.10":
+  version "15.2.10"
+  resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-15.2.10.tgz#c9194ba9a2b9b4e466e9c76e18591cde096a28e8"
+  integrity sha512-yxfN8qQpMaukRU5LjFkJBmy85rqrOp86tYVCsf+hmPEFRiXBMUj6xYLeCMcpk3Mt1JtnWGBR34ivGx+7bNeAow==
   dependencies:
     tslib "^2.3.0"
 
-"@angular/cdk@^15.2.8":
-  version "15.2.8"
-  resolved "https://registry.yarnpkg.com/@angular/cdk/-/cdk-15.2.8.tgz#f7da13abd6fb6a1355c02f5c02dc32bc679c4b1d"
-  integrity sha512-jiCoxfBFMH29IZIiPmVUzIWetfUNpMIvC20xYVF8RMM819vPogoObzwK4DN/sXcp/6oVbBzZFaYdijhhIt9soQ==
+"@angular/cdk@^15.2.9":
+  version "15.2.9"
+  resolved "https://registry.yarnpkg.com/@angular/cdk/-/cdk-15.2.9.tgz#e22df07b296fec6dccf66d569c3acc3c504c2058"
+  integrity sha512-koaM07N1AIQ5oHU27l0/FoQSSoYAwlAYwVZ4Di3bYrJsTBNCN2Xsby7wI8gZxdepMnV4Fe9si382BDBov+oO4Q==
   dependencies:
     tslib "^2.3.0"
   optionalDependencies:
     parse5 "^7.1.2"
 
-"@angular/cli@^15.2.6":
-  version "15.2.6"
-  resolved "https://registry.yarnpkg.com/@angular/cli/-/cli-15.2.6.tgz#d5994fbd4d02e71017d4dd28ba06dc1c3cb7a976"
-  integrity sha512-wNkQ/qCVbd4pERaGVagKJPifEvjRNY5otwsd4iRVubY/XOcIHcYChUThZwgQdVfNAImfJPMZNrhbGxejuWLA9w==
+"@angular/cli@^16.2.16":
+  version "16.2.16"
+  resolved "https://registry.yarnpkg.com/@angular/cli/-/cli-16.2.16.tgz#8886e63c75bbce91c5a550eeaf3b283eaef89533"
+  integrity sha512-aqfNYZ45ndrf36i+7AhQ9R8BCm025j7TtYaUmvvjT4LwiUg6f6KtlZPB/ivBlXmd1g9oXqW4advL0AIi8A/Ozg==
   dependencies:
-    "@angular-devkit/architect" "0.1502.6"
-    "@angular-devkit/core" "15.2.6"
-    "@angular-devkit/schematics" "15.2.6"
-    "@schematics/angular" "15.2.6"
+    "@angular-devkit/architect" "0.1602.16"
+    "@angular-devkit/core" "16.2.16"
+    "@angular-devkit/schematics" "16.2.16"
+    "@schematics/angular" "16.2.16"
     "@yarnpkg/lockfile" "1.1.0"
     ansi-colors "4.1.3"
-    ini "3.0.1"
+    ini "4.1.1"
     inquirer "8.2.4"
     jsonc-parser "3.2.0"
     npm-package-arg "10.1.0"
     npm-pick-manifest "8.0.1"
-    open "8.4.1"
+    open "8.4.2"
     ora "5.4.1"
-    pacote "15.1.0"
-    resolve "1.22.1"
-    semver "7.3.8"
+    pacote "15.2.0"
+    resolve "1.22.2"
+    semver "7.5.4"
     symbol-observable "4.0.0"
-    yargs "17.6.2"
+    yargs "17.7.2"
 
-"@angular/common@^15.2.8":
-  version "15.2.8"
-  resolved "https://registry.yarnpkg.com/@angular/common/-/common-15.2.8.tgz#7d60a4d906b41a852f31c63116ede1b87c84a7ad"
-  integrity sha512-yLDQihiRcVl38HrWMPbqgzOaSUw85AQH5BsGdjbS6BpoBQj3EXOpccCMFsuxOKxPG4toatgawNqrEnK0Jpv9Mw==
+"@angular/common@^15.2.10":
+  version "15.2.10"
+  resolved "https://registry.yarnpkg.com/@angular/common/-/common-15.2.10.tgz#897923023c8ca4a361ce218bdee9a3f09060df75"
+  integrity sha512-jdBn3fctkqoNrJn9VLsUHpcCEhCxWSczdsR+BBbD6T0oLl6vMrAVNjPwfBejnlgfWN1KoRU9kgOYsMxa5apIWQ==
   dependencies:
     tslib "^2.3.0"
 
-"@angular/compiler-cli@^15.2.8":
-  version "15.2.8"
-  resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-15.2.8.tgz#6535a34b51d143970aa046593d5289883a40fea8"
-  integrity sha512-fFxaDlbILo0t2t662qA0cjgn+kWItGlc1tFYKU6X7bvYb3t2e0cd9FzrFPLXUQVboGis83ULcJ2zkDxScnuPuQ==
+"@angular/compiler-cli@^15.2.10":
+  version "15.2.10"
+  resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-15.2.10.tgz#e51013aa0f3da303fc74f8e1948c550d8e74ead5"
+  integrity sha512-mCFIxrs60XicKfA2o42hA7LrQvhybi9BQveWuZn/2iIEOXx7R62Iemz8E21pLWftAZHGxEW3NECfBrY1d3gVmA==
   dependencies:
     "@babel/core" "7.19.3"
     "@jridgewell/sourcemap-codec" "^1.4.14"
@@ -381,68 +306,68 @@
     tslib "^2.3.0"
     yargs "^17.2.1"
 
-"@angular/compiler@^15.2.8":
-  version "15.2.8"
-  resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-15.2.8.tgz#7d8f3274e9f011b7b972ba616cd536a66d1e52ea"
-  integrity sha512-+dvspIDvuGoYqdL7r/3o9ojkR3fH1zevgC0ISJivcIrMi+WcJ0FV2JmJdnm8V52oNsHy+sMF9eEZGEbCbACE/A==
+"@angular/compiler@^15.2.10":
+  version "15.2.10"
+  resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-15.2.10.tgz#bd78f327d12eb5978f9dd05440aa23d4b5b925a9"
+  integrity sha512-M0XkeU0O73UlJZwDvOyp8/apetz9UKj78eTFDseMYJDLcxe6MpkbkxqpsGZnKYDj7LIep8PmCAKEkhtenE82zw==
   dependencies:
     tslib "^2.3.0"
 
-"@angular/core@^15.2.8":
-  version "15.2.8"
-  resolved "https://registry.yarnpkg.com/@angular/core/-/core-15.2.8.tgz#6d7f8afa61be44b91e4b8737b39d7fdcb256a6ae"
-  integrity sha512-NDs+g4uM4EhyCvluf8a0YBCFXsDAEfCMHOD5cS00Bl+liTQ7JwtmepkWXMyjLB92irC9JaR79kdy4BoIKOh8WA==
+"@angular/core@^15.2.10":
+  version "15.2.10"
+  resolved "https://registry.yarnpkg.com/@angular/core/-/core-15.2.10.tgz#93c1e0d460d21711654c578d2709a402e1822023"
+  integrity sha512-meGGidnitQJGDxYd9/LrqYiVlId+vGaLoiLgJdKBz+o2ZO6OmXQGuNw2VBqf17/Cc0/UjzrOY7+kILNFKkk/WQ==
   dependencies:
     tslib "^2.3.0"
 
-"@angular/forms@^15.2.8":
-  version "15.2.8"
-  resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-15.2.8.tgz#f62a3ede067ddac24ed1b7dc5cefe9b4b0370be7"
-  integrity sha512-VyevVj20DdQWjAQUyiFTe+DAzqG9GqfAOWn376Y/lhPcwxAojXePTGNgtQud566/urDrNrP5haaLD6O36/3n+w==
+"@angular/forms@^15.2.10":
+  version "15.2.10"
+  resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-15.2.10.tgz#09308e887df2fa4d349300c9d1f05cadfb3872b3"
+  integrity sha512-NIntGsNcN6o8L1txsbWXOf6f3K/CUBizdKsxsYVYGJIXEW5qU6UnWmfAZffNNXsT/XvbgUCjgDwT0cAwcqZPuQ==
   dependencies:
     tslib "^2.3.0"
 
-"@angular/language-service@^15.2.8":
-  version "15.2.8"
-  resolved "https://registry.yarnpkg.com/@angular/language-service/-/language-service-15.2.8.tgz#f37fb8b020c9d0fccf1bb5b46db525b67084cc9c"
-  integrity sha512-3wlaJrpxe8ZLe7ZGIOs/Z++kgJMOHZCUvdXLyp/4t1ejULgUgW9yi7nGsemWnSzsUCjf7595BP1Cp1gA/J/1QQ==
+"@angular/language-service@^15.2.10":
+  version "15.2.10"
+  resolved "https://registry.yarnpkg.com/@angular/language-service/-/language-service-15.2.10.tgz#829a802aaf40bfab21d71463023a3b517500ffa9"
+  integrity sha512-G0g0teF4pBqLTgfyLcoBl55g91sCZvBK+V4VgTD/hXGpXyMNlNpOsgECSMliGQoJlsRLEugFsSlBNqy7CRoBtw==
 
-"@angular/localize@15.2.8":
-  version "15.2.8"
-  resolved "https://registry.yarnpkg.com/@angular/localize/-/localize-15.2.8.tgz#fa44efa7d3f84d4767b3b3ca586e7d36929aff54"
-  integrity sha512-wJLBp0MUnET9kHzBtqIlZ3RQ56JFItXSgmBXagQq+MU+uJZmGvuw6fez0i5wkgv9Rgnr25oCULVtpTF+T5RGYA==
+"@angular/localize@15.2.10":
+  version "15.2.10"
+  resolved "https://registry.yarnpkg.com/@angular/localize/-/localize-15.2.10.tgz#9ca7ddcb6f51fc77b3000ec6a2b10b1bed005ce9"
+  integrity sha512-RHN+mUR4H34c/LLnNPAyQbfuZME4i9JgodK5YRRX8cSAFPafYLT0SspSuLsKtcCCEDadAZNDHzb8qv5MBtzJtg==
   dependencies:
     "@babel/core" "7.19.3"
     glob "8.1.0"
     yargs "^17.2.1"
 
-"@angular/platform-browser-dynamic@^15.2.8":
-  version "15.2.8"
-  resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-15.2.8.tgz#158d28298a6f38dc8a17c416eb2779afcafc16a7"
-  integrity sha512-75HyoZNibA3u/FvdK4Aw5KMzUmS/nDk5N8s7gfM09fe1resSPgFiW8JJEkr1xiUdA2WtSRbHs34y5rHLDe7n1Q==
+"@angular/platform-browser-dynamic@^15.2.10":
+  version "15.2.10"
+  resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-15.2.10.tgz#cc9ad3dcded6cb945ee8c4eef14db081dc6c3dfd"
+  integrity sha512-JHP6W+FX715Qv7DhqvfZLuBZXSDJrboiQsR06gUAgDSjAUyhbqmpVg/2YOtgeWpPkzNDtXdPU2PhcRdIv5J3Yg==
   dependencies:
     tslib "^2.3.0"
 
-"@angular/platform-browser@^15.2.8":
-  version "15.2.8"
-  resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-15.2.8.tgz#2400f732a020d59f17b9bf8c6c3f1fb065147328"
-  integrity sha512-8sKFUld54inj0FnQ1ydhFxnDgsbbf43W9FALye/5uEtLgwwE/ZvkNYMaQ7hq1JPuQRMDj3gJkFqaLeFjplpHDA==
+"@angular/platform-browser@^15.2.10":
+  version "15.2.10"
+  resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-15.2.10.tgz#ca5a904b4da9e0cf719414db89514ee4221cb93d"
+  integrity sha512-9tbgVGSJqwfrOzT8aA/kWBLNhJSQ9gUg0CJxwFBSJm8VkBUJrszoBlDsnSvlxx8/W2ejNULKHFTXeUzq0O/+RQ==
   dependencies:
     tslib "^2.3.0"
 
-"@angular/platform-server@^15.2.8":
-  version "15.2.8"
-  resolved "https://registry.yarnpkg.com/@angular/platform-server/-/platform-server-15.2.8.tgz#b850cd70baabd986e0d94f27bff1dc44f958f3af"
-  integrity sha512-YfPAoK2zp3mTO6ubDe0C9Vzg9Vi4BxXkxHCPG0k8IM3Ivjedkv5PZ+vC0a+GjV2xR/0YqiVE3FCwXk4X6m6LuQ==
+"@angular/platform-server@^15.2.10":
+  version "15.2.10"
+  resolved "https://registry.yarnpkg.com/@angular/platform-server/-/platform-server-15.2.10.tgz#521bcbd39a58fa5bb9649754cfceb99fe0d06f1b"
+  integrity sha512-fniyZJI59CFQaVeKnDvXZg/TW6EltzXO0WnozSG58ZNehJQF5g3ZjmPYsnmzb5VYNRXgve2itudNXmd6NeOoYg==
   dependencies:
     domino "^2.1.2"
     tslib "^2.3.0"
     xhr2 "^0.2.0"
 
-"@angular/router@^15.2.8":
-  version "15.2.8"
-  resolved "https://registry.yarnpkg.com/@angular/router/-/router-15.2.8.tgz#99ebf83d34dae3ebe61097b43aded3743b49c5db"
-  integrity sha512-C62QBEeJSBTNTrQHZiklPrxwJwuENoZzWX22MMJ7dxl+7VjRgnmj8J7mcX9fLjHlL+mC3RvesMlX7sGZRQV1cg==
+"@angular/router@^15.2.10":
+  version "15.2.10"
+  resolved "https://registry.yarnpkg.com/@angular/router/-/router-15.2.10.tgz#a5d32d769b930e905582ed6c7aa8122e63655738"
+  integrity sha512-LmuqEg0iIXSw7bli6HKJ19cbxP91v37GtRwbGKswyLihqzTgvjBYpvcfMnB5FRQ5LWkTwq5JclkX03dZw290Yg==
   dependencies:
     tslib "^2.3.0"
 
@@ -451,13 +376,21 @@
   resolved "https://registry.npmjs.org/@assemblyscript/loader/-/loader-0.10.1.tgz"
   integrity sha512-H71nDOOL8Y7kWRLqf6Sums+01Q5msqBW2KhDUTemh1tvY04eSkSXrK0uj/4mmY0Xr16/3zyZmsrxN7CKuRbNRg==
 
-"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.18.6", "@babel/code-frame@^7.21.4":
+"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.18.6":
   version "7.21.4"
   resolved "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.21.4.tgz"
   integrity sha512-LYvhNKfwWSPpocw8GI7gpK2nq3HSDuEPC/uSYaALSJu9xjsalaaYFOq0Pwt5KmVqwEbZlDu81aLXwBOmD/Fv9g==
   dependencies:
     "@babel/highlight" "^7.18.6"
 
+"@babel/code-frame@^7.22.13":
+  version "7.22.13"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.22.13.tgz#e3c1c099402598483b7a8c46a721d1038803755e"
+  integrity sha512-XktuhWlJ5g+3TJXc5upd9Ks1HutSArik6jf2eAjYFyIOf4ej3RN+184cZbzDvbPnuTJIUhPKKJE3cIsYTiAT3w==
+  dependencies:
+    "@babel/highlight" "^7.22.13"
+    chalk "^2.4.2"
+
 "@babel/compat-data@^7.17.7", "@babel/compat-data@^7.20.1", "@babel/compat-data@^7.20.5", "@babel/compat-data@^7.21.4":
   version "7.21.4"
   resolved "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.21.4.tgz"
@@ -484,7 +417,7 @@
     json5 "^2.2.1"
     semver "^6.3.0"
 
-"@babel/core@7.20.12":
+"@babel/core@7.20.12", "@babel/core@^7.12.3":
   version "7.20.12"
   resolved "https://registry.npmjs.org/@babel/core/-/core-7.20.12.tgz"
   integrity sha512-XsMfHovsUYHFMdrIHkZphTN/2Hzzi78R08NuHfDBehym2VsPDL6Zn/JAD/JQdnRvbSsbQc4mVaU1m6JgtTEElg==
@@ -505,28 +438,16 @@
     json5 "^2.2.2"
     semver "^6.3.0"
 
-"@babel/core@^7.12.3":
-  version "7.18.9"
-  resolved "https://registry.npmjs.org/@babel/core/-/core-7.18.9.tgz"
-  integrity sha512-1LIb1eL8APMy91/IMW+31ckrfBM4yCoLaVzoDhZUKSM4cu1L1nIidyxkCgzPAgrC5WEz36IPEr/eSeSF9pIn+g==
+"@babel/eslint-parser@^7.23.10":
+  version "7.25.8"
+  resolved "https://registry.yarnpkg.com/@babel/eslint-parser/-/eslint-parser-7.25.8.tgz#0119dec46be547d7a339978dedb9d29e517c2443"
+  integrity sha512-Po3VLMN7fJtv0nsOjBDSbO1J71UhzShE9MuOSkWEV9IZQXzhZklYtzKZ8ZD/Ij3a0JBv1AG3Ny2L3jvAHQVOGg==
   dependencies:
-    "@ampproject/remapping" "^2.1.0"
-    "@babel/code-frame" "^7.18.6"
-    "@babel/generator" "^7.18.9"
-    "@babel/helper-compilation-targets" "^7.18.9"
-    "@babel/helper-module-transforms" "^7.18.9"
-    "@babel/helpers" "^7.18.9"
-    "@babel/parser" "^7.18.9"
-    "@babel/template" "^7.18.6"
-    "@babel/traverse" "^7.18.9"
-    "@babel/types" "^7.18.9"
-    convert-source-map "^1.7.0"
-    debug "^4.1.0"
-    gensync "^1.0.0-beta.2"
-    json5 "^2.2.1"
-    semver "^6.3.0"
+    "@nicolo-ribaudo/eslint-scope-5-internals" "5.1.1-v1"
+    eslint-visitor-keys "^2.1.0"
+    semver "^6.3.1"
 
-"@babel/generator@7.20.14", "@babel/generator@^7.20.7":
+"@babel/generator@7.20.14":
   version "7.20.14"
   resolved "https://registry.npmjs.org/@babel/generator/-/generator-7.20.14.tgz"
   integrity sha512-AEmuXHdcD3A52HHXxaTmYlb8q/xMEhoRP67B3T4Oq7lbmSoqroMZzjnGj3+i1io3pdnF8iBYVu4Ilj+c4hBxYg==
@@ -535,12 +456,12 @@
     "@jridgewell/gen-mapping" "^0.3.2"
     jsesc "^2.5.1"
 
-"@babel/generator@^7.18.9", "@babel/generator@^7.19.3", "@babel/generator@^7.21.4":
-  version "7.21.4"
-  resolved "https://registry.npmjs.org/@babel/generator/-/generator-7.21.4.tgz"
-  integrity sha512-NieM3pVIYW2SwGzKoqfPrQsf4xGs9M9AIG3ThppsSRmO+m7eQhmI6amajKMUeIO37wFfsvnvcxQFx6x6iqxDnA==
+"@babel/generator@^7.19.3", "@babel/generator@^7.20.7", "@babel/generator@^7.23.0":
+  version "7.23.0"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.23.0.tgz#df5c386e2218be505b34837acbcb874d7a983420"
+  integrity sha512-lN85QRR+5IbYrMWM6Y4pE/noaQtg4pNiqeNGX60eqOfo6gtEj6uw/JagelB8vVztSd7R6M5n1+PQkDbHbBRU4g==
   dependencies:
-    "@babel/types" "^7.21.4"
+    "@babel/types" "^7.23.0"
     "@jridgewell/gen-mapping" "^0.3.2"
     "@jridgewell/trace-mapping" "^0.3.17"
     jsesc "^2.5.1"
@@ -610,6 +531,11 @@
   resolved "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz"
   integrity sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg==
 
+"@babel/helper-environment-visitor@^7.22.20":
+  version "7.22.20"
+  resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz#96159db61d34a29dba454c959f5ae4a649ba9167"
+  integrity sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==
+
 "@babel/helper-explode-assignable-expression@^7.18.6":
   version "7.18.6"
   resolved "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.18.6.tgz"
@@ -625,6 +551,14 @@
     "@babel/template" "^7.20.7"
     "@babel/types" "^7.21.0"
 
+"@babel/helper-function-name@^7.23.0":
+  version "7.23.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz#1f9a3cdbd5b2698a670c30d2735f9af95ed52759"
+  integrity sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==
+  dependencies:
+    "@babel/template" "^7.22.15"
+    "@babel/types" "^7.23.0"
+
 "@babel/helper-hoist-variables@^7.18.6":
   version "7.18.6"
   resolved "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz"
@@ -632,6 +566,13 @@
   dependencies:
     "@babel/types" "^7.18.6"
 
+"@babel/helper-hoist-variables@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz#c01a007dac05c085914e8fb652b339db50d823bb"
+  integrity sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==
+  dependencies:
+    "@babel/types" "^7.22.5"
+
 "@babel/helper-member-expression-to-functions@^7.20.7", "@babel/helper-member-expression-to-functions@^7.21.0":
   version "7.21.0"
   resolved "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.21.0.tgz"
@@ -646,7 +587,7 @@
   dependencies:
     "@babel/types" "^7.21.4"
 
-"@babel/helper-module-transforms@^7.18.6", "@babel/helper-module-transforms@^7.18.9", "@babel/helper-module-transforms@^7.19.0", "@babel/helper-module-transforms@^7.20.11", "@babel/helper-module-transforms@^7.21.2":
+"@babel/helper-module-transforms@^7.18.6", "@babel/helper-module-transforms@^7.19.0", "@babel/helper-module-transforms@^7.20.11", "@babel/helper-module-transforms@^7.21.2":
   version "7.21.2"
   resolved "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.21.2.tgz"
   integrity sha512-79yj2AR4U/Oqq/WOV7Lx6hUjau1Zfo4cI+JLAVYeMV5XIlbOhmjEk5ulbTc9fMpmlojzZHkUUxAiK+UKn+hNQQ==
@@ -708,23 +649,40 @@
   dependencies:
     "@babel/types" "^7.20.0"
 
-"@babel/helper-split-export-declaration@7.18.6", "@babel/helper-split-export-declaration@^7.18.6":
+"@babel/helper-split-export-declaration@7.18.6":
   version "7.18.6"
   resolved "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz"
   integrity sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA==
   dependencies:
     "@babel/types" "^7.18.6"
 
+"@babel/helper-split-export-declaration@^7.18.6", "@babel/helper-split-export-declaration@^7.22.6":
+  version "7.22.6"
+  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz#322c61b7310c0997fe4c323955667f18fcefb91c"
+  integrity sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==
+  dependencies:
+    "@babel/types" "^7.22.5"
+
 "@babel/helper-string-parser@^7.19.4":
   version "7.19.4"
   resolved "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.19.4.tgz"
   integrity sha512-nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw==
 
+"@babel/helper-string-parser@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz#533f36457a25814cf1df6488523ad547d784a99f"
+  integrity sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw==
+
 "@babel/helper-validator-identifier@^7.18.6", "@babel/helper-validator-identifier@^7.19.1":
   version "7.19.1"
   resolved "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz"
   integrity sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w==
 
+"@babel/helper-validator-identifier@^7.22.20":
+  version "7.22.20"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz#c4ae002c61d2879e724581d96665583dbc1dc0e0"
+  integrity sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==
+
 "@babel/helper-validator-option@^7.18.6", "@babel/helper-validator-option@^7.21.0":
   version "7.21.0"
   resolved "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.21.0.tgz"
@@ -740,7 +698,7 @@
     "@babel/traverse" "^7.20.5"
     "@babel/types" "^7.20.5"
 
-"@babel/helpers@^7.18.9", "@babel/helpers@^7.19.0", "@babel/helpers@^7.20.7":
+"@babel/helpers@^7.19.0", "@babel/helpers@^7.20.7":
   version "7.21.0"
   resolved "https://registry.npmjs.org/@babel/helpers/-/helpers-7.21.0.tgz"
   integrity sha512-XXve0CBtOW0pd7MRzzmoyuSj0e3SEzj8pgyFxnTT1NJZL38BD1MK7yYrm8yefRPIDvNNe14xR4FdbHwpInD4rA==
@@ -758,11 +716,25 @@
     chalk "^2.0.0"
     js-tokens "^4.0.0"
 
-"@babel/parser@^7.10.3", "@babel/parser@^7.14.7", "@babel/parser@^7.18.9", "@babel/parser@^7.19.3", "@babel/parser@^7.20.7", "@babel/parser@^7.21.4":
+"@babel/highlight@^7.22.13":
+  version "7.22.20"
+  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.22.20.tgz#4ca92b71d80554b01427815e06f2df965b9c1f54"
+  integrity sha512-dkdMCN3py0+ksCgYmGG8jKeGA/8Tk+gJwSYYlFGxG5lmhfKNoAy004YpLxpS1W2J8m/EK2Ew+yOs9pVRwO89mg==
+  dependencies:
+    "@babel/helper-validator-identifier" "^7.22.20"
+    chalk "^2.4.2"
+    js-tokens "^4.0.0"
+
+"@babel/parser@^7.14.7", "@babel/parser@^7.19.3", "@babel/parser@^7.20.7":
   version "7.21.4"
   resolved "https://registry.npmjs.org/@babel/parser/-/parser-7.21.4.tgz"
   integrity sha512-alVJj7k7zIxqBZ7BTRhz0IqJFxW1VJbm6N8JbcYhQ186df9ZBPbZBmWSqAMXwHGsCJdYks7z/voa3ibiS5bCIw==
 
+"@babel/parser@^7.22.15", "@babel/parser@^7.23.0":
+  version "7.23.0"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.23.0.tgz#da950e622420bf96ca0d0f2909cdddac3acd8719"
+  integrity sha512-vvPKKdMemU85V9WE/l5wZEmImpCtLqbnTvqDS2U1fJ96KrxoW7KrXhNsNCblQlg8Ck4b85yxdTyelsMUgFUXiw==
+
 "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.18.6":
   version "7.18.6"
   resolved "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6.tgz"
@@ -1380,21 +1352,12 @@
   dependencies:
     regenerator-runtime "^0.13.11"
 
-"@babel/runtime@7.21.0":
-  version "7.21.0"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.21.0.tgz#5b55c9d394e5fcf304909a8b00c07dc217b56673"
-  integrity sha512-xwII0//EObnq89Ji5AKYQaRYiW/nZ3llSv29d49IuxPhKbtJoLP+9QUUZ4nVragQVtaVGeZrpB+ZtG/Pdy/POw==
-  dependencies:
-    regenerator-runtime "^0.13.11"
+"@babel/runtime@7.27.1", "@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.12.0", "@babel/runtime@^7.14.5", "@babel/runtime@^7.15.4", "@babel/runtime@^7.21.0", "@babel/runtime@^7.3.1", "@babel/runtime@^7.4.4", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.3", "@babel/runtime@^7.8.3", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2":
+  version "7.27.1"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.27.1.tgz#9fce313d12c9a77507f264de74626e87fd0dc541"
+  integrity sha512-1x3D2xEk2fRo3PAhwQwu5UubzgiVWSXTBfWpVd2Mx2AzRqJuDJCsgaDVZ7HB5iGzDW1Hl1sWN2mFyKjmR9uAog==
 
-"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.12.0", "@babel/runtime@^7.14.5", "@babel/runtime@^7.15.4", "@babel/runtime@^7.3.1", "@babel/runtime@^7.4.4", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.3", "@babel/runtime@^7.8.3", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2":
-  version "7.17.2"
-  resolved "https://registry.npmjs.org/@babel/runtime/-/runtime-7.17.2.tgz"
-  integrity sha512-hzeyJyMA1YGdJTuWU0e/j4wKXrU4OMFvY2MSlaI9B7VQb0r5cxTE3EAIS2Q7Tn2RIcDkRvTA/v2JsAEhxe99uw==
-  dependencies:
-    regenerator-runtime "^0.13.4"
-
-"@babel/template@7.20.7", "@babel/template@^7.18.10", "@babel/template@^7.18.6", "@babel/template@^7.20.7":
+"@babel/template@7.20.7":
   version "7.20.7"
   resolved "https://registry.npmjs.org/@babel/template/-/template-7.20.7.tgz"
   integrity sha512-8SegXApWe6VoNw0r9JHpSteLKTpTiLZ4rMlGIm9JQ18KiCtyQiAMEazujAHrUS5flrcqYZa75ukev3P6QmUwUw==
@@ -1403,23 +1366,32 @@
     "@babel/parser" "^7.20.7"
     "@babel/types" "^7.20.7"
 
-"@babel/traverse@^7.10.3", "@babel/traverse@^7.18.9", "@babel/traverse@^7.19.3", "@babel/traverse@^7.20.12", "@babel/traverse@^7.20.5", "@babel/traverse@^7.20.7", "@babel/traverse@^7.21.0", "@babel/traverse@^7.21.2":
-  version "7.21.4"
-  resolved "https://registry.npmjs.org/@babel/traverse/-/traverse-7.21.4.tgz"
-  integrity sha512-eyKrRHKdyZxqDm+fV1iqL9UAHMoIg0nDaGqfIOd8rKH17m5snv7Gn4qgjBoFfLz9APvjFU/ICT00NVCv1Epp8Q==
+"@babel/template@^7.18.10", "@babel/template@^7.20.7", "@babel/template@^7.22.15":
+  version "7.22.15"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.22.15.tgz#09576efc3830f0430f4548ef971dde1350ef2f38"
+  integrity sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==
   dependencies:
-    "@babel/code-frame" "^7.21.4"
-    "@babel/generator" "^7.21.4"
-    "@babel/helper-environment-visitor" "^7.18.9"
-    "@babel/helper-function-name" "^7.21.0"
-    "@babel/helper-hoist-variables" "^7.18.6"
-    "@babel/helper-split-export-declaration" "^7.18.6"
-    "@babel/parser" "^7.21.4"
-    "@babel/types" "^7.21.4"
+    "@babel/code-frame" "^7.22.13"
+    "@babel/parser" "^7.22.15"
+    "@babel/types" "^7.22.15"
+
+"@babel/traverse@^7.19.3", "@babel/traverse@^7.20.12", "@babel/traverse@^7.20.5", "@babel/traverse@^7.20.7", "@babel/traverse@^7.21.0", "@babel/traverse@^7.21.2":
+  version "7.23.2"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.23.2.tgz#329c7a06735e144a506bdb2cad0268b7f46f4ad8"
+  integrity sha512-azpe59SQ48qG6nu2CzcMLbxUudtN+dOM9kDbUqGq3HXUJRlo7i8fvPoxQUzYgLZ4cMVmuZgm8vvBpNeRhd6XSw==
+  dependencies:
+    "@babel/code-frame" "^7.22.13"
+    "@babel/generator" "^7.23.0"
+    "@babel/helper-environment-visitor" "^7.22.20"
+    "@babel/helper-function-name" "^7.23.0"
+    "@babel/helper-hoist-variables" "^7.22.5"
+    "@babel/helper-split-export-declaration" "^7.22.6"
+    "@babel/parser" "^7.23.0"
+    "@babel/types" "^7.23.0"
     debug "^4.1.0"
     globals "^11.1.0"
 
-"@babel/types@^7.10.3", "@babel/types@^7.18.6", "@babel/types@^7.18.9", "@babel/types@^7.19.3", "@babel/types@^7.20.0", "@babel/types@^7.20.2", "@babel/types@^7.20.5", "@babel/types@^7.20.7", "@babel/types@^7.21.0", "@babel/types@^7.21.2", "@babel/types@^7.21.4", "@babel/types@^7.4.4":
+"@babel/types@^7.18.6", "@babel/types@^7.18.9", "@babel/types@^7.19.3", "@babel/types@^7.20.0", "@babel/types@^7.20.2", "@babel/types@^7.20.5", "@babel/types@^7.20.7", "@babel/types@^7.21.0", "@babel/types@^7.21.2", "@babel/types@^7.21.4", "@babel/types@^7.4.4":
   version "7.21.4"
   resolved "https://registry.npmjs.org/@babel/types/-/types-7.21.4.tgz"
   integrity sha512-rU2oY501qDxE8Pyo7i/Orqma4ziCOrby0/9mvbDUGEfvZjb279Nk9k19e2fiCxHbRRpY2ZyrgW1eq22mvmOIzA==
@@ -1428,6 +1400,15 @@
     "@babel/helper-validator-identifier" "^7.19.1"
     to-fast-properties "^2.0.0"
 
+"@babel/types@^7.22.15", "@babel/types@^7.22.5", "@babel/types@^7.23.0":
+  version "7.23.0"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.23.0.tgz#8c1f020c9df0e737e4e247c0619f58c68458aaeb"
+  integrity sha512-0oIyUfKoI3mSqMvsxBdclDwxXKXAUA8v/apZbc+iSyARYou1o8ZGDxbUYyLFoW2arqS2jDGqJuZvv1d/io1axg==
+  dependencies:
+    "@babel/helper-string-parser" "^7.22.5"
+    "@babel/helper-validator-identifier" "^7.22.20"
+    to-fast-properties "^2.0.0"
+
 "@colors/colors@1.5.0":
   version "1.5.0"
   resolved "https://registry.npmjs.org/@colors/colors/-/colors-1.5.0.tgz"
@@ -1551,10 +1532,10 @@
   resolved "https://registry.npmjs.org/@csstools/selector-specificity/-/selector-specificity-2.2.0.tgz"
   integrity sha512-+OJ9konv95ClSTOJCmMZqpd5+YGsB2S+x6w3E1oaM8UuR5j8nTNHYSz8c9BEPGDOCMQYIEEGlVPj/VY64iTbGw==
 
-"@cypress/request@^2.88.10":
-  version "2.88.11"
-  resolved "https://registry.npmjs.org/@cypress/request/-/request-2.88.11.tgz"
-  integrity sha512-M83/wfQ1EkspjkE2lNWNV5ui2Cv7UCv1swW1DqljahbzLVWltcsexQh8jYtuS/vzFXP+HySntGM83ZXA9fn17w==
+"@cypress/request@^3.0.6":
+  version "3.0.7"
+  resolved "https://registry.yarnpkg.com/@cypress/request/-/request-3.0.7.tgz#6a74a4da98d9e5ae9121d6e2d9c14780c9b5cf1a"
+  integrity sha512-LzxlLEMbBOPYB85uXrDqvD4MgcenjRBLIns3zyhx7vTPj/0u2eQhzXvPiGcaJrV38Q9dbkExWp6cOHPJ+EtFYg==
   dependencies:
     aws-sign2 "~0.7.0"
     aws4 "^1.8.0"
@@ -1562,16 +1543,16 @@
     combined-stream "~1.0.6"
     extend "~3.0.2"
     forever-agent "~0.6.1"
-    form-data "~2.3.2"
-    http-signature "~1.3.6"
+    form-data "~4.0.0"
+    http-signature "~1.4.0"
     is-typedarray "~1.0.0"
     isstream "~0.1.2"
     json-stringify-safe "~5.0.1"
     mime-types "~2.1.19"
     performance-now "^2.1.0"
-    qs "~6.10.3"
+    qs "6.13.1"
     safe-buffer "^5.1.2"
-    tough-cookie "~2.5.0"
+    tough-cookie "^5.0.0"
     tunnel-agent "^0.6.0"
     uuid "^8.3.2"
 
@@ -1610,14 +1591,14 @@
   resolved "https://registry.npmjs.org/@emotion/hash/-/hash-0.8.0.tgz"
   integrity sha512-kBJtf7PH6aWwZ6fka3zQ0p6SBYzx4fl1LoZXE2RrnYST9Xljm7WfKJrU4g/Xr3Beg72MLrp1AWNUmuYJTL7Cow==
 
-"@es-joy/jsdoccomment@~0.36.1":
-  version "0.36.1"
-  resolved "https://registry.npmjs.org/@es-joy/jsdoccomment/-/jsdoccomment-0.36.1.tgz"
-  integrity sha512-922xqFsTpHs6D0BUiG4toiyPOMc8/jafnWKxz1KWgS4XzKPy2qXf1Pe6UFuNSCQqt6tOuhAWXBNuuyUhJmw9Vg==
+"@es-joy/jsdoccomment@~0.39.4":
+  version "0.39.4"
+  resolved "https://registry.yarnpkg.com/@es-joy/jsdoccomment/-/jsdoccomment-0.39.4.tgz#6b8a62e9b3077027837728818d3c4389a898b392"
+  integrity sha512-Jvw915fjqQct445+yron7Dufix9A+m9j1fCJYlCo1FWlRvTxa3pjJelxdSTdaLWcTwRU6vbL+NYjO4YuNIS5Qg==
   dependencies:
     comment-parser "1.3.1"
-    esquery "^1.4.0"
-    jsdoc-type-pratt-parser "~3.1.0"
+    esquery "^1.5.0"
+    jsdoc-type-pratt-parser "~4.0.0"
 
 "@esbuild/android-arm64@0.17.8":
   version "0.17.8"
@@ -1729,12 +1710,12 @@
   resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.17.8.tgz#200a0965cf654ac28b971358ecdca9cc5b44c335"
   integrity sha512-1iuezdyDNngPnz8rLRDO2C/ZZ/emJLb72OsZeqQ6gL6Avko/XCXZw+NuxBSNhBAP13Hie418V7VMt9et1FMvpg==
 
-"@eslint-community/eslint-utils@^4.2.0":
-  version "4.4.0"
-  resolved "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz"
-  integrity sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==
+"@eslint-community/eslint-utils@^4.2.0", "@eslint-community/eslint-utils@^4.5.1":
+  version "4.5.1"
+  resolved "https://registry.yarnpkg.com/@eslint-community/eslint-utils/-/eslint-utils-4.5.1.tgz#b0fc7e06d0c94f801537fd4237edc2706d3b8e4c"
+  integrity sha512-soEIOALTfTK6EjmKMMoLugwaP0rzkad90iIWd1hMO9ARkSAyjfMfkRRhLvD5qH7vvM0Cg72pieUfR6yh6XxC4w==
   dependencies:
-    eslint-visitor-keys "^3.3.0"
+    eslint-visitor-keys "^3.4.3"
 
 "@eslint-community/regexpp@^4.4.0":
   version "4.5.0"
@@ -1761,10 +1742,15 @@
   resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.39.0.tgz#58b536bcc843f4cd1e02a7e6171da5c040f4d44b"
   integrity sha512-kf9RB0Fg7NZfap83B3QOqOGg9QmD9yBudqQXzzOtn3i4y7ZUXe5ONeW34Gwi+TxhH4mvj72R1Zc300KUMa9Bng==
 
-"@fortawesome/fontawesome-free@^6.4.0":
-  version "6.4.0"
-  resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-6.4.0.tgz#1ee0c174e472c84b23cb46c995154dc383e3b4fe"
-  integrity sha512-0NyytTlPJwB/BF5LtRV8rrABDbe3TdTXqNB3PdZ+UUUZAEIrdOJdmABqKjt4AXwIoJNaRVVZEXxpNrqvE1GAYQ==
+"@fastify/deepmerge@^1.0.0":
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/@fastify/deepmerge/-/deepmerge-1.3.0.tgz#8116858108f0c7d9fd460d05a7d637a13fe3239a"
+  integrity sha512-J8TOSBq3SoZbDhM9+R/u77hP93gz/rajSA+K2kGyijPpORPWUXHUpTaleoj+92As0S9uPRP7Oi8IqMf0u+ro6A==
+
+"@fortawesome/fontawesome-free@^6.7.2":
+  version "6.7.2"
+  resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-6.7.2.tgz#8249de9b7e22fcb3ceb5e66090c30a1d5492b81a"
+  integrity sha512-JUOtgFW6k9u4Y+xeIaEiLr3+cjoUPiAuLXoyKOJSia6Duzb7pq+A76P9ZdPDoAoxHdHzq6gE9/jKBGXlZT8FbA==
 
 "@gar/promisify@^1.0.1", "@gar/promisify@^1.1.3":
   version "1.1.3"
@@ -1851,7 +1837,7 @@
   resolved "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz"
   integrity sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==
 
-"@jridgewell/sourcemap-codec@^1.4.10", "@jridgewell/sourcemap-codec@^1.4.13", "@jridgewell/sourcemap-codec@^1.4.14":
+"@jridgewell/sourcemap-codec@^1.4.10", "@jridgewell/sourcemap-codec@^1.4.13", "@jridgewell/sourcemap-codec@^1.4.14", "@jridgewell/sourcemap-codec@^1.4.15":
   version "1.4.15"
   resolved "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz"
   integrity sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==
@@ -1876,7 +1862,7 @@
   resolved "https://registry.npmjs.org/@leichtgewicht/ip-codec/-/ip-codec-2.0.4.tgz"
   integrity sha512-Hcv+nVC0kZnQ3tD9GVu5xSMR4VVYOteQIr/hwFPVEvPdlXqgGEuRjiheChHgdM+JyqdgNcmzZOX/tnl0JOiI7A==
 
-"@material-ui/core@^4.11.0":
+"@material-ui/core@^4.12.3", "@material-ui/core@^4.12.4":
   version "4.12.4"
   resolved "https://registry.npmjs.org/@material-ui/core/-/core-4.12.4.tgz"
   integrity sha512-tr7xekNlM9LjA6pagJmL8QCgZXaubWUwkJnoYcMKd4gw/t4XiyvnTkjdGrUVicyB2BsdaAv1tvow45bPM4sSwQ==
@@ -2007,15 +1993,10 @@
   dependencies:
     tslib "^2.0.0"
 
-"@ngtools/webpack@15.2.5":
-  version "15.2.5"
-  resolved "https://registry.npmjs.org/@ngtools/webpack/-/webpack-15.2.5.tgz"
-  integrity sha512-wD6GY4xghVK+SQL0dy/M3saGx5pqi7+1VHEr+BBI7IUNYGSqPNzylKNxLBgQiTzfkzvbrZ6MhfaMNkhvSCYr5w==
-
-"@ngtools/webpack@15.2.6", "@ngtools/webpack@^15.2.6":
-  version "15.2.6"
-  resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-15.2.6.tgz#9000eafbcb74508ad8300d4f92cc3640f86f0810"
-  integrity sha512-I+kekKItfsCLdX+ZjjmsWqd0AyoYGTQPjlbQAiPtmdH73/rfPOF4Q/3AU4tzTdn0n0GXqZWv6VOs91w99ydi0A==
+"@ngtools/webpack@15.2.11", "@ngtools/webpack@^15.2.6":
+  version "15.2.11"
+  resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-15.2.11.tgz#c30f7af978bc512b874624ce0f7be5d22ae39e6d"
+  integrity sha512-yqp+FziuJ+wIVij4eTqfhuiTPNaG1PU8ukeGOdqkVH4nQMlmzs9UldXy1iYC/6swzn6XO/pkqisU3m/jxemMzA==
 
 "@nguniversal/builders@^15.2.1":
   version "15.2.1"
@@ -2065,6 +2046,13 @@
   dependencies:
     tslib "^2.3.0"
 
+"@nicolo-ribaudo/eslint-scope-5-internals@5.1.1-v1":
+  version "5.1.1-v1"
+  resolved "https://registry.yarnpkg.com/@nicolo-ribaudo/eslint-scope-5-internals/-/eslint-scope-5-internals-5.1.1-v1.tgz#dbf733a965ca47b1973177dc0bb6c889edcfb129"
+  integrity sha512-54/JRvkLIzzDWshCWfuhadfrfZVPiElY8Fcgmg1HroEly/EDSszzhBAsarCux+D/kOslTRquNzuyGSmUSTTHGg==
+  dependencies:
+    eslint-scope "5.1.1"
+
 "@nodelib/fs.scandir@2.1.5":
   version "2.1.5"
   resolved "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz"
@@ -2170,10 +2158,93 @@
     read-package-json-fast "^3.0.0"
     which "^3.0.0"
 
-"@polka/url@^1.0.0-next.20":
-  version "1.0.0-next.21"
-  resolved "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.21.tgz"
-  integrity sha512-a5Sab1C4/icpTZVzZc5Ghpz88yQtGOyNqYXcZgOssB2uuAr+wF/MvN6bgtW32q7HHrvBki+BsZ0OuNv6EV3K9g==
+"@parcel/watcher-android-arm64@2.4.1":
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/@parcel/watcher-android-arm64/-/watcher-android-arm64-2.4.1.tgz#c2c19a3c442313ff007d2d7a9c2c1dd3e1c9ca84"
+  integrity sha512-LOi/WTbbh3aTn2RYddrO8pnapixAziFl6SMxHM69r3tvdSm94JtCenaKgk1GRg5FJ5wpMCpHeW+7yqPlvZv7kg==
+
+"@parcel/watcher-darwin-arm64@2.4.1":
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/@parcel/watcher-darwin-arm64/-/watcher-darwin-arm64-2.4.1.tgz#c817c7a3b4f3a79c1535bfe54a1c2818d9ffdc34"
+  integrity sha512-ln41eihm5YXIY043vBrrHfn94SIBlqOWmoROhsMVTSXGh0QahKGy77tfEywQ7v3NywyxBBkGIfrWRHm0hsKtzA==
+
+"@parcel/watcher-darwin-x64@2.4.1":
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/@parcel/watcher-darwin-x64/-/watcher-darwin-x64-2.4.1.tgz#1a3f69d9323eae4f1c61a5f480a59c478d2cb020"
+  integrity sha512-yrw81BRLjjtHyDu7J61oPuSoeYWR3lDElcPGJyOvIXmor6DEo7/G2u1o7I38cwlcoBHQFULqF6nesIX3tsEXMg==
+
+"@parcel/watcher-freebsd-x64@2.4.1":
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/@parcel/watcher-freebsd-x64/-/watcher-freebsd-x64-2.4.1.tgz#0d67fef1609f90ba6a8a662bc76a55fc93706fc8"
+  integrity sha512-TJa3Pex/gX3CWIx/Co8k+ykNdDCLx+TuZj3f3h7eOjgpdKM+Mnix37RYsYU4LHhiYJz3DK5nFCCra81p6g050w==
+
+"@parcel/watcher-linux-arm-glibc@2.4.1":
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/@parcel/watcher-linux-arm-glibc/-/watcher-linux-arm-glibc-2.4.1.tgz#ce5b340da5829b8e546bd00f752ae5292e1c702d"
+  integrity sha512-4rVYDlsMEYfa537BRXxJ5UF4ddNwnr2/1O4MHM5PjI9cvV2qymvhwZSFgXqbS8YoTk5i/JR0L0JDs69BUn45YA==
+
+"@parcel/watcher-linux-arm64-glibc@2.4.1":
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/@parcel/watcher-linux-arm64-glibc/-/watcher-linux-arm64-glibc-2.4.1.tgz#6d7c00dde6d40608f9554e73998db11b2b1ff7c7"
+  integrity sha512-BJ7mH985OADVLpbrzCLgrJ3TOpiZggE9FMblfO65PlOCdG++xJpKUJ0Aol74ZUIYfb8WsRlUdgrZxKkz3zXWYA==
+
+"@parcel/watcher-linux-arm64-musl@2.4.1":
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/@parcel/watcher-linux-arm64-musl/-/watcher-linux-arm64-musl-2.4.1.tgz#bd39bc71015f08a4a31a47cd89c236b9d6a7f635"
+  integrity sha512-p4Xb7JGq3MLgAfYhslU2SjoV9G0kI0Xry0kuxeG/41UfpjHGOhv7UoUDAz/jb1u2elbhazy4rRBL8PegPJFBhA==
+
+"@parcel/watcher-linux-x64-glibc@2.4.1":
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/@parcel/watcher-linux-x64-glibc/-/watcher-linux-x64-glibc-2.4.1.tgz#0ce29966b082fb6cdd3de44f2f74057eef2c9e39"
+  integrity sha512-s9O3fByZ/2pyYDPoLM6zt92yu6P4E39a03zvO0qCHOTjxmt3GHRMLuRZEWhWLASTMSrrnVNWdVI/+pUElJBBBg==
+
+"@parcel/watcher-linux-x64-musl@2.4.1":
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/@parcel/watcher-linux-x64-musl/-/watcher-linux-x64-musl-2.4.1.tgz#d2ebbf60e407170bb647cd6e447f4f2bab19ad16"
+  integrity sha512-L2nZTYR1myLNST0O632g0Dx9LyMNHrn6TOt76sYxWLdff3cB22/GZX2UPtJnaqQPdCRoszoY5rcOj4oMTtp5fQ==
+
+"@parcel/watcher-win32-arm64@2.4.1":
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/@parcel/watcher-win32-arm64/-/watcher-win32-arm64-2.4.1.tgz#eb4deef37e80f0b5e2f215dd6d7a6d40a85f8adc"
+  integrity sha512-Uq2BPp5GWhrq/lcuItCHoqxjULU1QYEcyjSO5jqqOK8RNFDBQnenMMx4gAl3v8GiWa59E9+uDM7yZ6LxwUIfRg==
+
+"@parcel/watcher-win32-ia32@2.4.1":
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/@parcel/watcher-win32-ia32/-/watcher-win32-ia32-2.4.1.tgz#94fbd4b497be39fd5c8c71ba05436927842c9df7"
+  integrity sha512-maNRit5QQV2kgHFSYwftmPBxiuK5u4DXjbXx7q6eKjq5dsLXZ4FJiVvlcw35QXzk0KrUecJmuVFbj4uV9oYrcw==
+
+"@parcel/watcher-win32-x64@2.4.1":
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/@parcel/watcher-win32-x64/-/watcher-win32-x64-2.4.1.tgz#4bf920912f67cae5f2d264f58df81abfea68dadf"
+  integrity sha512-+DvS92F9ezicfswqrvIRM2njcYJbd5mb9CUgtrHCHmvn7pPPa+nMDRu1o1bYYz/l5IB2NVGNJWiH7h1E58IF2A==
+
+"@parcel/watcher@^2.4.1":
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/@parcel/watcher/-/watcher-2.4.1.tgz#a50275151a1bb110879c6123589dba90c19f1bf8"
+  integrity sha512-HNjmfLQEVRZmHRET336f20H/8kOozUGwk7yajvsonjNxbj2wBTK1WsQuHkD5yYh9RxFGL2EyDHryOihOwUoKDA==
+  dependencies:
+    detect-libc "^1.0.3"
+    is-glob "^4.0.3"
+    micromatch "^4.0.5"
+    node-addon-api "^7.0.0"
+  optionalDependencies:
+    "@parcel/watcher-android-arm64" "2.4.1"
+    "@parcel/watcher-darwin-arm64" "2.4.1"
+    "@parcel/watcher-darwin-x64" "2.4.1"
+    "@parcel/watcher-freebsd-x64" "2.4.1"
+    "@parcel/watcher-linux-arm-glibc" "2.4.1"
+    "@parcel/watcher-linux-arm64-glibc" "2.4.1"
+    "@parcel/watcher-linux-arm64-musl" "2.4.1"
+    "@parcel/watcher-linux-x64-glibc" "2.4.1"
+    "@parcel/watcher-linux-x64-musl" "2.4.1"
+    "@parcel/watcher-win32-arm64" "2.4.1"
+    "@parcel/watcher-win32-ia32" "2.4.1"
+    "@parcel/watcher-win32-x64" "2.4.1"
+
+"@pkgr/core@^0.2.4":
+  version "0.2.4"
+  resolved "https://registry.yarnpkg.com/@pkgr/core/-/core-0.2.4.tgz#d897170a2b0ba51f78a099edccd968f7b103387c"
+  integrity sha512-ROFF39F6ZrnzSUEmQQZUar0Jt4xVoP9WnDRdWwF4NNcXs3xBTLgBUDoOwW141y1jP+S8nahIbdxbFC7IShw9Iw==
 
 "@react-dnd/asap@^4.0.0":
   version "4.0.1"
@@ -2239,13 +2310,18 @@
   resolved "https://registry.npmjs.org/@researchgate/react-intersection-observer/-/react-intersection-observer-1.3.5.tgz"
   integrity sha512-aYlsex5Dd6BAHMJvJrUoFp8gzgMSL27xFvrxkVYW0bV1RMAapVsO+QeYLtTaSF/QCflktODodvv+wJm49oMnnQ==
 
-"@schematics/angular@15.2.6":
-  version "15.2.6"
-  resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-15.2.6.tgz#5a0face51806f6b2adf67eef73b08c31744b07bc"
-  integrity sha512-OcBUvVAxZEMBX+fi0ytybeAdmStra+GwtlvipS70yOxcAgJ84ZrnZGN7a072cCVQcq7AgqUfssnyqCx1wu+yCg==
+"@rtsao/scc@^1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@rtsao/scc/-/scc-1.1.0.tgz#927dd2fae9bc3361403ac2c7a00c32ddce9ad7e8"
+  integrity sha512-zt6OdqaDoOnJ1ZYsCYGt9YmWzDXl4vQdKTyJev62gFhRGKdx7mcT54V9KIjg+d2wi9EXsPvAPKe7i7WjfVWB8g==
+
+"@schematics/angular@16.2.16":
+  version "16.2.16"
+  resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-16.2.16.tgz#3f077f398fc7ff88654fd477790af8270585c3af"
+  integrity sha512-V4cE4R5MbusKaNW9DWsisiSRUoQzbAaBIeJh42yCkg5H/lUdf18hUB7DG6Pl7yH6/tjzzz4SqIVD7N64uCDC2A==
   dependencies:
-    "@angular-devkit/core" "15.2.6"
-    "@angular-devkit/schematics" "15.2.6"
+    "@angular-devkit/core" "16.2.16"
+    "@angular-devkit/schematics" "16.2.16"
     jsonc-parser "3.2.0"
 
 "@schematics/angular@^12.2.17":
@@ -2257,10 +2333,34 @@
     "@angular-devkit/schematics" "12.2.18"
     jsonc-parser "3.0.0"
 
-"@sigstore/protobuf-specs@^0.1.0":
-  version "0.1.0"
-  resolved "https://registry.npmjs.org/@sigstore/protobuf-specs/-/protobuf-specs-0.1.0.tgz"
-  integrity sha512-a31EnjuIDSX8IXBUib3cYLDRlPMU36AWX4xS8ysLaNu4ZzUesDiPt83pgrW2X1YLMe5L2HbDyaKK5BrL4cNKaQ==
+"@sigstore/bundle@^1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@sigstore/bundle/-/bundle-1.1.0.tgz#17f8d813b09348b16eeed66a8cf1c3d6bd3d04f1"
+  integrity sha512-PFutXEy0SmQxYI4texPw3dd2KewuNqv7OuK1ZFtY2fM754yhvG2KdgwIhRnoEE2uHdtdGNQ8s0lb94dW9sELog==
+  dependencies:
+    "@sigstore/protobuf-specs" "^0.2.0"
+
+"@sigstore/protobuf-specs@^0.2.0":
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/@sigstore/protobuf-specs/-/protobuf-specs-0.2.1.tgz#be9ef4f3c38052c43bd399d3f792c97ff9e2277b"
+  integrity sha512-XTWVxnWJu+c1oCshMLwnKvz8ZQJJDVOlciMfgpJBQbThVjKTCG8dwyhgLngBD2KN0ap9F/gOV8rFDEx8uh7R2A==
+
+"@sigstore/sign@^1.0.0":
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/@sigstore/sign/-/sign-1.0.0.tgz#6b08ebc2f6c92aa5acb07a49784cb6738796f7b4"
+  integrity sha512-INxFVNQteLtcfGmcoldzV6Je0sbbfh9I16DM4yJPw3j5+TFP8X6uIiA18mvpEa9yyeycAKgPmOA3X9hVdVTPUA==
+  dependencies:
+    "@sigstore/bundle" "^1.1.0"
+    "@sigstore/protobuf-specs" "^0.2.0"
+    make-fetch-happen "^11.0.1"
+
+"@sigstore/tuf@^1.0.3":
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/@sigstore/tuf/-/tuf-1.0.3.tgz#2a65986772ede996485728f027b0514c0b70b160"
+  integrity sha512-2bRovzs0nJZFlCN3rXirE4gwxCn97JNjMmwpecqlbgV9WcxX7WRuIrgzx/X7Ib7MYRbyUTpBYE0s2x6AmZXnlg==
+  dependencies:
+    "@sigstore/protobuf-specs" "^0.2.0"
+    tuf-js "^1.1.7"
 
 "@socket.io/component-emitter@~3.1.0":
   version "3.1.0"
@@ -2302,13 +2402,13 @@
   resolved "https://registry.npmjs.org/@tufjs/canonical-json/-/canonical-json-1.0.0.tgz"
   integrity sha512-QTnf++uxunWvG2z3UFNzAoQPHxnSXOwtaI3iJ+AohhV+5vONuArPjJE7aPXPVXfXJsqrVbZBu9b81AJoSd09IQ==
 
-"@tufjs/models@1.0.2":
-  version "1.0.2"
-  resolved "https://registry.npmjs.org/@tufjs/models/-/models-1.0.2.tgz"
-  integrity sha512-uxarDtxTIK3f8hJS4yFhW/lvTa3tsiQU5iDCRut+NCnOXvNtEul0Ct58NIIcIx9Rkt7OFEK31Ndpqsd663nsew==
+"@tufjs/models@1.0.4":
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/@tufjs/models/-/models-1.0.4.tgz#5a689630f6b9dbda338d4b208019336562f176ef"
+  integrity sha512-qaGV9ltJP0EO25YfFUPhxRVK0evXFIAGicsVXuRim4Ed9cjPxYhNnNJ49SFmbeLgtxpslIkX317IgpfcHPVj/A==
   dependencies:
     "@tufjs/canonical-json" "1.0.0"
-    minimatch "^8.0.3"
+    minimatch "^9.0.0"
 
 "@types/body-parser@*":
   version "1.19.2"
@@ -2325,11 +2425,6 @@
   dependencies:
     "@types/node" "*"
 
-"@types/circular-json@^0.4.0":
-  version "0.4.0"
-  resolved "https://registry.npmjs.org/@types/circular-json/-/circular-json-0.4.0.tgz"
-  integrity sha512-7+kYB7x5a7nFWW1YPBh3KxhwKfiaI4PbZ1RvzBU91LZy7lWJO822CI+pqzSre/DZ7KsCuMKdHnLHHFu8AyXbQg==
-
 "@types/connect-history-api-fallback@^1.3.5":
   version "1.3.5"
   resolved "https://registry.npmjs.org/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.3.5.tgz"
@@ -2357,15 +2452,15 @@
   dependencies:
     "@types/node" "*"
 
-"@types/deep-freeze@0.1.2":
-  version "0.1.2"
-  resolved "https://registry.npmjs.org/@types/deep-freeze/-/deep-freeze-0.1.2.tgz"
-  integrity sha512-M6x29Vk4681dght4IMnPIcF1SNmeEm0c4uatlTFhp+++H1oDK1THEIzuCC2WeCBVhX+gU0NndsseDS3zaCtlcQ==
+"@types/deep-freeze@0.1.5":
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/@types/deep-freeze/-/deep-freeze-0.1.5.tgz#ae94f37ca134b4e34facb55f52ed90921192f764"
+  integrity sha512-KZtR+jtmgkCpgE0f+We/QEI2Fi0towBV/tTkvHVhMzx+qhUVGXMx7pWvAtDp6vEWIjdKLTKpqbI/sORRCo8TKg==
 
-"@types/ejs@^3.1.2":
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/@types/ejs/-/ejs-3.1.2.tgz#75d277b030bc11b3be38c807e10071f45ebc78d9"
-  integrity sha512-ZmiaE3wglXVWBM9fyVC17aGPkLo/UgaOjEiI2FXQfyczrCefORPxIe+2dVmnmk3zkVIbizjrlQzmPGhSYGXG5g==
+"@types/ejs@^3.1.5":
+  version "3.1.5"
+  resolved "https://registry.yarnpkg.com/@types/ejs/-/ejs-3.1.5.tgz#49d738257cc73bafe45c13cb8ff240683b4d5117"
+  integrity sha512-nv+GSx77ZtXiJzwKdsASqi+YQ5Z7vwHsTP0JY2SiQgjGckkBRKZnk8nIM+7oUZ1VCtuTz0+By4qVR7fqzp/Dfg==
 
 "@types/eslint-scope@^3.7.3":
   version "3.7.4"
@@ -2397,20 +2492,20 @@
     "@types/qs" "*"
     "@types/range-parser" "*"
 
-"@types/express@*", "@types/express@^4.17.13", "@types/express@^4.17.17":
-  version "4.17.17"
-  resolved "https://registry.npmjs.org/@types/express/-/express-4.17.17.tgz"
-  integrity sha512-Q4FmmuLGBG58btUnfS1c1r/NQdlp3DMfGDGig8WhfpA2YRUtEkxAjkZb0yvplJGYdF1fsQ81iMDcH24sSCNC/Q==
+"@types/express@*", "@types/express@^4.17.13", "@types/express@^4.17.21":
+  version "4.17.21"
+  resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.21.tgz#c26d4a151e60efe0084b23dc3369ebc631ed192d"
+  integrity sha512-ejlPM315qwLpaQlQDTjPdsUFSc6ZsP4AN6AlWnogPjQ7CVi7PYF3YVz+CY3jE2pwYf7E/7HlDAN0rV2GxTG0HQ==
   dependencies:
     "@types/body-parser" "*"
     "@types/express-serve-static-core" "^4.17.33"
     "@types/qs" "*"
     "@types/serve-static" "*"
 
-"@types/grecaptcha@^3.0.4":
-  version "3.0.4"
-  resolved "https://registry.npmjs.org/@types/grecaptcha/-/grecaptcha-3.0.4.tgz"
-  integrity sha512-7l1Y8DTGXkx/r4pwU1nMVAR+yD/QC+MCHKXAyEX/7JZhwcN1IED09aZ9vCjjkcGdhSQiu/eJqcXInpl6eEEEwg==
+"@types/grecaptcha@^3.0.9":
+  version "3.0.9"
+  resolved "https://registry.yarnpkg.com/@types/grecaptcha/-/grecaptcha-3.0.9.tgz#9f3b07ec06c8fff221aa6fc124fe5b8a0e2c3349"
+  integrity sha512-fFxMtjAvXXMYTzDFK5NpcVB7WHnrHVLl00QzEGpuFxSAC789io6M+vjcn+g5FTEamIJtJr/IHkCDsqvJxeWDyw==
 
 "@types/hoist-non-react-statics@^3.3.0", "@types/hoist-non-react-statics@^3.3.1":
   version "3.3.1"
@@ -2420,7 +2515,7 @@
     "@types/react" "*"
     hoist-non-react-statics "^3.3.0"
 
-"@types/http-proxy@^1.17.5", "@types/http-proxy@^1.17.8":
+"@types/http-proxy@^1.17.8":
   version "1.17.10"
   resolved "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.10.tgz"
   integrity sha512-Qs5aULi+zV1bwKAg5z1PWnDXWmsn+LxIvUGv6E2+OOMYhclZMO+OXd9pYVf2gLykf2I7IV2u7oTHwChPNsvJ7g==
@@ -2447,20 +2542,20 @@
   resolved "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz"
   integrity sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==
 
-"@types/lodash@^4.14.194":
-  version "4.14.194"
-  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.194.tgz#b71eb6f7a0ff11bff59fc987134a093029258a76"
-  integrity sha512-r22s9tAS7imvBt2lyHC9B8AGwWnXaYb1tY09oyLkXDs4vArpYJzw09nj8MLx5VfciBPGIb+ZwG0ssYnEPJxn/g==
+"@types/lodash@^4.17.16":
+  version "4.17.16"
+  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.17.16.tgz#94ae78fab4a38d73086e962d0b65c30d816bfb0a"
+  integrity sha512-HX7Em5NYQAXKW+1T+FiuG27NGwzJfCX3s1GjOa7ujxZa52kjJLOr4FUxT+giF6Tgxv1e+/czV/iTtBw27WTU9g==
 
 "@types/mime@*":
   version "3.0.1"
   resolved "https://registry.npmjs.org/@types/mime/-/mime-3.0.1.tgz"
   integrity sha512-Y4XFY5VJAuw0FgAqPNd6NNoV44jbq9Bz2L7Rh/J6jLTiHBSBJa9fxqQIvkIld4GsoDOcCbvzOUAbLPsSKKg+uA==
 
-"@types/node@*", "@types/node@>=10.0.0", "@types/node@^14.14.31", "@types/node@^14.14.9":
-  version "14.18.42"
-  resolved "https://registry.npmjs.org/@types/node/-/node-14.18.42.tgz"
-  integrity sha512-xefu+RBie4xWlK8hwAzGh3npDz/4VhF6icY/shU+zv/1fNn+ZVG7T7CRwe9LId9sAYRPxI+59QBPuKL3WpyGRg==
+"@types/node@*", "@types/node@>=10.0.0", "@types/node@^14.18.63":
+  version "14.18.63"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-14.18.63.tgz#1788fa8da838dbb5f9ea994b834278205db6ca2b"
+  integrity sha512-fAtCfv4jJg+ExtXhvCkCqUKZ+4ok/JQk01qDKhL5BDDoS3AxKXhV5/MAVUZyQnSEd2GT92fkgZl0pz0Q0AzcIQ==
 
 "@types/parse-json@^4.0.0":
   version "4.0.0"
@@ -2513,10 +2608,10 @@
   resolved "https://registry.npmjs.org/@types/retry/-/retry-0.12.0.tgz"
   integrity sha512-wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA==
 
-"@types/sanitize-html@^2.9.0":
-  version "2.9.0"
-  resolved "https://registry.yarnpkg.com/@types/sanitize-html/-/sanitize-html-2.9.0.tgz#5b609f7592de22ef80a0930c39670329753dca1b"
-  integrity sha512-4fP/kEcKNj2u39IzrxWYuf/FnCCwwQCpif6wwY6ROUS1EPRIfWJjGkY3HIowY1EX/VbX5e86yq8AAE7UPMgATg==
+"@types/sanitize-html@^2.16.0":
+  version "2.16.0"
+  resolved "https://registry.yarnpkg.com/@types/sanitize-html/-/sanitize-html-2.16.0.tgz#860d72c1ba8a5d044946f37559cc359c0a13b24e"
+  integrity sha512-l6rX1MUXje5ztPT0cAFtUayXF06DqPhRyfVXareEN5gGCFaP/iwsxIyKODr9XDhfxPpN6vXUFNfo5kZMXCxBtw==
   dependencies:
     htmlparser2 "^8.0.0"
 
@@ -2562,15 +2657,10 @@
   dependencies:
     "@types/node" "*"
 
-"@types/stacktrace-js@^0.0.33":
-  version "0.0.33"
-  resolved "https://registry.npmjs.org/@types/stacktrace-js/-/stacktrace-js-0.0.33.tgz"
-  integrity sha512-aqJ6QM9QThNL4dHBhwl1f9B0oDqiREkYLn9RldghUKsGeFWWGlCsqsRWxbh+hDvvmptMFqc4aIfFIGz9BBu8Qg==
-
-"@types/ws@^8.5.1":
-  version "8.5.4"
-  resolved "https://registry.npmjs.org/@types/ws/-/ws-8.5.4.tgz"
-  integrity sha512-zdQDHKUgcX/zBc4GrwsE/7dVdAD8JR4EuiAXiiUhhfyIJXXb2+PrGshFyeXWQPMmmZ2XxgaqclgpIC7eTXc1mg==
+"@types/ws@^8.5.1", "@types/ws@^8.5.5":
+  version "8.5.12"
+  resolved "https://registry.yarnpkg.com/@types/ws/-/ws-8.5.12.tgz#619475fe98f35ccca2a2f6c137702d85ec247b7e"
+  integrity sha512-3tPRkv1EtkDpzlgyKyI8pGsGZAGPEaXeu0DOj5DI25Ja91bdAYddYHbADRYVrZMRbfW+1l5YwXVDKohDJNQxkQ==
   dependencies:
     "@types/node" "*"
 
@@ -2581,30 +2671,30 @@
   dependencies:
     "@types/node" "*"
 
-"@typescript-eslint/eslint-plugin@^5.59.1":
-  version "5.59.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.59.1.tgz#9b09ee1541bff1d2cebdcb87e7ce4a4003acde08"
-  integrity sha512-AVi0uazY5quFB9hlp2Xv+ogpfpk77xzsgsIEWyVS7uK/c7MZ5tw7ZPbapa0SbfkqE0fsAMkz5UwtgMLVk2BQAg==
+"@typescript-eslint/eslint-plugin@^5.62.0":
+  version "5.62.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.62.0.tgz#aeef0328d172b9e37d9bab6dbc13b87ed88977db"
+  integrity sha512-TiZzBSJja/LbhNPvk6yc0JrX9XqhQ0hdh6M2svYfsHGejaKFIAGd9MQ+ERIMzLGlN/kZoYIgdxFV0PuljTKXag==
   dependencies:
     "@eslint-community/regexpp" "^4.4.0"
-    "@typescript-eslint/scope-manager" "5.59.1"
-    "@typescript-eslint/type-utils" "5.59.1"
-    "@typescript-eslint/utils" "5.59.1"
+    "@typescript-eslint/scope-manager" "5.62.0"
+    "@typescript-eslint/type-utils" "5.62.0"
+    "@typescript-eslint/utils" "5.62.0"
     debug "^4.3.4"
-    grapheme-splitter "^1.0.4"
+    graphemer "^1.4.0"
     ignore "^5.2.0"
     natural-compare-lite "^1.4.0"
     semver "^7.3.7"
     tsutils "^3.21.0"
 
-"@typescript-eslint/parser@^5.59.1":
-  version "5.59.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.59.1.tgz#73c2c12127c5c1182d2e5b71a8fa2a85d215cbb4"
-  integrity sha512-nzjFAN8WEu6yPRDizIFyzAfgK7nybPodMNFGNH0M9tei2gYnYszRDqVA0xlnRjkl7Hkx2vYrEdb6fP2a21cG1g==
+"@typescript-eslint/parser@^5.62.0":
+  version "5.62.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.62.0.tgz#1b63d082d849a2fcae8a569248fbe2ee1b8a56c7"
+  integrity sha512-VlJEV0fOQ7BExOsHYAGrgbEiZoi8D+Bl2+f6V2RrXerRSylnp+ZBHmPvaIa8cz0Ajx7WO7Z5RqfgYg7ED1nRhA==
   dependencies:
-    "@typescript-eslint/scope-manager" "5.59.1"
-    "@typescript-eslint/types" "5.59.1"
-    "@typescript-eslint/typescript-estree" "5.59.1"
+    "@typescript-eslint/scope-manager" "5.62.0"
+    "@typescript-eslint/types" "5.62.0"
+    "@typescript-eslint/typescript-estree" "5.62.0"
     debug "^4.3.4"
 
 "@typescript-eslint/scope-manager@5.48.2":
@@ -2615,21 +2705,13 @@
     "@typescript-eslint/types" "5.48.2"
     "@typescript-eslint/visitor-keys" "5.48.2"
 
-"@typescript-eslint/scope-manager@5.58.0":
-  version "5.58.0"
-  resolved "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.58.0.tgz"
-  integrity sha512-b+w8ypN5CFvrXWQb9Ow9T4/6LC2MikNf1viLkYTiTbkQl46CnR69w7lajz1icW0TBsYmlpg+mRzFJ4LEJ8X9NA==
+"@typescript-eslint/scope-manager@5.62.0":
+  version "5.62.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.62.0.tgz#d9457ccc6a0b8d6b37d0eb252a23022478c5460c"
+  integrity sha512-VXuvVvZeQCQb5Zgf4HAxc04q5j+WrNAtNh9OwCsCgpKqESMTu3tF/jhZ3xG6T4NZwWl65Bg8KuS2uEvhSfLl0w==
   dependencies:
-    "@typescript-eslint/types" "5.58.0"
-    "@typescript-eslint/visitor-keys" "5.58.0"
-
-"@typescript-eslint/scope-manager@5.59.1":
-  version "5.59.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.59.1.tgz#8a20222719cebc5198618a5d44113705b51fd7fe"
-  integrity sha512-mau0waO5frJctPuAzcxiNWqJR5Z8V0190FTSqRw1Q4Euop6+zTwHAf8YIXNwDOT29tyUDrQ65jSg9aTU/H0omA==
-  dependencies:
-    "@typescript-eslint/types" "5.59.1"
-    "@typescript-eslint/visitor-keys" "5.59.1"
+    "@typescript-eslint/types" "5.62.0"
+    "@typescript-eslint/visitor-keys" "5.62.0"
 
 "@typescript-eslint/type-utils@5.48.2":
   version "5.48.2"
@@ -2641,13 +2723,13 @@
     debug "^4.3.4"
     tsutils "^3.21.0"
 
-"@typescript-eslint/type-utils@5.59.1":
-  version "5.59.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.59.1.tgz#63981d61684fd24eda2f9f08c0a47ecb000a2111"
-  integrity sha512-ZMWQ+Oh82jWqWzvM3xU+9y5U7MEMVv6GLioM3R5NJk6uvP47kZ7YvlgSHJ7ERD6bOY7Q4uxWm25c76HKEwIjZw==
+"@typescript-eslint/type-utils@5.62.0":
+  version "5.62.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.62.0.tgz#286f0389c41681376cdad96b309cedd17d70346a"
+  integrity sha512-xsSQreu+VnfbqQpW5vnCJdq1Z3Q0U31qiWmRhr98ONQmcp/yhiPJFPq8MXiJVLiksmOKSjIldZzkebzHuCGzew==
   dependencies:
-    "@typescript-eslint/typescript-estree" "5.59.1"
-    "@typescript-eslint/utils" "5.59.1"
+    "@typescript-eslint/typescript-estree" "5.62.0"
+    "@typescript-eslint/utils" "5.62.0"
     debug "^4.3.4"
     tsutils "^3.21.0"
 
@@ -2656,15 +2738,10 @@
   resolved "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.48.2.tgz"
   integrity sha512-hE7dA77xxu7ByBc6KCzikgfRyBCTst6dZQpwaTy25iMYOnbNljDT4hjhrGEJJ0QoMjrfqrx+j1l1B9/LtKeuqA==
 
-"@typescript-eslint/types@5.58.0":
-  version "5.58.0"
-  resolved "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.58.0.tgz"
-  integrity sha512-JYV4eITHPzVQMnHZcYJXl2ZloC7thuUHrcUmxtzvItyKPvQ50kb9QXBkgNAt90OYMqwaodQh2kHutWZl1fc+1g==
-
-"@typescript-eslint/types@5.59.1":
-  version "5.59.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.59.1.tgz#03f3fedd1c044cb336ebc34cc7855f121991f41d"
-  integrity sha512-dg0ICB+RZwHlysIy/Dh1SP+gnXNzwd/KS0JprD3Lmgmdq+dJAJnUPe1gNG34p0U19HvRlGX733d/KqscrGC1Pg==
+"@typescript-eslint/types@5.62.0":
+  version "5.62.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.62.0.tgz#258607e60effa309f067608931c3df6fed41fd2f"
+  integrity sha512-87NVngcbVXUahrRTqIK27gD2t5Cu1yuCXxbLcFtCzZGlfyVWWh8mLHkoxzjsB6DDNnvdL+fW8MiwPEJyGJQDgQ==
 
 "@typescript-eslint/typescript-estree@5.48.2":
   version "5.48.2"
@@ -2679,26 +2756,13 @@
     semver "^7.3.7"
     tsutils "^3.21.0"
 
-"@typescript-eslint/typescript-estree@5.58.0":
-  version "5.58.0"
-  resolved "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.58.0.tgz"
-  integrity sha512-cRACvGTodA+UxnYM2uwA2KCwRL7VAzo45syNysqlMyNyjw0Z35Icc9ihPJZjIYuA5bXJYiJ2YGUB59BqlOZT1Q==
+"@typescript-eslint/typescript-estree@5.62.0":
+  version "5.62.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.62.0.tgz#7d17794b77fabcac615d6a48fb143330d962eb9b"
+  integrity sha512-CmcQ6uY7b9y694lKdRB8FEel7JbU/40iSAPomu++SjLMntB+2Leay2LO6i8VnJk58MtE9/nQSFIH6jpyRWyYzA==
   dependencies:
-    "@typescript-eslint/types" "5.58.0"
-    "@typescript-eslint/visitor-keys" "5.58.0"
-    debug "^4.3.4"
-    globby "^11.1.0"
-    is-glob "^4.0.3"
-    semver "^7.3.7"
-    tsutils "^3.21.0"
-
-"@typescript-eslint/typescript-estree@5.59.1":
-  version "5.59.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.59.1.tgz#4aa546d27fd0d477c618f0ca00b483f0ec84c43c"
-  integrity sha512-lYLBBOCsFltFy7XVqzX0Ju+Lh3WPIAWxYpmH/Q7ZoqzbscLiCW00LeYCdsUnnfnj29/s1WovXKh2gwCoinHNGA==
-  dependencies:
-    "@typescript-eslint/types" "5.59.1"
-    "@typescript-eslint/visitor-keys" "5.59.1"
+    "@typescript-eslint/types" "5.62.0"
+    "@typescript-eslint/visitor-keys" "5.62.0"
     debug "^4.3.4"
     globby "^11.1.0"
     is-glob "^4.0.3"
@@ -2719,31 +2783,17 @@
     eslint-utils "^3.0.0"
     semver "^7.3.7"
 
-"@typescript-eslint/utils@5.59.1":
-  version "5.59.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.59.1.tgz#d89fc758ad23d2157cfae53f0b429bdf15db9473"
-  integrity sha512-MkTe7FE+K1/GxZkP5gRj3rCztg45bEhsd8HYjczBuYm+qFHP5vtZmjx3B0yUCDotceQ4sHgTyz60Ycl225njmA==
+"@typescript-eslint/utils@5.62.0", "@typescript-eslint/utils@^5.57.0":
+  version "5.62.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.62.0.tgz#141e809c71636e4a75daa39faed2fb5f4b10df86"
+  integrity sha512-n8oxjeb5aIbPFEtmQxQYOLI0i9n5ySBEY/ZEHHZqKQSFnxio1rv6dthascc9dLuwrL0RC5mPCxB7vnAVGAYWAQ==
   dependencies:
     "@eslint-community/eslint-utils" "^4.2.0"
     "@types/json-schema" "^7.0.9"
     "@types/semver" "^7.3.12"
-    "@typescript-eslint/scope-manager" "5.59.1"
-    "@typescript-eslint/types" "5.59.1"
-    "@typescript-eslint/typescript-estree" "5.59.1"
-    eslint-scope "^5.1.1"
-    semver "^7.3.7"
-
-"@typescript-eslint/utils@^5.57.0":
-  version "5.58.0"
-  resolved "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.58.0.tgz"
-  integrity sha512-gAmLOTFXMXOC+zP1fsqm3VceKSBQJNzV385Ok3+yzlavNHZoedajjS4UyS21gabJYcobuigQPs/z71A9MdJFqQ==
-  dependencies:
-    "@eslint-community/eslint-utils" "^4.2.0"
-    "@types/json-schema" "^7.0.9"
-    "@types/semver" "^7.3.12"
-    "@typescript-eslint/scope-manager" "5.58.0"
-    "@typescript-eslint/types" "5.58.0"
-    "@typescript-eslint/typescript-estree" "5.58.0"
+    "@typescript-eslint/scope-manager" "5.62.0"
+    "@typescript-eslint/types" "5.62.0"
+    "@typescript-eslint/typescript-estree" "5.62.0"
     eslint-scope "^5.1.1"
     semver "^7.3.7"
 
@@ -2755,20 +2805,12 @@
     "@typescript-eslint/types" "5.48.2"
     eslint-visitor-keys "^3.3.0"
 
-"@typescript-eslint/visitor-keys@5.58.0":
-  version "5.58.0"
-  resolved "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.58.0.tgz"
-  integrity sha512-/fBraTlPj0jwdyTwLyrRTxv/3lnU2H96pNTVM6z3esTWLtA5MZ9ghSMJ7Rb+TtUAdtEw9EyJzJ0EydIMKxQ9gA==
+"@typescript-eslint/visitor-keys@5.62.0":
+  version "5.62.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.62.0.tgz#2174011917ce582875954ffe2f6912d5931e353e"
+  integrity sha512-07ny+LHRzQXepkGg6w0mFY41fVUNBrL2Roj/++7V1txKugfjm/Ci/qSND03r2RhlJhJYMcTn9AhhSSqQp0Ysyw==
   dependencies:
-    "@typescript-eslint/types" "5.58.0"
-    eslint-visitor-keys "^3.3.0"
-
-"@typescript-eslint/visitor-keys@5.59.1":
-  version "5.59.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.59.1.tgz#0d96c36efb6560d7fb8eb85de10442c10d8f6058"
-  integrity sha512-6waEYwBTCWryx0VJmP7JaM4FpipLsFl9CvYf2foAE8Qh/Y0s+bxWysciwOs0LTBED4JCaNxTZ5rGadB14M6dwA==
-  dependencies:
-    "@typescript-eslint/types" "5.59.1"
+    "@typescript-eslint/types" "5.62.0"
     eslint-visitor-keys "^3.3.0"
 
 "@webassemblyjs/ast@1.11.1":
@@ -2944,7 +2986,7 @@ abbrev@1, abbrev@^1.0.0:
   resolved "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz"
   integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==
 
-accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.8:
+accepts@~1.3.4, accepts@~1.3.8:
   version "1.3.8"
   resolved "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz"
   integrity sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==
@@ -2983,7 +3025,7 @@ acorn-walk@^7.1.1:
   resolved "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz"
   integrity sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==
 
-acorn-walk@^8.0.0, acorn-walk@^8.0.2, acorn-walk@^8.1.1:
+acorn-walk@^8.0.2, acorn-walk@^8.1.1:
   version "8.2.0"
   resolved "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.2.0.tgz"
   integrity sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==
@@ -2993,10 +3035,15 @@ acorn@^7.1.1:
   resolved "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz"
   integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==
 
-acorn@^8.0.4, acorn@^8.1.0, acorn@^8.2.4, acorn@^8.4.1, acorn@^8.5.0, acorn@^8.7.1, acorn@^8.8.0, acorn@^8.8.1:
-  version "8.8.2"
-  resolved "https://registry.npmjs.org/acorn/-/acorn-8.8.2.tgz"
-  integrity sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw==
+acorn@^8.1.0, acorn@^8.2.4, acorn@^8.4.1, acorn@^8.5.0, acorn@^8.7.1, acorn@^8.8.1, acorn@^8.9.0:
+  version "8.13.0"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.13.0.tgz#2a30d670818ad16ddd6a35d3842dacec9e5d7ca3"
+  integrity sha512-8zSiw54Oxrdym50NlZ9sUusyO1Z1ZchgRLWRaK6c86XJFClyCgFKetdowBg5bKxyp/u+CDBJG4Mpp0m3HLZl9w==
+
+acorn@^8.14.0:
+  version "8.14.1"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.14.1.tgz#721d5dc10f7d5b5609a891773d47731796935dfb"
+  integrity sha512-OvQ/2pUDKmgfCg++xsTX1wGxfTaszcHVcTctW4UJB4hibJx2HXxxO5UmVgyjMa+ZDsiaf5wWLXYpRWMmBI0QHg==
 
 adjust-sourcemap-loader@^4.0.0:
   version "4.0.0"
@@ -3006,11 +3053,6 @@ adjust-sourcemap-loader@^4.0.0:
     loader-utils "^2.0.0"
     regex-parser "^2.2.11"
 
-adm-zip@^0.5.2:
-  version "0.5.10"
-  resolved "https://registry.yarnpkg.com/adm-zip/-/adm-zip-0.5.10.tgz#4a51d5ab544b1f5ce51e1b9043139b639afff45b"
-  integrity sha512-x0HvcHqVJNTPk/Bw8JbLWlWoo6Wwnsug0fnYYro1HBrjxZ3G7/AZk7Ahv8JwDe1uIcz8eBqvu86FuF1POiG7vQ==
-
 agent-base@6, agent-base@^6.0.2:
   version "6.0.2"
   resolved "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz"
@@ -3061,9 +3103,9 @@ ajv-keywords@^5.0.0:
   dependencies:
     fast-deep-equal "^3.1.3"
 
-ajv@8.12.0, ajv@^8.8.0:
+ajv@8.12.0, ajv@^8.10.0, ajv@^8.8.0:
   version "8.12.0"
-  resolved "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.12.0.tgz#d1a0527323e22f53562c567c00991577dfbe19d1"
   integrity sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==
   dependencies:
     fast-deep-equal "^3.1.1"
@@ -3081,7 +3123,7 @@ ajv@8.6.2, ajv@^8.0.0:
     require-from-string "^2.0.2"
     uri-js "^4.2.2"
 
-ajv@^6.10.0, ajv@^6.12.3, ajv@^6.12.4, ajv@^6.12.5:
+ajv@^6.10.0, ajv@^6.12.4, ajv@^6.12.5:
   version "6.12.6"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4"
   integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==
@@ -3096,10 +3138,10 @@ angular-idle-preload@3.0.0:
   resolved "https://registry.npmjs.org/angular-idle-preload/-/angular-idle-preload-3.0.0.tgz"
   integrity sha512-W3P2m2B6MHdt1DVunH6H3VWkAZrG3ZwxGcPjedVvIyRhg/LmMtILoizHSxTXw3fsKIEdAPwGObXGpML9WD1jJA==
 
-angulartics2@^12.2.0:
-  version "12.2.0"
-  resolved "https://registry.yarnpkg.com/angulartics2/-/angulartics2-12.2.0.tgz#79159693b4436905391e3b1e7d549c900408e175"
-  integrity sha512-1wl/cPA4PGYj42z80VIR+A0Hy3+rt13POzfTfZ83NUDx2KKbHjtTKS0O7u3umi10cqvi5tn4NTSYIFFJ1fI2Tw==
+angulartics2@^12.2.1:
+  version "12.2.1"
+  resolved "https://registry.yarnpkg.com/angulartics2/-/angulartics2-12.2.1.tgz#9a5727aaacafe77b6b912ff5a94532d41377ce51"
+  integrity sha512-+uDXkGGJJzzIITE59z1s3rL5okNyGXZN5mP7m2Ro9gouJF88COeRkhYlXZwIXkdQjBzIyOvUv6UamzgL9NiXLg==
   dependencies:
     tslib "^2.3.0"
 
@@ -3120,11 +3162,6 @@ ansi-html-community@^0.0.8:
   resolved "https://registry.npmjs.org/ansi-html-community/-/ansi-html-community-0.0.8.tgz"
   integrity sha512-1APHAyr3+PCamwNw3bXCPp4HFLONZt/yIH0sZp0/469KWNTEy+qN5jQ3GVX6DMZ1UXAi34yVwtTeaG/HpBuuzw==
 
-ansi-regex@^2.0.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
-  integrity sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==
-
 ansi-regex@^3.0.0:
   version "3.0.1"
   resolved "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.1.tgz"
@@ -3135,11 +3172,6 @@ ansi-regex@^5.0.1:
   resolved "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz"
   integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==
 
-ansi-styles@^2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
-  integrity sha512-kmCevFghRiWM7HB5zTPULl4r9bVFSWjz62MhqizDGUrq2NWuNMQyuv4tHHoKJHs69M/MF64lEcHdYIocrdWQYA==
-
 ansi-styles@^3.2.1:
   version "3.2.1"
   resolved "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz"
@@ -3172,6 +3204,11 @@ arch@^2.2.0:
   resolved "https://registry.npmjs.org/arch/-/arch-2.2.0.tgz"
   integrity sha512-Of/R0wqp83cgHozfIYLbBMnej79U/SVGOOyuB3VVFv1NRM/PSFMK12x9KVtiYzJqmnU5WR2qp0Z5rHb7sWGnFQ==
 
+are-docs-informative@^0.0.2:
+  version "0.0.2"
+  resolved "https://registry.yarnpkg.com/are-docs-informative/-/are-docs-informative-0.0.2.tgz#387f0e93f5d45280373d387a59d34c96db321963"
+  integrity sha512-ixiS0nLNNG5jNQzgZJNoUpBKdo9yTYZMGJ+QgT2jmjR7G7+QHRCc4v6LQ3NgE7EBJq+o0ams3waJwkrlBom8Ig==
+
 are-we-there-yet@^3.0.0:
   version "3.0.1"
   resolved "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-3.0.1.tgz"
@@ -3204,13 +3241,13 @@ aria-query@5.1.3:
   dependencies:
     deep-equal "^2.0.5"
 
-array-buffer-byte-length@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.0.tgz"
-  integrity sha512-LPuwb2P+NrQw3XhxGc36+XSvuBPopovXYTR9Ew++Du9Yb/bx5AzBfrIsBoj0EZUifjQU+sHL21sseZ3jerWO/A==
+array-buffer-byte-length@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/array-buffer-byte-length/-/array-buffer-byte-length-1.0.1.tgz#1e5583ec16763540a27ae52eed99ff899223568f"
+  integrity sha512-ahC5W1xgou+KTXix4sAO8Ki12Q+jf4i0+tmk3sC+zgcynshkHxzpXdImBehiUYKKKDwvfFiJl1tZt6ewscS1Mg==
   dependencies:
-    call-bind "^1.0.2"
-    is-array-buffer "^3.0.1"
+    call-bind "^1.0.5"
+    is-array-buffer "^3.0.4"
 
 array-flatten@1.1.1:
   version "1.1.1"
@@ -3222,58 +3259,68 @@ array-flatten@^2.1.2:
   resolved "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.2.tgz"
   integrity sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==
 
-array-includes@^3.1.6:
-  version "3.1.6"
-  resolved "https://registry.npmjs.org/array-includes/-/array-includes-3.1.6.tgz"
-  integrity sha512-sgTbLvL6cNnw24FnbaDyjmvddQ2ML8arZsgaJhoABMoplz/4QRhtrYS+alr1BUM1Bwp6dhx8vVCBSLG+StwOFw==
+array-includes@^3.1.8:
+  version "3.1.8"
+  resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.8.tgz#5e370cbe172fdd5dd6530c1d4aadda25281ba97d"
+  integrity sha512-itaWrbYbqpGXkGhZPGUulwnhVf5Hpy1xiCFsGqyIGglbBxmG5vSjxQen3/WGOjPpNEv1RtBLKxbmVXm8HpJStQ==
   dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.1.4"
-    es-abstract "^1.20.4"
-    get-intrinsic "^1.1.3"
+    call-bind "^1.0.7"
+    define-properties "^1.2.1"
+    es-abstract "^1.23.2"
+    es-object-atoms "^1.0.0"
+    get-intrinsic "^1.2.4"
     is-string "^1.0.7"
 
-array-union@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/array-union/-/array-union-1.0.2.tgz#9a34410e4f4e3da23dea375be5be70f24778ec39"
-  integrity sha512-Dxr6QJj/RdU/hCaBjOfxW+q6lyuVE6JFWIrAUpuOOhoJJoQ99cUn3igRaHVB5P9WrgFVN0FfArM3x0cueOU8ng==
-  dependencies:
-    array-uniq "^1.0.1"
-
 array-union@^2.1.0:
   version "2.1.0"
   resolved "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz"
   integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==
 
-array-uniq@^1.0.1:
+array.prototype.findlastindex@^1.2.5:
+  version "1.2.5"
+  resolved "https://registry.yarnpkg.com/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.5.tgz#8c35a755c72908719453f87145ca011e39334d0d"
+  integrity sha512-zfETvRFA8o7EiNn++N5f/kaCw221hrpGsDmcpndVupkPzEc1Wuf3VgC0qby1BbHs7f5DVYjgtEU2LLh5bqeGfQ==
+  dependencies:
+    call-bind "^1.0.7"
+    define-properties "^1.2.1"
+    es-abstract "^1.23.2"
+    es-errors "^1.3.0"
+    es-object-atoms "^1.0.0"
+    es-shim-unscopables "^1.0.2"
+
+array.prototype.flat@^1.3.2:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.3.2.tgz#1476217df8cff17d72ee8f3ba06738db5b387d18"
+  integrity sha512-djYB+Zx2vLewY8RWlNCUdHjDXs2XOgm602S9E7P/UpHgfeHL00cRiIF+IN/G/aUJ7kGPb6yO/ErDI5V2s8iycA==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.2.0"
+    es-abstract "^1.22.1"
+    es-shim-unscopables "^1.0.0"
+
+array.prototype.flatmap@^1.3.2:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.3.2.tgz#c9a7c6831db8e719d6ce639190146c24bbd3e527"
+  integrity sha512-Ewyx0c9PmpcsByhSW4r+9zDU7sGjFc86qf/kKtuSCRdhfbk0SNLLkaT5qvcHnRGgc5NP/ly/y+qkXkqONX54CQ==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.2.0"
+    es-abstract "^1.22.1"
+    es-shim-unscopables "^1.0.0"
+
+arraybuffer.prototype.slice@^1.0.3:
   version "1.0.3"
-  resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6"
-  integrity sha512-MNha4BWQ6JbwhFhj03YK552f7cb3AzoE8SzeljgChvL1dl3IcvggXVz1DilzySZkCja+CXuZbdW7yATchWn8/Q==
-
-array.prototype.flat@^1.3.1:
-  version "1.3.1"
-  resolved "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.1.tgz"
-  integrity sha512-roTU0KWIOmJ4DRLmwKd19Otg0/mT3qPNt0Qb3GWW8iObuZXxrjB/pzn0R3hqpRSWg4HCwqx+0vwOnWnvlOyeIA==
+  resolved "https://registry.yarnpkg.com/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.3.tgz#097972f4255e41bc3425e37dc3f6421cf9aefde6"
+  integrity sha512-bMxMKAjg13EBSVscxTaYA4mRc5t1UAXa2kXiGTNfZ079HIWXEkKmkgFrh/nJqamaLSrXO5H4WFFkPEaLJWbs3A==
   dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.1.4"
-    es-abstract "^1.20.4"
-    es-shim-unscopables "^1.0.0"
-
-array.prototype.flatmap@^1.3.1:
-  version "1.3.1"
-  resolved "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.1.tgz"
-  integrity sha512-8UGn9O1FDVvMNB0UlLv4voxRMze7+FpHyF5mSMRjWHUMlpoDViniy05870VlxhfgTnLbpuwTzvD76MTtWxB/mQ==
-  dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.1.4"
-    es-abstract "^1.20.4"
-    es-shim-unscopables "^1.0.0"
-
-arrify@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
-  integrity sha512-3CYzex9M9FGQjCGMGyi6/31c8GJbgb0qGyrx5HWxPd0aCwh4cB2YjMb2Xf9UuoogrMrlO9cTqnB5rI5GHZTcUA==
+    array-buffer-byte-length "^1.0.1"
+    call-bind "^1.0.5"
+    define-properties "^1.2.1"
+    es-abstract "^1.22.3"
+    es-errors "^1.2.1"
+    get-intrinsic "^1.2.3"
+    is-array-buffer "^3.0.4"
+    is-shared-array-buffer "^1.0.2"
 
 asn1@~0.2.3:
   version "0.2.6"
@@ -3348,6 +3395,13 @@ available-typed-arrays@^1.0.5:
   resolved "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz"
   integrity sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==
 
+available-typed-arrays@^1.0.7:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz#a5cc375d6a03c2efc87a553f3e0b1522def14846"
+  integrity sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==
+  dependencies:
+    possible-typed-array-names "^1.0.0"
+
 aws-sign2@~0.7.0:
   version "0.7.0"
   resolved "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz"
@@ -3358,10 +3412,10 @@ aws4@^1.8.0:
   resolved "https://registry.npmjs.org/aws4/-/aws4-1.12.0.tgz"
   integrity sha512-NmWvPnx0F1SfrQbYwOi7OeaNGokp9XhzNioJ/CSBs8Qa4vxug81mhJEAVZwxXuBmYB5KDRfMq/F3RR0BIU7sWg==
 
-axe-core@^4.7.0:
-  version "4.7.0"
-  resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-4.7.0.tgz#34ba5a48a8b564f67e103f0aa5768d76e15bbbbf"
-  integrity sha512-M0JtH+hlOL5pLQwHOLNYZaXuhqmvS8oExsqB1SBYgA4Dk7u/xx+YdGHXaK5pyUfed5mYXdlYiphWq3G8cRi5JQ==
+axe-core@^4.10.3:
+  version "4.10.3"
+  resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-4.10.3.tgz#04145965ac7894faddbac30861e5d8f11bfd14fc"
+  integrity sha512-Xm7bpRXnDSX2YE2YFfBk2FnF0ep6tmG7xPh8iHee8MIcrgq762Nkce856dYtJYLkuIoYZvGfTs/PbZhideTcEg==
 
 axios@0.21.4:
   version "0.21.4"
@@ -3370,13 +3424,14 @@ axios@0.21.4:
   dependencies:
     follow-redirects "^1.14.0"
 
-axios@^0.27.2:
-  version "0.27.2"
-  resolved "https://registry.npmjs.org/axios/-/axios-0.27.2.tgz"
-  integrity sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ==
+axios@^1.9.0:
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/axios/-/axios-1.9.0.tgz#25534e3b72b54540077d33046f77e3b8d7081901"
+  integrity sha512-re4CqKTJaURpzbLHtIi6XpDv20/CnpXOtjRY5/CU32L8gU8ek9UIivcfvSWvmKEngmVbrUtPpdDwWDWL7DNHvg==
   dependencies:
-    follow-redirects "^1.14.9"
+    follow-redirects "^1.15.6"
     form-data "^4.0.0"
+    proxy-from-env "^1.1.0"
 
 axobject-query@3.1.1:
   version "3.1.1"
@@ -3467,15 +3522,6 @@ bcrypt-pbkdf@^1.0.0:
   dependencies:
     tweetnacl "^0.14.3"
 
-bent@~7.3.6:
-  version "7.3.12"
-  resolved "https://registry.npmjs.org/bent/-/bent-7.3.12.tgz"
-  integrity sha512-T3yrKnVGB63zRuoco/7Ybl7BwwGZR0lceoVG5XmQyMIH9s19SV5m+a8qam4if0zQuAmOQTyPTPmsQBdAorGK3w==
-  dependencies:
-    bytesish "^0.4.1"
-    caseless "~0.12.0"
-    is-stream "^2.0.0"
-
 big.js@^5.2.2:
   version "5.2.2"
   resolved "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz"
@@ -3505,21 +3551,21 @@ bluebird@^3.7.2:
   resolved "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz"
   integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==
 
-body-parser@1.20.1, body-parser@^1.19.0:
-  version "1.20.1"
-  resolved "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz"
-  integrity sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==
+body-parser@1.20.3, body-parser@^1.19.0:
+  version "1.20.3"
+  resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.3.tgz#1953431221c6fb5cd63c4b36d53fab0928e548c6"
+  integrity sha512-7rAxByjUMqQ3/bHJy7D6OGXvx/MMc4IqBn/X0fcM1QUcAItpZrBEYhWGem+tzXH90c+G01ypMcYJBO9Y30203g==
   dependencies:
     bytes "3.1.2"
-    content-type "~1.0.4"
+    content-type "~1.0.5"
     debug "2.6.9"
     depd "2.0.0"
     destroy "1.2.0"
     http-errors "2.0.0"
     iconv-lite "0.4.24"
     on-finished "2.4.1"
-    qs "6.11.0"
-    raw-body "2.5.1"
+    qs "6.13.0"
+    raw-body "2.5.2"
     type-is "~1.6.18"
     unpipe "1.0.0"
 
@@ -3538,6 +3584,11 @@ boolbase@^1.0.0:
   resolved "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz"
   integrity sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==
 
+boolean@^3.1.4:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/boolean/-/boolean-3.2.0.tgz#9e5294af4e98314494cbb17979fa54ca159f116b"
+  integrity sha512-d0II/GO9uf9lfUHH2BQsjxzRJZBdsjgsBiW4BvhWk/3qoKwQFjIDVN19PfX8F2D/r9PCMTtLWjYVCFrpeYUzsw==
+
 bootstrap@^4.6.1:
   version "4.6.2"
   resolved "https://registry.npmjs.org/bootstrap/-/bootstrap-4.6.2.tgz"
@@ -3558,31 +3609,31 @@ brace-expansion@^2.0.1:
   dependencies:
     balanced-match "^1.0.0"
 
-braces@^3.0.2, braces@~3.0.2:
-  version "3.0.2"
-  resolved "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz"
-  integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
+braces@^3.0.2, braces@^3.0.3, braces@~3.0.2:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.3.tgz#490332f40919452272d55a8480adc0c441358789"
+  integrity sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==
   dependencies:
-    fill-range "^7.0.1"
+    fill-range "^7.1.1"
 
 browser-process-hrtime@^1.0.0:
   version "1.0.0"
   resolved "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz"
   integrity sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==
 
-browser-sync-client@^2.29.1:
-  version "2.29.1"
-  resolved "https://registry.npmjs.org/browser-sync-client/-/browser-sync-client-2.29.1.tgz"
-  integrity sha512-aESnjt3rU7CZpzjyqzhIC2UJ3MVhzRis7cPKkGbyYWDf/wnbxyRa3fFenF3Qx9061/guY3HHhD67uiTVV26DVg==
+browser-sync-client@^2.29.3:
+  version "2.29.3"
+  resolved "https://registry.yarnpkg.com/browser-sync-client/-/browser-sync-client-2.29.3.tgz#9300b97f42abc2c4f95ca29b5a9781b5c492f14a"
+  integrity sha512-4tK5JKCl7v/3aLbmCBMzpufiYLsB1+UI+7tUXCCp5qF0AllHy/jAqYu6k7hUF3hYtlClKpxExWaR+rH+ny07wQ==
   dependencies:
     etag "1.8.1"
     fresh "0.5.2"
     mitt "^1.1.3"
 
-browser-sync-ui@^2.29.1:
-  version "2.29.1"
-  resolved "https://registry.npmjs.org/browser-sync-ui/-/browser-sync-ui-2.29.1.tgz"
-  integrity sha512-MB7SAiUgVUrhipO2xyO1sheC9H0+LKXPQ3L1tQWcZ3AgizBnUNKAqDZPSwe4grNSa8o8ImSAwJp7lMS6XYy1Dw==
+browser-sync-ui@^2.29.3:
+  version "2.29.3"
+  resolved "https://registry.yarnpkg.com/browser-sync-ui/-/browser-sync-ui-2.29.3.tgz#35e2ce3b470dce6b7219307cac7278bf324a0f16"
+  integrity sha512-kBYOIQjU/D/3kYtUIJtj82e797Egk1FB2broqItkr3i4eF1qiHbFCG6srksu9gWhfmuM/TNG76jMfzAdxEPakg==
   dependencies:
     async-each-series "0.1.1"
     chalk "4.1.2"
@@ -3593,14 +3644,13 @@ browser-sync-ui@^2.29.1:
     stream-throttle "^0.1.3"
 
 browser-sync@^2.27.10:
-  version "2.29.1"
-  resolved "https://registry.npmjs.org/browser-sync/-/browser-sync-2.29.1.tgz"
-  integrity sha512-WXy9HMJVQaNUTPjmai330E2fnDA6W84l/vBILGkYu9yHXIpWw1gJYjdQWDfEhLFljYUHNTN9jM3GCej2T55m+g==
+  version "2.29.3"
+  resolved "https://registry.yarnpkg.com/browser-sync/-/browser-sync-2.29.3.tgz#c2a3ff00c659eb87a13cae9d7a427e1b4b580ee1"
+  integrity sha512-NiM38O6XU84+MN+gzspVmXV2fTOoe+jBqIBx3IBdhZrdeURr6ZgznJr/p+hQ+KzkKEiGH/GcC4SQFSL0jV49bg==
   dependencies:
-    browser-sync-client "^2.29.1"
-    browser-sync-ui "^2.29.1"
+    browser-sync-client "^2.29.3"
+    browser-sync-ui "^2.29.3"
     bs-recipes "1.3.4"
-    bs-snippet-injector "^2.0.1"
     chalk "4.1.2"
     chokidar "^3.5.1"
     connect "3.6.6"
@@ -3617,7 +3667,6 @@ browser-sync@^2.27.10:
     micromatch "^4.0.2"
     opn "5.3.0"
     portscanner "2.2.0"
-    qs "^6.11.0"
     raw-body "^2.3.2"
     resp-modifier "6.0.2"
     rx "4.1.0"
@@ -3644,11 +3693,6 @@ bs-recipes@1.3.4:
   resolved "https://registry.npmjs.org/bs-recipes/-/bs-recipes-1.3.4.tgz"
   integrity sha512-BXvDkqhDNxXEjeGM8LFkSbR+jzmP/CYpCiVKYn+soB1dDldeU15EBNDkwVXndKuX35wnNUaPd0qSoQEAkmQtMw==
 
-bs-snippet-injector@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.npmjs.org/bs-snippet-injector/-/bs-snippet-injector-2.0.1.tgz"
-  integrity sha512-4u8IgB+L9L+S5hknOj3ddNSb42436gsnGm1AuM15B7CdbkpQTyVWgIM5/JUBiKiRwGOR86uo0Lu/OsX+SAlJmw==
-
 buffer-crc32@~0.2.3:
   version "0.2.13"
   resolved "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz"
@@ -3659,7 +3703,7 @@ buffer-from@^1.0.0:
   resolved "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz"
   integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==
 
-buffer@^5.5.0, buffer@^5.6.0:
+buffer@^5.5.0, buffer@^5.7.1:
   version "5.7.1"
   resolved "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz"
   integrity sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==
@@ -3674,21 +3718,11 @@ builtins@^5.0.0:
   dependencies:
     semver "^7.0.0"
 
-bytes@3.0.0:
-  version "3.0.0"
-  resolved "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz"
-  integrity sha512-pMhOfFDPiv9t5jjIXkHosWmkSyQbvsgEVNkz0ERHbuLh2T/7j4Mqqpz523Fe8MVY89KC6Sh/QfS2sM+SjgFDcw==
-
 bytes@3.1.2:
   version "3.1.2"
   resolved "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz"
   integrity sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==
 
-bytesish@^0.4.1:
-  version "0.4.4"
-  resolved "https://registry.npmjs.org/bytesish/-/bytesish-0.4.4.tgz"
-  integrity sha512-i4uu6M4zuMUiyfZN4RU2+i9+peJh//pXhd9x1oSe1LBkZ3LEbCoygu8W0bXTukU1Jme2txKuotpCZRaC3FLxcQ==
-
 cacache@17.0.4:
   version "17.0.4"
   resolved "https://registry.npmjs.org/cacache/-/cacache-17.0.4.tgz"
@@ -3788,6 +3822,17 @@ call-bind@^1.0.0, call-bind@^1.0.2:
     function-bind "^1.1.1"
     get-intrinsic "^1.0.2"
 
+call-bind@^1.0.5, call-bind@^1.0.6, call-bind@^1.0.7:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.7.tgz#06016599c40c56498c18769d2730be242b6fa3b9"
+  integrity sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==
+  dependencies:
+    es-define-property "^1.0.0"
+    es-errors "^1.3.0"
+    function-bind "^1.1.2"
+    get-intrinsic "^1.2.4"
+    set-function-length "^1.2.1"
+
 callsites@^3.0.0:
   version "3.1.0"
   resolved "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz"
@@ -3815,7 +3860,7 @@ cerialize@0.1.18:
   dependencies:
     typescript "^2.5.0"
 
-chalk@4.1.2, chalk@^4.0.0, chalk@^4.0.2, chalk@^4.1.0, chalk@^4.1.1, chalk@~4.1.0:
+chalk@4.1.2, chalk@^4.0.0, chalk@^4.0.2, chalk@^4.1.0, chalk@^4.1.1:
   version "4.1.2"
   resolved "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz"
   integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==
@@ -3823,18 +3868,7 @@ chalk@4.1.2, chalk@^4.0.0, chalk@^4.0.2, chalk@^4.1.0, chalk@^4.1.1, chalk@~4.1.
     ansi-styles "^4.1.0"
     supports-color "^7.1.0"
 
-chalk@^1.1.1:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
-  integrity sha512-U3lRVLMSlsCfjqYPbLyVv11M9CPW4I728d6TCKMAOJueEeB9/8o+eSsMnxPJD+Q+K909sdESg7C+tIkoH6on1A==
-  dependencies:
-    ansi-styles "^2.2.1"
-    escape-string-regexp "^1.0.2"
-    has-ansi "^2.0.0"
-    strip-ansi "^3.0.0"
-    supports-color "^2.0.0"
-
-chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.4.1:
+chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.4.2:
   version "2.4.2"
   resolved "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz"
   integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
@@ -3897,6 +3931,13 @@ chokidar@3.5.3, "chokidar@>=3.0.0 <4.0.0", chokidar@^3.0.0, chokidar@^3.5.1, cho
   optionalDependencies:
     fsevents "~2.3.2"
 
+chokidar@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-4.0.1.tgz#4a6dff66798fb0f72a94f616abbd7e1a19f31d41"
+  integrity sha512-n8enUVCED/KVRQlab1hr3MVpcVMvxtZjmEa956u+4YijlmQED223XMSYj2tLuKvr4jcCTzNNMpQDUer72MMmzA==
+  dependencies:
+    readdirp "^4.0.1"
+
 chownr@^2.0.0:
   version "2.0.0"
   resolved "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz"
@@ -3907,15 +3948,10 @@ chrome-trace-event@^1.0.2:
   resolved "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz"
   integrity sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==
 
-ci-info@^3.2.0:
-  version "3.8.0"
-  resolved "https://registry.npmjs.org/ci-info/-/ci-info-3.8.0.tgz"
-  integrity sha512-eXTggHWSooYhq49F2opQhuHWgzucfF2YgODK4e1566GQs5BIfP30B0oenwBJHfWxAs2fyPB1s7Mg949zLf61Yw==
-
-circular-json@^0.5.0:
-  version "0.5.9"
-  resolved "https://registry.npmjs.org/circular-json/-/circular-json-0.5.9.tgz"
-  integrity sha512-4ivwqHpIFJZBuhN3g/pEcdbnGUywkBblloGbkglyloVjjR3uT6tieI89MVOfbP2tHX5sgb01FuLgAOzebNlJNQ==
+ci-info@^4.0.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-4.1.0.tgz#92319d2fa29d2620180ea5afed31f589bc98cf83"
+  integrity sha512-HutrvTNsF48wnxkzERIXOe5/mlcfFcbfCmwcg6CJnizbSue78AbDt+1cgl26zwn61WFxhcPykPfZrbqjGmBb4A==
 
 classnames@^2.2.6:
   version "2.3.2"
@@ -4000,7 +4036,7 @@ clone@^1.0.2:
   resolved "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz"
   integrity sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==
 
-clsx@^1.0.4, clsx@^1.1.1:
+clsx@^1.0.4, clsx@^1.1.0, clsx@^1.1.1:
   version "1.2.1"
   resolved "https://registry.npmjs.org/clsx/-/clsx-1.2.1.tgz"
   integrity sha512-EcR6r5a8bj6pu3ycsa/E/cKVGuTgZJZdsyUYHOksG/UHIiKfjxzRxYJpyVBwYaQeOvghal9fcc4PidlgzugAQg==
@@ -4044,7 +4080,7 @@ colors@^1.4.0:
   resolved "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz"
   integrity sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==
 
-combined-stream@^1.0.6, combined-stream@^1.0.8, combined-stream@~1.0.6:
+combined-stream@^1.0.8, combined-stream@~1.0.6:
   version "1.0.8"
   resolved "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz"
   integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==
@@ -4066,7 +4102,7 @@ commander@^6.1.0, commander@^6.2.1:
   resolved "https://registry.npmjs.org/commander/-/commander-6.2.1.tgz"
   integrity sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==
 
-commander@^7.0.0, commander@^7.2.0:
+commander@^7.0.0:
   version "7.2.0"
   resolved "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz"
   integrity sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==
@@ -4086,7 +4122,7 @@ commondir@^1.0.1:
   resolved "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz"
   integrity sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg==
 
-compressible@~2.0.16:
+compressible@~2.0.18:
   version "2.0.18"
   resolved "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz"
   integrity sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==
@@ -4101,17 +4137,17 @@ compression-webpack-plugin@^9.2.0:
     schema-utils "^4.0.0"
     serialize-javascript "^6.0.0"
 
-compression@^1.7.4:
-  version "1.7.4"
-  resolved "https://registry.npmjs.org/compression/-/compression-1.7.4.tgz"
-  integrity sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==
+compression@^1.7.4, compression@^1.8.0:
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/compression/-/compression-1.8.0.tgz#09420efc96e11a0f44f3a558de59e321364180f7"
+  integrity sha512-k6WLKfunuqCYD3t6AsuPGvQWaKwuLLh2/xHNcX4qE+vIfDNXpSqnrhwA7O53R7WVQUnt8dVAIW+YHr7xTgOgGA==
   dependencies:
-    accepts "~1.3.5"
-    bytes "3.0.0"
-    compressible "~2.0.16"
+    bytes "3.1.2"
+    compressible "~2.0.18"
     debug "2.6.9"
+    negotiator "~0.6.4"
     on-headers "~1.0.2"
-    safe-buffer "5.1.2"
+    safe-buffer "5.2.1"
     vary "~1.1.2"
 
 concat-map@0.0.1:
@@ -4161,7 +4197,7 @@ content-disposition@0.5.4:
   dependencies:
     safe-buffer "5.2.1"
 
-content-type@~1.0.4:
+content-type@~1.0.4, content-type@~1.0.5:
   version "1.0.5"
   resolved "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz"
   integrity sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==
@@ -4171,12 +4207,12 @@ convert-source-map@^1.5.1, convert-source-map@^1.7.0:
   resolved "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz"
   integrity sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==
 
-cookie-parser@1.4.6:
-  version "1.4.6"
-  resolved "https://registry.yarnpkg.com/cookie-parser/-/cookie-parser-1.4.6.tgz#3ac3a7d35a7a03bbc7e365073a26074824214594"
-  integrity sha512-z3IzaNjdwUC2olLIB5/ITd0/setiaFMLYiZJle7xg5Fe9KWAceil7xszYfHHBtDFYLSgJduS2Ty0P1uJdPDJeA==
+cookie-parser@1.4.7:
+  version "1.4.7"
+  resolved "https://registry.yarnpkg.com/cookie-parser/-/cookie-parser-1.4.7.tgz#e2125635dfd766888ffe90d60c286404fa0e7b26"
+  integrity sha512-nGUvgXnotP3BsjiLX2ypbQnWoGUPIIfHQNZkkC668ntrzGWEZVW70HDEB1qnNGMicPje6EttlIgzo51YSwNQGw==
   dependencies:
-    cookie "0.4.1"
+    cookie "0.7.2"
     cookie-signature "1.0.6"
 
 cookie-signature@1.0.6:
@@ -4184,20 +4220,15 @@ cookie-signature@1.0.6:
   resolved "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz"
   integrity sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==
 
-cookie@0.4.1:
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.1.tgz#afd713fe26ebd21ba95ceb61f9a8116e50a537d1"
-  integrity sha512-ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA==
+cookie@0.7.1:
+  version "0.7.1"
+  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.7.1.tgz#2f73c42142d5d5cf71310a74fc4ae61670e5dbc9"
+  integrity sha512-6DnInpx7SJ2AK3+CTUE/ZM0vWTUboZCegxhC2xiIydHR9jNuTAASBrfEpHhiGOZw/nX51bHt6YQl8jsGo4y/0w==
 
-cookie@0.5.0:
-  version "0.5.0"
-  resolved "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz"
-  integrity sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==
-
-cookie@~0.4.1:
-  version "0.4.2"
-  resolved "https://registry.npmjs.org/cookie/-/cookie-0.4.2.tgz"
-  integrity sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==
+cookie@0.7.2, cookie@~0.7.2:
+  version "0.7.2"
+  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.7.2.tgz#556369c472a2ba910f2979891b526b3436237ed7"
+  integrity sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w==
 
 copy-anything@^2.0.1:
   version "2.0.6"
@@ -4249,10 +4280,10 @@ core-js-compat@^3.25.1:
   dependencies:
     browserslist "^4.21.5"
 
-core-js@^3.30.1:
-  version "3.30.1"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.30.1.tgz#fc9c5adcc541d8e9fa3e381179433cbf795628ba"
-  integrity sha512-ZNS5nbiSwDTq4hFosEDqm65izl2CWmLz0hARJMyNQBgkUZMIF51cQiMvIQKA6hvuaeWxQDP3hEedM1JZIgTldQ==
+core-js@^3.42.0:
+  version "3.42.0"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.42.0.tgz#edbe91f78ac8cfb6df8d997e74d368a68082fe37"
+  integrity sha512-Sz4PP4ZA+Rq4II21qkNqOEDTDrCvcANId3xpIgB34NDkWc3UduWj2dqEtN9yZIq8Dk3HyPI33x9sqqU5C8sr0g==
 
 core-util-is@1.0.2:
   version "1.0.2"
@@ -4308,9 +4339,9 @@ cross-env@^7.0.3:
     cross-spawn "^7.0.1"
 
 cross-spawn@^7.0.0, cross-spawn@^7.0.1, cross-spawn@^7.0.2, cross-spawn@^7.0.3:
-  version "7.0.3"
-  resolved "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz"
-  integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==
+  version "7.0.6"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.6.tgz#8a58fe78f00dcd70c370451759dfbfaf03e8ee9f"
+  integrity sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==
   dependencies:
     path-key "^3.1.0"
     shebang-command "^2.0.0"
@@ -4427,33 +4458,38 @@ csstype@^3.0.2:
   resolved "https://registry.npmjs.org/csstype/-/csstype-3.1.2.tgz"
   integrity sha512-I7K1Uu0MBPzaFKg4nI5Q7Vs2t+3gWWW648spaF+Rg7pI9ds18Ugn+lvg4SHczUdKlHI5LWBXyqfS8+DufyBsgQ==
 
+csstype@^3.1.3:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.1.3.tgz#d80ff294d114fb0e6ac500fbf85b60137d7eff81"
+  integrity sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==
+
 custom-event@~1.0.0:
   version "1.0.1"
   resolved "https://registry.npmjs.org/custom-event/-/custom-event-1.0.1.tgz"
   integrity sha512-GAj5FOq0Hd+RsCGVJxZuKaIDXDf3h6GQoNEjFgbLLI/trgtavwUbSnZ5pVfg27DVCaWjIohryS0JFwIJyT2cMg==
 
-cypress-axe@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/cypress-axe/-/cypress-axe-1.4.0.tgz#e67482bfe9e740796bf77c7823f19781a8a2faff"
-  integrity sha512-Ut7NKfzjyKm0BEbt2WxuKtLkIXmx6FD2j0RwdvO/Ykl7GmB/qRQkwbKLk3VP35+83hiIr8GKD04PDdrTK5BnyA==
+cypress-axe@^1.6.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/cypress-axe/-/cypress-axe-1.6.0.tgz#2d70475e15356dd243ebcbfefd5719526f7ca9bc"
+  integrity sha512-C/ij50G8eebBrl/WsGT7E+T/SFyIsRZ3Epx9cRTLrPL9Y1GcxlQGFoAVdtSFWRrHSCWXq9HC6iJQMaI89O9yvQ==
 
-cypress@12.10.0:
-  version "12.10.0"
-  resolved "https://registry.yarnpkg.com/cypress/-/cypress-12.10.0.tgz#b6264f77c214d63530ebac2b33c4d099bd40b715"
-  integrity sha512-Y0wPc221xKKW1/4iAFCphkrG2jNR4MjOne3iGn4mcuCaE7Y5EtXL83N8BzRsAht7GYfWVjJ/UeTqEdDKHz39HQ==
+cypress@^13.17.0:
+  version "13.17.0"
+  resolved "https://registry.yarnpkg.com/cypress/-/cypress-13.17.0.tgz#34c3d68080c4497eace0f353bd1629587a5f600d"
+  integrity sha512-5xWkaPurwkIljojFidhw8lFScyxhtiFHl/i/3zov+1Z5CmY4t9tjIdvSXfu82Y3w7wt0uR9KkucbhkVvJZLQSA==
   dependencies:
-    "@cypress/request" "^2.88.10"
+    "@cypress/request" "^3.0.6"
     "@cypress/xvfb" "^1.2.4"
-    "@types/node" "^14.14.31"
     "@types/sinonjs__fake-timers" "8.1.1"
     "@types/sizzle" "^2.3.2"
     arch "^2.2.0"
     blob-util "^2.0.2"
     bluebird "^3.7.2"
-    buffer "^5.6.0"
+    buffer "^5.7.1"
     cachedir "^2.3.0"
     chalk "^4.1.0"
     check-more-types "^2.24.0"
+    ci-info "^4.0.0"
     cli-cursor "^3.1.0"
     cli-table3 "~0.6.1"
     commander "^6.2.1"
@@ -4468,7 +4504,6 @@ cypress@12.10.0:
     figures "^3.2.0"
     fs-extra "^9.1.0"
     getos "^3.2.1"
-    is-ci "^3.0.0"
     is-installed-globally "~0.4.0"
     lazy-ass "^1.6.0"
     listr2 "^3.8.3"
@@ -4477,11 +4512,13 @@ cypress@12.10.0:
     minimist "^1.2.8"
     ospath "^1.2.2"
     pretty-bytes "^5.6.0"
+    process "^0.11.10"
     proxy-from-env "1.0.0"
     request-progress "^3.0.0"
-    semver "^7.3.2"
+    semver "^7.5.3"
     supports-color "^8.1.1"
-    tmp "~0.2.1"
+    tmp "~0.2.3"
+    tree-kill "1.2.2"
     untildify "^4.0.0"
     yauzl "^2.10.0"
 
@@ -4510,15 +4547,44 @@ data-urls@^3.0.2:
     whatwg-mimetype "^3.0.0"
     whatwg-url "^11.0.0"
 
+data-view-buffer@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/data-view-buffer/-/data-view-buffer-1.0.1.tgz#8ea6326efec17a2e42620696e671d7d5a8bc66b2"
+  integrity sha512-0lht7OugA5x3iJLOWFhWK/5ehONdprk0ISXqVFn/NFrDu+cuc8iADFrGQz5BnRK7LLU3JmkbXSxaqX+/mXYtUA==
+  dependencies:
+    call-bind "^1.0.6"
+    es-errors "^1.3.0"
+    is-data-view "^1.0.1"
+
+data-view-byte-length@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/data-view-byte-length/-/data-view-byte-length-1.0.1.tgz#90721ca95ff280677eb793749fce1011347669e2"
+  integrity sha512-4J7wRJD3ABAzr8wP+OcIcqq2dlUKp4DVflx++hs5h5ZKydWMI6/D/fAot+yh6g2tHh8fLFTvNOaVN357NvSrOQ==
+  dependencies:
+    call-bind "^1.0.7"
+    es-errors "^1.3.0"
+    is-data-view "^1.0.1"
+
+data-view-byte-offset@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/data-view-byte-offset/-/data-view-byte-offset-1.0.0.tgz#5e0bbfb4828ed2d1b9b400cd8a7d119bca0ff18a"
+  integrity sha512-t/Ygsytq+R995EJ5PZlD4Cu56sWa8InXySaViRzw9apusqsOO2bQP+SbYzAhR0pFKoB+43lYy8rWban9JSuXnA==
+  dependencies:
+    call-bind "^1.0.6"
+    es-errors "^1.3.0"
+    is-data-view "^1.0.1"
+
 date-fns-tz@^1.3.7:
   version "1.3.8"
   resolved "https://registry.npmjs.org/date-fns-tz/-/date-fns-tz-1.3.8.tgz"
   integrity sha512-qwNXUFtMHTTU6CFSFjoJ80W8Fzzp24LntbjFFBgL/faqds4e5mo9mftoRLgr3Vi1trISsg4awSpYVsOQCRnapQ==
 
-date-fns@^2.29.3:
-  version "2.29.3"
-  resolved "https://registry.npmjs.org/date-fns/-/date-fns-2.29.3.tgz"
-  integrity sha512-dDCnyH2WnnKusqvZZ6+jA1O51Ibt8ZMRNkDZdyAyK4YfbDwa/cEmuztzG5pk6hqlp9aSBPYcjOlktquahGwGeA==
+date-fns@^2.30.0:
+  version "2.30.0"
+  resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.30.0.tgz#f367e644839ff57894ec6ac480de40cae4b0f4d0"
+  integrity sha512-fnULvOpxnC5/Vg3NCiWelDsLiUc9bRwAPs/+LfTLNvetFCtCTN+yQz15C/fs4AwX1R9K5GLtLfn8QW+dWisaAw==
+  dependencies:
+    "@babel/runtime" "^7.21.0"
 
 date-format@^4.0.14:
   version "4.0.14"
@@ -4615,6 +4681,15 @@ defaults@^1.0.3:
   dependencies:
     clone "^1.0.2"
 
+define-data-property@^1.0.1, define-data-property@^1.1.4:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/define-data-property/-/define-data-property-1.1.4.tgz#894dc141bb7d3060ae4366f6a0107e68fbe48c5e"
+  integrity sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==
+  dependencies:
+    es-define-property "^1.0.0"
+    es-errors "^1.3.0"
+    gopd "^1.0.1"
+
 define-lazy-prop@^2.0.0:
   version "2.0.0"
   resolved "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz"
@@ -4628,18 +4703,19 @@ define-properties@^1.1.3, define-properties@^1.1.4:
     has-property-descriptors "^1.0.0"
     object-keys "^1.1.1"
 
-del@^2.2.0:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/del/-/del-2.2.2.tgz#c12c981d067846c84bcaf862cff930d907ffd1a8"
-  integrity sha512-Z4fzpbIRjOu7lO5jCETSWoqUDVe0IPOlfugBsF6suen2LKDlVb4QZpKEM9P+buNJ4KI1eN7I083w/pbKUpsrWQ==
+define-properties@^1.2.0, define-properties@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.2.1.tgz#10781cc616eb951a80a034bafcaa7377f6af2b6c"
+  integrity sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==
   dependencies:
-    globby "^5.0.0"
-    is-path-cwd "^1.0.0"
-    is-path-in-cwd "^1.0.0"
-    object-assign "^4.0.1"
-    pify "^2.0.0"
-    pinkie-promise "^2.0.0"
-    rimraf "^2.2.8"
+    define-data-property "^1.0.1"
+    has-property-descriptors "^1.0.0"
+    object-keys "^1.1.1"
+
+delay@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/delay/-/delay-5.0.0.tgz#137045ef1b96e5071060dd5be60bf9334436bd1d"
+  integrity sha512-ReEBKkIfe4ya47wlPYf/gu5ib6yUG0/Aez0JQZQz94kiWtRQvZIQbTiehsnwHvLSWJnQdhVeqYue7Id1dKr0qw==
 
 delayed-stream@~1.0.0:
   version "1.0.0"
@@ -4676,6 +4752,11 @@ destroy@~1.0.4:
   resolved "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz"
   integrity sha512-3NdhDuEXnfun/z7x9GOElY49LoqVHoGScmOKwmxhsS8N5Y+Z8KyPPDnaSzqWgYt/ji4mqwfTS34Htrk0zPIXVg==
 
+detect-libc@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
+  integrity sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg==
+
 detect-node@^2.0.4:
   version "2.1.0"
   resolved "https://registry.npmjs.org/detect-node/-/detect-node-2.1.0.tgz"
@@ -4825,9 +4906,9 @@ domino@^2.1.2:
   integrity sha512-3VdM/SXBZX2omc9JF9nOPCtDaYQ67BGp5CoLpIQlO2KCAPETs8TcDHacF26jXadGbvUteZzRTeos2fhID5+ucQ==
 
 dompurify@^2.0.11:
-  version "2.4.5"
-  resolved "https://registry.npmjs.org/dompurify/-/dompurify-2.4.5.tgz"
-  integrity sha512-jggCCd+8Iqp4Tsz0nIvpcb22InKEBrGz5dw3EQJMs8HPJDsKbFIO3STYtAvCfDx26Muevn1MHVI0XxjgFfmiSA==
+  version "2.5.7"
+  resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-2.5.7.tgz#6e0d36b9177db5a99f18ade1f28579db5ab839d7"
+  integrity sha512-2q4bEI+coQM8f5ez7kt2xclg1XsecaV9ASJk/54vwlfRRNQfDqJz2pzQ8t0Ix/ToBpXlVjrRIx7pFC/o8itG2Q==
 
 domutils@^2.4.2, domutils@^2.5.2, domutils@^2.8.0:
   version "2.8.0"
@@ -4847,11 +4928,6 @@ domutils@^3.0.1:
     domelementtype "^2.3.0"
     domhandler "^5.0.1"
 
-duplexer@^0.1.2:
-  version "0.1.2"
-  resolved "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz"
-  integrity sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==
-
 easy-extender@^2.3.4:
   version "2.3.4"
   resolved "https://registry.npmjs.org/easy-extender/-/easy-extender-2.3.4.tgz"
@@ -4879,10 +4955,10 @@ ee-first@1.1.1:
   resolved "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz"
   integrity sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==
 
-ejs@^3.1.9:
-  version "3.1.9"
-  resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.1.9.tgz#03c9e8777fe12686a9effcef22303ca3d8eeb361"
-  integrity sha512-rC+QVNMJWv+MtPgkt0y+0rVEIdbtxVADApW9JXrUVlzHetgcyczP/E7DJmWJ4fJCZF2cPcBk0laWO9ZHMG3DmQ==
+ejs@^3.1.10:
+  version "3.1.10"
+  resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.1.10.tgz#69ab8358b14e896f80cc39e62087b88500c3ac3b"
+  integrity sha512-UeJmFfOrAQS8OJWPZ4qtgHyWExa088/MtK5UEyoJGFH67cDEXkZSviOiKRCZ4Xij0zxI3JECgYs3oKx+AizQBA==
   dependencies:
     jake "^10.8.5"
 
@@ -4913,6 +4989,11 @@ encodeurl@~1.0.1, encodeurl@~1.0.2:
   resolved "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz"
   integrity sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==
 
+encodeurl@~2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-2.0.0.tgz#7b8ea898077d7e409d3ac45474ea38eaf0857a58"
+  integrity sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==
+
 encoding@^0.1.13:
   version "0.1.13"
   resolved "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz"
@@ -4943,21 +5024,26 @@ engine.io-parser@~5.0.3:
   resolved "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-5.0.6.tgz"
   integrity sha512-tjuoZDMAdEhVnSFleYPCtdL2GXwVTGtNjoeJd9IhIG3C1xs9uwxqRNEu5WpnDZCaozwVlK/nuQhpodhXSIMaxw==
 
-engine.io@~6.4.1:
-  version "6.4.2"
-  resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-6.4.2.tgz#ffeaf68f69b1364b0286badddf15ff633476473f"
-  integrity sha512-FKn/3oMiJjrOEOeUub2WCox6JhxBXq/Zn3fZOMCBxKnNYtsdKjxhl7yR3fZhM9PV+rdE75SU5SYMc+2PGzo+Tg==
+engine.io-parser@~5.2.1:
+  version "5.2.3"
+  resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-5.2.3.tgz#00dc5b97b1f233a23c9398d0209504cf5f94d92f"
+  integrity sha512-HqD3yTBfnBxIrbnM1DoD6Pcq8NECnh8d4As1Qgh0z5Gg3jRRIqijury0CL3ghu/edArpUYiYqQiDUQBIs4np3Q==
+
+engine.io@~6.6.0:
+  version "6.6.2"
+  resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-6.6.2.tgz#32bd845b4db708f8c774a4edef4e5c8a98b3da72"
+  integrity sha512-gmNvsYi9C8iErnZdVcJnvCpSKbWTt1E8+JZo8b+daLninywUWi5NQ5STSHZ9rFjFO7imNcvb8Pc5pe/wMR5xEw==
   dependencies:
     "@types/cookie" "^0.4.1"
     "@types/cors" "^2.8.12"
     "@types/node" ">=10.0.0"
     accepts "~1.3.4"
     base64id "2.0.0"
-    cookie "~0.4.1"
+    cookie "~0.7.2"
     cors "~2.8.5"
     debug "~4.3.1"
-    engine.io-parser "~5.0.3"
-    ws "~8.11.0"
+    engine.io-parser "~5.2.1"
+    ws "~8.17.1"
 
 enhanced-resolve@^5.10.0:
   version "5.12.0"
@@ -5023,52 +5109,69 @@ error-ex@^1.3.1:
   dependencies:
     is-arrayish "^0.2.1"
 
-error-stack-parser@^2.0.1:
-  version "2.1.4"
-  resolved "https://registry.npmjs.org/error-stack-parser/-/error-stack-parser-2.1.4.tgz"
-  integrity sha512-Sk5V6wVazPhq5MhpO+AUxJn5x7XSXGl1R93Vn7i+zS15KDVxQijejNCrz8340/2bgLBjR9GtEG8ZVKONDjcqGQ==
+es-abstract@^1.22.1, es-abstract@^1.22.3, es-abstract@^1.23.0, es-abstract@^1.23.2:
+  version "1.23.3"
+  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.23.3.tgz#8f0c5a35cd215312573c5a27c87dfd6c881a0aa0"
+  integrity sha512-e+HfNH61Bj1X9/jLc5v1owaLYuHdeHHSQlkhCBiTK8rBvKaULl/beGMxwrMXjpYrv4pz22BlY570vVePA2ho4A==
   dependencies:
-    stackframe "^1.3.4"
-
-es-abstract@^1.19.0, es-abstract@^1.20.4:
-  version "1.21.2"
-  resolved "https://registry.npmjs.org/es-abstract/-/es-abstract-1.21.2.tgz"
-  integrity sha512-y/B5POM2iBnIxCiernH1G7rC9qQoM77lLIMQLuob0zhp8C56Po81+2Nj0WFKnd0pNReDTnkYryc+zhOzpEIROg==
-  dependencies:
-    array-buffer-byte-length "^1.0.0"
-    available-typed-arrays "^1.0.5"
-    call-bind "^1.0.2"
-    es-set-tostringtag "^2.0.1"
+    array-buffer-byte-length "^1.0.1"
+    arraybuffer.prototype.slice "^1.0.3"
+    available-typed-arrays "^1.0.7"
+    call-bind "^1.0.7"
+    data-view-buffer "^1.0.1"
+    data-view-byte-length "^1.0.1"
+    data-view-byte-offset "^1.0.0"
+    es-define-property "^1.0.0"
+    es-errors "^1.3.0"
+    es-object-atoms "^1.0.0"
+    es-set-tostringtag "^2.0.3"
     es-to-primitive "^1.2.1"
-    function.prototype.name "^1.1.5"
-    get-intrinsic "^1.2.0"
-    get-symbol-description "^1.0.0"
+    function.prototype.name "^1.1.6"
+    get-intrinsic "^1.2.4"
+    get-symbol-description "^1.0.2"
     globalthis "^1.0.3"
     gopd "^1.0.1"
-    has "^1.0.3"
-    has-property-descriptors "^1.0.0"
-    has-proto "^1.0.1"
+    has-property-descriptors "^1.0.2"
+    has-proto "^1.0.3"
     has-symbols "^1.0.3"
-    internal-slot "^1.0.5"
-    is-array-buffer "^3.0.2"
+    hasown "^2.0.2"
+    internal-slot "^1.0.7"
+    is-array-buffer "^3.0.4"
     is-callable "^1.2.7"
-    is-negative-zero "^2.0.2"
+    is-data-view "^1.0.1"
+    is-negative-zero "^2.0.3"
     is-regex "^1.1.4"
-    is-shared-array-buffer "^1.0.2"
+    is-shared-array-buffer "^1.0.3"
     is-string "^1.0.7"
-    is-typed-array "^1.1.10"
+    is-typed-array "^1.1.13"
     is-weakref "^1.0.2"
-    object-inspect "^1.12.3"
+    object-inspect "^1.13.1"
     object-keys "^1.1.1"
-    object.assign "^4.1.4"
-    regexp.prototype.flags "^1.4.3"
-    safe-regex-test "^1.0.0"
-    string.prototype.trim "^1.2.7"
-    string.prototype.trimend "^1.0.6"
-    string.prototype.trimstart "^1.0.6"
-    typed-array-length "^1.0.4"
+    object.assign "^4.1.5"
+    regexp.prototype.flags "^1.5.2"
+    safe-array-concat "^1.1.2"
+    safe-regex-test "^1.0.3"
+    string.prototype.trim "^1.2.9"
+    string.prototype.trimend "^1.0.8"
+    string.prototype.trimstart "^1.0.8"
+    typed-array-buffer "^1.0.2"
+    typed-array-byte-length "^1.0.1"
+    typed-array-byte-offset "^1.0.2"
+    typed-array-length "^1.0.6"
     unbox-primitive "^1.0.2"
-    which-typed-array "^1.1.9"
+    which-typed-array "^1.1.15"
+
+es-define-property@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/es-define-property/-/es-define-property-1.0.0.tgz#c7faefbdff8b2696cf5f46921edfb77cc4ba3845"
+  integrity sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==
+  dependencies:
+    get-intrinsic "^1.2.4"
+
+es-errors@^1.2.1, es-errors@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/es-errors/-/es-errors-1.3.0.tgz#05f75a25dab98e4fb1dcd5e1472c0546d5057c8f"
+  integrity sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==
 
 es-get-iterator@^1.1.2:
   version "1.1.3"
@@ -5090,14 +5193,21 @@ es-module-lexer@^0.9.0:
   resolved "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-0.9.3.tgz"
   integrity sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ==
 
-es-set-tostringtag@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.1.tgz"
-  integrity sha512-g3OMbtlwY3QewlqAiMLI47KywjWZoEytKr8pf6iTC8uJq5bIAH52Z9pnQ8pVL6whrCto53JZDuUIsifGeLorTg==
+es-object-atoms@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/es-object-atoms/-/es-object-atoms-1.0.0.tgz#ddb55cd47ac2e240701260bc2a8e31ecb643d941"
+  integrity sha512-MZ4iQ6JwHOBQjahnjwaC1ZtIBH+2ohjamzAO3oaHcXYup7qxjF2fixyH+Q71voWHeOkI2q/TnJao/KfXYIZWbw==
   dependencies:
-    get-intrinsic "^1.1.3"
-    has "^1.0.3"
-    has-tostringtag "^1.0.0"
+    es-errors "^1.3.0"
+
+es-set-tostringtag@^2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/es-set-tostringtag/-/es-set-tostringtag-2.0.3.tgz#8bb60f0a440c2e4281962428438d58545af39777"
+  integrity sha512-3T8uNMC3OQTHkFUsFq8r/BwAXLHvU/9O9mE0fBc/MY5iq/8H7ncvO947LmYA6ldWw9Uh8Yhf25zu6n7nML5QWQ==
+  dependencies:
+    get-intrinsic "^1.2.4"
+    has-tostringtag "^1.0.2"
+    hasown "^2.0.1"
 
 es-shim-unscopables@^1.0.0:
   version "1.0.0"
@@ -5106,6 +5216,13 @@ es-shim-unscopables@^1.0.0:
   dependencies:
     has "^1.0.3"
 
+es-shim-unscopables@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/es-shim-unscopables/-/es-shim-unscopables-1.0.2.tgz#1f6942e71ecc7835ed1c8a83006d8771a63a3763"
+  integrity sha512-J3yBRXCzDu4ULnQwxyToo/OjdMx6akgVC7K6few0a7F/0wLtmKKN7I73AH5T2836UuXRqN7Qg+IIUw/+YJksRw==
+  dependencies:
+    hasown "^2.0.0"
+
 es-to-primitive@^1.2.1:
   version "1.2.1"
   resolved "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz"
@@ -5168,7 +5285,7 @@ escape-html@~1.0.3:
   resolved "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz"
   integrity sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==
 
-escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
+escape-string-regexp@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
   integrity sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==
@@ -5190,73 +5307,97 @@ escodegen@^2.0.0:
   optionalDependencies:
     source-map "~0.6.1"
 
-eslint-import-resolver-node@^0.3.7:
-  version "0.3.7"
-  resolved "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.7.tgz"
-  integrity sha512-gozW2blMLJCeFpBwugLTGyvVjNoeo1knonXAcatC6bjPBZitotxdWf7Gimr25N4c0AAOo4eOUfaG82IJPDpqCA==
+eslint-compat-utils@^0.6.4:
+  version "0.6.5"
+  resolved "https://registry.yarnpkg.com/eslint-compat-utils/-/eslint-compat-utils-0.6.5.tgz#6b06350a1c947c4514cfa64a170a6bfdbadc7ec2"
+  integrity sha512-vAUHYzue4YAa2hNACjB8HvUQj5yehAZgiClyFVVom9cP8z5NSFq3PwB/TtJslN2zAMgRX6FCFCjYBbQh71g5RQ==
+  dependencies:
+    semver "^7.5.4"
+
+eslint-import-resolver-node@^0.3.9:
+  version "0.3.9"
+  resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.9.tgz#d4eaac52b8a2e7c3cd1903eb00f7e053356118ac"
+  integrity sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g==
   dependencies:
     debug "^3.2.7"
-    is-core-module "^2.11.0"
-    resolve "^1.22.1"
+    is-core-module "^2.13.0"
+    resolve "^1.22.4"
 
-eslint-module-utils@^2.7.4:
-  version "2.7.4"
-  resolved "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.7.4.tgz"
-  integrity sha512-j4GT+rqzCoRKHwURX7pddtIPGySnX9Si/cgMI5ztrcqOPtk5dDEeZ34CQVPphnqkJytlc97Vuk05Um2mJ3gEQA==
+eslint-json-compat-utils@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/eslint-json-compat-utils/-/eslint-json-compat-utils-0.2.1.tgz#32931d42c723da383712f25177a2c57b9ef5f079"
+  integrity sha512-YzEodbDyW8DX8bImKhAcCeu/L31Dd/70Bidx2Qex9OFUtgzXLqtfWL4Hr5fM/aCCB8QUZLuJur0S9k6UfgFkfg==
+  dependencies:
+    esquery "^1.6.0"
+
+eslint-module-utils@^2.12.0:
+  version "2.12.0"
+  resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.12.0.tgz#fe4cfb948d61f49203d7b08871982b65b9af0b0b"
+  integrity sha512-wALZ0HFoytlyh/1+4wuZ9FJCD/leWHQzzrxJ8+rebyReSLk7LApMyd3WJaLVoN+D5+WIdJyDK1c6JnE65V4Zyg==
   dependencies:
     debug "^3.2.7"
 
-eslint-plugin-deprecation@^1.4.1:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-deprecation/-/eslint-plugin-deprecation-1.4.1.tgz#09a2889210955fd1a5c37703922c01724aba80eb"
-  integrity sha512-4vxTghWzxsBukPJVQupi6xlTuDc8Pyi1QlRCrFiLgwLPMJQW3cJCNaehJUKQqQFvuue5m4W27e179Y3Qjzeghg==
+eslint-plugin-deprecation@^1.5.0:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-deprecation/-/eslint-plugin-deprecation-1.5.0.tgz#5136b3879e623dea5dd19a792c184b4bcc8ae6a9"
+  integrity sha512-mRcssI/tLROueBQ6yf4LnnGTijbMsTCPIpbRbPj5R5wGYVCpk1zDmAS0SEkgcUDXOPc22qMNFR24Qw7vSPrlTA==
   dependencies:
     "@typescript-eslint/utils" "^5.57.0"
     tslib "^2.3.1"
     tsutils "^3.21.0"
 
-eslint-plugin-import@^2.27.5:
-  version "2.27.5"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.27.5.tgz#876a6d03f52608a3e5bb439c2550588e51dd6c65"
-  integrity sha512-LmEt3GVofgiGuiE+ORpnvP+kAm3h6MLZJ4Q5HCyHADofsb4VzXFsRiWj3c0OFiV+3DWFh0qg3v9gcPlfc3zRow==
+eslint-plugin-import@^2.31.0:
+  version "2.31.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.31.0.tgz#310ce7e720ca1d9c0bb3f69adfd1c6bdd7d9e0e7"
+  integrity sha512-ixmkI62Rbc2/w8Vfxyh1jQRTdRTF52VxwRVHl/ykPAmqG+Nb7/kNn+byLP0LxPgI7zWA16Jt82SybJInmMia3A==
   dependencies:
-    array-includes "^3.1.6"
-    array.prototype.flat "^1.3.1"
-    array.prototype.flatmap "^1.3.1"
+    "@rtsao/scc" "^1.1.0"
+    array-includes "^3.1.8"
+    array.prototype.findlastindex "^1.2.5"
+    array.prototype.flat "^1.3.2"
+    array.prototype.flatmap "^1.3.2"
     debug "^3.2.7"
     doctrine "^2.1.0"
-    eslint-import-resolver-node "^0.3.7"
-    eslint-module-utils "^2.7.4"
-    has "^1.0.3"
-    is-core-module "^2.11.0"
+    eslint-import-resolver-node "^0.3.9"
+    eslint-module-utils "^2.12.0"
+    hasown "^2.0.2"
+    is-core-module "^2.15.1"
     is-glob "^4.0.3"
     minimatch "^3.1.2"
-    object.values "^1.1.6"
-    resolve "^1.22.1"
-    semver "^6.3.0"
-    tsconfig-paths "^3.14.1"
+    object.fromentries "^2.0.8"
+    object.groupby "^1.0.3"
+    object.values "^1.2.0"
+    semver "^6.3.1"
+    string.prototype.trimend "^1.0.8"
+    tsconfig-paths "^3.15.0"
 
-eslint-plugin-jsdoc@^39.6.4:
-  version "39.9.1"
-  resolved "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-39.9.1.tgz"
-  integrity sha512-Rq2QY6BZP2meNIs48aZ3GlIlJgBqFCmR55+UBvaDkA3ZNQ0SvQXOs2QKkubakEijV8UbIVbVZKsOVN8G3MuqZw==
+eslint-plugin-jsdoc@^45.0.0:
+  version "45.0.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-45.0.0.tgz#6be84e4842a7138cc571a907ea9c31c42eaac5c0"
+  integrity sha512-l2+Jcs/Ps7oFA+SWY+0sweU/e5LgricnEl6EsDlyRTF5y0+NWL1y9Qwz9PHwHAxtdJq6lxPjEQWmYLMkvhzD4g==
   dependencies:
-    "@es-joy/jsdoccomment" "~0.36.1"
+    "@es-joy/jsdoccomment" "~0.39.4"
+    are-docs-informative "^0.0.2"
     comment-parser "1.3.1"
     debug "^4.3.4"
     escape-string-regexp "^4.0.0"
-    esquery "^1.4.0"
-    semver "^7.3.8"
+    esquery "^1.5.0"
+    semver "^7.5.1"
     spdx-expression-parse "^3.0.1"
 
-eslint-plugin-jsonc@^2.6.0:
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-jsonc/-/eslint-plugin-jsonc-2.6.0.tgz#5a439ec15b4930c022bf157264a3d4f4712b982c"
-  integrity sha512-4bA9YTx58QaWalua1Q1b82zt7eZMB7i+ed8q8cKkbKP75ofOA2SXbtFyCSok7RY6jIXeCqQnKjN9If8zCgv6PA==
+eslint-plugin-jsonc@^2.20.1:
+  version "2.20.1"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-jsonc/-/eslint-plugin-jsonc-2.20.1.tgz#138b41e857a2add02b5408b13f3bc6f14d51d702"
+  integrity sha512-gUzIwQHXx7ZPypUoadcyRi4WbHW2TPixDr0kqQ4miuJBU0emJmyGTlnaT3Og9X2a8R1CDayN9BFSq5weGWbTng==
   dependencies:
-    eslint-utils "^3.0.0"
-    jsonc-eslint-parser "^2.0.4"
+    "@eslint-community/eslint-utils" "^4.5.1"
+    eslint-compat-utils "^0.6.4"
+    eslint-json-compat-utils "^0.2.1"
+    espree "^9.6.1 || ^10.3.0"
+    graphemer "^1.4.0"
+    jsonc-eslint-parser "^2.4.0"
     natural-compare "^1.4.0"
+    synckit "^0.6.2 || ^0.7.3 || ^0.11.5"
 
 eslint-plugin-lodash@^7.4.0:
   version "7.4.0"
@@ -5308,7 +5449,7 @@ eslint-utils@^3.0.0:
   dependencies:
     eslint-visitor-keys "^2.0.0"
 
-eslint-visitor-keys@^2.0.0:
+eslint-visitor-keys@^2.0.0, eslint-visitor-keys@^2.1.0:
   version "2.1.0"
   resolved "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz"
   integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==
@@ -5318,6 +5459,16 @@ eslint-visitor-keys@^3.0.0, eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4
   resolved "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.0.tgz"
   integrity sha512-HPpKPUBQcAsZOsHAFwTtIKcYlCje62XB7SEAcxjtmW6TD1WVpkS6i6/hOVtTZIl4zGj/mBqpFVGvaDneik+VoQ==
 
+eslint-visitor-keys@^3.4.1, eslint-visitor-keys@^3.4.3:
+  version "3.4.3"
+  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz#0cd72fe8550e3c2eae156a96a4dddcd1c8ac5800"
+  integrity sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==
+
+eslint-visitor-keys@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz#687bacb2af884fcdda8a6e7d65c606f46a14cd45"
+  integrity sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==
+
 eslint@^8.39.0:
   version "8.39.0"
   resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.39.0.tgz#7fd20a295ef92d43809e914b70c39fd5a23cf3f1"
@@ -5370,26 +5521,42 @@ esm@^3.2.25:
   integrity sha512-U1suiZ2oDVWv4zPO56S0NcR5QriEahGtdN2OR6FiOG4WJvcjBVFB0qI4+eKoWFH483PKGuLuu6V8Z4T5g63UVA==
 
 espree@^9.0.0, espree@^9.5.1:
-  version "9.5.1"
-  resolved "https://registry.npmjs.org/espree/-/espree-9.5.1.tgz"
-  integrity sha512-5yxtHSZXRSW5pvv3hAlXM5+/Oswi1AUFqBmbibKb5s6bp3rGIDkyXU6xCoyuuLhijr4SFwPrXRoZjz0AZDN9tg==
+  version "9.6.1"
+  resolved "https://registry.yarnpkg.com/espree/-/espree-9.6.1.tgz#a2a17b8e434690a5432f2f8018ce71d331a48c6f"
+  integrity sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==
   dependencies:
-    acorn "^8.8.0"
+    acorn "^8.9.0"
     acorn-jsx "^5.3.2"
-    eslint-visitor-keys "^3.4.0"
+    eslint-visitor-keys "^3.4.1"
+
+"espree@^9.6.1 || ^10.3.0":
+  version "10.3.0"
+  resolved "https://registry.yarnpkg.com/espree/-/espree-10.3.0.tgz#29267cf5b0cb98735b65e64ba07e0ed49d1eed8a"
+  integrity sha512-0QYC8b24HWY8zjRnDTL6RiHfDbAWn63qb4LMj1Z4b076A4une81+z03Kg7l7mn/48PUTqoLptSXez8oknU8Clg==
+  dependencies:
+    acorn "^8.14.0"
+    acorn-jsx "^5.3.2"
+    eslint-visitor-keys "^4.2.0"
 
 esprima@^4.0.0, esprima@^4.0.1:
   version "4.0.1"
   resolved "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz"
   integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
 
-esquery@^1.4.0, esquery@^1.4.2:
+esquery@^1.4.2, esquery@^1.5.0:
   version "1.5.0"
   resolved "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz"
   integrity sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==
   dependencies:
     estraverse "^5.1.0"
 
+esquery@^1.6.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.6.0.tgz#91419234f804d852a82dceec3e16cdc22cf9dae7"
+  integrity sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==
+  dependencies:
+    estraverse "^5.1.0"
+
 esrecurse@^4.3.0:
   version "4.3.0"
   resolved "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz"
@@ -5479,44 +5646,45 @@ express-rate-limit@^5.1.3:
   resolved "https://registry.npmjs.org/express-rate-limit/-/express-rate-limit-5.5.1.tgz"
   integrity sha512-MTjE2eIbHv5DyfuFz4zLYWxpqVhEhkTiwFGuB74Q9CSou2WHO52nlE5y3Zlg6SIsiYUIPj6ifFxnkPz6O3sIUg==
 
-express-static-gzip@^2.1.7:
-  version "2.1.7"
-  resolved "https://registry.yarnpkg.com/express-static-gzip/-/express-static-gzip-2.1.7.tgz#5904824a07950ba741ec3a23a21839dd04c63506"
-  integrity sha512-QOCZUC+lhPPCjIJKpQGu1Oa61Axg9Mq09Qvit8Of7kzpMuwDeMSqjjQteQS3OVw/GkENBoSBheuQDWPlngImvw==
+express-static-gzip@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/express-static-gzip/-/express-static-gzip-2.2.0.tgz#7c3f7dd89da68e51c591edf02e6de6169c017f5f"
+  integrity sha512-4ZQ0pHX0CAauxmzry2/8XFLM6aZA4NBvg9QezSlsEO1zLnl7vMFa48/WIcjzdfOiEUS4S1npPPKP2NHHYAp6qg==
   dependencies:
-    serve-static "^1.14.1"
+    parseurl "^1.3.3"
+    serve-static "^1.16.2"
 
-express@^4.17.3, express@^4.18.2:
-  version "4.18.2"
-  resolved "https://registry.npmjs.org/express/-/express-4.18.2.tgz"
-  integrity sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==
+express@^4.17.3, express@^4.18.2, express@^4.21.2:
+  version "4.21.2"
+  resolved "https://registry.yarnpkg.com/express/-/express-4.21.2.tgz#cf250e48362174ead6cea4a566abef0162c1ec32"
+  integrity sha512-28HqgMZAmih1Czt9ny7qr6ek2qddF4FclbMzwhCREB6OFfH+rXAnuNCwo1/wFvrtbgsQDb4kSbX9de9lFbrXnA==
   dependencies:
     accepts "~1.3.8"
     array-flatten "1.1.1"
-    body-parser "1.20.1"
+    body-parser "1.20.3"
     content-disposition "0.5.4"
     content-type "~1.0.4"
-    cookie "0.5.0"
+    cookie "0.7.1"
     cookie-signature "1.0.6"
     debug "2.6.9"
     depd "2.0.0"
-    encodeurl "~1.0.2"
+    encodeurl "~2.0.0"
     escape-html "~1.0.3"
     etag "~1.8.1"
-    finalhandler "1.2.0"
+    finalhandler "1.3.1"
     fresh "0.5.2"
     http-errors "2.0.0"
-    merge-descriptors "1.0.1"
+    merge-descriptors "1.0.3"
     methods "~1.1.2"
     on-finished "2.4.1"
     parseurl "~1.3.3"
-    path-to-regexp "0.1.7"
+    path-to-regexp "0.1.12"
     proxy-addr "~2.0.7"
-    qs "6.11.0"
+    qs "6.13.0"
     range-parser "~1.2.1"
     safe-buffer "5.2.1"
-    send "0.18.0"
-    serve-static "1.15.0"
+    send "0.19.0"
+    serve-static "1.16.2"
     setprototypeof "1.2.0"
     statuses "2.0.1"
     type-is "~1.6.18"
@@ -5579,6 +5747,18 @@ fast-json-stable-stringify@2.1.0, fast-json-stable-stringify@^2.0.0:
   resolved "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz"
   integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==
 
+fast-json-stringify@^5.8.0:
+  version "5.8.0"
+  resolved "https://registry.yarnpkg.com/fast-json-stringify/-/fast-json-stringify-5.8.0.tgz#b229ed01ac5f92f3b82001a916c31324652f46d7"
+  integrity sha512-VVwK8CFMSALIvt14U8AvrSzQAwN/0vaVRiFFUVlpnXSnDGrSkOAO5MtzyN8oQNjLd5AqTW5OZRgyjoNuAuR3jQ==
+  dependencies:
+    "@fastify/deepmerge" "^1.0.0"
+    ajv "^8.10.0"
+    ajv-formats "^2.1.1"
+    fast-deep-equal "^3.1.3"
+    fast-uri "^2.1.0"
+    rfdc "^1.2.0"
+
 fast-levenshtein@^2.0.6, fast-levenshtein@~2.0.6:
   version "2.0.6"
   resolved "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz"
@@ -5589,6 +5769,18 @@ fast-memoize@^2.5.1:
   resolved "https://registry.npmjs.org/fast-memoize/-/fast-memoize-2.5.2.tgz"
   integrity sha512-Ue0LwpDYErFbmNnZSF0UH6eImUwDmogUO1jyE+JbN2gsQz/jICm1Ve7t9QT0rNSsfJt+Hs4/S3GnsDVjL4HVrw==
 
+fast-printf@^1.6.9:
+  version "1.6.9"
+  resolved "https://registry.yarnpkg.com/fast-printf/-/fast-printf-1.6.9.tgz#212f56570d2dc8ccdd057ee93d50dd414d07d676"
+  integrity sha512-FChq8hbz65WMj4rstcQsFB0O7Cy++nmbNfLYnD9cYv2cRn8EG6k/MGn9kO/tjO66t09DLDugj3yL+V2o6Qftrg==
+  dependencies:
+    boolean "^3.1.4"
+
+fast-uri@^2.1.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/fast-uri/-/fast-uri-2.2.0.tgz#519a0f849bef714aad10e9753d69d8f758f7445a"
+  integrity sha512-cIusKBIt/R/oI6z/1nyfe2FvGKVTohVRfvkOhvx0nCEW+xf5NoCXjAHcWp93uOUBchzYcsvPlrapAdX1uW+YGg==
+
 fastest-levenshtein@^1.0.12:
   version "1.0.16"
   resolved "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz"
@@ -5641,16 +5833,16 @@ filesize@^6.1.0:
   resolved "https://registry.npmjs.org/filesize/-/filesize-6.4.0.tgz"
   integrity sha512-mjFIpOHC4jbfcTfoh4rkWpI31mF7viw9ikj/JyLoKzqlwG/YsefKfvYlYhdYdg/9mtK2z1AzgN/0LvVQ3zdlSQ==
 
-fill-range@^7.0.1:
-  version "7.0.1"
-  resolved "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz"
-  integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==
+fill-range@^7.1.1:
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.1.1.tgz#44265d3cac07e3ea7dc247516380643754a05292"
+  integrity sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==
   dependencies:
     to-regex-range "^5.0.1"
 
 finalhandler@1.1.0:
   version "1.1.0"
-  resolved "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.0.tgz"
+  resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.0.tgz#ce0b6855b45853e791b2fcc680046d88253dd7f5"
   integrity sha512-ejnvM9ZXYzp6PUPUyQBMBf0Co5VX2gr5H2VQe2Ui2jWXNlxv+PYZo8wpAymJNJdLsG1R4p+M4aynF8KuoUEwRw==
   dependencies:
     debug "2.6.9"
@@ -5663,7 +5855,7 @@ finalhandler@1.1.0:
 
 finalhandler@1.1.2:
   version "1.1.2"
-  resolved "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz"
+  resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.2.tgz#b7e7d000ffd11938d0fdb053506f6ebabe9f587d"
   integrity sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==
   dependencies:
     debug "2.6.9"
@@ -5674,13 +5866,13 @@ finalhandler@1.1.2:
     statuses "~1.5.0"
     unpipe "~1.0.0"
 
-finalhandler@1.2.0:
-  version "1.2.0"
-  resolved "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz"
-  integrity sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==
+finalhandler@1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.3.1.tgz#0c575f1d1d324ddd1da35ad7ece3df7d19088019"
+  integrity sha512-6BN9trH7bp3qvnrRyzsBz+g3lZxTNZTbVO2EV1CS0WIcDbawYVdYvGflME/9QP0h0pYlCDBCTjYa9nZzMDpyxQ==
   dependencies:
     debug "2.6.9"
-    encodeurl "~1.0.2"
+    encodeurl "~2.0.0"
     escape-html "~1.0.3"
     on-finished "2.4.1"
     parseurl "~1.3.3"
@@ -5720,15 +5912,20 @@ flat-cache@^3.0.4:
     flatted "^3.1.0"
     rimraf "^3.0.2"
 
+flat@^5.0.2:
+  version "5.0.2"
+  resolved "https://registry.yarnpkg.com/flat/-/flat-5.0.2.tgz#8ca6fe332069ffa9d324c327198c598259ceb241"
+  integrity sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==
+
 flatted@^3.1.0, flatted@^3.2.7:
   version "3.2.7"
   resolved "https://registry.npmjs.org/flatted/-/flatted-3.2.7.tgz"
   integrity sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==
 
-follow-redirects@^1.0.0, follow-redirects@^1.14.0, follow-redirects@^1.14.9:
-  version "1.15.2"
-  resolved "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz"
-  integrity sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==
+follow-redirects@^1.0.0, follow-redirects@^1.14.0, follow-redirects@^1.15.6:
+  version "1.15.6"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.6.tgz#7f815c0cda4249c74ff09e95ef97c23b5fd0399b"
+  integrity sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==
 
 for-each@^0.3.3:
   version "0.3.3"
@@ -5751,7 +5948,7 @@ form-data@^3.0.0:
     combined-stream "^1.0.8"
     mime-types "^2.1.12"
 
-form-data@^4.0.0:
+form-data@^4.0.0, form-data@~4.0.0:
   version "4.0.0"
   resolved "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz"
   integrity sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==
@@ -5760,15 +5957,6 @@ form-data@^4.0.0:
     combined-stream "^1.0.8"
     mime-types "^2.1.12"
 
-form-data@~2.3.2:
-  version "2.3.3"
-  resolved "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz"
-  integrity sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==
-  dependencies:
-    asynckit "^0.4.0"
-    combined-stream "^1.0.6"
-    mime-types "^2.1.12"
-
 forwarded@0.2.0:
   version "0.2.0"
   resolved "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz"
@@ -5851,17 +6039,22 @@ function-bind@^1.1.1:
   resolved "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz"
   integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
 
-function.prototype.name@^1.1.5:
-  version "1.1.5"
-  resolved "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.5.tgz"
-  integrity sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==
+function-bind@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.2.tgz#2c02d864d97f3ea6c8830c464cbd11ab6eab7a1c"
+  integrity sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==
+
+function.prototype.name@^1.1.6:
+  version "1.1.6"
+  resolved "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.1.6.tgz#cdf315b7d90ee77a4c6ee216c3c3362da07533fd"
+  integrity sha512-Z5kx79swU5P27WEayXM1tBi5Ze/lbIyiNgU3qyXUOf9b2rgXYyF9Dy9Cx+IQv/Lc8WCG6L82zwUPpSS9hGehIg==
   dependencies:
     call-bind "^1.0.2"
-    define-properties "^1.1.3"
-    es-abstract "^1.19.0"
-    functions-have-names "^1.2.2"
+    define-properties "^1.2.0"
+    es-abstract "^1.22.1"
+    functions-have-names "^1.2.3"
 
-functions-have-names@^1.2.2:
+functions-have-names@^1.2.2, functions-have-names@^1.2.3:
   version "1.2.3"
   resolved "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz"
   integrity sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==
@@ -5899,6 +6092,17 @@ get-intrinsic@^1.0.2, get-intrinsic@^1.1.1, get-intrinsic@^1.1.3, get-intrinsic@
     has "^1.0.3"
     has-symbols "^1.0.3"
 
+get-intrinsic@^1.2.1, get-intrinsic@^1.2.3, get-intrinsic@^1.2.4:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.4.tgz#e385f5a4b5227d449c3eabbad05494ef0abbeadd"
+  integrity sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==
+  dependencies:
+    es-errors "^1.3.0"
+    function-bind "^1.1.2"
+    has-proto "^1.0.1"
+    has-symbols "^1.0.3"
+    hasown "^2.0.0"
+
 get-package-type@^0.1.0:
   version "0.1.0"
   resolved "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz"
@@ -5916,13 +6120,14 @@ get-stream@^6.0.0:
   resolved "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz"
   integrity sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==
 
-get-symbol-description@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz"
-  integrity sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==
+get-symbol-description@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/get-symbol-description/-/get-symbol-description-1.0.2.tgz#533744d5aa20aca4e079c8e5daf7fd44202821f5"
+  integrity sha512-g0QYk1dZBxGwk+Ngc+ltRH2IBp2f7zBkBMBJZCDerh6EhlhSR6+9irMCuT/09zD6qkarHUSn529sK/yL4S27mg==
   dependencies:
-    call-bind "^1.0.2"
-    get-intrinsic "^1.1.1"
+    call-bind "^1.0.5"
+    es-errors "^1.3.0"
+    get-intrinsic "^1.2.4"
 
 getos@^3.2.1:
   version "3.2.1"
@@ -5968,7 +6173,7 @@ glob@8.1.0, glob@^8.0.1:
     minimatch "^5.0.1"
     once "^1.3.0"
 
-glob@^7.0.3:
+glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, glob@^7.1.7:
   version "7.2.3"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b"
   integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==
@@ -5980,18 +6185,6 @@ glob@^7.0.3:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, glob@^7.1.7, glob@~7.2.0:
-  version "7.2.0"
-  resolved "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz"
-  integrity sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==
-  dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^3.0.4"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
 glob@^9.3.0, glob@^9.3.1:
   version "9.3.5"
   resolved "https://registry.npmjs.org/glob/-/glob-9.3.5.tgz"
@@ -6021,9 +6214,9 @@ globals@^13.19.0:
   dependencies:
     type-fest "^0.20.2"
 
-globalthis@^1.0.3:
+globalthis@^1.0.2, globalthis@^1.0.3:
   version "1.0.3"
-  resolved "https://registry.npmjs.org/globalthis/-/globalthis-1.0.3.tgz"
+  resolved "https://registry.yarnpkg.com/globalthis/-/globalthis-1.0.3.tgz#5852882a52b80dc301b0660273e1ed082f0b6ccf"
   integrity sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA==
   dependencies:
     define-properties "^1.1.3"
@@ -6051,17 +6244,10 @@ globby@^13.1.1:
     merge2 "^1.4.1"
     slash "^4.0.0"
 
-globby@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/globby/-/globby-5.0.0.tgz#ebd84667ca0dbb330b99bcfc68eac2bc54370e0d"
-  integrity sha512-HJRTIH2EeH44ka+LWig+EqT2ONSYpVlNfx6pyd592/VF1TbfljJ7elwie7oSwcViLGqOdWocSdu2txwBF9bjmQ==
-  dependencies:
-    array-union "^1.0.1"
-    arrify "^1.0.0"
-    glob "^7.0.3"
-    object-assign "^4.0.1"
-    pify "^2.0.0"
-    pinkie-promise "^2.0.0"
+goober@^2.0.33:
+  version "2.1.16"
+  resolved "https://registry.yarnpkg.com/goober/-/goober-2.1.16.tgz#7d548eb9b83ff0988d102be71f271ca8f9c82a95"
+  integrity sha512-erjk19y1U33+XAMe1VTvIONHYoSqE4iS7BYUZfHaqeohLmnC0FdxEh7rQU+6MZ4OajItzjZFSRtVANrQwNq6/g==
 
 gopd@^1.0.1:
   version "1.0.1"
@@ -6080,6 +6266,11 @@ grapheme-splitter@^1.0.4:
   resolved "https://registry.npmjs.org/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz"
   integrity sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==
 
+graphemer@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/graphemer/-/graphemer-1.4.0.tgz#fb2f1d55e0e3a1849aeffc90c4fa0dd53a0e66c6"
+  integrity sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==
+
 guess-parser@^0.4.22:
   version "0.4.22"
   resolved "https://registry.npmjs.org/guess-parser/-/guess-parser-0.4.22.tgz"
@@ -6087,38 +6278,11 @@ guess-parser@^0.4.22:
   dependencies:
     "@wessberg/ts-evaluator" "0.0.27"
 
-gzip-size@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.npmjs.org/gzip-size/-/gzip-size-6.0.0.tgz"
-  integrity sha512-ax7ZYomf6jqPTQ4+XCpUGyXKHk5WweS+e05MBO4/y3WJ5RkmPXNKvX+bx1behVILVwr6JSQvZAku021CHPXG3Q==
-  dependencies:
-    duplexer "^0.1.2"
-
 handle-thing@^2.0.0:
   version "2.0.1"
   resolved "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.1.tgz"
   integrity sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg==
 
-har-schema@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
-  integrity sha512-Oqluz6zhGX8cyRaTQlFMPw80bSJVG2x/cFb8ZPhUILGgHka9SsokCCOQgpveePerqidZOrT14ipqfJb7ILcW5Q==
-
-har-validator@~5.1.3:
-  version "5.1.5"
-  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.5.tgz#1f0803b9f8cb20c0fa13822df1ecddb36bde1efd"
-  integrity sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==
-  dependencies:
-    ajv "^6.12.3"
-    har-schema "^2.0.0"
-
-has-ansi@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91"
-  integrity sha512-C8vBJ8DwUCx19vhm7urhTuUsr4/IyP6l4VzNQDv+ryHQObW3TTTp9yB68WpYgRe2bbaGuZ/se74IqFeVnMnLZg==
-  dependencies:
-    ansi-regex "^2.0.0"
-
 has-bigints@^1.0.1, has-bigints@^1.0.2:
   version "1.0.2"
   resolved "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz"
@@ -6141,11 +6305,23 @@ has-property-descriptors@^1.0.0:
   dependencies:
     get-intrinsic "^1.1.1"
 
+has-property-descriptors@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz#963ed7d071dc7bf5f084c5bfbe0d1b6222586854"
+  integrity sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==
+  dependencies:
+    es-define-property "^1.0.0"
+
 has-proto@^1.0.1:
   version "1.0.1"
   resolved "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz"
   integrity sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==
 
+has-proto@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/has-proto/-/has-proto-1.0.3.tgz#b31ddfe9b0e6e9914536a6ab286426d0214f77fd"
+  integrity sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==
+
 has-symbols@^1.0.2, has-symbols@^1.0.3:
   version "1.0.3"
   resolved "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz"
@@ -6158,6 +6334,13 @@ has-tostringtag@^1.0.0:
   dependencies:
     has-symbols "^1.0.2"
 
+has-tostringtag@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/has-tostringtag/-/has-tostringtag-1.0.2.tgz#2cdc42d40bef2e5b4eeab7c01a73c54ce7ab5abc"
+  integrity sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==
+  dependencies:
+    has-symbols "^1.0.3"
+
 has-unicode@^2.0.1:
   version "2.0.1"
   resolved "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz"
@@ -6170,6 +6353,13 @@ has@^1.0.3:
   dependencies:
     function-bind "^1.1.1"
 
+hasown@^2.0.0, hasown@^2.0.1, hasown@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/hasown/-/hasown-2.0.2.tgz#003eaf91be7adc372e84ec59dc37252cedb80003"
+  integrity sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==
+  dependencies:
+    function-bind "^1.1.2"
+
 hdr-histogram-js@^2.0.1:
   version "2.0.3"
   resolved "https://registry.npmjs.org/hdr-histogram-js/-/hdr-histogram-js-2.0.3.tgz"
@@ -6323,21 +6513,10 @@ http-proxy-agent@^5.0.0:
     agent-base "6"
     debug "4"
 
-http-proxy-middleware@^1.0.5:
-  version "1.3.1"
-  resolved "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-1.3.1.tgz"
-  integrity sha512-13eVVDYS4z79w7f1+NPllJtOQFx/FdUW4btIvVRMaRlUY9VGstAbo5MOhLEuUgZFRHn3x50ufn25zkj/boZnEg==
-  dependencies:
-    "@types/http-proxy" "^1.17.5"
-    http-proxy "^1.18.1"
-    is-glob "^4.0.1"
-    is-plain-obj "^3.0.0"
-    micromatch "^4.0.2"
-
-http-proxy-middleware@^2.0.3, http-proxy-middleware@^2.0.6:
-  version "2.0.6"
-  resolved "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.6.tgz"
-  integrity sha512-ya/UeJ6HVBYxrgYotAZo1KvPWlgB48kUJLDePFeneHsVujFaW5WNj2NgWCAE//B1Dl02BIfYlpNgBy8Kf8Rjmw==
+http-proxy-middleware@^2.0.3, http-proxy-middleware@^2.0.6, http-proxy-middleware@^2.0.9:
+  version "2.0.9"
+  resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-2.0.9.tgz#e9e63d68afaa4eee3d147f39149ab84c0c2815ef"
+  integrity sha512-c1IyJYLYppU574+YI7R4QyX2ystMtVXZwIdzazUIPIJsHuWNd+mho2j+bKoHftndicGj9yh+xjd+l0yj7VeT1Q==
   dependencies:
     "@types/http-proxy" "^1.17.8"
     http-proxy "^1.18.1"
@@ -6354,23 +6533,24 @@ http-proxy@^1.18.1:
     follow-redirects "^1.0.0"
     requires-port "^1.0.0"
 
-http-signature@~1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1"
-  integrity sha512-CAbnr6Rz4CYQkLYUtSNXxQPUH2gK8f3iWexVlsnMeD+GjlsQ0Xsy1cOX+mN3dtxYomRy21CiOzU8Uhw6OwncEQ==
-  dependencies:
-    assert-plus "^1.0.0"
-    jsprim "^1.2.2"
-    sshpk "^1.7.0"
-
-http-signature@~1.3.6:
-  version "1.3.6"
-  resolved "https://registry.npmjs.org/http-signature/-/http-signature-1.3.6.tgz"
-  integrity sha512-3adrsD6zqo4GsTqtO7FyrejHNv+NgiIfAfv68+jVlFmSr9OGy7zrxONceFRLKvnnZA5jbxQBX1u9PpB6Wi32Gw==
+http-signature@~1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.4.0.tgz#dee5a9ba2bf49416abc544abd6d967f6a94c8c3f"
+  integrity sha512-G5akfn7eKbpDN+8nPS/cb57YeA1jLTVxjpCj7tmm3QKPdyDy7T+qSC40e9ptydSWvkwjSXw1VbkpyEm39ukeAg==
   dependencies:
     assert-plus "^1.0.0"
     jsprim "^2.0.2"
-    sshpk "^1.14.1"
+    sshpk "^1.18.0"
+
+http-terminator@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/http-terminator/-/http-terminator-3.2.0.tgz#bc158d2694b733ca4fbf22a35065a81a609fb3e9"
+  integrity sha512-JLjck1EzPaWjsmIf8bziM3p9fgR1Y3JoUKAkyYEbZmFrIvJM6I8vVJfBGWlEtV9IWOvzNnaTtjuwZeBY2kwB4g==
+  dependencies:
+    delay "^5.0.0"
+    p-wait-for "^3.2.0"
+    roarr "^7.0.4"
+    type-fest "^2.3.3"
 
 https-proxy-agent@5.0.1, https-proxy-agent@^5.0.0, https-proxy-agent@^5.0.1:
   version "5.0.1"
@@ -6477,6 +6657,11 @@ immutable@^4.0.0:
   resolved "https://registry.npmjs.org/immutable/-/immutable-4.3.0.tgz"
   integrity sha512-0AOCmOip+xgJwEVTQj1EfiDDOkPmuyllDuTuEX+DDXUgapLAsBIfkg3sxCYyCEA8mQqZrrxPUGjcOQ2JS3WLkg==
 
+immutable@^5.0.2:
+  version "5.0.3"
+  resolved "https://registry.yarnpkg.com/immutable/-/immutable-5.0.3.tgz#aa037e2313ea7b5d400cd9298fa14e404c933db1"
+  integrity sha512-P8IdPQHq3lA1xVeBRi5VPqUm5HDgKnx0Ru51wZz5mjxHr5n3RWhjIpOFU7ybkUxfB+5IToy+OLaHYDBIWsv+uw==
+
 import-fresh@^3.0.0, import-fresh@^3.2.1:
   version "3.3.0"
   resolved "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz"
@@ -6531,15 +6716,10 @@ ini@2.0.0:
   resolved "https://registry.npmjs.org/ini/-/ini-2.0.0.tgz"
   integrity sha512-7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA==
 
-ini@3.0.1:
-  version "3.0.1"
-  resolved "https://registry.npmjs.org/ini/-/ini-3.0.1.tgz"
-  integrity sha512-it4HyVAUTKBc6m8e1iXWvXSTdndF7HbdN713+kvLrymxTaU4AUBWrJ4vEooP+V7fexnVD3LKcBshjGGPefSMUQ==
-
-ini@^1.3.4:
-  version "1.3.8"
-  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c"
-  integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==
+ini@4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/ini/-/ini-4.1.1.tgz#d95b3d843b1e906e56d6747d5447904ff50ce7a1"
+  integrity sha512-QQnnxNyfvmHFIsj7gkPcYymR8Jdw/o7mp5ZFihxn6h8Ci6fh3Dx4E1gPjpQEpIuPo9XVNY/ZUwh4BPMjGyL01g==
 
 inquirer@8.2.4:
   version "8.2.4"
@@ -6562,7 +6742,7 @@ inquirer@8.2.4:
     through "^2.3.6"
     wrap-ansi "^7.0.0"
 
-internal-slot@^1.0.4, internal-slot@^1.0.5:
+internal-slot@^1.0.4:
   version "1.0.5"
   resolved "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.5.tgz"
   integrity sha512-Y+R5hJrzs52QCG2laLn4udYVnxsfny9CpOhNhUvk/SSSVyF6T27FzRbF0sroPidSu3X8oEAkOn2K804mjpt6UQ==
@@ -6571,6 +6751,15 @@ internal-slot@^1.0.4, internal-slot@^1.0.5:
     has "^1.0.3"
     side-channel "^1.0.4"
 
+internal-slot@^1.0.7:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.7.tgz#c06dcca3ed874249881007b0a5523b172a190802"
+  integrity sha512-NGnrKwXzSms2qUUih/ILZ5JBqNTSa1+ZmP6flaIp6KmSElgE9qdndzS3cqjrDovwFdmwsGsLdeFgB6suw+1e9g==
+  dependencies:
+    es-errors "^1.3.0"
+    hasown "^2.0.0"
+    side-channel "^1.0.4"
+
 interpret@^2.2.0:
   version "2.2.0"
   resolved "https://registry.npmjs.org/interpret/-/interpret-2.2.0.tgz"
@@ -6589,9 +6778,9 @@ invariant@^2.2.4:
     loose-envify "^1.0.0"
 
 ip@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.npmjs.org/ip/-/ip-2.0.0.tgz"
-  integrity sha512-WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ==
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/ip/-/ip-2.0.1.tgz#e8f3595d33a3ea66490204234b77636965307105"
+  integrity sha512-lJUL9imLTNi1ZfXT+DU6rBBdbiKGBuay9B6xGSPVjUeQwaH1RIGqef8RZkUtHioLmSNpPR5M4HVKJGm1j8FWVQ==
 
 ipaddr.js@1.9.1:
   version "1.9.1"
@@ -6611,7 +6800,7 @@ is-arguments@^1.1.1:
     call-bind "^1.0.2"
     has-tostringtag "^1.0.0"
 
-is-array-buffer@^3.0.1, is-array-buffer@^3.0.2:
+is-array-buffer@^3.0.1:
   version "3.0.2"
   resolved "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.2.tgz"
   integrity sha512-y+FyyR/w8vfIRq4eQcM1EYgSTnmHXPqaF+IgzgraytCFq5Xh8lllDVmAZolPJiZttZLeFSINPYMaEJ7/vWUa1w==
@@ -6620,6 +6809,14 @@ is-array-buffer@^3.0.1, is-array-buffer@^3.0.2:
     get-intrinsic "^1.2.0"
     is-typed-array "^1.1.10"
 
+is-array-buffer@^3.0.4:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/is-array-buffer/-/is-array-buffer-3.0.4.tgz#7a1f92b3d61edd2bc65d24f130530ea93d7fae98"
+  integrity sha512-wcjaerHw0ydZwfhiKbXJWLDY8A7yV7KhjQOpb83hGgGfId/aQa4TOvwyzn2PuswW2gPCYEL/nEAiSVpdOj1lXw==
+  dependencies:
+    call-bind "^1.0.2"
+    get-intrinsic "^1.2.1"
+
 is-arrayish@^0.2.1:
   version "0.2.1"
   resolved "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz"
@@ -6657,19 +6854,19 @@ is-callable@^1.1.3, is-callable@^1.1.4, is-callable@^1.2.7:
   resolved "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz"
   integrity sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==
 
-is-ci@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.npmjs.org/is-ci/-/is-ci-3.0.1.tgz"
-  integrity sha512-ZYvCgrefwqoQ6yTyYUbQu64HsITZ3NfKX1lzaEYdkTDcfKzzCI/wthRRYKkdjHKFVgNiXKAKm65Zo1pk2as/QQ==
+is-core-module@^2.11.0, is-core-module@^2.13.0, is-core-module@^2.15.1, is-core-module@^2.8.1:
+  version "2.15.1"
+  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.15.1.tgz#a7363a25bee942fefab0de13bf6aa372c82dcc37"
+  integrity sha512-z0vtXSwucUJtANQWldhbtbt7BnL0vxiFjIdDLAatwhDYty2bad6s+rijD6Ri4YuYJubLzIJLUidCh09e1djEVQ==
   dependencies:
-    ci-info "^3.2.0"
+    hasown "^2.0.2"
 
-is-core-module@^2.11.0, is-core-module@^2.8.1, is-core-module@^2.9.0:
-  version "2.12.0"
-  resolved "https://registry.npmjs.org/is-core-module/-/is-core-module-2.12.0.tgz"
-  integrity sha512-RECHCBCd/viahWmwj6enj19sKbHfJrddi/6cBDsNTKbNq0f7VeaUkBo60BqzvPqo/W54ChS62Z5qyun7cfOMqQ==
+is-data-view@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-data-view/-/is-data-view-1.0.1.tgz#4b4d3a511b70f3dc26d42c03ca9ca515d847759f"
+  integrity sha512-AHkaJrsUVW6wq6JS8y3JnM/GJF/9cf+k20+iDzlSaJrinEo5+7vRiteOSwBhHRiAyQATN1AmY4hwzxJKPmYf+w==
   dependencies:
-    has "^1.0.3"
+    is-typed-array "^1.1.13"
 
 is-date-object@^1.0.1, is-date-object@^1.0.5:
   version "1.0.5"
@@ -6728,10 +6925,10 @@ is-map@^2.0.1, is-map@^2.0.2:
   resolved "https://registry.npmjs.org/is-map/-/is-map-2.0.2.tgz"
   integrity sha512-cOZFQQozTha1f4MxLFzlgKYPTyj26picdZTx82hbc/Xf4K/tZOOXSCkMvU4pKioRXGDLJRn0GM7Upe7kR721yg==
 
-is-negative-zero@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz"
-  integrity sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==
+is-negative-zero@^2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.3.tgz#ced903a027aca6381b777a5743069d7376a49747"
+  integrity sha512-5KoIu2Ngpyek75jXodFvnafB6DJgr3u8uuK0LEZJjrU19DrMD3EVERaR8sjz8CCGgpZvxPl9SuE1GMVPFHx1mw==
 
 is-number-like@^1.0.3:
   version "1.0.8"
@@ -6752,25 +6949,6 @@ is-number@^7.0.0:
   resolved "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz"
   integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
 
-is-path-cwd@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-1.0.0.tgz#d225ec23132e89edd38fda767472e62e65f1106d"
-  integrity sha512-cnS56eR9SPAscL77ik76ATVqoPARTqPIVkMDVxRaWH06zT+6+CzIroYRJ0VVvm0Z1zfAvxvz9i/D3Ppjaqt5Nw==
-
-is-path-in-cwd@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-path-in-cwd/-/is-path-in-cwd-1.0.1.tgz#5ac48b345ef675339bd6c7a48a912110b241cf52"
-  integrity sha512-FjV1RTW48E7CWM7eE/J2NJvAEEVektecDBVBE5Hh3nM1Jd0kvhHtX68Pr3xsDf857xt3Y4AkwVULK1Vku62aaQ==
-  dependencies:
-    is-path-inside "^1.0.0"
-
-is-path-inside@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-1.0.1.tgz#8ef5b7de50437a3fdca6b4e865ef7aa55cb48036"
-  integrity sha512-qhsCR/Esx4U4hg/9I19OVUAJkGWtjRYHMRgUMZE2TDdj+Ag+kttZanLupfddNyglzz50cUlmWzUaI37GDfNx/g==
-  dependencies:
-    path-is-inside "^1.0.1"
-
 is-path-inside@^3.0.2, is-path-inside@^3.0.3:
   version "3.0.3"
   resolved "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz"
@@ -6818,6 +6996,13 @@ is-shared-array-buffer@^1.0.2:
   dependencies:
     call-bind "^1.0.2"
 
+is-shared-array-buffer@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.3.tgz#1237f1cba059cdb62431d378dcc37d9680181688"
+  integrity sha512-nA2hv5XIhLR3uVzDDfCIknerhx8XUKnstuOERPNNIinXG7v9u+ohXF67vxm4TPTEPU6lm61ZkwP3c9PCB97rhg==
+  dependencies:
+    call-bind "^1.0.7"
+
 is-stream@^2.0.0:
   version "2.0.1"
   resolved "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz"
@@ -6837,7 +7022,7 @@ is-symbol@^1.0.2, is-symbol@^1.0.3:
   dependencies:
     has-symbols "^1.0.2"
 
-is-typed-array@^1.1.10, is-typed-array@^1.1.9:
+is-typed-array@^1.1.10:
   version "1.1.10"
   resolved "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.10.tgz"
   integrity sha512-PJqgEHiWZvMpaFZ3uTc8kHPM4+4ADTlDniuQL7cU/UDA0Ql7F70yGfHph3cLNe+c9toaigv+DFzTJKhc2CtO6A==
@@ -6848,6 +7033,13 @@ is-typed-array@^1.1.10, is-typed-array@^1.1.9:
     gopd "^1.0.1"
     has-tostringtag "^1.0.0"
 
+is-typed-array@^1.1.13:
+  version "1.1.13"
+  resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.13.tgz#d6c5ca56df62334959322d7d7dd1cca50debe229"
+  integrity sha512-uZ25/bUAlUY5fR4OKT4rZQEBrzQWYV9ZJYGGsUmEJ6thodVJ1HX64ePQ6Z0qPWP+m+Uq6e9UugrE38jeYsDSMw==
+  dependencies:
+    which-typed-array "^1.1.14"
+
 is-typedarray@~1.0.0:
   version "1.0.0"
   resolved "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz"
@@ -6910,10 +7102,10 @@ isbinaryfile@^4.0.8:
   resolved "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-4.0.10.tgz"
   integrity sha512-iHrqe5shvBUcFbmZq9zOQHBoeOhZJu6RQGrDpBgenUm/Am+F3JM2MgQj+rK3Z601fzrL5gLZWtAPH2OBaSVcyw==
 
-isbot@^3.6.10:
-  version "3.6.10"
-  resolved "https://registry.yarnpkg.com/isbot/-/isbot-3.6.10.tgz#7b66334e81794f0461794debb567975cf08eaf2b"
-  integrity sha512-+I+2998oyP4oW9+OTQD8TS1r9P6wv10yejukj+Ksj3+UR5pUhsZN3f8W7ysq0p1qxpOVNbl5mCuv0bCaF8y5iQ==
+isbot@^5.1.28:
+  version "5.1.28"
+  resolved "https://registry.yarnpkg.com/isbot/-/isbot-5.1.28.tgz#a9a32e70c890cf19b76090971b1fccf6021a519b"
+  integrity sha512-qrOp4g3xj8YNse4biorv6O5ZShwsJM0trsoda4y7j/Su7ZtTTfVXFzbKkpgcSoDrHS8FcTuUwcU04YimZlZOxw==
 
 isexe@^2.0.0:
   version "2.0.0"
@@ -7053,10 +7245,10 @@ jsbn@~0.1.0:
   resolved "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz"
   integrity sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg==
 
-jsdoc-type-pratt-parser@~3.1.0:
-  version "3.1.0"
-  resolved "https://registry.npmjs.org/jsdoc-type-pratt-parser/-/jsdoc-type-pratt-parser-3.1.0.tgz"
-  integrity sha512-MgtD0ZiCDk9B+eI73BextfRrVQl0oyzRG8B2BjORts6jbunj4ScKPcyXGTbB6eXL4y9TzxCm6hyeLq/2ASzNdw==
+jsdoc-type-pratt-parser@~4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/jsdoc-type-pratt-parser/-/jsdoc-type-pratt-parser-4.0.0.tgz#136f0571a99c184d84ec84662c45c29ceff71114"
+  integrity sha512-YtOli5Cmzy3q4dP26GraSOeAhqecewG04hoO8DY56CH4KJ9Fvv5qKWUCCo3HZob7esJQHCv6/+bnTy72xZZaVQ==
 
 jsdom@21.1.0:
   version "21.1.0"
@@ -7180,22 +7372,22 @@ json5@^2.1.2, json5@^2.2.1, json5@^2.2.2, json5@^2.2.3:
   resolved "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz"
   integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==
 
-jsonc-eslint-parser@^2.0.4:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/jsonc-eslint-parser/-/jsonc-eslint-parser-2.1.0.tgz#4c126b530aa583d85308d0b3041ff81ce402bbb2"
-  integrity sha512-qCRJWlbP2v6HbmKW7R3lFbeiVWHo+oMJ0j+MizwvauqnCV/EvtAeEeuCgoc/ErtsuoKgYB8U4Ih8AxJbXoE6/g==
+jsonc-eslint-parser@^2.4.0:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/jsonc-eslint-parser/-/jsonc-eslint-parser-2.4.0.tgz#74ded53f9d716e8d0671bd167bf5391f452d5461"
+  integrity sha512-WYDyuc/uFcGp6YtM2H0uKmUwieOuzeE/5YocFJLnLfclZ4inf3mRn8ZVy1s7Hxji7Jxm6Ss8gqpexD/GlKoGgg==
   dependencies:
     acorn "^8.5.0"
     eslint-visitor-keys "^3.0.0"
     espree "^9.0.0"
     semver "^7.3.5"
 
-jsonc-parser@3.0.0, jsonc-parser@^3.0.0:
+jsonc-parser@3.0.0:
   version "3.0.0"
   resolved "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.0.0.tgz"
   integrity sha512-fQzRfAbIBnR0IQvftw9FJveWiHp72Fg20giDrHz6TdfB12UH/uue0D3hm57UB5KgAVuniLMCaS8P1IMj9NR7cA==
 
-jsonc-parser@3.2.0:
+jsonc-parser@3.2.0, jsonc-parser@^3.0.0:
   version "3.2.0"
   resolved "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.0.tgz"
   integrity sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w==
@@ -7228,20 +7420,10 @@ jsonparse@^1.3.1:
   resolved "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz"
   integrity sha512-POQXvpdL69+CluYsillJ7SUhKvytYjW9vG/GKpnf+xP8UWgYEM/RaMzHHofbALDiKbbP1W8UEYmgGl39WkPZsg==
 
-jsonschema@1.4.1:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/jsonschema/-/jsonschema-1.4.1.tgz#cc4c3f0077fb4542982973d8a083b6b34f482dab"
-  integrity sha512-S6cATIPVv1z0IlxdN+zUk5EPjkGCdnhN4wVSBlvoUO1tOLJootbo9CquNJmbIh4yikWHiUedhRYrNPn1arpEmQ==
-
-jsprim@^1.2.2:
-  version "1.4.2"
-  resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.2.tgz#712c65533a15c878ba59e9ed5f0e26d5b77c5feb"
-  integrity sha512-P2bSOMAc/ciLz6DzgjVlGJP9+BrJWu5UDGK70C2iweC5QBIeFf0ZXRvGjEj2uYgrY2MkAAhsSWHDWlFtEroZWw==
-  dependencies:
-    assert-plus "1.0.0"
-    extsprintf "1.3.0"
-    json-schema "0.4.0"
-    verror "1.10.0"
+jsonschema@1.5.0:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/jsonschema/-/jsonschema-1.5.0.tgz#f6aceb1ab9123563dd901d05f81f9d4883d3b7d8"
+  integrity sha512-K+A9hhqbn0f3pJX17Q/7H6yQfD/5OXgdrR5UE12gMXCiN9D5Xq2o5mddV2QEcX/bjla99ASsAAQUyMCCRWAEhw==
 
 jsprim@^2.0.2:
   version "2.0.2"
@@ -7392,10 +7574,10 @@ karma-source-map-support@1.4.0:
   dependencies:
     source-map-support "^0.5.5"
 
-karma@^6.4.2:
-  version "6.4.2"
-  resolved "https://registry.yarnpkg.com/karma/-/karma-6.4.2.tgz#a983f874cee6f35990c4b2dcc3d274653714de8e"
-  integrity sha512-C6SU/53LB31BEgRg+omznBEMY4SjHU3ricV6zBcAe1EeILKkeScr+fZXtaI5WyDbkVowJxxAI6h73NcFPmXolQ==
+karma@^6.4.4:
+  version "6.4.4"
+  resolved "https://registry.yarnpkg.com/karma/-/karma-6.4.4.tgz#dfa5a426cf5a8b53b43cd54ef0d0d09742351492"
+  integrity sha512-LrtUxbdvt1gOpo3gxG+VAJlJAEMhbWlM4YrFQgql98FwF7+K8K12LYO4hnDdUkNjeztYrOXEMqgTajSWgmtI/w==
   dependencies:
     "@colors/colors" "1.5.0"
     body-parser "^1.19.0"
@@ -7416,7 +7598,7 @@ karma@^6.4.2:
     qjobs "^1.2.0"
     range-parser "^1.2.1"
     rimraf "^3.0.2"
-    socket.io "^4.4.1"
+    socket.io "^4.7.2"
     source-map "^0.6.1"
     tmp "^0.2.1"
     ua-parser-js "^0.7.30"
@@ -7427,15 +7609,14 @@ kind-of@^6.0.2:
   resolved "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz"
   integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==
 
-klaro@^0.7.18:
-  version "0.7.18"
-  resolved "https://registry.npmjs.org/klaro/-/klaro-0.7.18.tgz"
-  integrity sha512-Q5nehkGeZuFerisW4oeeB1ax6dHDszWckR70EcxKvhFiJQ61CM0WBSo20yLbdvz8N9MFsOFu4RNCO9JsbkCxgQ==
-
-kleur@^3.0.3:
-  version "3.0.3"
-  resolved "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz"
-  integrity sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==
+klaro@^0.7.21:
+  version "0.7.21"
+  resolved "https://registry.yarnpkg.com/klaro/-/klaro-0.7.21.tgz#2ecaccb058ef7660fe21563b80a0c367d80b9c8a"
+  integrity sha512-PbF23xYGPObhg2GL0yqskPqRTziv3RTwVi9QZiBEB/BVulS/e1fFprgRiW6f4utPjb61q/16fWgPwHuuXJZYRA==
+  dependencies:
+    "@babel/eslint-parser" "^7.23.10"
+    sass "^1.25.0"
+    webpack-merge "^5.10.0"
 
 klona@^2.0.4, klona@^2.0.5:
   version "2.0.6"
@@ -7682,6 +7863,13 @@ magic-string@0.29.0:
   dependencies:
     "@jridgewell/sourcemap-codec" "^1.4.13"
 
+magic-string@0.30.1:
+  version "0.30.1"
+  resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.30.1.tgz#ce5cd4b0a81a5d032bd69aab4522299b2166284d"
+  integrity sha512-mbVKXPmS0z0G4XqFDCTllmDQ6coZzn94aMlb0o/A4HEHJCKcanlDZwYJgwnkmgD3jyWhUgj9VsPrfd972yPffA==
+  dependencies:
+    "@jridgewell/sourcemap-codec" "^1.4.15"
+
 magic-string@^0.27.0:
   version "0.27.0"
   resolved "https://registry.npmjs.org/magic-string/-/magic-string-0.27.0.tgz"
@@ -7752,6 +7940,27 @@ make-fetch-happen@^11.0.0, make-fetch-happen@^11.0.1:
     socks-proxy-agent "^7.0.0"
     ssri "^10.0.0"
 
+make-fetch-happen@^11.1.1:
+  version "11.1.1"
+  resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-11.1.1.tgz#85ceb98079584a9523d4bf71d32996e7e208549f"
+  integrity sha512-rLWS7GCSTcEujjVBs2YqG7Y4643u8ucvCJeSRqiLYhesrDuzeuFIk37xREzAsfQaqzl8b9rNCE4m6J8tvX4Q8w==
+  dependencies:
+    agentkeepalive "^4.2.1"
+    cacache "^17.0.0"
+    http-cache-semantics "^4.1.1"
+    http-proxy-agent "^5.0.0"
+    https-proxy-agent "^5.0.0"
+    is-lambda "^1.0.1"
+    lru-cache "^7.7.1"
+    minipass "^5.0.0"
+    minipass-fetch "^3.0.0"
+    minipass-flush "^1.0.5"
+    minipass-pipeline "^1.2.4"
+    negotiator "^0.6.3"
+    promise-retry "^2.0.1"
+    socks-proxy-agent "^7.0.0"
+    ssri "^10.0.0"
+
 manifesto.js@^4.2.0:
   version "4.2.17"
   resolved "https://registry.npmjs.org/manifesto.js/-/manifesto.js-4.2.17.tgz"
@@ -7770,10 +7979,10 @@ markdown-it-mathjax3@^4.3.2:
     juice "^8.0.0"
     mathjax-full "^3.2.0"
 
-markdown-it@^13.0.1:
-  version "13.0.1"
-  resolved "https://registry.npmjs.org/markdown-it/-/markdown-it-13.0.1.tgz"
-  integrity sha512-lTlxriVoy2criHP0JKRhO2VDG9c2ypWCsT237eDiLqi09rmbKoUetyGHq2uOIRoRS//kfoJckS0eUzzkDR+k2Q==
+markdown-it@^13.0.2:
+  version "13.0.2"
+  resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-13.0.2.tgz#1bc22e23379a6952e5d56217fbed881e0c94d536"
+  integrity sha512-FtwnEuuK+2yVU7goGn/MJ0WBZMM9ZPgU9spqlFs7/A/pDIUNSOQZhUgOqYCficIuR2QaFnrt8LHqBWsbTAoI5w==
   dependencies:
     argparse "^2.0.1"
     entities "~3.0.1"
@@ -7827,10 +8036,10 @@ mensch@^0.3.4:
   resolved "https://registry.npmjs.org/mensch/-/mensch-0.3.4.tgz"
   integrity sha512-IAeFvcOnV9V0Yk+bFhYR07O3yNina9ANIN5MoXBKYJ/RLYPurd2d0yw14MDhpr9/momp0WofT1bPUh3hkzdi/g==
 
-merge-descriptors@1.0.1:
-  version "1.0.1"
-  resolved "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz"
-  integrity sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==
+merge-descriptors@1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.3.tgz#d80319a65f3c7935351e5cfdac8f9318504dbed5"
+  integrity sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ==
 
 merge-stream@^2.0.0:
   version "2.0.0"
@@ -7852,12 +8061,12 @@ mhchemparser@^4.1.0:
   resolved "https://registry.npmjs.org/mhchemparser/-/mhchemparser-4.1.1.tgz"
   integrity sha512-R75CUN6O6e1t8bgailrF1qPq+HhVeFTM3XQ0uzI+mXTybmphy3b6h4NbLOYhemViQ3lUs+6CKRkC3Ws1TlYREA==
 
-micromatch@^4.0.2, micromatch@^4.0.4:
-  version "4.0.5"
-  resolved "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz"
-  integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==
+micromatch@^4.0.2, micromatch@^4.0.4, micromatch@^4.0.5:
+  version "4.0.8"
+  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.8.tgz#d66fa18f3a47076789320b9b1af32bd86d9fa202"
+  integrity sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==
   dependencies:
-    braces "^3.0.2"
+    braces "^3.0.3"
     picomatch "^2.3.1"
 
 mime-db@1.52.0, "mime-db@>= 1.43.0 < 2":
@@ -7925,14 +8134,21 @@ minimatch@^7.4.2:
   dependencies:
     brace-expansion "^2.0.1"
 
-minimatch@^8.0.2, minimatch@^8.0.3:
+minimatch@^8.0.2:
   version "8.0.4"
   resolved "https://registry.npmjs.org/minimatch/-/minimatch-8.0.4.tgz"
   integrity sha512-W0Wvr9HyFXZRGIDgCicunpQ299OKXs9RgZfaukz4qAW/pJhcpUfupc9c+OObPOFueNy8VSrZgEmDtk6Kh4WzDA==
   dependencies:
     brace-expansion "^2.0.1"
 
-minimist@^1.2.0, minimist@^1.2.5, minimist@^1.2.6, minimist@^1.2.8:
+minimatch@^9.0.0:
+  version "9.0.3"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.3.tgz#a6e00c3de44c3a542bfaae70abfc22420a6da825"
+  integrity sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==
+  dependencies:
+    brace-expansion "^2.0.1"
+
+minimist@^1.2.0, minimist@^1.2.6, minimist@^1.2.8:
   version "1.2.8"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c"
   integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==
@@ -8025,17 +8241,19 @@ mirador-dl-plugin@^0.13.0:
   resolved "https://registry.npmjs.org/mirador-dl-plugin/-/mirador-dl-plugin-0.13.0.tgz"
   integrity sha512-I/6etIvpTtO1zgjxx2uEUFoyB9NxQ43JWg8CMkKmZqblW7AAeFqRn1/zUlQH7N8KFZft9Rah6D8qxtuNAo9jmA==
 
-mirador-share-plugin@^0.11.0:
-  version "0.11.0"
-  resolved "https://registry.npmjs.org/mirador-share-plugin/-/mirador-share-plugin-0.11.0.tgz"
-  integrity sha512-fHcdDXyrtfy5pn1zdQNX9BvE5Tjup66eQwyNippE5PMaP8ImUcrFaSL+mStdn+v6agsHcsdRqLhseZ0XWgEuAw==
-
-mirador@^3.3.0:
-  version "3.3.0"
-  resolved "https://registry.npmjs.org/mirador/-/mirador-3.3.0.tgz"
-  integrity sha512-BmGfRnWJ45B+vtiAwcFT7n9nKialfejE9UvuUK0NorO37ShArpsKr3yVSD4jQASwSR4DRRpPEG21jOk4WN7H3w==
+mirador-share-plugin@^0.16.0:
+  version "0.16.0"
+  resolved "https://registry.yarnpkg.com/mirador-share-plugin/-/mirador-share-plugin-0.16.0.tgz#736c575dea17f0f846a6c6a4770d87a1275557fc"
+  integrity sha512-Rlywq/06nXf4/BUc2LTBD6jf+Q5VO97NK+MTd4VPMfY50Fb8NMr6L0edZXZETcTML1qh11GDEVrHx/csxMSlMA==
   dependencies:
-    "@material-ui/core" "^4.11.0"
+    notistack "^3.0.1"
+
+mirador@^3.4.3:
+  version "3.4.3"
+  resolved "https://registry.yarnpkg.com/mirador/-/mirador-3.4.3.tgz#1b083bd037b851d1389758f3c86eb94832b00ec6"
+  integrity sha512-yHoug0MHy4e9apykbbBhK+4CmbZS94zMxmugw2E2VX6iB0b2PKKY0JfYr/QfXh9P29YnWAbymaXJVpgbHVpTVw==
+  dependencies:
+    "@material-ui/core" "^4.12.3"
     "@material-ui/icons" "^4.9.1"
     "@material-ui/lab" "^4.0.0-alpha.53"
     "@researchgate/react-intersection-observer" "^1.0.0"
@@ -8052,7 +8270,7 @@ mirador@^3.3.0:
     lodash "^4.17.11"
     manifesto.js "^4.2.0"
     normalize-url "^4.5.0"
-    openseadragon "^2.4.2"
+    openseadragon "^2.4.2 || ^3.0.0 || 4.0.x || ^4.1.1 || ^5.0.0"
     prop-types "^15.6.2"
     re-reselect "^4.0.0"
     react-aria-live "^2.0.5"
@@ -8112,11 +8330,6 @@ morgan@^1.10.0:
     on-finished "~2.3.0"
     on-headers "~1.0.2"
 
-mrmime@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.npmjs.org/mrmime/-/mrmime-1.0.1.tgz"
-  integrity sha512-hzzEagAgDyoU1Q6yg5uI+AorQgdvMCur3FcKf7NhMKWsaYg+RnbTyHRa/9IlLF9rf455MOCtcqqrQQ83pPP7Uw==
-
 ms@2.0.0:
   version "2.0.0"
   resolved "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz"
@@ -8145,10 +8358,10 @@ mute-stream@0.0.8:
   resolved "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz"
   integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==
 
-nanoid@^3.3.4, nanoid@^3.3.6:
-  version "3.3.6"
-  resolved "https://registry.npmjs.org/nanoid/-/nanoid-3.3.6.tgz"
-  integrity sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==
+nanoid@^3.3.6, nanoid@^3.3.8:
+  version "3.3.8"
+  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.8.tgz#b1be3030bee36aaff18bacb375e5cce521684baf"
+  integrity sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==
 
 natural-compare-lite@^1.4.0:
   version "1.4.0"
@@ -8169,20 +8382,25 @@ needle@^3.1.0:
     iconv-lite "^0.6.3"
     sax "^1.2.4"
 
-negotiator@0.6.3, negotiator@^0.6.3:
+negotiator@0.6.3:
   version "0.6.3"
   resolved "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz"
   integrity sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==
 
+negotiator@^0.6.3, negotiator@~0.6.4:
+  version "0.6.4"
+  resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.4.tgz#777948e2452651c570b712dd01c23e262713fff7"
+  integrity sha512-myRT3DiWPHqho5PrJaIRyaMv2kgYf0mUVgBNOYMuCH5Ki1yEiQaf/ZJuQ62nvpc44wL5WDbTX7yGJi1Neevw8w==
+
 neo-async@^2.6.2:
   version "2.6.2"
   resolved "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz"
   integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==
 
-ng-mocks@^14.10.0:
-  version "14.10.0"
-  resolved "https://registry.yarnpkg.com/ng-mocks/-/ng-mocks-14.10.0.tgz#36064650c52f6e01be5c810228a0c9585109bb27"
-  integrity sha512-gUnrSH4ejlkSpd9wgEe7PNKEyADJCriemSIbyebS0SQjyotSZfp/8jBuMl7Euvk0sPanV2IGhOv6W9e6hNRe/A==
+ng-mocks@^14.13.4:
+  version "14.13.4"
+  resolved "https://registry.yarnpkg.com/ng-mocks/-/ng-mocks-14.13.4.tgz#bb53f7b75e0937fcfc8a2177a234a0937143f326"
+  integrity sha512-OFpzcx9vzeMqpVaBaukH8gvHRhor8iAkc8pOWakSPwxD3DuoHyDrjb/odgjI3Jq+Iaerqb3js1I4Sluu+0rLSQ==
 
 ng2-file-upload@1.4.0:
   version "1.4.0"
@@ -8191,10 +8409,12 @@ ng2-file-upload@1.4.0:
   dependencies:
     tslib "^1.9.0"
 
-ng2-nouislider@^1.8.3:
-  version "1.8.3"
-  resolved "https://registry.npmjs.org/ng2-nouislider/-/ng2-nouislider-1.8.3.tgz"
-  integrity sha512-Vl8tHCcJ/ioJLAs2t6FBC35sZq1P/O5ZdqdFwYxOCOMVbILGWNg+2gWZIjFstvv9pqb/mVvVUYe6qGG/mA/RBQ==
+ng2-nouislider@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/ng2-nouislider/-/ng2-nouislider-2.0.0.tgz#a62fd6cf3f1561be19a2691c2f68d21a46dc6006"
+  integrity sha512-NGbF/0w0+bZqclpSPFOlWIeVJaVwRRYFJzD1x8PClbw9GIeo7fCHoBzZ81y7K7FTJg6to+cgjSTFETPZG/Dizg==
+  dependencies:
+    tslib "^2.3.0"
 
 ngx-infinite-scroll@^15.0.0:
   version "15.0.0"
@@ -8217,6 +8437,14 @@ ngx-pagination@6.0.3:
   dependencies:
     tslib "^2.3.0"
 
+ngx-skeleton-loader@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/ngx-skeleton-loader/-/ngx-skeleton-loader-7.0.0.tgz#3b1325025a7208a20f3a0fdba6e578532a09cfcd"
+  integrity sha512-myc6GNcNhyksZrimIFkCxeihi0kQ8JhQVZiGbtiIv4gYrnnRk5nXbs3kYitK8E8OstHG+jlsmRofqGBxuIsYTA==
+  dependencies:
+    perf-marks "^1.13.4"
+    tslib "^2.0.0"
+
 ngx-sortablejs@^11.1.0:
   version "11.1.0"
   resolved "https://registry.npmjs.org/ngx-sortablejs/-/ngx-sortablejs-11.1.0.tgz"
@@ -8224,10 +8452,10 @@ ngx-sortablejs@^11.1.0:
   dependencies:
     tslib "^2.0.0"
 
-ngx-ui-switch@^14.0.3:
-  version "14.0.3"
-  resolved "https://registry.npmjs.org/ngx-ui-switch/-/ngx-ui-switch-14.0.3.tgz"
-  integrity sha512-SZ8ZnTCuNJgNWuY3/mOG3TdsRUNPCX3vGdCKKx1ZHVMTUynerJQlTWck2JrYlnrexNnd7wy4P10jDvdtDwoYeg==
+ngx-ui-switch@^14.1.0:
+  version "14.1.0"
+  resolved "https://registry.yarnpkg.com/ngx-ui-switch/-/ngx-ui-switch-14.1.0.tgz#32248361a684257c5ae64cfde61b95de920b901c"
+  integrity sha512-uGGLppBP1FXjyD+x7f8Pm6I3JQTMmsBqPtwERAX27jSZxDWFp/sewnl75fuDvu75qFofJd/BIOtV4xHxzgZOvw==
   dependencies:
     tslib "^2.3.0"
 
@@ -8244,6 +8472,11 @@ node-addon-api@^3.0.0:
   resolved "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.2.1.tgz"
   integrity sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A==
 
+node-addon-api@^7.0.0:
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-7.1.1.tgz#1aba6693b0f255258a049d621329329322aad558"
+  integrity sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ==
+
 node-fetch@^2.6.0, node-fetch@^2.6.1:
   version "2.6.9"
   resolved "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.9.tgz"
@@ -8337,10 +8570,18 @@ normalize-url@^4.5.0:
   resolved "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.1.tgz"
   integrity sha512-9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA==
 
-nouislider@^14.6.3:
-  version "14.7.0"
-  resolved "https://registry.npmjs.org/nouislider/-/nouislider-14.7.0.tgz"
-  integrity sha512-4RtQ1+LHJKesDCNJrXkQcwXAWCrC2aggdLYMstS/G5fEWL+fXZbUA9pwVNHFghMGuFGRATlDLNInRaPeRKzpFQ==
+notistack@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/notistack/-/notistack-3.0.1.tgz#daf59888ab7e2c30a1fa8f71f9cba2978773236e"
+  integrity sha512-ntVZXXgSQH5WYfyU+3HfcXuKaapzAJ8fBLQ/G618rn3yvSzEbnOB8ZSOwhX+dAORy/lw+GC2N061JA0+gYWTVA==
+  dependencies:
+    clsx "^1.1.0"
+    goober "^2.0.33"
+
+nouislider@^15.8.1:
+  version "15.8.1"
+  resolved "https://registry.yarnpkg.com/nouislider/-/nouislider-15.8.1.tgz#18729ed29738d2d328a1b5e0429d38eb8be8a696"
+  integrity sha512-93TweAi8kqntHJSPiSWQ1o/uZ29VWOmal9YKb6KKGGlCkugaNfAupT7o1qTHqdJvNQ7S0su5rO6qRFCjP8fxtw==
 
 npm-bundled@^3.0.0:
   version "3.0.0"
@@ -8430,17 +8671,17 @@ nwsapi@^2.2.0, nwsapi@^2.2.2:
   resolved "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.3.tgz"
   integrity sha512-jscxIO4/VKScHlbmFBdV1Z6LXnLO+ZR4VMtypudUdfwtKxUN3TQcNFIHLwKtrUbDyHN4/GycY9+oRGZ2XMXYPw==
 
-oauth-sign@~0.9.0:
-  version "0.9.0"
-  resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455"
-  integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==
-
-object-assign@^4, object-assign@^4.0.1, object-assign@^4.1.1:
+object-assign@^4, object-assign@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
   integrity sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==
 
-object-inspect@^1.12.3, object-inspect@^1.9.0:
+object-inspect@^1.13.1:
+  version "1.13.2"
+  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.13.2.tgz#dea0088467fb991e67af4058147a24824a3043ff"
+  integrity sha512-IRZSRuzJiynemAXPYtPe5BoI/RESNYR7TYm50MC5Mqbd3Jmw5y790sErYw3V6SryFJD64b74qQQs9wn5Bg/k3g==
+
+object-inspect@^1.9.0:
   version "1.12.3"
   resolved "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz"
   integrity sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==
@@ -8473,14 +8714,43 @@ object.assign@^4.1.4:
     has-symbols "^1.0.3"
     object-keys "^1.1.1"
 
-object.values@^1.1.6:
-  version "1.1.6"
-  resolved "https://registry.npmjs.org/object.values/-/object.values-1.1.6.tgz"
-  integrity sha512-FVVTkD1vENCsAcwNs9k6jea2uHC/X0+JcjG8YA60FN5CMaJmG95wT9jek/xX9nornqGRrBkKtzuAu2wuHpKqvw==
+object.assign@^4.1.5:
+  version "4.1.5"
+  resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.5.tgz#3a833f9ab7fdb80fc9e8d2300c803d216d8fdbb0"
+  integrity sha512-byy+U7gp+FVwmyzKPYhW2h5l3crpmGsxl7X2s8y43IgxvG4g3QZ6CffDtsNQy1WsmZpQbO+ybo0AlW7TY6DcBQ==
   dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.1.4"
-    es-abstract "^1.20.4"
+    call-bind "^1.0.5"
+    define-properties "^1.2.1"
+    has-symbols "^1.0.3"
+    object-keys "^1.1.1"
+
+object.fromentries@^2.0.8:
+  version "2.0.8"
+  resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.8.tgz#f7195d8a9b97bd95cbc1999ea939ecd1a2b00c65"
+  integrity sha512-k6E21FzySsSK5a21KRADBd/NGneRegFO5pLHfdQLpRDETUNJueLXs3WCzyQ3tFRDYgbq3KHGXfTbi2bs8WQ6rQ==
+  dependencies:
+    call-bind "^1.0.7"
+    define-properties "^1.2.1"
+    es-abstract "^1.23.2"
+    es-object-atoms "^1.0.0"
+
+object.groupby@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/object.groupby/-/object.groupby-1.0.3.tgz#9b125c36238129f6f7b61954a1e7176148d5002e"
+  integrity sha512-+Lhy3TQTuzXI5hevh8sBGqbmurHbbIjAi0Z4S63nthVLmLxfbj4T54a4CfZrXIrt9iP4mVAPYMo/v99taj3wjQ==
+  dependencies:
+    call-bind "^1.0.7"
+    define-properties "^1.2.1"
+    es-abstract "^1.23.2"
+
+object.values@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.2.0.tgz#65405a9d92cee68ac2d303002e0b8470a4d9ab1b"
+  integrity sha512-yBYjY9QX2hnRmZHAjG/f13MzmBzxzYgQhFrke06TTyKY5zSTEqkOeukBzIdVA3j3ulu8Qa3MbVFShV7T2RmGtQ==
+  dependencies:
+    call-bind "^1.0.7"
+    define-properties "^1.2.1"
+    es-object-atoms "^1.0.0"
 
 obuf@^1.0.0, obuf@^1.1.2:
   version "1.1.2"
@@ -8529,24 +8799,19 @@ open@8.4.1:
     is-docker "^2.1.1"
     is-wsl "^2.2.0"
 
-open@^8.0.9:
-  version "8.4.0"
-  resolved "https://registry.npmjs.org/open/-/open-8.4.0.tgz"
-  integrity sha512-XgFPPM+B28FtCCgSb9I+s9szOC1vZRSwgWsRUA5ylIxRTgKozqjOCrVOqGsYABPYK5qnfqClxZTFBa8PKt2v6Q==
+open@8.4.2, open@^8.0.9:
+  version "8.4.2"
+  resolved "https://registry.yarnpkg.com/open/-/open-8.4.2.tgz#5b5ffe2a8f793dcd2aad73e550cb87b59cb084f9"
+  integrity sha512-7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ==
   dependencies:
     define-lazy-prop "^2.0.0"
     is-docker "^2.1.1"
     is-wsl "^2.2.0"
 
-opener@^1.5.2:
-  version "1.5.2"
-  resolved "https://registry.npmjs.org/opener/-/opener-1.5.2.tgz"
-  integrity sha512-ur5UIdyw5Y7yEj9wLzhqXiy6GZ3Mwx0yGI+5sMn2r0N0v3cKJvUmFH5yPP+WXh9e0xfyzyJX95D8l088DNFj7A==
-
-openseadragon@^2.4.2:
-  version "2.4.2"
-  resolved "https://registry.npmjs.org/openseadragon/-/openseadragon-2.4.2.tgz"
-  integrity sha512-398KbZwRtOYA6OmeWRY4Q0737NTacQ9Q6whmr9Lp1MNQO3p0eBz5LIASRne+4gwequcSM1vcHcjfy3dIndQziw==
+"openseadragon@^2.4.2 || ^3.0.0 || 4.0.x || ^4.1.1 || ^5.0.0":
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/openseadragon/-/openseadragon-5.0.1.tgz#ad3aaccc6c0f733c3153131e9af05bc2e17a1952"
+  integrity sha512-a/hjouW9i3UfWxRADVYN2MyRhXMGnE7x9VVL7/4jXCcDLFyO4UM5o4RStYtqa5BfaHw/wMNAaD2WbxQF8f1pJg==
 
 openurl@1.1.1:
   version "1.1.1"
@@ -8609,6 +8874,11 @@ ospath@^1.2.2:
   resolved "https://registry.npmjs.org/ospath/-/ospath-1.2.2.tgz"
   integrity sha512-o6E5qJV5zkAbIDNhGSIlyOhScKXgQrSRMilfph0clDfM0nEnBOlKlH4sWDmG95BW/CvwNz0vmm7dJVtU2KlMiA==
 
+p-finally@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
+  integrity sha512-LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow==
+
 p-limit@^2.2.0:
   version "2.3.0"
   resolved "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz"
@@ -8652,15 +8922,29 @@ p-retry@^4.5.0:
     "@types/retry" "0.12.0"
     retry "^0.13.1"
 
+p-timeout@^3.0.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/p-timeout/-/p-timeout-3.2.0.tgz#c7e17abc971d2a7962ef83626b35d635acf23dfe"
+  integrity sha512-rhIwUycgwwKcP9yTOOFK/AKsAopjjCakVqLHePO3CC6Mir1Z99xT+R63jZxAT5lFZLa2inS5h+ZS2GvR99/FBg==
+  dependencies:
+    p-finally "^1.0.0"
+
 p-try@^2.0.0:
   version "2.2.0"
   resolved "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz"
   integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==
 
-pacote@15.1.0:
-  version "15.1.0"
-  resolved "https://registry.npmjs.org/pacote/-/pacote-15.1.0.tgz"
-  integrity sha512-FFcjtIl+BQNfeliSm7MZz5cpdohvUV1yjGnqgVM4UnVF7JslRY0ImXAygdaCDV0jjUADEWu4y5xsDV8brtrTLg==
+p-wait-for@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/p-wait-for/-/p-wait-for-3.2.0.tgz#640429bcabf3b0dd9f492c31539c5718cb6a3f1f"
+  integrity sha512-wpgERjNkLrBiFmkMEjuZJEWKKDrNfHCKA1OhyN1wg1FrLkULbviEy6py1AyJUgZ72YWFbZ38FIpnqvVqAlDUwA==
+  dependencies:
+    p-timeout "^3.0.0"
+
+pacote@15.2.0:
+  version "15.2.0"
+  resolved "https://registry.yarnpkg.com/pacote/-/pacote-15.2.0.tgz#0f0dfcc3e60c7b39121b2ac612bf8596e95344d3"
+  integrity sha512-rJVZeIwHTUta23sIZgEIM62WYwbmGbThdbnkt81ravBplQv+HjyroqnLRNH2+sLJHcGZmLRmhPwACqhfTcOmnA==
   dependencies:
     "@npmcli/git" "^4.0.0"
     "@npmcli/installed-package-contents" "^2.0.1"
@@ -8668,7 +8952,7 @@ pacote@15.1.0:
     "@npmcli/run-script" "^6.0.0"
     cacache "^17.0.0"
     fs-minipass "^3.0.0"
-    minipass "^4.0.0"
+    minipass "^5.0.0"
     npm-package-arg "^10.0.0"
     npm-packlist "^7.0.0"
     npm-pick-manifest "^8.0.0"
@@ -8677,7 +8961,7 @@ pacote@15.1.0:
     promise-retry "^2.0.1"
     read-package-json "^6.0.0"
     read-package-json-fast "^3.0.0"
-    sigstore "^1.0.0"
+    sigstore "^1.3.0"
     ssri "^10.0.0"
     tar "^6.1.11"
 
@@ -8748,7 +9032,7 @@ parse5@^7.0.0, parse5@^7.1.1, parse5@^7.1.2:
   dependencies:
     entities "^4.4.0"
 
-parseurl@~1.3.2, parseurl@~1.3.3:
+parseurl@^1.3.3, parseurl@~1.3.2, parseurl@~1.3.3:
   version "1.3.3"
   resolved "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz"
   integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==
@@ -8763,11 +9047,6 @@ path-is-absolute@^1.0.0:
   resolved "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz"
   integrity sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==
 
-path-is-inside@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53"
-  integrity sha512-DUWJr3+ULp4zXmol/SZkFf3JGsS9/SIv+Y3Rt93/UjPpDpklB5f1er4O3POIbUuUJ3FXgqte2Q7SrU6zAqwk8w==
-
 path-key@^3.0.0, path-key@^3.1.0:
   version "3.1.1"
   resolved "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz"
@@ -8786,20 +9065,20 @@ path-scurry@^1.6.1:
     lru-cache "^9.0.0"
     minipass "^5.0.0"
 
-path-to-regexp@0.1.7:
-  version "0.1.7"
-  resolved "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz"
-  integrity sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==
+path-to-regexp@0.1.12:
+  version "0.1.12"
+  resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.12.tgz#d5e1a12e478a976d432ef3c58d534b9923164bb7"
+  integrity sha512-RA1GjUVMnvYFxuqovrEqZoxxW5NUZqbwKtYz/Tt7nXerk0LbLblQmrsgdeOxV5SFHf0UDggjS/bSeOZwt1pmEQ==
 
 path-type@^4.0.0:
   version "4.0.0"
   resolved "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz"
   integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==
 
-pem@1.14.7:
-  version "1.14.7"
-  resolved "https://registry.yarnpkg.com/pem/-/pem-1.14.7.tgz#dae9831ee5fa7c88547327fb7738898cd76412c6"
-  integrity sha512-tN5+bp2/Yh/2yuv/JFXXHXrd5RVfsEBwlV7BshuYPX0OJWbR/MeAr89CKWcIp/W0cEnaTPT44haXyaEz1T6XeA==
+pem@1.14.8:
+  version "1.14.8"
+  resolved "https://registry.yarnpkg.com/pem/-/pem-1.14.8.tgz#9c414bee991b138a24617f423059e809d01aa720"
+  integrity sha512-ZpbOf4dj9/fQg5tQzTqv4jSKJQsK7tPl0pm4/pvPcZVjZcJg7TMfr3PBk6gJH97lnpJDu4e4v8UUqEz5daipCg==
   dependencies:
     es6-promisify "^7.0.0"
     md5 "^2.3.0"
@@ -8811,27 +9090,29 @@ pend@~1.2.0:
   resolved "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz"
   integrity sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==
 
+perf-marks@^1.13.4:
+  version "1.14.2"
+  resolved "https://registry.yarnpkg.com/perf-marks/-/perf-marks-1.14.2.tgz#7511c24239b9c2071717993a33ec3057f387b8c7"
+  integrity sha512-N0/bQcuTlETpgox/DsXS1voGjqaoamMoiyhncgeW3rSHy/qw8URVgmPRYfFDQns/+C6yFUHDbeSBGL7ixT6Y4A==
+  dependencies:
+    tslib "^2.1.0"
+
 performance-now@^2.1.0:
   version "2.1.0"
   resolved "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz"
   integrity sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==
 
-picocolors@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz"
-  integrity sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==
+picocolors@^1.0.0, picocolors@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.1.1.tgz#3d321af3eab939b083c8f929a1d12cda81c26b6b"
+  integrity sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==
 
-picocolors@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz"
-  integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==
-
-picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.3.1:
+picomatch@2.3.1, picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.3.1:
   version "2.3.1"
   resolved "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz"
   integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==
 
-pify@^2.0.0, pify@^2.2.0, pify@^2.3.0:
+pify@^2.2.0, pify@^2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
   integrity sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==
@@ -8841,18 +9122,6 @@ pify@^4.0.1:
   resolved "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz"
   integrity sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==
 
-pinkie-promise@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa"
-  integrity sha512-0Gni6D4UcLTbv9c57DfxDGdr41XfgUjqWZu492f0cIGr16zDU06BWP/RAEvOuo7CQ0CNjHaLlM59YJJFm3NWlw==
-  dependencies:
-    pinkie "^2.0.0"
-
-pinkie@^2.0.0:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
-  integrity sha512-MnUuEycAemtSaeFSjXKW/aroV7akBbY+Sv+RkyqFjgAe73F+MR0TBWKBRDkmfWq/HiFmdavfZ1G7h4SPZXaCSg==
-
 piscina@3.2.0, piscina@~3.2.0:
   version "3.2.0"
   resolved "https://registry.npmjs.org/piscina/-/piscina-3.2.0.tgz"
@@ -8884,13 +9153,10 @@ portscanner@2.2.0:
     async "^2.6.0"
     is-number-like "^1.0.3"
 
-postcss-apply@0.12.0:
-  version "0.12.0"
-  resolved "https://registry.npmjs.org/postcss-apply/-/postcss-apply-0.12.0.tgz"
-  integrity sha512-u8qZLyA9P86cD08IhqjSVV8tf1eGiKQ4fPvjcG3Ic/eOU65EAkDQClp8We7d15TG+RIWRVPSy9v7cJ2D9OReqw==
-  dependencies:
-    balanced-match "^1.0.0"
-    postcss "^7.0.14"
+possible-typed-array-names@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/possible-typed-array-names/-/possible-typed-array-names-1.0.0.tgz#89bb63c6fada2c3e90adc4a647beeeb39cc7bf8f"
+  integrity sha512-d7Uw+eZoloe0EHDIYoe+bQ5WXnGMOpmiZFTuMWCwpjzzkL2nTjcKiAk4hh8TjnGye2TwWOk3UXucZ+3rbmBa8Q==
 
 postcss-attribute-case-insensitive@^5.0.2:
   version "5.0.2"
@@ -9180,13 +9446,6 @@ postcss-replace-overflow-wrap@^4.0.0:
   resolved "https://registry.npmjs.org/postcss-replace-overflow-wrap/-/postcss-replace-overflow-wrap-4.0.0.tgz"
   integrity sha512-KmF7SBPphT4gPPcKZc7aDkweHiKEEO8cla/GjcBK+ckKxiZslIu3C4GCRW3DNfL0o7yW7kMQu9xlZ1kXRXLXtw==
 
-postcss-responsive-type@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.npmjs.org/postcss-responsive-type/-/postcss-responsive-type-1.0.0.tgz"
-  integrity sha512-O4kAKbc4RLnSkzcguJ6ojW67uOfeILaj+8xjsO0quLU94d8BKCqYwwFEUVRNbj0YcXA6d3uF/byhbaEATMRVig==
-  dependencies:
-    postcss "^6.0.6"
-
 postcss-selector-not@^6.0.1:
   version "6.0.1"
   resolved "https://registry.npmjs.org/postcss-selector-not/-/postcss-selector-not-6.0.1.tgz"
@@ -9207,41 +9466,24 @@ postcss-value-parser@^4.0.0, postcss-value-parser@^4.1.0, postcss-value-parser@^
   resolved "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz"
   integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==
 
-postcss@8.4.21, postcss@^8.2.14, postcss@^8.3.11, postcss@^8.3.7, postcss@^8.4.19:
-  version "8.4.21"
-  resolved "https://registry.npmjs.org/postcss/-/postcss-8.4.21.tgz"
-  integrity sha512-tP7u/Sn/dVxK2NnruI4H9BG+x+Wxz6oeZ1cJ8P6G/PZY0IKk4k/63TDsQf2kQq3+qoJeLm2kIBUNlZe3zgb4Zg==
-  dependencies:
-    nanoid "^3.3.4"
-    picocolors "^1.0.0"
-    source-map-js "^1.0.2"
-
-postcss@^6.0.6:
-  version "6.0.23"
-  resolved "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz"
-  integrity sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==
-  dependencies:
-    chalk "^2.4.1"
-    source-map "^0.6.1"
-    supports-color "^5.4.0"
-
-postcss@^7.0.14:
-  version "7.0.39"
-  resolved "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz"
-  integrity sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==
-  dependencies:
-    picocolors "^0.2.1"
-    source-map "^0.6.1"
-
-postcss@^8.4:
-  version "8.4.23"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.23.tgz#df0aee9ac7c5e53e1075c24a3613496f9e6552ab"
-  integrity sha512-bQ3qMcpF6A/YjR55xtoTr0jGOlnPOKAIMdOWiv0EIT6HVPEaJiJB4NLljSbiHoC2RX7DN5Uvjtpbg1NPdwv1oA==
+postcss@8.4.31:
+  version "8.4.31"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.31.tgz#92b451050a9f914da6755af352bdc0192508656d"
+  integrity sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==
   dependencies:
     nanoid "^3.3.6"
     picocolors "^1.0.0"
     source-map-js "^1.0.2"
 
+postcss@^8.2.14, postcss@^8.3.11, postcss@^8.3.7, postcss@^8.4.19, postcss@^8.5:
+  version "8.5.3"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.5.3.tgz#1463b6f1c7fb16fe258736cba29a2de35237eafb"
+  integrity sha512-dle9A3yYxlBSrt8Fu+IpjGT8SY8hN0mlaA6GY8t0P5PjIOZemULz/E2Bnm/2dcUOena75OTNkHI76uZBNUUq3A==
+  dependencies:
+    nanoid "^3.3.8"
+    picocolors "^1.1.1"
+    source-map-js "^1.2.1"
+
 prelude-ls@^1.2.1:
   version "1.2.1"
   resolved "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz"
@@ -9267,6 +9509,11 @@ process-nextick-args@~2.0.0:
   resolved "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz"
   integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==
 
+process@^0.11.10:
+  version "0.11.10"
+  resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"
+  integrity sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==
+
 promise-inflight@^1.0.1:
   version "1.0.1"
   resolved "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz"
@@ -9280,14 +9527,6 @@ promise-retry@^2.0.1:
     err-code "^2.0.2"
     retry "^0.12.0"
 
-prompts@~2.4.2:
-  version "2.4.2"
-  resolved "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz"
-  integrity sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==
-  dependencies:
-    kleur "^3.0.3"
-    sisteransi "^1.0.5"
-
 prop-types@^15.6.0, prop-types@^15.6.2, prop-types@^15.7.2, prop-types@^15.8.1:
   version "15.8.1"
   resolved "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz"
@@ -9310,12 +9549,17 @@ proxy-from-env@1.0.0:
   resolved "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.0.0.tgz"
   integrity sha512-F2JHgJQ1iqwnHDcQjVBsq3n/uoaFL+iPW/eAeL7kVxy/2RrWaN4WroKjjvbsoRtv0ftelNyC01bjRhn/bhcf4A==
 
+proxy-from-env@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz#e102f16ca355424865755d2c9e8ea4f24d58c3e2"
+  integrity sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==
+
 prr@~1.0.1:
   version "1.0.1"
   resolved "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz"
   integrity sha512-yPw4Sng1gWghHQWj0B3ZggWUm4qVbPwPFcRG8KyxiU7J2OHFSoEHKS+EZ3fv5l1t9CyCiop6l/ZYeWbrgoQejw==
 
-psl@^1.1.28, psl@^1.1.33:
+psl@^1.1.33:
   version "1.9.0"
   resolved "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz"
   integrity sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==
@@ -9338,34 +9582,24 @@ punycode@^2.1.0, punycode@^2.1.1:
   resolved "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz"
   integrity sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==
 
-q@^1.4.1:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7"
-  integrity sha512-kV/CThkXo6xyFEZUugw/+pIOywXcDbFYgSct5cT3gqlbkBE1SJdwy6UQoZvodiWF/ckQLZyDE/Bu1M6gVu5lVw==
-
 qjobs@^1.2.0:
   version "1.2.0"
   resolved "https://registry.npmjs.org/qjobs/-/qjobs-1.2.0.tgz"
   integrity sha512-8YOJEHtxpySA3fFDyCRxA+UUV+fA+rTWnuWvylOK/NCjhY+b4ocCtmu8TtsWb+mYeU+GCHf/S66KZF/AsteKHg==
 
-qs@6.11.0, qs@^6.11.0:
-  version "6.11.0"
-  resolved "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz"
-  integrity sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==
+qs@6.13.0:
+  version "6.13.0"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.13.0.tgz#6ca3bd58439f7e245655798997787b0d88a51906"
+  integrity sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==
   dependencies:
-    side-channel "^1.0.4"
+    side-channel "^1.0.6"
 
-qs@~6.10.3:
-  version "6.10.4"
-  resolved "https://registry.npmjs.org/qs/-/qs-6.10.4.tgz"
-  integrity sha512-OQiU+C+Ds5qiH91qh/mg0w+8nwQuLjM4F4M/PbmhDOoYehPh+Fb0bDjtR1sOvy7YKxvj28Y/M0PhP5uVX0kB+g==
+qs@6.13.1:
+  version "6.13.1"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.13.1.tgz#3ce5fc72bd3a8171b85c99b93c65dd20b7d1b16e"
+  integrity sha512-EJPeIn0CYrGu+hli1xilKAPXODtJ12T0sP63Ijx2/khC2JtuaN3JyNIpvmnkmaEtha9ocbG4A4cMcr+TvqvwQg==
   dependencies:
-    side-channel "^1.0.4"
-
-qs@~6.5.2:
-  version "6.5.3"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.3.tgz#3aeeffc91967ef6e35c0e488ef46fb296ab76aad"
-  integrity sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==
+    side-channel "^1.0.6"
 
 querystringify@^2.1.1:
   version "2.2.0"
@@ -9394,7 +9628,17 @@ range-parser@^1.2.1, range-parser@~1.2.0, range-parser@~1.2.1:
   resolved "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz"
   integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==
 
-raw-body@2.5.1, raw-body@^2.3.2:
+raw-body@2.5.2:
+  version "2.5.2"
+  resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.5.2.tgz#99febd83b90e08975087e8f1f9419a149366b68a"
+  integrity sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==
+  dependencies:
+    bytes "3.1.2"
+    http-errors "2.0.0"
+    iconv-lite "0.4.24"
+    unpipe "1.0.0"
+
+raw-body@^2.3.2:
   version "2.5.1"
   resolved "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz"
   integrity sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==
@@ -9664,6 +9908,11 @@ readable-stream@^3.0.6, readable-stream@^3.4.0, readable-stream@^3.6.0:
     string_decoder "^1.1.1"
     util-deprecate "^1.0.1"
 
+readdirp@^4.0.1:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-4.0.2.tgz#388fccb8b75665da3abffe2d8f8ed59fe74c230a"
+  integrity sha512-yDMz9g+VaZkqBYS/ozoBJwaBhTbZo3UNYQHNRw1D3UFQB8oHB4uS/tAODO+ZLjGWmUbKnIlOWO+aaIiAxrUWHA==
+
 readdirp@~3.6.0:
   version "3.6.0"
   resolved "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz"
@@ -9702,11 +9951,16 @@ redux@^4.0.0, redux@^4.0.4, redux@^4.0.5:
   dependencies:
     "@babel/runtime" "^7.9.2"
 
-reflect-metadata@^0.1.13, reflect-metadata@^0.1.2:
+reflect-metadata@^0.1.2:
   version "0.1.13"
   resolved "https://registry.npmjs.org/reflect-metadata/-/reflect-metadata-0.1.13.tgz"
   integrity sha512-Ts1Y/anZELhSsjMcU605fU9RE4Oi3p5ORujwbIKXfWa+0Zxs510Qrmrce5/Jowq3cHSZSJqBjypxmHarc+vEWg==
 
+reflect-metadata@^0.2.2:
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/reflect-metadata/-/reflect-metadata-0.2.2.tgz#400c845b6cba87a21f2c65c4aeb158f4fa4d9c5b"
+  integrity sha512-urBwgfrvVP/eAyXx4hluJivBKzuEbSQs9rKWCrCkbSxNv8mxPcUZKeuoF3Uy4mJl3Lwprp6yy5/39VWigZ4K6Q==
+
 regenerate-unicode-properties@^10.1.0:
   version "10.1.0"
   resolved "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.0.tgz"
@@ -9719,7 +9973,7 @@ regenerate@^1.4.2:
   resolved "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz"
   integrity sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==
 
-regenerator-runtime@^0.13.11, regenerator-runtime@^0.13.4:
+regenerator-runtime@^0.13.11:
   version "0.13.11"
   resolved "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz"
   integrity sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==
@@ -9745,6 +9999,16 @@ regexp.prototype.flags@^1.4.3:
     define-properties "^1.1.3"
     functions-have-names "^1.2.2"
 
+regexp.prototype.flags@^1.5.2:
+  version "1.5.3"
+  resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.5.3.tgz#b3ae40b1d2499b8350ab2c3fe6ef3845d3a96f42"
+  integrity sha512-vqlC04+RQoFalODCbCumG2xIOvapzVMHwsyIGM/SIE8fRhFFsXeH8/QQ+s0T0kDAhKc4k30s73/0ydkHQz6HlQ==
+  dependencies:
+    call-bind "^1.0.7"
+    define-properties "^1.2.1"
+    es-errors "^1.3.0"
+    set-function-name "^2.0.2"
+
 regexpu-core@^5.3.1:
   version "5.3.2"
   resolved "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.3.2.tgz"
@@ -9771,32 +10035,6 @@ request-progress@^3.0.0:
   dependencies:
     throttleit "^1.0.0"
 
-request@^2.87.0:
-  version "2.88.2"
-  resolved "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3"
-  integrity sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==
-  dependencies:
-    aws-sign2 "~0.7.0"
-    aws4 "^1.8.0"
-    caseless "~0.12.0"
-    combined-stream "~1.0.6"
-    extend "~3.0.2"
-    forever-agent "~0.6.1"
-    form-data "~2.3.2"
-    har-validator "~5.1.3"
-    http-signature "~1.2.0"
-    is-typedarray "~1.0.0"
-    isstream "~0.1.2"
-    json-stringify-safe "~5.0.1"
-    mime-types "~2.1.19"
-    oauth-sign "~0.9.0"
-    performance-now "^2.1.0"
-    qs "~6.5.2"
-    safe-buffer "^5.1.2"
-    tough-cookie "~2.5.0"
-    tunnel-agent "^0.6.0"
-    uuid "^3.3.2"
-
 require-directory@^2.1.1:
   version "2.1.1"
   resolved "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz"
@@ -9845,16 +10083,7 @@ resolve-url-loader@5.0.0:
     postcss "^8.2.14"
     source-map "0.6.1"
 
-resolve@1.22.1:
-  version "1.22.1"
-  resolved "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz"
-  integrity sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==
-  dependencies:
-    is-core-module "^2.9.0"
-    path-parse "^1.0.7"
-    supports-preserve-symlinks-flag "^1.0.0"
-
-resolve@^1.1.7, resolve@^1.14.2, resolve@^1.22.1, resolve@^1.9.0:
+resolve@1.22.2, resolve@^1.1.7, resolve@^1.14.2, resolve@^1.9.0:
   version "1.22.2"
   resolved "https://registry.npmjs.org/resolve/-/resolve-1.22.2.tgz"
   integrity sha512-Sb+mjNHOULsBv818T40qSPeRiuWLyaGMa5ewydRLFimneixmVy2zdivRl+AF6jaYPC8ERxGDmFSiqui6SfPd+g==
@@ -9863,6 +10092,15 @@ resolve@^1.1.7, resolve@^1.14.2, resolve@^1.22.1, resolve@^1.9.0:
     path-parse "^1.0.7"
     supports-preserve-symlinks-flag "^1.0.0"
 
+resolve@^1.22.4:
+  version "1.22.8"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.8.tgz#b6c87a9f2aa06dfab52e3d70ac8cde321fa5a48d"
+  integrity sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==
+  dependencies:
+    is-core-module "^2.13.0"
+    path-parse "^1.0.7"
+    supports-preserve-symlinks-flag "^1.0.0"
+
 resp-modifier@6.0.2:
   version "6.0.2"
   resolved "https://registry.npmjs.org/resp-modifier/-/resp-modifier-6.0.2.tgz"
@@ -9894,12 +10132,12 @@ reusify@^1.0.4:
   resolved "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz"
   integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==
 
-rfdc@^1.3.0:
+rfdc@^1.2.0, rfdc@^1.3.0:
   version "1.3.0"
-  resolved "https://registry.npmjs.org/rfdc/-/rfdc-1.3.0.tgz"
+  resolved "https://registry.yarnpkg.com/rfdc/-/rfdc-1.3.0.tgz#d0b7c441ab2720d05dc4cf26e01c89631d9da08b"
   integrity sha512-V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA==
 
-rimraf@^2.2.8, rimraf@^2.5.2, rimraf@^2.6.3:
+rimraf@^2.6.3:
   version "2.7.1"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec"
   integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==
@@ -9913,6 +10151,18 @@ rimraf@^3.0.0, rimraf@^3.0.2:
   dependencies:
     glob "^7.1.3"
 
+roarr@^7.0.4:
+  version "7.15.1"
+  resolved "https://registry.yarnpkg.com/roarr/-/roarr-7.15.1.tgz#e4d93105c37b5ea7dd1200d96a3500f757ddc39f"
+  integrity sha512-0ExL9rjOXeQPvQvQo8IcV8SR2GTXmDr1FQFlY2HiAV+gdVQjaVZNOx9d4FI2RqFFsd0sNsiw2TRS/8RU9g0ZfA==
+  dependencies:
+    boolean "^3.1.4"
+    fast-json-stringify "^5.8.0"
+    fast-printf "^1.6.9"
+    globalthis "^1.0.2"
+    safe-stable-stringify "^2.4.3"
+    semver-compare "^1.0.0"
+
 rtl-css-js@^1.13.1:
   version "1.16.1"
   resolved "https://registry.npmjs.org/rtl-css-js/-/rtl-css-js-1.16.1.tgz"
@@ -9937,31 +10187,6 @@ rx@4.1.0:
   resolved "https://registry.npmjs.org/rx/-/rx-4.1.0.tgz"
   integrity sha512-CiaiuN6gapkdl+cZUr67W6I8jquN4lkak3vtIsIWCl4XIPP8ffsoyN6/+PuGXnQy8Cu8W2y9Xxh31Rq4M6wUug==
 
-rxjs-report-usage@^1.0.4:
-  version "1.0.6"
-  resolved "https://registry.npmjs.org/rxjs-report-usage/-/rxjs-report-usage-1.0.6.tgz"
-  integrity sha512-omv1DIv5z1kV+zDAEjaDjWSkx8w5TbFp5NZoPwUipwzYVcor/4So9ZU3bUyQ1c8lxY5Q0Es/ztWW7PGjY7to0Q==
-  dependencies:
-    "@babel/parser" "^7.10.3"
-    "@babel/traverse" "^7.10.3"
-    "@babel/types" "^7.10.3"
-    bent "~7.3.6"
-    chalk "~4.1.0"
-    glob "~7.2.0"
-    prompts "~2.4.2"
-
-rxjs-spy@^8.0.2:
-  version "8.0.2"
-  resolved "https://registry.npmjs.org/rxjs-spy/-/rxjs-spy-8.0.2.tgz"
-  integrity sha512-w2yc+EiwYA8J97hxqMD+pxGZkNbRCQwxR660r4nw4Soa8kCvatsdSRc0THndYk9uk6SvZy2RNyiVcxfX39pWpw==
-  dependencies:
-    "@types/circular-json" "^0.4.0"
-    "@types/stacktrace-js" "^0.0.33"
-    circular-json "^0.5.0"
-    error-stack-parser "^2.0.1"
-    rxjs-report-usage "^1.0.4"
-    stacktrace-gps "^3.0.2"
-
 rxjs@6.6.7, rxjs@^6.5.5, rxjs@~6.6.0:
   version "6.6.7"
   resolved "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz"
@@ -9969,41 +10194,63 @@ rxjs@6.6.7, rxjs@^6.5.5, rxjs@~6.6.0:
   dependencies:
     tslib "^1.9.0"
 
-rxjs@^7.5.1, rxjs@^7.5.5, rxjs@^7.8.0:
-  version "7.8.0"
-  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.8.0.tgz#90a938862a82888ff4c7359811a595e14e1e09a4"
-  integrity sha512-F2+gxDshqmIub1KdvZkaEfGDwLNpPvk9Fs6LD/MyQxNgMds/WH9OdDDXOmxUZpME+iSK3rQCctkL0DYyytUqMg==
+rxjs@7.8.1:
+  version "7.8.1"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.8.1.tgz#6f6f3d99ea8044291efd92e7c7fcf562c4057543"
+  integrity sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==
   dependencies:
     tslib "^2.1.0"
 
-safe-buffer@5.1.2, safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
+rxjs@^7.5.1, rxjs@^7.5.5, rxjs@^7.8.2:
+  version "7.8.2"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.8.2.tgz#955bc473ed8af11a002a2be52071bf475638607b"
+  integrity sha512-dhKf903U/PQZY6boNNtAGdWbG85WAbjT/1xYoZIC7FAY0yWapOBQVsVrDl58W86//e1VpMNBtRV4MaXfdMySFA==
+  dependencies:
+    tslib "^2.1.0"
+
+safe-array-concat@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/safe-array-concat/-/safe-array-concat-1.1.2.tgz#81d77ee0c4e8b863635227c721278dd524c20edb"
+  integrity sha512-vj6RsCsWBCf19jIeHEfkRMw8DPiBb+DMXklQ/1SGDHOMlHdPUkZXFQ2YdplS23zESTijAcurb1aSgJA3AgMu1Q==
+  dependencies:
+    call-bind "^1.0.7"
+    get-intrinsic "^1.2.4"
+    has-symbols "^1.0.3"
+    isarray "^2.0.5"
+
+safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   version "5.1.2"
   resolved "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz"
   integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
 
-safe-buffer@5.2.1, safe-buffer@~5.2.0:
+safe-buffer@5.2.1, safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.2, safe-buffer@~5.2.0:
   version "5.2.1"
   resolved "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz"
   integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
 
-safe-regex-test@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.0.tgz"
-  integrity sha512-JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA==
+safe-regex-test@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/safe-regex-test/-/safe-regex-test-1.0.3.tgz#a5b4c0f06e0ab50ea2c395c14d8371232924c377"
+  integrity sha512-CdASjNJPvRa7roO6Ra/gLYBTzYzzPyyBXxIMdGW3USQLyjWEls2RgW5UBTXaQVp+OrpeCK3bLem8smtmheoRuw==
   dependencies:
-    call-bind "^1.0.2"
-    get-intrinsic "^1.1.3"
+    call-bind "^1.0.6"
+    es-errors "^1.3.0"
     is-regex "^1.1.4"
 
+safe-stable-stringify@^2.4.3:
+  version "2.4.3"
+  resolved "https://registry.yarnpkg.com/safe-stable-stringify/-/safe-stable-stringify-2.4.3.tgz#138c84b6f6edb3db5f8ef3ef7115b8f55ccbf886"
+  integrity sha512-e2bDA2WJT0wxseVd4lsDP4+3ONX6HpMXQa1ZhFQ7SU+GjvORCmShbCMltrtIDfkYhVHrOcPtj+KhmDBdPdZD1g==
+
 "safer-buffer@>= 2.1.2 < 3", "safer-buffer@>= 2.1.2 < 3.0.0", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0:
   version "2.1.2"
   resolved "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz"
   integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
 
-sanitize-html@^2.10.0:
-  version "2.10.0"
-  resolved "https://registry.yarnpkg.com/sanitize-html/-/sanitize-html-2.10.0.tgz#74d28848dfcf72c39693139131895c78900ab452"
-  integrity sha512-JqdovUd81dG4k87vZt6uA6YhDfWkUGruUu/aPmXLxXi45gZExnt9Bnw/qeQU8oGf82vPyaE0vO4aH0PbobB9JQ==
+sanitize-html@^2.16.0:
+  version "2.16.0"
+  resolved "https://registry.yarnpkg.com/sanitize-html/-/sanitize-html-2.16.0.tgz#2b9973b63fa42e3580020499cbda1d894b3642bc"
+  integrity sha512-0s4caLuHHaZFVxFTG74oW91+j6vW7gKbGD6CD2+miP73CE6z6YtOBN0ArtLd2UGyi4IC7K47v3ENUbQX4jV3Mg==
   dependencies:
     deepmerge "^4.2.2"
     escape-string-regexp "^4.0.0"
@@ -10047,16 +10294,18 @@ sass@1.58.1:
     immutable "^4.0.0"
     source-map-js ">=0.6.2 <2.0.0"
 
-sass@~1.62.0:
-  version "1.62.0"
-  resolved "https://registry.yarnpkg.com/sass/-/sass-1.62.0.tgz#3686b2195b93295d20765135e562366b33ece37d"
-  integrity sha512-Q4USplo4pLYgCi+XlipZCWUQz5pkg/ruSSgJ0WRDSb/+3z9tXUOkQ7QPYn4XrhZKYAK4HlpaQecRwKLJX6+DBg==
+sass@^1.25.0, sass@~1.89.0:
+  version "1.89.0"
+  resolved "https://registry.yarnpkg.com/sass/-/sass-1.89.0.tgz#6df72360c5c3ec2a9833c49adafe57b28206752d"
+  integrity sha512-ld+kQU8YTdGNjOLfRWBzewJpU5cwEv/h5yyqlSeJcj6Yh8U4TDA9UA5FPicqDz/xgRPWRSYIQNiFks21TbA9KQ==
   dependencies:
-    chokidar ">=3.0.0 <4.0.0"
-    immutable "^4.0.0"
+    chokidar "^4.0.0"
+    immutable "^5.0.2"
     source-map-js ">=0.6.2 <2.0.0"
+  optionalDependencies:
+    "@parcel/watcher" "^2.4.1"
 
-sax@>=0.6.0, sax@^1.2.4:
+sax@^1.2.4:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
   integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==
@@ -10114,38 +10363,48 @@ selfsigned@^2.1.1:
   dependencies:
     node-forge "^1"
 
-semver@7.3.8, semver@^7.3.5, semver@^7.3.8:
-  version "7.3.8"
-  resolved "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz"
-  integrity sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==
+semver-compare@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz#0dee216a1c941ab37e9efb1788f6afc5ff5537fc"
+  integrity sha512-YM3/ITh2MJ5MtzaM429anh+x2jiLVjqILF4m4oyQB18W7Ggea7BfqdH/wGMK7dDiMghv/6WG7znWMwUDzJiXow==
+
+semver@7.5.3:
+  version "7.5.3"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.3.tgz#161ce8c2c6b4b3bdca6caadc9fa3317a4c4fe88e"
+  integrity sha512-QBlUtyVk/5EeHbi7X0fw6liDZc7BBmEaSYn01fMU1OUYbf6GPsbTtd8WmnqbI20SeycoHSeiybkE/q1Q+qlThQ==
   dependencies:
     lru-cache "^6.0.0"
 
-semver@^5.3.0, semver@^5.6.0, semver@^5.7.1:
-  version "5.7.1"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
-  integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
-
-semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.3.0:
-  version "6.3.0"
-  resolved "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz"
-  integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
-
-semver@^7.0.0, semver@^7.1.1, semver@^7.3.2, semver@^7.3.4, semver@^7.3.7:
-  version "7.4.0"
-  resolved "https://registry.npmjs.org/semver/-/semver-7.4.0.tgz"
-  integrity sha512-RgOxM8Mw+7Zus0+zcLEUn8+JfoLpj/huFTItQy2hsM4khuC1HYRDp0cU482Ewn/Fcy6bCjufD8vAj7voC66KQw==
+semver@7.5.4:
+  version "7.5.4"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e"
+  integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==
   dependencies:
     lru-cache "^6.0.0"
 
+semver@^5.6.0, semver@^5.7.1:
+  version "5.7.2"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.2.tgz#48d55db737c3287cd4835e17fa13feace1c41ef8"
+  integrity sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==
+
+semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.3.0, semver@^6.3.1:
+  version "6.3.1"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4"
+  integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
+
+semver@^7.0.0, semver@^7.1.1, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7, semver@^7.3.8, semver@^7.5.1, semver@^7.5.3, semver@^7.5.4:
+  version "7.6.3"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.3.tgz#980f7b5550bc175fb4dc09403085627f9eb33143"
+  integrity sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==
+
 semver@~7.0.0:
   version "7.0.0"
-  resolved "https://registry.npmjs.org/semver/-/semver-7.0.0.tgz"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e"
   integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==
 
 send@0.16.2:
   version "0.16.2"
-  resolved "https://registry.npmjs.org/send/-/send-0.16.2.tgz"
+  resolved "https://registry.yarnpkg.com/send/-/send-0.16.2.tgz#6ecca1e0f8c156d141597559848df64730a6bbc1"
   integrity sha512-E64YFPUssFHEFBvpbbjr44NCLtI1AohxQ8ZSiJjQLskAdKuriYEP6VyGEsRDH8ScozGpkaX1BGvhanqCwkcEZw==
   dependencies:
     debug "2.6.9"
@@ -10162,10 +10421,10 @@ send@0.16.2:
     range-parser "~1.2.0"
     statuses "~1.4.0"
 
-send@0.18.0:
-  version "0.18.0"
-  resolved "https://registry.npmjs.org/send/-/send-0.18.0.tgz"
-  integrity sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==
+send@0.19.0:
+  version "0.19.0"
+  resolved "https://registry.yarnpkg.com/send/-/send-0.19.0.tgz#bbc5a388c8ea6c048967049dbeac0e4a3f09d7f8"
+  integrity sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw==
   dependencies:
     debug "2.6.9"
     depd "2.0.0"
@@ -10210,7 +10469,7 @@ serve-index@1.9.1, serve-index@^1.9.1:
 
 serve-static@1.13.2:
   version "1.13.2"
-  resolved "https://registry.npmjs.org/serve-static/-/serve-static-1.13.2.tgz"
+  resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.13.2.tgz#095e8472fd5b46237db50ce486a43f4b86c6cec1"
   integrity sha512-p/tdJrO4U387R9oMjb1oj7qSMaMfmOyd4j9hOFoxZe2baQszgHcSWjuya/CiT5kgZZKRudHNOA0pYXOl8rQ5nw==
   dependencies:
     encodeurl "~1.0.2"
@@ -10218,15 +10477,15 @@ serve-static@1.13.2:
     parseurl "~1.3.2"
     send "0.16.2"
 
-serve-static@1.15.0, serve-static@^1.14.1:
-  version "1.15.0"
-  resolved "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz"
-  integrity sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==
+serve-static@1.16.2, serve-static@^1.16.2:
+  version "1.16.2"
+  resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.16.2.tgz#b6a5343da47f6bdd2673848bf45754941e803296"
+  integrity sha512-VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw==
   dependencies:
-    encodeurl "~1.0.2"
+    encodeurl "~2.0.0"
     escape-html "~1.0.3"
     parseurl "~1.3.3"
-    send "0.18.0"
+    send "0.19.0"
 
 server-destroy@1.0.1:
   version "1.0.1"
@@ -10238,6 +10497,28 @@ set-blocking@^2.0.0:
   resolved "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz"
   integrity sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==
 
+set-function-length@^1.2.1:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/set-function-length/-/set-function-length-1.2.2.tgz#aac72314198eaed975cf77b2c3b6b880695e5449"
+  integrity sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==
+  dependencies:
+    define-data-property "^1.1.4"
+    es-errors "^1.3.0"
+    function-bind "^1.1.2"
+    get-intrinsic "^1.2.4"
+    gopd "^1.0.1"
+    has-property-descriptors "^1.0.2"
+
+set-function-name@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/set-function-name/-/set-function-name-2.0.2.tgz#16a705c5a0dc2f5e638ca96d8a8cd4e1c2b90985"
+  integrity sha512-7PGFlmtwsEADb0WYyvCMa1t+yke6daIG4Wirafur5kcf+MhUnPms1UeR0CKQdTZD81yESwMHbtn+TR+dMviakQ==
+  dependencies:
+    define-data-property "^1.1.4"
+    es-errors "^1.3.0"
+    functions-have-names "^1.2.3"
+    has-property-descriptors "^1.0.2"
+
 setprototypeof@1.1.0:
   version "1.1.0"
   resolved "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz"
@@ -10286,19 +10567,31 @@ side-channel@^1.0.4:
     get-intrinsic "^1.0.2"
     object-inspect "^1.9.0"
 
+side-channel@^1.0.6:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.6.tgz#abd25fb7cd24baf45466406b1096b7831c9215f2"
+  integrity sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==
+  dependencies:
+    call-bind "^1.0.7"
+    es-errors "^1.3.0"
+    get-intrinsic "^1.2.4"
+    object-inspect "^1.13.1"
+
 signal-exit@^3.0.2, signal-exit@^3.0.3, signal-exit@^3.0.7:
   version "3.0.7"
   resolved "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz"
   integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==
 
-sigstore@^1.0.0:
-  version "1.2.0"
-  resolved "https://registry.npmjs.org/sigstore/-/sigstore-1.2.0.tgz"
-  integrity sha512-Fr9+W1nkBSIZCkJQR7jDn/zI0UXNsVpp+7mDQkCnZOIxG9p6yNXBx9xntHsfUyYHE55XDkkVV3+rYbrkzAeesA==
+sigstore@^1.3.0:
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/sigstore/-/sigstore-1.9.0.tgz#1e7ad8933aa99b75c6898ddd0eeebc3eb0d59875"
+  integrity sha512-0Zjz0oe37d08VeOtBIuB6cRriqXse2e8w+7yIy2XSXjshRKxbc2KkhXjL229jXSxEm7UbcjS76wcJDGQddVI9A==
   dependencies:
-    "@sigstore/protobuf-specs" "^0.1.0"
+    "@sigstore/bundle" "^1.1.0"
+    "@sigstore/protobuf-specs" "^0.2.0"
+    "@sigstore/sign" "^1.0.0"
+    "@sigstore/tuf" "^1.0.3"
     make-fetch-happen "^11.0.1"
-    tuf-js "^1.0.0"
 
 simple-update-notifier@^1.0.7:
   version "1.1.0"
@@ -10307,20 +10600,6 @@ simple-update-notifier@^1.0.7:
   dependencies:
     semver "~7.0.0"
 
-sirv@^1.0.7:
-  version "1.0.19"
-  resolved "https://registry.npmjs.org/sirv/-/sirv-1.0.19.tgz"
-  integrity sha512-JuLThK3TnZG1TAKDwNIqNq6QA2afLOCcm+iE8D1Kj3GA40pSPsxQjjJl0J8X3tsR7T+CP1GavpzLwYkgVLWrZQ==
-  dependencies:
-    "@polka/url" "^1.0.0-next.20"
-    mrmime "^1.0.0"
-    totalist "^1.0.0"
-
-sisteransi@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz"
-  integrity sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==
-
 slash@^3.0.0:
   version "3.0.0"
   resolved "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz"
@@ -10384,17 +10663,26 @@ socket.io-parser@~4.2.1:
     "@socket.io/component-emitter" "~3.1.0"
     debug "~4.3.1"
 
-socket.io@^4.4.1:
-  version "4.6.1"
-  resolved "https://registry.npmjs.org/socket.io/-/socket.io-4.6.1.tgz"
-  integrity sha512-KMcaAi4l/8+xEjkRICl6ak8ySoxsYG+gG6/XfRCPJPQ/haCRIJBTL4wIl8YCsmtaBovcAXGLOShyVWQ/FG8GZA==
+socket.io-parser@~4.2.4:
+  version "4.2.4"
+  resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-4.2.4.tgz#c806966cf7270601e47469ddeec30fbdfda44c83"
+  integrity sha512-/GbIKmo8ioc+NIWIhwdecY0ge+qVBSMdgxGygevmdHj24bsfgtCmcUUcQ5ZzcylGFHsN3k4HB4Cgkl96KVnuew==
+  dependencies:
+    "@socket.io/component-emitter" "~3.1.0"
+    debug "~4.3.1"
+
+socket.io@^4.4.1, socket.io@^4.7.2:
+  version "4.8.0"
+  resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-4.8.0.tgz#33d05ae0915fad1670bd0c4efcc07ccfabebe3b1"
+  integrity sha512-8U6BEgGjQOfGz3HHTYaC/L1GaxDCJ/KM0XTkJly0EhZ5U/du9uNEZy4ZgYzEzIqlx2CMm25CrCqr1ck899eLNA==
   dependencies:
     accepts "~1.3.4"
     base64id "~2.0.0"
+    cors "~2.8.5"
     debug "~4.3.2"
-    engine.io "~6.4.1"
+    engine.io "~6.6.0"
     socket.io-adapter "~2.5.2"
-    socket.io-parser "~4.2.1"
+    socket.io-parser "~4.2.4"
 
 sockjs@^0.3.24:
   version "0.3.24"
@@ -10422,20 +10710,20 @@ socks@^2.6.2:
     ip "^2.0.0"
     smart-buffer "^4.2.0"
 
-sortablejs@1.15.0:
-  version "1.15.0"
-  resolved "https://registry.yarnpkg.com/sortablejs/-/sortablejs-1.15.0.tgz#53230b8aa3502bb77a29e2005808ffdb4a5f7e2a"
-  integrity sha512-bv9qgVMjUMf89wAvM6AxVvS/4MX3sPeN0+agqShejLU5z5GX4C75ow1O2e5k4L6XItUyAK3gH6AxSbXrOM5e8w==
+sortablejs@1.15.6:
+  version "1.15.6"
+  resolved "https://registry.yarnpkg.com/sortablejs/-/sortablejs-1.15.6.tgz#ff93699493f5b8ab8d828f933227b4988df1d393"
+  integrity sha512-aNfiuwMEpfBM/CN6LY0ibyhxPfPbyFeBTYJKCvzkJ2GkUpazIt3H+QIPAMHwqQ7tMKaHz1Qj+rJJCqljnf4p3A==
 
 source-list-map@^2.0.0:
   version "2.0.1"
   resolved "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz"
   integrity sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==
 
-"source-map-js@>=0.6.2 <2.0.0", source-map-js@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz"
-  integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==
+"source-map-js@>=0.6.2 <2.0.0", source-map-js@^1.0.2, source-map-js@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.2.1.tgz#1ce5650fddd87abc099eda37dcff024c2667ae46"
+  integrity sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==
 
 source-map-loader@4.0.1:
   version "4.0.1"
@@ -10454,11 +10742,6 @@ source-map-support@0.5.21, source-map-support@^0.5.17, source-map-support@^0.5.5
     buffer-from "^1.0.0"
     source-map "^0.6.0"
 
-source-map@0.5.6:
-  version "0.5.6"
-  resolved "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz"
-  integrity sha512-MjZkVp0NHr5+TPihLcadqnlVoGIoWo4IBHptutGh9wI3ttUYvCG26HkSuDi+K6lsZ25syXJXcctwgyVCt//xqA==
-
 source-map@0.6.1, source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0, source-map@~0.6.1:
   version "0.6.1"
   resolved "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz"
@@ -10542,10 +10825,10 @@ sprintf-js@~1.0.2:
   resolved "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz"
   integrity sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==
 
-sshpk@^1.14.1, sshpk@^1.7.0:
-  version "1.17.0"
-  resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.17.0.tgz#578082d92d4fe612b13007496e543fa0fbcbe4c5"
-  integrity sha512-/9HIEs1ZXGhSPE8X6Ccm7Nam1z8KcoCqPdI7ecm1N33EzAetWahvQWVqLZtaZQ+IDKX4IyA2o0gBzqIMkAagHQ==
+sshpk@^1.18.0:
+  version "1.18.0"
+  resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.18.0.tgz#1663e55cddf4d688b86a46b77f0d5fe363aba028"
+  integrity sha512-2p2KJZTSqQ/I3+HX42EpYOa2l3f8Erv8MWKsy2I9uf4wA7yFIkXRffYdsx86y6z4vHtV8u7g+pPlr8/4ouAxsQ==
   dependencies:
     asn1 "~0.2.3"
     assert-plus "^1.0.0"
@@ -10578,38 +10861,25 @@ ssri@^9.0.0:
   dependencies:
     minipass "^3.1.1"
 
-stackframe@^1.3.4:
-  version "1.3.4"
-  resolved "https://registry.npmjs.org/stackframe/-/stackframe-1.3.4.tgz"
-  integrity sha512-oeVtt7eWQS+Na6F//S4kJ2K2VbRlS9D43mAlMyVpVWovy9o+jfgH8O9agzANzaiLjclA0oYzUXEM4PurhSUChw==
-
-stacktrace-gps@^3.0.2:
-  version "3.1.2"
-  resolved "https://registry.npmjs.org/stacktrace-gps/-/stacktrace-gps-3.1.2.tgz"
-  integrity sha512-GcUgbO4Jsqqg6RxfyTHFiPxdPqF+3LFmQhm7MgCuYQOYuWyqxo5pwRPz5d/u6/WYJdEnWfK4r+jGbyD8TSggXQ==
-  dependencies:
-    source-map "0.5.6"
-    stackframe "^1.3.4"
-
 statuses@2.0.1:
   version "2.0.1"
   resolved "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz"
   integrity sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==
 
-"statuses@>= 1.4.0 < 2", statuses@~1.4.0:
-  version "1.4.0"
-  resolved "https://registry.npmjs.org/statuses/-/statuses-1.4.0.tgz"
-  integrity sha512-zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew==
+"statuses@>= 1.4.0 < 2", statuses@~1.5.0:
+  version "1.5.0"
+  resolved "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz"
+  integrity sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==
 
 statuses@~1.3.1:
   version "1.3.1"
   resolved "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz"
   integrity sha512-wuTCPGlJONk/a1kqZ4fQM2+908lC7fa7nPYpTC1EhnvqLX/IICbeP1OZGDtA374trpSq68YubKUMo8oRhN46yg==
 
-statuses@~1.5.0:
-  version "1.5.0"
-  resolved "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz"
-  integrity sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==
+statuses@~1.4.0:
+  version "1.4.0"
+  resolved "https://registry.npmjs.org/statuses/-/statuses-1.4.0.tgz"
+  integrity sha512-zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew==
 
 stop-iteration-iterator@^1.0.0:
   version "1.0.0"
@@ -10644,32 +10914,33 @@ streamroller@^3.1.5:
     is-fullwidth-code-point "^3.0.0"
     strip-ansi "^6.0.1"
 
-string.prototype.trim@^1.2.7:
-  version "1.2.7"
-  resolved "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.7.tgz"
-  integrity sha512-p6TmeT1T3411M8Cgg9wBTMRtY2q9+PNy9EV1i2lIXUN/btt763oIfxwN3RR8VU6wHX8j/1CFy0L+YuThm6bgOg==
+string.prototype.trim@^1.2.9:
+  version "1.2.9"
+  resolved "https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.2.9.tgz#b6fa326d72d2c78b6df02f7759c73f8f6274faa4"
+  integrity sha512-klHuCNxiMZ8MlsOihJhJEBJAiMVqU3Z2nEXWfWnIqjN0gEFS9J9+IxKozWWtQGcgoa1WUZzLjKPTr4ZHNFTFxw==
   dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.1.4"
-    es-abstract "^1.20.4"
+    call-bind "^1.0.7"
+    define-properties "^1.2.1"
+    es-abstract "^1.23.0"
+    es-object-atoms "^1.0.0"
 
-string.prototype.trimend@^1.0.6:
-  version "1.0.6"
-  resolved "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz"
-  integrity sha512-JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ==
+string.prototype.trimend@^1.0.8:
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.8.tgz#3651b8513719e8a9f48de7f2f77640b26652b229"
+  integrity sha512-p73uL5VCHCO2BZZ6krwwQE3kCzM7NKmis8S//xEC6fQonchbum4eP6kR4DLEjQFO3Wnj3Fuo8NM0kOSjVdHjZQ==
   dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.1.4"
-    es-abstract "^1.20.4"
+    call-bind "^1.0.7"
+    define-properties "^1.2.1"
+    es-object-atoms "^1.0.0"
 
-string.prototype.trimstart@^1.0.6:
-  version "1.0.6"
-  resolved "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.6.tgz"
-  integrity sha512-omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA==
+string.prototype.trimstart@^1.0.8:
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.8.tgz#7ee834dda8c7c17eff3118472bb35bfedaa34dde"
+  integrity sha512-UXSH262CSZY1tfu3G3Secr6uGLCFVPMhIqHjlgCUtCCcgihYc/xKs9djMTMUOb2j1mVSeU8EU6NWc/iQKU6Gfg==
   dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.1.4"
-    es-abstract "^1.20.4"
+    call-bind "^1.0.7"
+    define-properties "^1.2.1"
+    es-object-atoms "^1.0.0"
 
 string_decoder@^1.1.1:
   version "1.3.0"
@@ -10685,13 +10956,6 @@ string_decoder@~1.1.1:
   dependencies:
     safe-buffer "~5.1.0"
 
-strip-ansi@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
-  integrity sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==
-  dependencies:
-    ansi-regex "^2.0.0"
-
 strip-ansi@^4.0.0:
   version "4.0.0"
   resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz"
@@ -10721,12 +10985,7 @@ strip-json-comments@3.1.1, strip-json-comments@^3.1.0, strip-json-comments@^3.1.
   resolved "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz"
   integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==
 
-supports-color@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
-  integrity sha512-KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g==
-
-supports-color@^5.3.0, supports-color@^5.4.0, supports-color@^5.5.0:
+supports-color@^5.3.0, supports-color@^5.5.0:
   version "5.5.0"
   resolved "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz"
   integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==
@@ -10762,19 +11021,26 @@ symbol-tree@^3.2.4:
   resolved "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz"
   integrity sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==
 
+"synckit@^0.6.2 || ^0.7.3 || ^0.11.5":
+  version "0.11.6"
+  resolved "https://registry.yarnpkg.com/synckit/-/synckit-0.11.6.tgz#e742a0c27bbc1fbc96f2010770521015cca7ed5c"
+  integrity sha512-2pR2ubZSV64f/vqm9eLPz/KOvR9Dm+Co/5ChLgeHl0yEDRc6h5hXHoxEQH8Y5Ljycozd3p1k5TTSVdzYGkPvLw==
+  dependencies:
+    "@pkgr/core" "^0.2.4"
+
 tapable@^2.1.1, tapable@^2.2.0:
   version "2.2.1"
   resolved "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz"
   integrity sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==
 
 tar@^6.0.2, tar@^6.1.11, tar@^6.1.2:
-  version "6.1.13"
-  resolved "https://registry.npmjs.org/tar/-/tar-6.1.13.tgz"
-  integrity sha512-jdIBIN6LTIe2jqzay/2vtYLlBHa3JF42ot3h1dW8Q0PaAG4v8rm0cvpVePtau5C6OKXGGcgO9q2AMNSWxiLqKw==
+  version "6.2.1"
+  resolved "https://registry.yarnpkg.com/tar/-/tar-6.2.1.tgz#717549c541bc3c2af15751bea94b1dd068d4b03a"
+  integrity sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==
   dependencies:
     chownr "^2.0.0"
     fs-minipass "^2.0.0"
-    minipass "^4.0.0"
+    minipass "^5.0.0"
     minizlib "^2.1.1"
     mkdirp "^1.0.3"
     yallist "^4.0.0"
@@ -10854,7 +11120,19 @@ tiny-warning@^1.0.2:
   resolved "https://registry.npmjs.org/tiny-warning/-/tiny-warning-1.0.3.tgz"
   integrity sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==
 
-tmp@0.2.1, tmp@^0.2.1, tmp@~0.2.1:
+tldts-core@^6.1.72:
+  version "6.1.72"
+  resolved "https://registry.yarnpkg.com/tldts-core/-/tldts-core-6.1.72.tgz#32b38e1843f4adab57d2414a9ec4af9a81826bc0"
+  integrity sha512-FW3H9aCaGTJ8l8RVCR3EX8GxsxDbQXuwetwwgXA2chYdsX+NY1ytCBl61narjjehWmCw92tc1AxlcY3668CU8g==
+
+tldts@^6.1.32:
+  version "6.1.72"
+  resolved "https://registry.yarnpkg.com/tldts/-/tldts-6.1.72.tgz#9b85f47e451e2ff079fab5801b4fa156ecda69f4"
+  integrity sha512-QNtgIqSUb9o2CoUjX9T5TwaIvUUJFU1+12PJkgt42DFV2yf9J6549yTF2uGloQsJ/JOC8X+gIB81ind97hRiIQ==
+  dependencies:
+    tldts-core "^6.1.72"
+
+tmp@0.2.1:
   version "0.2.1"
   resolved "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz"
   integrity sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==
@@ -10868,6 +11146,11 @@ tmp@^0.0.33:
   dependencies:
     os-tmpdir "~1.0.2"
 
+tmp@^0.2.1, tmp@~0.2.3:
+  version "0.2.3"
+  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.2.3.tgz#eb783cc22bc1e8bebd0671476d46ea4eb32a79ae"
+  integrity sha512-nZD7m9iCPC5g0pYmcaxogYKggSfLsdxl8of3Q/oIbqCqLLIO9IAF0GWjX1z9NZRHPiXv8Wex4yDCaZsgEw0Y8w==
+
 to-fast-properties@^2.0.0:
   version "2.0.0"
   resolved "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz"
@@ -10890,11 +11173,6 @@ toidentifier@1.0.1:
   resolved "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz"
   integrity sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==
 
-totalist@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.npmjs.org/totalist/-/totalist-1.1.0.tgz"
-  integrity sha512-gduQwd1rOdDMGxFG1gEvhV88Oirdo2p+KjoYFU7k2g+i7n6AFFbDQ5kMPUsW0pNbfQsB/cwXvT1i4Bue0s9g5g==
-
 touch@^3.1.0:
   version "3.1.0"
   resolved "https://registry.npmjs.org/touch/-/touch-3.1.0.tgz"
@@ -10903,22 +11181,21 @@ touch@^3.1.0:
     nopt "~1.0.10"
 
 tough-cookie@^4.0.0, tough-cookie@^4.1.2:
-  version "4.1.2"
-  resolved "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.2.tgz"
-  integrity sha512-G9fqXWoYFZgTc2z8Q5zaHy/vJMjm+WV0AkAeHxVCQiEB1b+dGvWzFW6QV07cY5jQ5gRkeid2qIkzkxUnmoQZUQ==
+  version "4.1.4"
+  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.1.4.tgz#945f1461b45b5a8c76821c33ea49c3ac192c1b36"
+  integrity sha512-Loo5UUvLD9ScZ6jh8beX1T6sO1w2/MpCRpEP7V280GKMVUQ0Jzar2U3UJPsrdbziLEMMhu3Ujnq//rhiFuIeag==
   dependencies:
     psl "^1.1.33"
     punycode "^2.1.1"
     universalify "^0.2.0"
     url-parse "^1.5.3"
 
-tough-cookie@~2.5.0:
-  version "2.5.0"
-  resolved "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz"
-  integrity sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==
+tough-cookie@^5.0.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-5.1.0.tgz#0667b0f2fbb5901fe6f226c3e0b710a9a4292f87"
+  integrity sha512-rvZUv+7MoBYTiDmFPBrhL7Ujx9Sk+q9wwm22x8c8T5IJaR+Wsyc7TNxbVxo84kZoRJZZMazowFLqpankBEQrGg==
   dependencies:
-    psl "^1.1.28"
-    punycode "^2.1.1"
+    tldts "^6.1.32"
 
 tr46@^2.1.0:
   version "2.1.0"
@@ -10944,7 +11221,7 @@ tree-kill@1.2.2, tree-kill@^1.2.2:
   resolved "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.2.tgz"
   integrity sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==
 
-ts-node@10.2.1, ts-node@^10.0.0:
+ts-node@^10.0.0:
   version "10.2.1"
   resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-10.2.1.tgz#4cc93bea0a7aba2179497e65bb08ddfc198b3ab5"
   integrity sha512-hCnyOyuGmD5wHleOQX6NIjJtYVIO8bPP8F2acWkB4W06wdlkgyvJtubO/I9NkI88hCFECbsEgoLc0VNkYmcSfw==
@@ -10973,10 +11250,10 @@ ts-node@^8.10.2:
     source-map-support "^0.5.17"
     yn "3.1.1"
 
-tsconfig-paths@^3.14.1:
-  version "3.14.2"
-  resolved "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.2.tgz"
-  integrity sha512-o/9iXgCYc5L/JxCHPe3Hvh8Q/2xm5Z+p18PESBU6Ff33695QnCHBEjcytY2q19ua7Mbl/DavtBOLq+oG0RCL+g==
+tsconfig-paths@^3.15.0:
+  version "3.15.0"
+  resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.15.0.tgz#5299ec605e55b1abb23ec939ef15edaf483070d4"
+  integrity sha512-2Ac2RgzDe/cn48GvOe3M+o82pEFewD3UPbyoUHHdKasHwJKjds4fLXWf/Ux5kATBKN20oaFGu+jbElp1pos0mg==
   dependencies:
     "@types/json5" "^0.0.29"
     json5 "^1.0.2"
@@ -10997,7 +11274,7 @@ tslib@2.3.1:
   resolved "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz"
   integrity sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==
 
-tslib@2.5.0, tslib@^2.0.0, tslib@^2.0.3, tslib@^2.1.0, tslib@^2.2.0, tslib@^2.3.0, tslib@^2.3.1:
+tslib@2.5.0:
   version "2.5.0"
   resolved "https://registry.npmjs.org/tslib/-/tslib-2.5.0.tgz"
   integrity sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg==
@@ -11007,6 +11284,11 @@ tslib@^1.8.1, tslib@^1.9.0:
   resolved "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz"
   integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
 
+tslib@^2.0.0, tslib@^2.0.3, tslib@^2.1.0, tslib@^2.2.0, tslib@^2.3.0, tslib@^2.3.1:
+  version "2.8.1"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.8.1.tgz#612efe4ed235d567e8aba5f2a5fab70280ade83f"
+  integrity sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==
+
 tsutils@^3.21.0:
   version "3.21.0"
   resolved "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz"
@@ -11014,13 +11296,14 @@ tsutils@^3.21.0:
   dependencies:
     tslib "^1.8.1"
 
-tuf-js@^1.0.0:
-  version "1.1.3"
-  resolved "https://registry.npmjs.org/tuf-js/-/tuf-js-1.1.3.tgz"
-  integrity sha512-jGYi5nG/kqgfTFQSdoN6PW9eIn+XRZqdXku+fSwNk6UpWIsWaV7pzAqPgFr85edOPhoyJDyBqCS+DCnHroMvrw==
+tuf-js@^1.1.7:
+  version "1.1.7"
+  resolved "https://registry.yarnpkg.com/tuf-js/-/tuf-js-1.1.7.tgz#21b7ae92a9373015be77dfe0cb282a80ec3bbe43"
+  integrity sha512-i3P9Kgw3ytjELUfpuKVDNBJvk4u5bXL6gskv572mcevPbSKCV3zt3djhmlEQ65yERjIbOSncy7U4cQJaB1CBCg==
   dependencies:
-    "@tufjs/models" "1.0.2"
-    make-fetch-happen "^11.0.1"
+    "@tufjs/models" "1.0.4"
+    debug "^4.3.4"
+    make-fetch-happen "^11.1.1"
 
 tunnel-agent@^0.6.0:
   version "0.6.0"
@@ -11058,6 +11341,11 @@ type-fest@^0.21.3:
   resolved "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz"
   integrity sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==
 
+type-fest@^2.3.3:
+  version "2.19.0"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-2.19.0.tgz#88068015bb33036a598b952e55e9311a60fd3a9b"
+  integrity sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA==
+
 type-is@~1.6.18:
   version "1.6.18"
   resolved "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz"
@@ -11066,14 +11354,49 @@ type-is@~1.6.18:
     media-typer "0.3.0"
     mime-types "~2.1.24"
 
-typed-array-length@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.4.tgz"
-  integrity sha512-KjZypGq+I/H7HI5HlOoGHkWUUGq+Q0TPhQurLbyrVrvnKTBgzLhIJ7j6J/XTQOi0d1RjyZ0wdas8bKs2p0x3Ng==
+typed-array-buffer@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/typed-array-buffer/-/typed-array-buffer-1.0.2.tgz#1867c5d83b20fcb5ccf32649e5e2fc7424474ff3"
+  integrity sha512-gEymJYKZtKXzzBzM4jqa9w6Q1Jjm7x2d+sh19AdsD4wqnMPDYyvwpsIc2Q/835kHuo3BEQ7CjelGhfTsoBb2MQ==
   dependencies:
-    call-bind "^1.0.2"
+    call-bind "^1.0.7"
+    es-errors "^1.3.0"
+    is-typed-array "^1.1.13"
+
+typed-array-byte-length@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/typed-array-byte-length/-/typed-array-byte-length-1.0.1.tgz#d92972d3cff99a3fa2e765a28fcdc0f1d89dec67"
+  integrity sha512-3iMJ9q0ao7WE9tWcaYKIptkNBuOIcZCCT0d4MRvuuH88fEoEH62IuQe0OtraD3ebQEoTRk8XCBoknUNc1Y67pw==
+  dependencies:
+    call-bind "^1.0.7"
     for-each "^0.3.3"
-    is-typed-array "^1.1.9"
+    gopd "^1.0.1"
+    has-proto "^1.0.3"
+    is-typed-array "^1.1.13"
+
+typed-array-byte-offset@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/typed-array-byte-offset/-/typed-array-byte-offset-1.0.2.tgz#f9ec1acb9259f395093e4567eb3c28a580d02063"
+  integrity sha512-Ous0vodHa56FviZucS2E63zkgtgrACj7omjwd/8lTEMEPFFyjfixMZ1ZXenpgCFBBt4EC1J2XsyVS2gkG0eTFA==
+  dependencies:
+    available-typed-arrays "^1.0.7"
+    call-bind "^1.0.7"
+    for-each "^0.3.3"
+    gopd "^1.0.1"
+    has-proto "^1.0.3"
+    is-typed-array "^1.1.13"
+
+typed-array-length@^1.0.6:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/typed-array-length/-/typed-array-length-1.0.6.tgz#57155207c76e64a3457482dfdc1c9d1d3c4c73a3"
+  integrity sha512-/OxDN6OtAk5KBpGb28T+HZc2M+ADtvRxXrKKbUwtsLgdoxgX13hyy7ek6bFRl5+aBs2yZzB0c4CnQfAtVypW/g==
+  dependencies:
+    call-bind "^1.0.7"
+    for-each "^0.3.3"
+    gopd "^1.0.1"
+    has-proto "^1.0.3"
+    is-typed-array "^1.1.13"
+    possible-typed-array-names "^1.0.0"
 
 typed-assert@^1.0.8:
   version "1.0.9"
@@ -11381,28 +11704,6 @@ web-resource-inliner@^6.0.1:
     node-fetch "^2.6.0"
     valid-data-url "^3.0.0"
 
-webdriver-manager@^12.1.8:
-  version "12.1.9"
-  resolved "https://registry.yarnpkg.com/webdriver-manager/-/webdriver-manager-12.1.9.tgz#8d83543b92711b7217b39fef4cda958a4703d2df"
-  integrity sha512-Yl113uKm8z4m/KMUVWHq1Sjtla2uxEBtx2Ue3AmIlnlPAKloDn/Lvmy6pqWCUersVISpdMeVpAaGbNnvMuT2LQ==
-  dependencies:
-    adm-zip "^0.5.2"
-    chalk "^1.1.1"
-    del "^2.2.0"
-    glob "^7.0.3"
-    ini "^1.3.4"
-    minimist "^1.2.0"
-    q "^1.4.1"
-    request "^2.87.0"
-    rimraf "^2.5.2"
-    semver "^5.3.0"
-    xml2js "^0.4.17"
-
-webfontloader@1.6.28:
-  version "1.6.28"
-  resolved "https://registry.npmjs.org/webfontloader/-/webfontloader-1.6.28.tgz"
-  integrity sha512-Egb0oFEga6f+nSgasH3E0M405Pzn6y3/9tOVanv/DLfa1YBIgcv90L18YyWnvXkRbIM17v5Kv6IT2N6g1x5tvQ==
-
 webidl-conversions@^3.0.0:
   version "3.0.1"
   resolved "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz"
@@ -11423,22 +11724,6 @@ webidl-conversions@^7.0.0:
   resolved "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz"
   integrity sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==
 
-webpack-bundle-analyzer@^4.8.0:
-  version "4.8.0"
-  resolved "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.8.0.tgz#951b8aaf491f665d2ae325d8b84da229157b1d04"
-  integrity sha512-ZzoSBePshOKhr+hd8u6oCkZVwpVaXgpw23ScGLFpR6SjYI7+7iIWYarjN6OEYOfRt8o7ZyZZQk0DuMizJ+LEIg==
-  dependencies:
-    "@discoveryjs/json-ext" "0.5.7"
-    acorn "^8.0.4"
-    acorn-walk "^8.0.0"
-    chalk "^4.1.0"
-    commander "^7.2.0"
-    gzip-size "^6.0.0"
-    lodash "^4.17.20"
-    opener "^1.5.2"
-    sirv "^1.0.7"
-    ws "^7.3.1"
-
 webpack-cli@^4.2.0:
   version "4.10.0"
   resolved "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.10.0.tgz"
@@ -11457,10 +11742,10 @@ webpack-cli@^4.2.0:
     rechoir "^0.7.0"
     webpack-merge "^5.7.3"
 
-webpack-dev-middleware@6.0.1:
-  version "6.0.1"
-  resolved "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-6.0.1.tgz"
-  integrity sha512-PZPZ6jFinmqVPJZbisfggDiC+2EeGZ1ZByyMP5sOFJcPPWSexalISz+cvm+j+oYPT7FIJyxT76esjnw9DhE5sw==
+webpack-dev-middleware@6.1.2:
+  version "6.1.2"
+  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-6.1.2.tgz#0463232e59b7d7330fa154121528d484d36eb973"
+  integrity sha512-Wu+EHmX326YPYUpQLKmKbTyZZJIB8/n6R09pTmB03kJmnMsVPTo9COzHZFr01txwaCAuZvfBJE4ZCHRcKs5JaQ==
   dependencies:
     colorette "^2.0.10"
     memfs "^3.4.12"
@@ -11468,10 +11753,10 @@ webpack-dev-middleware@6.0.1:
     range-parser "^1.2.1"
     schema-utils "^4.0.0"
 
-webpack-dev-middleware@^5.3.1:
-  version "5.3.3"
-  resolved "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-5.3.3.tgz"
-  integrity sha512-hj5CYrY0bZLB+eTO+x/j67Pkrquiy7kWepMHmUMoPsmcUaeEnQJqFzHJOyxgWlq746/wUuA64p9ta34Kyb01pA==
+webpack-dev-middleware@^5.3.1, webpack-dev-middleware@^5.3.4:
+  version "5.3.4"
+  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-5.3.4.tgz#eb7b39281cbce10e104eb2b8bf2b63fce49a3517"
+  integrity sha512-BVdTqhhs+0IfoeAf7EoH5WE+exCmqGerHfDM0IL096Px60Tq2Mn9MAbnaGUe6HiMa41KMCYF19gyzZmBcq/o4Q==
   dependencies:
     colorette "^2.0.10"
     memfs "^3.4.3"
@@ -11514,10 +11799,10 @@ webpack-dev-server@4.11.1:
     webpack-dev-middleware "^5.3.1"
     ws "^8.4.2"
 
-webpack-dev-server@^4.13.3:
-  version "4.13.3"
-  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-4.13.3.tgz#9feb740b8b56b886260bae1360286818a221bae8"
-  integrity sha512-KqqzrzMRSRy5ePz10VhjyL27K2dxqwXQLP5rAKwRJBPUahe7Z2bBWzHw37jeb8GCPKxZRO79ZdQUAPesMh/Nug==
+webpack-dev-server@^4.15.2:
+  version "4.15.2"
+  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-4.15.2.tgz#9e0c70a42a012560860adb186986da1248333173"
+  integrity sha512-0XavAZbNJ5sDrCbkpWL8mia0o5WPOd2YGtxrEiZkBK9FjLppIUK2TgxK6qGD2P3hUXTJNNPVibrerKcx5WkR1g==
   dependencies:
     "@types/bonjour" "^3.5.9"
     "@types/connect-history-api-fallback" "^1.3.5"
@@ -11525,7 +11810,7 @@ webpack-dev-server@^4.13.3:
     "@types/serve-index" "^1.9.1"
     "@types/serve-static" "^1.13.10"
     "@types/sockjs" "^0.3.33"
-    "@types/ws" "^8.5.1"
+    "@types/ws" "^8.5.5"
     ansi-html-community "^0.0.8"
     bonjour-service "^1.0.11"
     chokidar "^3.5.3"
@@ -11547,10 +11832,10 @@ webpack-dev-server@^4.13.3:
     serve-index "^1.9.1"
     sockjs "^0.3.24"
     spdy "^4.0.2"
-    webpack-dev-middleware "^5.3.1"
+    webpack-dev-middleware "^5.3.4"
     ws "^8.13.0"
 
-webpack-merge@5.8.0, webpack-merge@^5.7.3:
+webpack-merge@5.8.0:
   version "5.8.0"
   resolved "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.8.0.tgz"
   integrity sha512-/SaI7xY0831XwP6kzuwhKWVKDP9t1QY1h65lAFLbZqMPIuYcD9QAW4u9STIbU9kaJbPBB/geU/gLr1wDjOhQ+Q==
@@ -11558,6 +11843,15 @@ webpack-merge@5.8.0, webpack-merge@^5.7.3:
     clone-deep "^4.0.1"
     wildcard "^2.0.0"
 
+webpack-merge@^5.10.0, webpack-merge@^5.7.3:
+  version "5.10.0"
+  resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-5.10.0.tgz#a3ad5d773241e9c682803abf628d4cd62b8a4177"
+  integrity sha512-+4zXKdx7UnO+1jaN4l2lHVD+mFvnlZQP/6ljaJVb4SZiwIKeUnrT5l0gkT8z+n4hKpC+jpOv6O9R+gLtag7pSA==
+  dependencies:
+    clone-deep "^4.0.1"
+    flat "^5.0.2"
+    wildcard "^2.0.0"
+
 webpack-sources@^1.4.3:
   version "1.4.3"
   resolved "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz"
@@ -11692,6 +11986,17 @@ which-collection@^1.0.1:
     is-weakmap "^2.0.1"
     is-weakset "^2.0.1"
 
+which-typed-array@^1.1.14, which-typed-array@^1.1.15:
+  version "1.1.15"
+  resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.15.tgz#264859e9b11a649b388bfaaf4f767df1f779b38d"
+  integrity sha512-oV0jmFtUky6CXfkqehVvBP/LSWJ2sy4vWMioiENyJLePrBO/yKyV9OyJySfAKosh+RYkIl5zJCNZ8/4JncrpdA==
+  dependencies:
+    available-typed-arrays "^1.0.7"
+    call-bind "^1.0.7"
+    for-each "^0.3.3"
+    gopd "^1.0.1"
+    has-tostringtag "^1.0.2"
+
 which-typed-array@^1.1.9:
   version "1.1.9"
   resolved "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.9.tgz"
@@ -11743,9 +12048,9 @@ wildcard@^2.0.0:
   integrity sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw==
 
 word-wrap@^1.2.3, word-wrap@~1.2.3:
-  version "1.2.3"
-  resolved "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz"
-  integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==
+  version "1.2.5"
+  resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.5.tgz#d2c45c6dd4fbce621a66f136cbe328afd0410b34"
+  integrity sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==
 
 wrap-ansi@^6.2.0:
   version "6.2.0"
@@ -11770,19 +12075,19 @@ wrappy@1:
   resolved "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz"
   integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==
 
-ws@^7.3.1, ws@^7.4.6:
-  version "7.5.9"
-  resolved "https://registry.npmjs.org/ws/-/ws-7.5.9.tgz"
-  integrity sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==
+ws@^7.4.6:
+  version "7.5.10"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.10.tgz#58b5c20dc281633f6c19113f39b349bd8bd558d9"
+  integrity sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ==
 
-ws@^8.11.0, ws@^8.13.0, ws@^8.4.2:
-  version "8.13.0"
-  resolved "https://registry.npmjs.org/ws/-/ws-8.13.0.tgz"
-  integrity sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA==
+ws@^8.11.0, ws@^8.13.0, ws@^8.4.2, ws@~8.17.1:
+  version "8.17.1"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-8.17.1.tgz#9293da530bb548febc95371d90f9c878727d919b"
+  integrity sha512-6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ==
 
 ws@~8.11.0:
   version "8.11.0"
-  resolved "https://registry.npmjs.org/ws/-/ws-8.11.0.tgz"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-8.11.0.tgz#6a0d36b8edfd9f96d8b25683db2f8d7de6e8e143"
   integrity sha512-HPG3wQd9sNQoT9xHyNCXoDUa+Xw/VevmY9FoHyQ+g+rrMn4j6FB4np7Z0OhdTgjx6MgQLK7jwSy1YecU1+4Asg==
 
 xhr2@^0.2.0:
@@ -11800,19 +12105,6 @@ xml-name-validator@^4.0.0:
   resolved "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-4.0.0.tgz"
   integrity sha512-ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw==
 
-xml2js@^0.4.17:
-  version "0.4.23"
-  resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.4.23.tgz#a0c69516752421eb2ac758ee4d4ccf58843eac66"
-  integrity sha512-ySPiMjM0+pLDftHgXY4By0uswI3SPKLDw/i3UXbnO8M/p28zqexCUoPmQFrYD+/1BzhGJSs2i1ERWKJAtiLrug==
-  dependencies:
-    sax ">=0.6.0"
-    xmlbuilder "~11.0.0"
-
-xmlbuilder@~11.0.0:
-  version "11.0.1"
-  resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-11.0.1.tgz#be9bae1c8a046e76b31127726347d0ad7002beb3"
-  integrity sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA==
-
 xmlchars@^2.2.0:
   version "2.2.0"
   resolved "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz"
@@ -11871,10 +12163,10 @@ yargs@17.1.1:
     y18n "^5.0.5"
     yargs-parser "^20.2.2"
 
-yargs@17.6.2:
-  version "17.6.2"
-  resolved "https://registry.npmjs.org/yargs/-/yargs-17.6.2.tgz"
-  integrity sha512-1/9UrdHjDZc0eOU0HxOHoS78C69UD3JRMvzlJ7S79S2nTaWRA/whGCTV8o9e/N/1Va9YIV7Q4sOxD8VV4pCWOw==
+yargs@17.7.2, yargs@^17.2.1, yargs@^17.3.1:
+  version "17.7.2"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.7.2.tgz#991df39aca675a192b816e1e0363f9d75d2aa269"
+  integrity sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==
   dependencies:
     cliui "^8.0.1"
     escalade "^3.1.1"
@@ -11897,19 +12189,6 @@ yargs@^16.1.1:
     y18n "^5.0.5"
     yargs-parser "^20.2.2"
 
-yargs@^17.2.1, yargs@^17.3.1:
-  version "17.7.1"
-  resolved "https://registry.npmjs.org/yargs/-/yargs-17.7.1.tgz"
-  integrity sha512-cwiTb08Xuv5fqF4AovYacTFNxk62th7LKJ6BL9IGUpTJrWoU7/7WdQGTP2SjKf1dUNBGzDd28p/Yfs/GI6JrLw==
-  dependencies:
-    cliui "^8.0.1"
-    escalade "^3.1.1"
-    get-caller-file "^2.0.5"
-    require-directory "^2.1.1"
-    string-width "^4.2.3"
-    y18n "^5.0.5"
-    yargs-parser "^21.1.1"
-
 yauzl@^2.10.0:
   version "2.10.0"
   resolved "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz"
@@ -11928,9 +12207,9 @@ yocto-queue@^0.1.0:
   resolved "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz"
   integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==
 
-zone.js@~0.11.5:
-  version "0.11.8"
-  resolved "https://registry.npmjs.org/zone.js/-/zone.js-0.11.8.tgz"
-  integrity sha512-82bctBg2hKcEJ21humWIkXRlLBBmrc3nN7DFh5LGGhcyycO2S7FN8NmdvlcKaGFDNVL4/9kFLmwmInTavdJERA==
+zone.js@~0.13.3:
+  version "0.13.3"
+  resolved "https://registry.yarnpkg.com/zone.js/-/zone.js-0.13.3.tgz#344c24098fa047eda6427a4c7ed486e391fd67b5"
+  integrity sha512-MKPbmZie6fASC/ps4dkmIhaT5eonHkEt6eAy80K42tAm0G2W+AahLJjbfi6X9NPdciOE9GRFTTM8u2IiF6O3ww==
   dependencies:
     tslib "^2.3.0"